From a8aa7c6ab5efeedfddb1531085389aaac8c895a3 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 22 Jun 2022 18:40:46 +0300
Subject: [PATCH] [styles] WIP Outdoors style

Bigger/thicker and/or visible at lower zoom levels features:
- paths/tracks, cliffs
- contour lines
- railways, powerlines and towers
- water sources, peaks, saddles, passes
- waterfalls, lighthouses, caves
- campsites, huts, shelters, picnic sites
- gates, stiles, fords
- etc.

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/clear/include/Basemap.mapcss      |  67 +++---
 .../styles/clear/include/Basemap_label.mapcss |  12 +-
 data/styles/clear/include/Icons.mapcss        | 221 +++++++++---------
 data/styles/clear/include/Roads.mapcss        | 154 +++++++-----
 data/styles/clear/include/Roads_label.mapcss  |  11 +-
 data/styles/clear/style-clear/colors.mapcss   |   2 +-
 6 files changed, 259 insertions(+), 208 deletions(-)

diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 1ddab4c6a9..3a1fe483ff 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -751,25 +751,36 @@ line|z19-[historic=citywalls],
 {width: 11; dashes: 8,8,3,8;}
 
 
-line|z14-[natural=cliff],
-line|z14-[natural=earth_bank],
-{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.6;}
+line|z13-[natural=cliff],
+line|z13-[natural=earth_bank],
+{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.7;}
+line|z14[natural=cliff],
+line|z14[natural=earth_bank],
+{width: 3; dashes: 1.5,1.5; opacity: 0.7;}
 line|z15[natural=cliff],
 line|z15[natural=earth_bank],
-{width: 3; dashes: 1.5,1.5; opacity: 0.6;}
+{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.7;}
 line|z16[natural=cliff],
 line|z16[natural=earth_bank],
-{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;}
+{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.7;}
 line|z17[natural=cliff],
 line|z17[natural=earth_bank],
-{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;}
+{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.8;}
 line|z18[natural=cliff],
 line|z18[natural=earth_bank],
-{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.7;}
+{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.8;}
 line|z19-[natural=cliff],
 line|z19-[natural=earth_bank],
-{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.7;}
+{width: 14.3; dashes: 6,8.5,12,2.3; opacity: 0.8;}
 
+/*
+line|z18[natural=cliff],
+line|z18[natural=earth_bank],
+{width: 17.3; dashes: 7,10,14.5,2.8; opacity: 0.7;}
+line|z19-[natural=cliff],
+line|z19-[natural=earth_bank],
+{width: 19.5; dashes: 8,12,16,3.5; opacity: 0.7;}
+*/
 
 line|z16-[barrier=retaining_wall],
 {color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;}
@@ -793,24 +804,24 @@ line|z19-[man_made=embankment],
 
 /* 9. ISOLINES */
 
-line|z11-[isoline=step_1000],
+line|z10-[isoline=step_1000],
 {color: @isoline1000;}
-line|z11-[isoline=step_500],
+line|z10-[isoline=step_500],
 {color: @isoline500;}
 
-line|z13-[isoline=step_100],
+line|z12-[isoline=step_100],
 {color: @isoline100;}
 
-line|z15-[isoline=step_50],
-line|z15-[isoline=zero],
+line|z14-[isoline=step_50],
+line|z14-[isoline=zero],
 {color: @isoline50;}
 
 line|z15-[isoline=step_10],
 {color: @isoline10;}
 
-line|z11-[isoline=step_1000],
+line|z10-[isoline=step_1000],
 {width: 1.3;opacity: 0.8;}
-line|z11[isoline=step_500],
+line|z10-[isoline=step_500],
 {width: 1.0;opacity: 0.5;}
 
 line|z12[isoline=step_500],
@@ -818,27 +829,27 @@ line|z12[isoline=step_500],
 
 line|z13-[isoline=step_500],
 {width: 1.3;opacity: 0.8;}
-line|z13[isoline=step_100],
+line|z12[isoline=step_100],
 {width: 1.0;opacity: 0.5;}
 
-line|z14[isoline=step_100],
+line|z13-14[isoline=step_100],
 {width: 1.3;opacity: 0.6;}
 
