[styles] Fix priority errors

3 files changed, 21 insertions, 24 deletions

diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index e9148659a4..cf5bcc25e0 100755
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -231,19 +231,19 @@ area|z10-[natural=wood],
 area|z10-[landuse=forest],
 area|z10-[leisure=park],
 area|z10-[leisure=garden],
-area|z14-[landuse=grass],
-area|z14-[natural=grassland],
-area|z14-[leisure=golf_course],
-area|z14-[natural=heath],
-area|z14-[landuse=farmland],
-area|z14-[landuse=allotments],
-area|z14-[natural=scrub],
-area|z14-[landuse=orchard],
-area|z14-[landuse=vineyard],
-area|z14-[landuse=meadow],
-area|z14-[landuse=recreation_ground],
-area|z14-[landuse=village_green],
-area|z14-[landuse=field],
+area|z12-[landuse=grass],
+area|z12-[natural=grassland],
+area|z12-[leisure=golf_course],
+area|z12-[natural=heath],
+area|z12-[landuse=farmland],
+area|z12-[landuse=allotments],
+area|z12-[natural=scrub],
+area|z12-[landuse=orchard],
+area|z12-[landuse=vineyard],
+area|z12-[landuse=meadow],
+area|z12-[landuse=recreation_ground],
+area|z12-[landuse=village_green],
+area|z12-[landuse=field],
 {fill-position: background; fill-opacity: 1;}
 
 area|z10-[leisure=nature_reserve]
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index d31b79ce96..c8769fb61a 100755
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -263,18 +263,12 @@ node[office=lawyer],
 area[office=lawyer]
 {z-index: 2600;}
 
-node[landuse=forest],
-area[landuse=forest]
-{z-index: 2650;}
-
 node[amenity=bus_station],
 area[amenity=bus_station],
 node[amenity=ferry_terminal],
 node[man_made=lighthouse],
 area[man_made=lighthouse],
 node[barrier=border_control],
-node[landuse=forest][boundary=national_park],
-area[landuse=forest][boundary=national_park],
 node[boundary=national_park],
 area[boundary=national_park],
 node[leisure=nature_reserve],
@@ -786,11 +780,11 @@ node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;fo
 node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;}
 
 /* 3.2.4 Kiev Subway Station */
-node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 8;	z-index: 2;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
+node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;}
 node|z15[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
 node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 6;z-index: 2;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+node[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
 node|z17[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
 node|z18-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
 
@@ -2086,7 +2080,7 @@ node|z18-[power=station],
 area|z18-[power=station],
 node|z18-[power=substation],
 area|z18-[power=substation]
-{icon-image: power-l.svg;font-size: 11;z-index: 2400;}
+{icon-image: power-l.svg;font-size: 11;}
 
 node|z17-[amenity=vending_machine],
 area|z17-[amenity=vending_machine]
@@ -2119,7 +2113,7 @@ area|z18-[amenity=toilets]
 {icon-image: toilets-l.svg;font-size: 11;}
 node|z18-[amenity=atm],
 area|z18-[amenity=atm]
-{z-index: 4200;icon-image: atm-l.svg;font-size: 11;}
+{icon-image: atm-l.svg;font-size: 11;}
 
 node|z18-[amenity=bench]
 {icon-image: bench.svg;}
@@ -2556,7 +2550,7 @@ area|z16[amenity=parking]
 {icon-image: parking-s.svg;icon-min-distance: 25;}
 node|z16[amenity=parking][access=permissive],
 node|z16[amenity=parking][access=private]
-{icon-image: zero-icon.svg;z-index: 6;}
+{icon-image: zero-icon.svg;}
 
 node|z17[amenity=parking] area|z17[amenity=parking]
 {icon-image: parking-m.svg;}
diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss
index ccdbe77160..71193bddec 100755
--- a/data/styles/clear/include/Roads_label.mapcss
+++ b/data/styles/clear/include/Roads_label.mapcss
@@ -131,6 +131,9 @@ line[highway=steps],
 node[highway=motorway_junction]
 {z-index: 1000;}
 
+line|z15-[hwtag=oneway]::arrows
+{z-index: 1000;}
+
 line[aerialway=cable_car]::dash,
 line[aerialway=chair_lift]::dash,
 line[aerialway=gondola]::dash,