-line|z15-16[isoline=step_100],
+line|z15[isoline=step_100],
 {width: 1.3;opacity: 0.8;}
-line|z15-16[isoline=step_50],
-line|z15-16[isoline=zero],
-line|z15-16[isoline=step_10],
+line|z14-15[isoline=step_50],
+line|z14-15[isoline=zero],
+line|z15[isoline=step_10],
 {width: 1.0;opacity: 0.5;}
 
-line|z17-[isoline=step_100],
+line|z16-[isoline=step_100],
 {width: 1.3;opacity: 0.8;}
-line|z17[isoline=step_50],
-line|z17[isoline=zero],
-line|z17[isoline=step_10],
+line|z16[isoline=step_50],
+line|z16[isoline=zero],
+line|z16[isoline=step_10],
 {width: 1.0;opacity: 0.6;}
 
-line|z18-[isoline=step_50],
-line|z18-[isoline=zero],
-line|z18-[isoline=step_10],
+line|z17-[isoline=step_50],
+line|z17-[isoline=zero],
+line|z17-[isoline=step_10],
 {width: 1.3;opacity: 0.8;}
diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 7a527b8ef5..7f66af33ad 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -747,18 +747,18 @@ area|z17-[public_transport=platform],
 line[isoline]
 {text-position: line;}
 
-line|z11-[isoline=step_1000],
+line|z10-[isoline=step_1000],
 {text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline1000;}
 
-line|z12-[isoline=step_500],
+line|z11-[isoline=step_500],
 {text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline500;}
 
-line|z15-[isoline=step_100],
+line|z13-[isoline=step_100],
 {text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline100;}
 
-line|z17-[isoline=step_50],
-line|z17-[isoline=zero],
+line|z15-[isoline=step_50],
+line|z15-[isoline=zero],
 {text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline50;}
 
-line|z17-[isoline=step_10],
+line|z16-[isoline=step_10],
 {text:name;font-size: 9;fill-opacity: 0.7;text-color: @label_isoline10;}
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 8a3c758d82..9dcefb7f97 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -525,25 +525,25 @@ area[building=train_station],
 
 node|z10-[natural=volcano],
 area|z10-[natural=volcano],
-node|z11-[natural=cave_entrance],
-area|z11-[natural=cave_entrance],
-node|z11-[waterway=waterfall],
-area|z11-[waterway=waterfall],
-node|z13-[natural=peak],
-area|z13-[natural=peak],
-node|z14-[natural=saddle],
-area|z14-[natural=saddle],
-node|z14-[mountain_pass],
-area|z14-[mountain_pass],
-node|z14-[natural=spring],
-area|z14-[natural=spring],
-node|z14-[natural=hot_spring],
-area|z14-[natural=hot_spring],
-node|z14-[natural=geyser],
-area|z14-[natural=geyser],
-node|z16-[natural=beach],
-area|z16-[natural=beach],
-area|z14-[natural=bare_rock],
+node|z10-[natural=cave_entrance],
+area|z10-[natural=cave_entrance],
+node|z10-[waterway=waterfall],
+area|z10-[waterway=waterfall],
+node|z10-[natural=peak],
+area|z10-[natural=peak],
+node|z11-[natural=saddle],
+area|z11-[natural=saddle],
+node|z11-[mountain_pass],
+area|z11-[mountain_pass],
+node|z11-[natural=spring],
+area|z11-[natural=spring],
+node|z12-[natural=hot_spring],
+area|z12-[natural=hot_spring],
+node|z12-[natural=geyser],
+area|z12-[natural=geyser],
+node|z14-[natural=beach],
+area|z14-[natural=beach],
+area|z12-[natural=bare_rock],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;text-optional: true;}
 
 node|z12-[boundary=national_park],
@@ -562,50 +562,50 @@ node|z18-[leisure=nature_reserve],
 area|z18-[leisure=nature_reserve]
 {text-optional: true;}
 
-node|z11[natural=cave_entrance],
-area|z11[natural=cave_entrance]
+node|z10-11[natural=cave_entrance],
+area|z1011[natural=cave_entrance]
 {icon-image: cave-s.svg;icon-min-distance: 20;text-optional: true;}
 node|z12-[natural=cave_entrance],
 area|z12-[natural=cave_entrance]
 {icon-image: cave-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
-node|z15-[natural=cave_entrance],
-area|z15-[natural=cave_entrance]
+node|z14-[natural=cave_entrance],
+area|z14-[natural=cave_entrance]
 {icon-image: cave-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z17-[natural=cave_entrance],
 area|z17-[natural=cave_entrance]
 {icon-image: cave-m.svg;text-offset: 1;font-size: 11;text-optional: true;}
 
-node|z11[waterway=waterfall],
-area|z11[waterway=waterfall]
+node|z10-11[waterway=waterfall],
+area|z10-11[waterway=waterfall]
 {icon-image: waterfall-s.svg;icon-min-distance: 15;text-optional: true;}
 node|z12-[waterway=waterfall],
 area|z12-[waterway=waterfall]
 {icon-image: waterfall-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
-node|z17-[waterway=waterfall],
-area|z17-[waterway=waterfall]
+node|z15-[waterway=waterfall],
+area|z15-[waterway=waterfall]
 {icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 
 node|z10-[natural=volcano],
 area|z10-[natural=volcano]
 {icon-image: volcano-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
-node|z15-[natural=volcano],
-area|z15-[natural=volcano]
+node|z14-[natural=volcano],
+area|z14-[natural=volcano]
 {icon-image: volcano-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 
-node|z12[natural=peak][name],
-area|z12[natural=peak][name]
+node|z10-12[natural=peak][name],
+area|z10-12[natural=peak][name]
 {icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 1;text: name;text-color: @poi_label;text-position: center;text-optional: true;}
-node|z12-14[natural=peak][!name],
-node|z12-14[natural=rock][!name],
-area|z12-14[natural=peak][!name],
-area|z12-14[natural=rock][!name]
+node|z10-14[natural=peak][!name],
+node|z12-14[natural=bare_rock][!name],
+area|z10-14[natural=peak][!name],
+area|z12-14[natural=bare_rock][!name]
 {font-size: 0;}
-node|z13[natural=peak][name],
-area|z13[natural=peak][name]
+node|z12-13[natural=peak][name],
+area|z12-13[natural=peak][name]
 {icon-image: peakt-s.svg;text-offset: 1;font-size: 9;text-optional: true;}
 node|z14[natural=peak][name],
 area|z14[natural=peak][name]
-{icon-image: peakt-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
+{icon-image: peakt-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[natural=peak],
 node|z15-[natural=rock],
 area|z15-[natural=peak],
@@ -613,11 +613,16 @@ area|z15-[natural=rock]
 {icon-image: peakt-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 
 /* ToDo: Make the same as natural=peak when we will have -s,-m icons */
-node|z14-[natural=saddle],
-area|z14-[natural=saddle],
-node|z14-[mountain_pass],
-area|z14-[mountain_pass],
-{icon-image: mountain-pass.svg;text-offset: 1;font-size: 10;text-optional: true;}
+node|z11-[natural=saddle],
+area|z11-[natural=saddle],
+node|z11-[mountain_pass],
+area|z11-[mountain_pass],
+{icon-image: mountain-pass.svg;}
+node|z13-[natural=saddle],
+area|z13-[natural=saddle],
+node|z13-[mountain_pass],
+area|z13-[mountain_pass],
+{text-offset: 1;font-size: 10;text-optional: true;}
 
 node|z16[leisure=beach_resort],
 area|z16[leisure=beach_resort]
@@ -672,10 +677,10 @@ node|z12-[landuse=forest][!name],
 area|z12-[landuse=forest][!name]
 {}
 
-node|z14[natural=spring],
-area|z14[natural=spring],
-node|z14[natural=hot_spring],
-area|z14[natural=hot_spring]
+node|z11-14[natural=spring],
+area|z11-14[natural=spring],
+node|z12-14[natural=hot_spring],
+area|z12-14[natural=hot_spring]
 {icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;}
 node|z15-[natural=spring],
 area|z15-[natural=spring],
@@ -683,13 +688,22 @@ node|z15-[natural=hot_spring],
 area|z15-[natural=hot_spring]
 {icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;}
 
-node|z14[natural=geyser],
-area|z14[natural=geyser]
+node|z10-12[natural=geyser],
+area|z10-12[natural=geyser]
 {icon-image: geyser-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;}
-node|z15-[natural=geyser],
-area|z15-[natural=geyser]
+node|z13-[natural=geyser],
+area|z13-[natural=geyser]
 {icon-image: geyser-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;}
 
+node|z12-[amenity=water_point],
+area|z12-[amenity=water_point],
+node|z12-[amenity=drinking_water],
+area|z12-[amenity=drinking_water],
+node|z12-[man_made=water_tap],
+area|z12-[man_made=water_tap],
+node|z12-[man_made=water_well],
+area|z12-[man_made=water_well],
+{icon-image: drinking-water-s.svg;icon-min-distance: 36;text-optional: true;}
 node|z15-[amenity=water_point],
 area|z15-[amenity=water_point],
 node|z15-[amenity=drinking_water],
@@ -698,15 +712,6 @@ node|z15-[man_made=water_tap],
 area|z15-[man_made=water_tap],
 node|z15-[man_made=water_well],
 area|z15-[man_made=water_well],
-{icon-image: drinking-water-s.svg;icon-min-distance: 36;text-optional: true;}
-node|z19-[amenity=water_point],
-area|z19-[amenity=water_point],
-node|z19-[amenity=drinking_water],
-area|z19-[amenity=drinking_water],
-node|z19-[man_made=water_tap],
-area|z19-[man_made=water_tap],
-node|z19-[man_made=water_well],
-area|z19-[man_made=water_well],
 {icon-image: drinking-water-m.svg;icon-min-distance: 36;text-optional: true;}
 
 /* 3. TRANSPORT */
@@ -1234,12 +1239,12 @@ node|z16-[tourism=hotel],
 node|z16-[tourism=hostel],
 node|z16-[tourism=guest_house],
 area|z16-[tourism=guest_house],
-node|z16-[tourism=alpine_hut],
-area|z16-[tourism=alpine_hut],
-node|z16-[tourism=wilderness_hut],
-area|z16-[tourism=wilderness_hut],
-node|z16-[tourism=chalet],
-area|z16-[tourism=chalet],
+node|z13-[tourism=alpine_hut],
+area|z13-[tourism=alpine_hut],
+node|z13-[tourism=wilderness_hut],
+area|z13-[tourism=wilderness_hut],
+node|z15-[tourism=chalet],
+area|z15-[tourism=chalet],
 node|z16-[tourism=resort],
 area|z16-[tourism=resort],
 node|z16-[tourism=motel],
@@ -1247,18 +1252,18 @@ area|z16-[tourism=motel],
 node|z16-[tourism=apartment],
 area|z16-[tourism=apartment]
 {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
-node|z15-[tourism=camp_site],
-area|z15-[tourism=camp_site],
-node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site],
-node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table],
-node|z16-[amenity=shelter],
-area|z16-[amenity=shelter],
+node|z14-[tourism=camp_site],
+area|z14-[tourism=camp_site],
+node|z14-[tourism=picnic_site],
+area|z14-[tourism=picnic_site],
+node|z15-[leisure=picnic_table],
+area|z15-[leisure=picnic_table],
+node|z13-[amenity=shelter],
+area|z13-[amenity=shelter],
 node|z16-[highway=rest_area],
 area|z16-[highway=rest_area],
-node|z16-[tourism=caravan_site],
-area|z16-[tourism=caravan_site]
+node|z15-[tourism=caravan_site],
+area|z15-[tourism=caravan_site]
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
 
 
@@ -1275,12 +1280,12 @@ area|z16[tourism=guest_house],
 node|z16[tourism=apartment],
 area|z16[tourism=apartment]
 {icon-image: apartment-m.svg;icon-min-distance: 24;text-halo-radius: 0;}
-node|z16[tourism=alpine_hut],
-area|z16[tourism=alpine_hut],
-node|z16[tourism=wilderness_hut],
-area|z16[tourism=wilderness_hut],
-node|z16[tourism=chalet],
-area|z16[tourism=chalet]
+node|z13-16[tourism=alpine_hut],
+area|z13-16[tourism=alpine_hut],
+node|z13-16[tourism=wilderness_hut],
+area|z13-16[tourism=wilderness_hut],
+node|z15-16[tourism=chalet],
+area|z15-16[tourism=chalet]
 {icon-image: alpine_hut-m.svg;icon-min-distance: 24;}
 
 node|z17-[tourism=hotel],
@@ -1296,12 +1301,12 @@ area|z17[tourism=guest_house],
 node|z17[tourism=apartment],
 area|z17[tourism=apartment]
 {icon-image: apartment-m.svg;text-halo-radius: 0;}
-node|z17-[tourism=alpine_hut],
-area|z17-[tourism=alpine_hut],
-node|z17-[tourism=wilderness_hut],
-area|z17-[tourism=wilderness_hut],
-node|z17-[tourism=chalet],
-area|z17-[tourism=chalet]
+node|z15-[tourism=alpine_hut],
+area|z15-[tourism=alpine_hut],
+node|z15-[tourism=wilderness_hut],
+area|z15-[tourism=wilderness_hut],
+node|z16-[tourism=chalet],
+area|z16-[tourism=chalet]
 {icon-image: alpine_hut-m.svg;icon-min-distance: 16;}
 
 node|z18-[tourism=guest_house],
@@ -1310,25 +1315,25 @@ node|z18-[tourism=apartment],
 area|z18-[tourism=apartment]
 {icon-image: apartment-m.svg;icon-min-distance: 16;}
 
-node|z15-[tourism=camp_site],
-area|z15-[tourism=camp_site]
+node|z14-[tourism=camp_site],
+area|z14-[tourism=camp_site]
 {icon-image: campsite-m.svg;icon-min-distance: 12;}
 
-node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site],
+node|z14-[tourism=picnic_site],
+area|z14-[tourism=picnic_site],
 node|z16-[highway=rest_area],
 area|z16-[highway=rest_area]
 {icon-image: picnic-m.svg;icon-min-distance: 10;}
-node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table]
+node|z15-[leisure=picnic_table],
+area|z15-[leisure=picnic_table]
 {icon-image: picnic_table-m.svg;icon-min-distance: 10;}
 
-node|z16-[amenity=shelter],
-area|z16-[amenity=shelter]
+node|z13-[amenity=shelter],
+area|z13-[amenity=shelter]
 {icon-image: shelter-m.svg;icon-min-distance: 10;}
 
-node|z16[tourism=caravan_site],
-area|z16[tourism=caravan_site]
+node|z15-16[tourism=caravan_site],
+area|z15-16[tourism=caravan_site]
 {icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
 node|z17-[tourism=caravan_site],
 area|z17-[tourism=caravan_site]
@@ -1955,11 +1960,11 @@ node|z19-[amenity=fountain],
 area|z19-[amenity=fountain]
 {icon-image: fountain-m.svg;icon-min-distance: 20;}
 
-node|z14[man_made=lighthouse],
-area|z14[man_made=lighthouse]
-{icon-image: lighthouse-s.svg;text-offset: 1;icon-min-distance: 5;}
-node|z15-[man_made=lighthouse],
-area|z15-[man_made=lighthouse]
+node|z11-[man_made=lighthouse],
+area|z11-[man_made=lighthouse]
+{icon-image: lighthouse-s.svg;text-offset: 1;icon-min-distance: 10;}
+node|z13-[man_made=lighthouse],
+area|z13-[man_made=lighthouse]
 {icon-image: lighthouse-m.svg;}
 
 node|z12-14[barrier=toll_booth],
@@ -1969,7 +1974,7 @@ node|z15-[barrier=toll_booth],
 area|z15-[barrier=toll_booth]
 {icon-image: toll_booth-m.svg;icon-min-distance: 8;text-optional: true;}
 
-node|z15-[barrier=border_control]
+node|z14-[barrier=border_control]
 {icon-image:bcontrol-m.svg;}
 
 node|z16-[barrier=block],
@@ -1981,10 +1986,10 @@ node|z16-[barrier=kissing_gate],
 node|z16-[barrier=stile],
 {icon-image: dot-m.svg;font-size: 11;}
 
-node|z16-[highway=ford],
-node|z16-[power=tower],
-node|z15-[man_made=flagpole],
-node|z16-[man_made=mast],
+node|z14-[highway=ford],
+node|z14-[power=tower],
+node|z12-[man_made=flagpole],
+node|z13-[man_made=mast],
 {icon-image: dot-m.svg;}
 
 node|z16-[amenity=taxi],
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 328fbdfd96..b3298d5843 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -822,14 +822,14 @@ line|z15-[highway=steps][bridge?]::bridgeblack,
 line|z16-[highway=road][bridge?]::bridgeblack,
 line|z16-[highway=service][bridge?]::bridgeblack
 {casing-linecap: butt;casing-color:@bridge_casing;}
-line|z14-[highway=track],
+line|z11-[highway=track],
 line|z14-[highway=raceway],
 {color: @track;opacity: 1;}
 line|z15-[leisure=track][!area],
 {color: @sport;opacity: 1;}
-line|z14-[highway=path],
-line|z14-[route=hiking],
-line|z14-[highway=footway][sac_scale],
+line|z11-[highway=path],
+line|z11-[route=hiking],
+line|z11-[highway=footway][sac_scale],
 {color: @path;opacity: 1;}
 line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 1;}
@@ -936,64 +936,78 @@ line|z19-[highway=proposed]
 
 /* 8.6 Track & Path 14-22 ZOOM */
 
-line|z14[highway=track][tracktype=grade1],
 line|z14[highway=raceway],
 {width: 1;}
-line|z15[highway=track][tracktype=grade1],
 line|z15[highway=raceway],
 line|z15[leisure=track][!area]
 {width: 1.5;}
-line|z16[highway=track][tracktype=grade1],
 line|z16[highway=raceway],
 line|z16[leisure=track][!area]
 {width: 1.8;}
-line|z17-18[highway=track][tracktype=grade1],
 line|z17-18[highway=raceway],
 line|z17-18[leisure=track][!area]
 {width:3;}
-line|z19-[highway=track][tracktype=grade1],
 line|z19-[highway=raceway],
 line|z19-[leisure=track][!area]
 {width:4;}
 
-line|z14[highway=track],
-{width: 1.1; dashes: 6,2.5;}
-line|z15[highway=track],
-{width: 1.4; dashes: 6,2.5;}
-line|z16[highway=track],
-{width: 1.9; dashes: 7,3;}
-line|z17[highway=track],
-{width: 2.5; dashes: 7,3;}
-line|z18[highway=track],
-{width: 3.5; dashes: 9,3.5;}
-line|z19-[highway=track],
-{width: 4.5; dashes: 12,3.5;}
 
+line|z11[highway=track],
+{width: 1.3; dashes: 6,2.5;}
+line|z12[highway=track],
+{width: 1.6; dashes: 6,2.5;}
+line|z13[highway=track],
+{width: 2.1; dashes: 7,3;}
+line|z14[highway=track],
+{width: 2.9; dashes: 7,3;}
+line|z15[highway=track],
+{width: 4; dashes: 12,4;}
+line|z16[highway=track],
+{width: 4.9; dashes: 12,4;}
+line|z17[highway=track],
+{width: 7; dashes: 12,4;}
+line|z18[highway=track],
+{width: 10; dashes: 17,5;}
+line|z19-[highway=track],
+{width: 13; dashes: 17,5;}
+
+
+line|z11[highway=path],
+line|z11[route=hiking],
+line|z11[highway=footway][sac_scale],
+{width: 1; dashes: 3.5,2;}
+line|z12[highway=path],
+line|z12[route=hiking],
+line|z12[highway=footway][sac_scale],
+{width: 1.2; dashes: 3.5,2;}
+line|z13[highway=path],
+line|z13[route=hiking],
+line|z13[highway=footway][sac_scale],
+{width: 1.5; dashes: 4,2.5;}
 line|z14[highway=path],
 line|z14[route=hiking],
 line|z14[highway=footway][sac_scale],
-{width: 0.9; dashes: 3.5,2;}
+{width: 2; dashes: 4,2.5;}
 line|z15[highway=path],
 line|z15[route=hiking],
 line|z15[highway=footway][sac_scale],
-{width: 1.1; dashes: 3.5,2;}
+{width: 2.8; dashes: 8,4;}
 line|z16[highway=path],
 line|z16[route=hiking],
 line|z16[highway=footway][sac_scale],
-{width: 1.5; dashes: 4,2.5;}
+{width: 4; dashes: 8,4;}
 line|z17[highway=path],
 line|z17[route=hiking],
 line|z17[highway=footway][sac_scale],
-{width: 2; dashes: 4,2.5;}
+{width: 5.3; dashes: 8,4;}
 line|z18[highway=path],
 line|z18[route=hiking],
 line|z18[highway=footway][sac_scale],
-{width: 3; dashes: 6,3.5;}
+{width: 7.5; dashes: 12,5;}
 line|z19-[highway=path],
 line|z19-[route=hiking],
 line|z19-[highway=footway][sac_scale],
-{width: 4; dashes: 8,4.5;}
-
+{width: 10; dashes: 12,5;}
 
 /* 8.7 Footway 14-22 ZOOM */
 
@@ -1080,7 +1094,7 @@ line|z15-[aeroway=taxiway]
 
 /* 9.RAIL 11-22 ZOOM */
 
-line|z11-[railway=rail],
+line|z10-[railway=rail],
 line|z11-[railway=yard],
 line|z12-[railway=funicular],
 line|z13-[railway=light_rail][!tunnel],
@@ -1094,10 +1108,10 @@ line|z16-[railway=abandoned],
 {color: @railway;opacity:1;}
 line|z13-[railway=tram]
 {color: @tram;opacity:1;}
-line|z16-[railway=rail]::dash,
-line|z16-[railway=subway][!tunnel]::dash,
-line|z16-[railway=light_rail][!tunnel]::dash,
-line|z16-[railway=yard]::dash
+line|z14-[railway=rail]::dash,
+line|z14-[railway=subway][!tunnel]::dash,
+line|z14-[railway=light_rail][!tunnel]::dash,
+line|z14-[railway=yard]::dash
 {color: @railway_dash;opacity:1;}
 line|z14-[railway=rail][bridge?]::bridgewhite,
 line|z14-[railway=subway][bridge?]::bridgewhite,
@@ -1110,60 +1124,78 @@ line|z14-[railway=light_rail][bridge?]::bridgeblack,
 line|z14-[railway=yard][bridge?]::bridgeblack
 {casing-linecap: butt;casing-color:@bridge_casing;}
 
-/* 9.1 RAIL 11-22 ZOOM */
+/* 9.1 RAIL 10-22 ZOOM */
 
-line|z11-12[railway=rail],
-line|z11-12[railway=yard]
-{color: @railway_light;width: 0.6;}
+line|z10-[railway=rail],
+line|z10-[railway=yard],
+{color: @railway; width: 2;}
+line|z12[railway=rail],
+line|z12[railway=yard],
+{width: 2.5;}
 line|z13-[railway=rail],
 line|z13-[railway=subway][!tunnel],
 line|z13-[railway=light_rail][!tunnel],
 line|z13-[railway=yard]
-{color: @railway_light;width: 0.8;}
-line|z14[railway=rail],
-line|z14[railway=subway][!tunnel],
-line|z14[railway=light_rail][!tunnel],
-line|z14[railway=yard]
-{width: 1;}
+{width: 3.2;}
+line|z14-[railway=rail],
+line|z14-[railway=subway][!tunnel],
+line|z14-[railway=light_rail][!tunnel],
+line|z14-[railway=yard]
+{width: 4.1;}
 line|z15[railway=rail],
 line|z15[railway=subway][!tunnel],
 line|z15[railway=light_rail][!tunnel],
 line|z15[railway=yard],
-{width: 1.2;}
+{width: 5.2;}
 line|z16[railway=rail],
 line|z16[railway=subway][!tunnel],
 line|z16[railway=light_rail][!tunnel],
 line|z16[railway=yard]
-{width: 2.6;}
-line|z17-[railway=rail],
-line|z17-[railway=subway][!tunnel],
-line|z17-[railway=light_rail][!tunnel],
-line|z17-[railway=yard]
-{width: 3;}
+{width: 6.6;}
+line|z17[railway=rail],
+line|z17[railway=subway][!tunnel],
+line|z17[railway=light_rail][!tunnel],
+line|z17[railway=yard]
+{width: 9.5;}
+line|z18-[railway=rail],
+line|z18-[railway=subway][!tunnel],
+line|z18-[railway=light_rail][!tunnel],
+line|z18-[railway=yard]
+{width: 13;}
 
+line|z14[railway=rail]::dash,
+line|z14[railway=subway][!tunnel]::dash,
+line|z14[railway=light_rail][!tunnel]::dash,
+line|z14[railway=yard]::dash,
+{width: 3.4; dashes: 5,5;}
+line|z15[railway=rail]::dash,
+line|z15[railway=subway][!tunnel]::dash,
+line|z15[railway=light_rail][!tunnel]::dash,
+line|z15[railway=yard]::dash,
+{width: 4.2; dashes: 6,6;}
 line|z16[railway=rail]::dash,
 line|z16[railway=subway][!tunnel]::dash,
 line|z16[railway=light_rail][!tunnel]::dash,
 line|z16[railway=yard]::dash,
-{width: 1.3;dashes: 4.5,4.5;}
+{width: 5; dashes: 6,6;}
 line|z17[railway=rail]::dash,
 line|z17[railway=subway][!tunnel]::dash,
 line|z17[railway=light_rail][!tunnel]::dash,
 line|z17[railway=yard]::dash
-{width: 2;dashes: 6.3,6.3;}
+{width: 7.5; dashes: 8,8;}
 line|z18-[railway=rail]::dash,
 line|z18-[railway=subway][!tunnel]::dash,
 line|z18-[railway=light_rail][!tunnel]::dash,
 line|z18-[railway=yard]::dash
-{width: 2;dashes: 8.1,8.1;}
+{width: 10; dashes: 10,10;}
 
-line|z16-[railway=preserved],
-line|z16-[railway=abandoned]
-{width: 1.6;dashes: 6.3,6.3;}
+line|z14-[railway=preserved],
+line|z14-[railway=abandoned]
+{width: 2; dashes: 6.3,6.3;}
 
-line|z16-[railway=construction],
-line|z16-[railway=disused]
-{width: 1;dashes: 1.8,5.4;}
+line|z14-[railway=construction],
+line|z14-[railway=disused]
+{width: 1.7; dashes: 1.8,5.4;}
 
 /* 9.2 Rail tunnel 14-22 ZOOM */
 
@@ -1303,8 +1335,10 @@ line|z14-[aerialway=platter]::dash,
 line|z14-[aerialway=rope_tow]::dash,
 {width: 2.5;opacity: 0.6;dashes: 0.9,18;}
 
-line|z19-[power=line],
+line|z15-[power=line],
 {color: @powerline; width: 1; opacity: 0.6;}
+line|z17-[power=line],
+{width: 1.3; opacity: 0.7;}
 
 /* 10.3 Piste & Route 14-22 ZOOM */
 
diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss
index 9126f63085..863c3442be 100644
--- a/data/styles/clear/include/Roads_label.mapcss
+++ b/data/styles/clear/include/Roads_label.mapcss
@@ -423,12 +423,12 @@ line|z18-[highway=road],
 line|z15-[highway=cycleway],
 line|z15-[highway=construction],
 line|z15-[highway=proposed],
-line|z15-[highway=track],
-line|z15-[highway=path],
+line|z13-[highway=track],
+line|z13-[highway=path],
 line|z15-[highway=bridleway],
 line|z15-[highway=footway],
 line|z16-[leisure=track],
-line|z16-[route=hiking],
+line|z13-[route=hiking],
 line|z16-[highway=steps],
 line|z16-[highway=ford],
 line|z16-[highway=raceway],
@@ -437,10 +437,11 @@ line|z16-[highway=raceway],
 line|z15[highway=construction],
 line|z15[highway=proposed],
 line|z15[highway=bridleway],
-line|z15[highway=path],
+line|z13-15[highway=path],
+line|z13-15[route=hiking],
 line|z15[highway=footway],
 line|z15[highway=cycleway],
-line|z15[highway=track]
+line|z13-15[highway=track],
 {font-size: 8;}
 line|z16-17[highway=ford],
 line|z16-17[highway=cycleway],
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 49c14f60c6..f2162fc6a1 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -141,7 +141,7 @@
 /* 5.5 Transport */
 
 @railway_light: #B2B1A2;
-@railway: #969586;
+@railway: #868576;
 @railway_dash: #EEEEEE;
 @railway_tunnel: #808080;
 @aerialway: #444444;