Regenerate for world level highways

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>

data/styles/clear/include/Basemap.mapcss

@@ -74,9 +74,6 @@ area[leisure=garden]
 area[leisure=pitch],
 area[leisure=stadium],
 area[leisure=track][area?],
-area[leisure=playground],
-area[sport=multi],
-area[sport=soccer],
 {z-index: 41;}
 
 area[landuse=farmland],
@@ -120,13 +117,13 @@ area[railway=platform]
 
 area[landuse=grass],
 area[natural=grassland],
-area[leisure=golf_course],
 area[natural=heath]
 {z-index: 46;}
 
 area[natural=scrub]
 {z-index: 47;}
 
+area[leisure=golf_course],
 line[waterway=river],
 line[waterway=riverbank],
 line[waterway=stream],
@@ -153,10 +150,6 @@ line[waterway=weir],
 node[waterway=lock_gate],
 {z-index: 110;}
 
-area[man_made=pier],
-area[man_made=breakwater],
-line[man_made=pier],
-line[man_made=breakwater],
 line[man_made=cutline]
 {z-index: 120;}
 
@@ -190,6 +183,10 @@ area[aeroway=terminal]
 area[amenity=place_of_worship]
 {z-index: 210;}
 
+area[man_made=pier],
+area[man_made=breakwater],
+line[man_made=pier],
+line[man_made=breakwater],
 line[barrier=wall],
 line[barrier=fence],
 line[barrier=hedge],

data/styles/clear/include/Basemap_label.mapcss

@@ -58,10 +58,6 @@ node[place=continent]
 {z-index: 999;}
 
 node[place=country],
-line[man_made=pier],
-line[man_made=breakwater],
-node[man_made=pier],
-node[man_made=breakwater],
 line[waterway=dam],
 line[waterway=weir],
 node[waterway=weir],
@@ -686,7 +682,7 @@ line|z17-[man_made=pier],
 line|z17-[man_made=breakwater],
 node|z17-[man_made=pier],
 node|z17-[man_made=breakwater]
-{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;-x-me-area-priority:16000;}
+{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;}
 
 /*	8.2 Building */
 area|z16[building],

data/styles/clear/include/Icons.mapcss

@@ -29,21 +29,6 @@
 
 /* 1. Z-INDEX OF ICONS */
 
-/*
-  Set default text priority for all POIs greater than building text priority (15201) to avoid name and symbol overlap.
-  This is the only valid variant to change text priority without overriding background filling priority.
-  ToDo: I'd prefer something like area[amenity] { z-name-index: 500; };
-  -x-me-min-text-priority and -x-me-text-priority are hacks.
-*/
-area[amenity],
-area[man_made],
-{-x-me-min-text-priority: 15300;}
-
-node|z17-[leisure=golf_course],
-area|z17-[leisure=golf_course]
-{z-index: 50;}
-/* нельзя другой z-index, иначе пропадают все объекты на поле */
-
 node[amenity=fountain],
 area[amenity=fountain]
 {z-index: 2000;}
@@ -100,8 +85,6 @@ node[amenity=vending_machine],
 area[amenity=vending_machine],
 node[amenity=parcel_locker],
 area[amenity=parcel_locker],
-node[aeroway=gate],
-area[aeroway=gate],
 node[amenity=hunting_stand],
 area[amenity=hunting_stand],
 node[amenity=shower],
@@ -119,10 +102,9 @@ area[shop],
 node[amenity=veterinary],
 area[amenity=veterinary],
 node[leisure=playground],
+area[leisure=playground],
 node[historic=ruins],
 area[historic=ruins],
-node[tourism=artwork][artwork_type=sculpture],
-area[tourism=artwork][artwork_type=sculpture],
 node[tourism=caravan_site],
 area[tourism=caravan_site],
 node[amenity=bicycle_parking],
@@ -149,10 +131,8 @@ node[power=station],
 area[power=station],
 node[power=substation],
 area[power=substation],
-node|z18-[tourism],
-area|z18-[tourism],
-node|z18-[craft],
-area|z18-[craft],
+node[craft],
+area[craft],
 node[amenity=bbq],
 area[amenity=bbq],
 node[amenity=toilets],
@@ -164,70 +144,72 @@ node[sport],
 area[sport],
 {z-index: 2410;}
 
-node|z18-[sport=archery],
-area|z18-[sport=archery],
-node|z18-[sport=shooting],
-area|z18-[sport=shooting],
-node|z18-[sport=australian_football],
-area|z18-[sport=australian_football],
-node|z18-[sport=bowls],
-area|z18-[sport=bowls],
-node|z18-[sport=cricket],
-area|z18-[sport=cricket],
-node|z18-[sport=curling],
-area|z18-[sport=curling],
-node|z18-[sport=diving],
-area|z18-[sport=diving],
-node|z18-[sport=scuba_diving],
-area|z18-[sport=scuba_diving],
-node|z18-[sport=equestrian],
-area|z18-[sport=equestrian],
-node|z18-[sport=climbing],
-area|z18-[sport=climbing],
-node|z18-[sport=9pin],
-area|z18-[sport=9pin],
-node|z18-[sport=10pin],
-area|z18-[sport=10pin],
-node|z18-[sport=chess],
-area|z18-[sport=chess],
+node[sport=futsal],
+area[sport=futsal],
+node[sport=archery],
+area[sport=archery],
+node[sport=shooting],
+area[sport=shooting],
+node[sport=australian_football],
+area[sport=australian_football],
+node[sport=bowls],
+area[sport=bowls],
+node[sport=cricket],
+area[sport=cricket],
+node[sport=curling],
+area[sport=curling],
+node[sport=diving],
+area[sport=diving],
+node[sport=scuba_diving],
+area[sport=scuba_diving],
+node[sport=equestrian],
+area[sport=equestrian],
+node[sport=climbing],
+area[sport=climbing],
+node[sport=9pin],
+area[sport=9pin],
+node[sport=10pin],
+area[sport=10pin],
+node[sport=chess],
+area[sport=chess],
 {z-index: 2440;}
 
-node|z18-[sport=swimming],
-area|z18-[sport=swimming],
-node|z18-[sport=baseball],
-area|z18-[sport=baseball],
-node|z18-[sport=basketball],
-area|z18-[sport=basketball],
-node|z18-[sport=american_football],
-area|z18-[sport=american_football],
-node|z18-[sport=athletics],
-area|z18-[sport=athletics],
-node|z18-[sport=golf],
-area|z18-[sport=golf],
-node|z18-[sport=gymnastics],
-area|z18-[sport=gymnastics],
-node|z18-[sport=skateboard],
-area|z18-[sport=skateboard],
-node|z18-[sport=volleyball],
-area|z18-[sport=volleyball],
-node|z18-[sport=beachvolleyball],
-area|z18-[sport=beachvolleyball],
-node|z18-[sport=table_tennis],
-area|z18-[sport=table_tennis],
-node|z18-[sport=yoga],
-area|z18-[sport=yoga],
-node|z18-[sport=padel],
-area|z18-[sport=padel],
-node|z18-[sport=handball],
-area|z18-[sport=handball],
-node|z18-[sport=ice_hockey],
-area|z18-[sport=ice_hockey],
-node|z18-[sport=field_hockey],
-area|z18-[sport=field_hockey],
-node|z18-[sport=badminton],
-area|z18-[sport=badminton],
-node|z18-[sport=pelota],
-area|z18-[sport=pelota],
+node[sport=swimming],
+area[sport=swimming],
+node[sport=baseball],
+area[sport=baseball],
+node[sport=basketball],
+area[sport=basketball],
+node[sport=american_football],
+area[sport=american_football],
+node[sport=athletics],
+area[sport=athletics],
+node[sport=golf],
+area[sport=golf],
+node[sport=gymnastics],
+area[sport=gymnastics],
+node[sport=skateboard],
+area[sport=skateboard],
+node[sport=volleyball],
+area[sport=volleyball],
+node[sport=beachvolleyball],
+area[sport=beachvolleyball],
+node[sport=table_tennis],
+area[sport=table_tennis],
+node[sport=yoga],
+area[sport=yoga],
+node[sport=padel],
+area[sport=padel],
+node[sport=handball],
+area[sport=handball],
+node[sport=ice_hockey],
+area[sport=ice_hockey],
+node[sport=field_hockey],
+area[sport=field_hockey],
+node[sport=badminton],
+area[sport=badminton],
+node[sport=pelota],
+area[sport=pelota],
 {z-index: 2460;}
 
 node[landuse=landfill],
@@ -271,6 +253,8 @@ node[shop=charity],
 area[shop=charity],
 node[shop=second_hand],
 area[shop=second_hand],
+node[aeroway=gate],
+area[aeroway=gate],
 {z-index: 2500;}
 
 node[amenity=fuel],
@@ -280,16 +264,16 @@ area[amenity=charging_station]
 {z-index: 2590;}
 
 node[aerialway=station],
-node[aerialway=cable_car],
-node[aerialway=chair_lift],
-node[aerialway=gondola],
-node[aerialway=mixed_lift],
-node[aerialway=drag_lift],
-node[aerialway=j-bar],
-node[aerialway=t-bar],
-node[aerialway=magic_carpet],
-node[aerialway=platter],
-node[aerialway=rope_tow],
+line[aerialway=cable_car],
+line[aerialway=chair_lift],
+line[aerialway=gondola],
+line[aerialway=mixed_lift],
+line[aerialway=drag_lift],
+line[aerialway=j-bar],
+line[aerialway=t-bar],
+line[aerialway=magic_carpet],
+line[aerialway=platter],
+line[aerialway=rope_tow],
 node[railway=level_crossing],
 node[amenity=marketplace],
 area[amenity=marketplace],
@@ -366,8 +350,6 @@ node[leisure=nature_reserve],
 area[leisure=nature_reserve]
 {z-index: 2700;}
 
-node[tourism=artwork],
-area[tourism=artwork],
 node[tourism=attraction][attraction=animal],
 area[tourism=attraction][attraction=animal],
 {z-index: 2760;}
@@ -403,17 +385,10 @@ node[historic=memorial],
 area[historic=memorial],
 node[historic=battlefield],
 area[historic=battlefield],
-node|z17-[tourism=artwork][artwork_type=sculpture],
-area|z17-[tourism=artwork][artwork_type=sculpture]
+node[tourism=artwork],
+area[tourism=artwork],
 {z-index: 2800;}
 
-/* Decrease _plaque_ priority from defaults */
-node[historic=memorial][memorial=plaque],
-area[historic=memorial][memorial=plaque],
-node[historic=memorial][memorial=stolperstein],
-area[historic=memorial][memorial=stolperstein],
-{z-index: 2760;}
-
 /* OSM Hotel */
 
 node[tourism=apartment],
@@ -473,16 +448,6 @@ node[leisure=stadium],
 area[leisure=stadium]
 {z-index: 2878;}
 node[tourism=viewpoint]
-node|z16-[tourism=artwork][artwork_type=architecture],
-area|z16-[tourism=artwork][artwork_type=architecture],
-node|z17-[tourism=artwork][artwork_type=statue],
-area|z17-[tourism=artwork][artwork_type=statue],
-node|z18-[historic=memorial][memorial=plaque],
-area|z18-[historic=memorial][memorial=plaque],
-node|z19-[historic=memorial][memorial=stolperstein],
-area|z19-[historic=memorial][memorial=stolperstein],
-node|z18-[tourism=artwork][artwork_type=painting],
-area|z18-[tourism=artwork][artwork_type=painting]
 {z-index: 2880;}
 node[tourism=zoo],
 area[tourism=zoo]
@@ -764,16 +729,6 @@ node|z10-[aeroway=aerodrome][aerodrome=international],
 area|z14-[aeroway=aerodrome],
 node|z14-[aeroway=aerodrome],
 node|z15-[aerialway=station],
-node|z15-[aerialway=cable_car],
-node|z15-[aerialway=chair_lift],
-node|z15-[aerialway=gondola],
-node|z15-[aerialway=mixed_lift],
-node|z15-[aerialway=drag_lift],
-node|z15-[aerialway=j-bar],
-node|z15-[aerialway=t-bar],
-node|z15-[aerialway=magic_carpet],
-node|z15-[aerialway=platter],
-node|z15-[aerialway=rope_tow],
 node|z16-[amenity=ferry_terminal]
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
 area|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
@@ -956,41 +911,13 @@ node|z16-[aeroway=helipad]
 /* 3.7 Aerialway */
 
 node|z12-13[aerialway=station],
-node|z12-13[aerialway=cable_car],
-node|z12-13[aerialway=chair_lift],
-node|z12-13[aerialway=gondola],
-node|z12-13[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;icon-min-distance: 10;text-optional: true;}
+{icon-image: cable-car-s.svg;icon-min-distance: 10;}
 node|z14[aerialway=station],
-node|z14[aerialway=cable_car],
-node|z14[aerialway=chair_lift],
-node|z14[aerialway=gondola],
-node|z14[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;text-optional: true;}
-node|z15-16[aerialway=station],
-node|z15-16[aerialway=cable_car],
-node|z15-16[aerialway=chair_lift],
-node|z15-16[aerialway=gondola],
-node|z15-16[aerialway=mixed_lift],
-node|z15-16[aerialway=drag_lift],
-node|z15-16[aerialway=j-bar],
-node|z15-16[aerialway=t-bar],
-node|z15-16[aerialway=magic_carpet],
-node|z15-16[aerialway=platter],
-node|z15-16[aerialway=rope_tow]
-{icon-image: cable-car-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
+{icon-image: cable-car-s.svg;}
+node|z15-[aerialway=station],
+{icon-image: cable-car-m.svg;text-offset: 1;font-size: 10;}
 node|z17-[aerialway=station],
-node|z17-[aerialway=cable_car],
-node|z17-[aerialway=chair_lift],
-node|z17-[aerialway=gondola],
-node|z17-[aerialway=mixed_lift],
-node|z17-[aerialway=drag_lift],
-node|z17-[aerialway=j-bar],
-node|z17-[aerialway=t-bar],
-node|z17-[aerialway=magic_carpet],
-node|z17-[aerialway=platter],
-node|z17-[aerialway=rope_tow]
-{icon-image: cable-car-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
+{font-size: 12;}
 
 node|z17-[railway=level_crossing]
 {icon-image: railway-crossing-m.svg;text-optional: true;}
@@ -1101,14 +1028,14 @@ node|z16-[historic=battlefield],
 area|z16-[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 12;}
 
-/* Zero previous params to redefine below */
+/* Do not display following features on lower zoom levels */
 node|z15-17[historic=memorial][memorial=plaque],
 area|z15-17[historic=memorial][memorial=plaque],
 node|z15-18[historic=memorial][memorial=stolperstein],
 area|z15-18[historic=memorial][memorial=stolperstein],
 node|z15-16[historic=memorial][memorial=cross],
 area|z15-16[historic=memorial][memorial=cross],
-{icon-image: zero-icon.svg;text: none;}
+{icon-image: ; text: none;}
 
 node|z18-[historic=memorial][memorial=plaque],
 area|z18-[historic=memorial][memorial=plaque],
@@ -1727,29 +1654,21 @@ area|z17-[amenity=pharmacy]
 
 area|z14[amenity=university][name]
 {icon-image: college-s.svg;icon-min-distance: 12;-x-me-text-priority:16000;}
-area|z15[amenity=university][name],
-node|z15[amenity=university][name]
+area|z15-[amenity=university][name],
+node|z15-[amenity=university][name]
 {icon-image: college-m.svg;icon-min-distance: 12;-x-me-text-priority:16000;}
-node|z15[amenity=university][!name]
-{}
 node|z16[amenity=university][name],
 area|z16[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 11;-x-me-text-priority:16000;}
-node|z16[amenity=university][!name],
-area|z16[amenity=university][!name]
-{}
+{icon-min-distance: 11;}
 node|z17[amenity=university][name],
 area|z17[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 10;-x-me-text-priority:16000;}
-node|z17[amenity=university][!name],
-area|z17[amenity=university][!name]
-{}
+{icon-min-distance: 10;}
 node|z18-[amenity=university][name],
 area|z18-[amenity=university][name]
-{icon-image: college-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;}
-node|z18-[amenity=university][!name],
-area|z18-[amenity=university][!name]
-{}
+{icon-min-distance: 0; font-size: 11;text-optional: true;}
+
+node|z15-[amenity=university][!name]
+{text: none}
 
 node|z16-[amenity=college],
 area|z16-[amenity=college]
@@ -1804,7 +1723,8 @@ node|z17-[leisure=fitness_centre]
 {icon-image: gym-m.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
 node|z17-[leisure=sauna]
 {icon-image: sauna-m.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=playground]
+node|z17-[leisure=playground],
+area|z17-[leisure=playground],
 {icon-image: playground-m.svg;font-size: 11;icon-min-distance: 10;}
 node|z17-[leisure=swimming_pool],
 area|z17-[leisure=swimming_pool]
@@ -2226,9 +2146,6 @@ area|z18-[amenity=vending_machine][vending=fuel]
 node|z17-[aeroway=gate],
 area|z17-[aeroway=gate]
 {icon-image: gate-m.svg;font-size: 11;}
-node|z18-[aeroway=gate],
-area|z18-[aeroway=gate]
-{icon-image: gate-m.svg;font-size: 11;z-index: 24200;}/*check*/
 
 node|z17-[amenity=bureau_de_change]
 {icon-image: banknote-m.svg;font-size: 11;text-optional: true;}

data/styles/clear/include/Roads.mapcss

@@ -1,7 +1,7 @@
 /* ~~~~ CONTENT OF ROADS ~~~~~
 
 1.Z-INDEX ROADS
-2.WORLD LAVEL ROAD 4-9 ZOOM
+2.WORLD LEVEL ROAD 4-9 ZOOM
 3.TRUNK & MOTORWAY 7-22 ZOOM
   3.1 Trunk & Motorway 7-22 ZOOM
   3.2 Trunk & Motorway tunnel 12-22 ZOOM
@@ -166,7 +166,7 @@ line[highway=bridleway]
 
 line[highway=track],
 line[highway=raceway],
-line[leisure=track][!area],
+line[leisure=track],
 line[highway=path],
 line[route=hiking],
 line[highway=footway]
@@ -193,16 +193,16 @@ line[railway=light_rail][!tunnel]::dash,
 line[railway=yard]::dash
 {z-index: 690;}
 
-line[highway=residential],
 line[highway=road],
 line[highway=living_street]
+line[highway=unclassified],
 {z-index: 700;}
 
 line[highway=residential_link],
 line[highway=tertiary_link]
 {z-index: 740;}
 
-line[highway=unclassified],
+line[highway=residential],
 line[highway=tertiary],
 {z-index: 750;}
 
@@ -216,16 +216,14 @@ line[highway=primary_link]
 {z-index: 840;}
 
 line[highway=primary],
-line|z8-9[highway=world_towns_level],
-line|z8-9[highway=world_level],
 {z-index: 850;}
 
 line[highway=motorway_link],
 line[highway=trunk_link]
 {z-index: 890;}
 
-line|z4-7[highway=world_towns_level],
-line|z4-7[highway=world_level],
+line[highway=world_towns_level],
+line[highway=world_level],
 line[highway=trunk],
 line[highway=motorway]
 {z-index: 900;}
@@ -271,9 +269,9 @@ line[power=line]
 line[highway]
 {casing-width: 0;}
 
-/* 2.WORLD LAVEL ROAD 4-9 ZOOM */
+/* 2.WORLD LEVEL ROAD 4-9 ZOOM */
 
-line|z4-9[highway=world_towns_level],
+line|z6-9[highway=world_towns_level],
 line|z4-9[highway=world_level],
 {color: @trunk_orange_light;opacity: 1;}
 

data/styles/clear/include/Roads_label.mapcss

@@ -48,123 +48,10 @@ line[piste:type=nordic],
 line[piste:type=sled],
 {z-index: 199;}
 
-line[highway=construction],
-line[highway=proposed],
-line[railway=construction],
-line[railway=disused],
-line[railway=preserved],
-line[railway=abandoned]
-{z-index: 450;}
-
-line[highway=bridleway]
-{z-index: 590;}
-
-line[highway=track],
-line[highway=raceway],
-line[leisure=track],
-line[highway=path],
-line[route=hiking],
-line[highway=footway]
-{z-index: 600;}
-
-line[highway=service],
-line[highway=service][service=busway],
-line[highway=busway],
-{z-index: 650;}
-
-line[highway=pedestrian],
-line[highway=ford]
-{z-index: 660;}
-
-line[railway=rail],
-line[railway=light_rail][!tunnel],
-line[railway=subway][!tunnel],
-line[railway=yard]
-{z-index: 680;}
-
-line[railway=rail]::dash,
-line[railway=light_rail][!tunnel]::dash,
-line[railway=subway][!tunnel]::dash,
-line[railway=yard]::dash
-{z-index: 690;}
-
-line[highway=unclassified],
-line[highway=road],
-line[highway=living_street]
-{z-index: 700;}
-
-line[highway=residential_link],
-line[highway=tertiary_link]
-{z-index: 740;}
-
-line[highway=residential],
-line[highway=tertiary],
-{z-index: 750;}
-
-line[highway=secondary_link]
-{z-index: 790;}
-
-line[highway=secondary]
-{z-index: 800;}
-
-line[highway=primary_link]
-{z-index: 840;}
-
-line[highway=primary],
-line|z8-9[highway=world_towns_level],
-line|z8-9[highway=world_level],
-{z-index: 850;}
-
-line[highway=motorway_link],
-line[highway=trunk_link]
-{z-index: 890;}
-
-line|z4-7[highway=world_towns_level],
-line|z4-7[highway=world_level],
-line[highway=trunk],
-line[highway=motorway]
-{z-index: 900;}
-
-line[railway=monorail],
-line[railway=narrow_gauge],
-line[railway=tram]
-{z-index: 950;}
-
-line[highway=cycleway],
-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,
-line[aerialway=mixed_lift]::dash,
-line[aerialway=drag_lift] ::dash,
-line[aerialway=j-bar]::dash,
-line[aerialway=t-bar]::dash,
-line[aerialway=magic_carpet]::dash,
-line[aerialway=platter]::dash,
-line[aerialway=rope_tow]::dash,
-{z-index: 1049;}
-
-line[aerialway=cable_car],
-line[aerialway=chair_lift],
-line[aerialway=gondola],
-line[aerialway=mixed_lift],
-line[aerialway=drag_lift],
-line[aerialway=j-bar],
-line[aerialway=t-bar],
-line[aerialway=magic_carpet],
-line[aerialway=platter],
-line[aerialway=rope_tow],
-{z-index: 1050;}
-
-line[power=line]
-{z-index: 2000;}
-
 /* 2.SHIELD 10-22 ZOOM */
 
 line|z10-[highway=motorway],
@@ -481,19 +368,19 @@ line[railway=narrow_gauge],
 line[railway=funicular]
 */
 /* 10.PISTE 15-22 ZOOM */
-/*
-line[power=line],
-line[aerialway=cable_car],
-line[aerialway=chair_lift],
-line[aerialway=gondola],
-line[aerialway=mixed_lift],
-line[aerialway=drag_lift],
-line[aerialway=j-bar],
-line[aerialway=t-bar],
-line[aerialway=magic_carpet],
-line[aerialway=platter],
-line[aerialway=rope_tow],
-*/
+
+line|z15-[aerialway=cable_car],
+line|z15-[aerialway=chair_lift],
+line|z15-[aerialway=gondola],
+line|z15-[aerialway=mixed_lift],
+line|z15-[aerialway=drag_lift],
+line|z15-[aerialway=j-bar],
+line|z15-[aerialway=t-bar],
+line|z15-[aerialway=magic_carpet],
+line|z15-[aerialway=platter],
+line|z15-[aerialway=rope_tow],
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: line;}
+
 /* 10.3 Piste & Route 14-22 ZOOM */
 /*
 line[piste:type=downhill],

data/styles/vehicle/include/Basemap.mapcss

@@ -99,10 +99,10 @@ area[railway=platform]
 
 area[landuse=grass],
 area[natural=grassland],
-area[leisure=golf_course],
 area[natural=heath]
 {z-index: 45;}
 
+area[leisure=golf_course],
 area[natural=wetland],
 line[waterway=stream][intermittent=yes]
 {z-index: 49;}
@@ -132,10 +132,6 @@ line[waterway=weir],
 node[waterway=lock_gate],
 {z-index: 110;}
 
-area[man_made=pier],
-area[man_made=breakwater],
-line[man_made=pier],
-line[man_made=breakwater],
 line[man_made=cutline]
 {z-index: 120;}
 
@@ -159,6 +155,10 @@ area[aeroway=terminal]
 area[amenity=place_of_worship]
 {z-index: 210;}
 
+area[man_made=pier],
+area[man_made=breakwater],
+line[man_made=pier],
+line[man_made=breakwater],
 line[barrier=wall],
 line[barrier=fence],
 line[barrier=hedge],

data/styles/vehicle/include/Basemap_label.mapcss

@@ -50,10 +50,6 @@ node[place=continent]
 {z-index: 999;}
 
 node[place=country],
-line[man_made=pier],
-line[man_made=breakwater],
-node[man_made=pier],
-node[man_made=breakwater],
 line[waterway=dam],
 line[waterway=weir],
 node[waterway=weir],

data/styles/vehicle/include/Icons.mapcss

@@ -28,16 +28,6 @@
 
 /* 1. Z-INDEX OF ICONS */
 
-/*
-  Set default text priority for all POIs greater than building text priority (15201) to avoid name and symbol overlap.
-  This is the only valid variant to change text priority without overriding background filling priority.
-  ToDo: I'd prefer something like area[amenity] { z-name-index: 500; };
-  -x-me-min-text-priority and -x-me-text-priority are hacks.
-*/
-area[amenity],
-area[man_made],
-{-x-me-min-text-priority: 15300;}
-
 node[amenity=marketplace],
 area[amenity=marketplace]
 {z-index: 6;}
@@ -449,14 +439,14 @@ node|z16-[historic=battlefield],
 area|z16-[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 12;}
 
-/* Zero previous params to redefine below */
+/* Do not display following features on lower zoom levels */
 node|z15-[historic=memorial][memorial=plaque],
 area|z15-[historic=memorial][memorial=plaque],
 node|z15-[historic=memorial][memorial=stolperstein],
 area|z15-[historic=memorial][memorial=stolperstein],
 node|z15-16[historic=memorial][memorial=cross],
 area|z15-16[historic=memorial][memorial=cross],
-{icon-image: zero-icon.svg; text: none;}
+{icon-image: ; text: none;}
 
 node|z17-[historic=memorial][memorial=cross],
 area|z17-[historic=memorial][memorial=cross],
@@ -686,35 +676,24 @@ area|z18-[building=hospital],
 
 /* 5.2 Education */
 
-area|z15[amenity=university][name],
-node|z15[amenity=university][name]
+area|z15-[amenity=university][name],
+node|z15-[amenity=university][name]
 {icon-image: college-m.svg;icon-min-distance: 15;-x-me-text-priority:16000;font-size: 12.5;}
-node|z15[amenity=university][!name]
-{}
 area|z16[amenity=university][name],
 node|z16[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;}
-node|z16[amenity=university][!name]
-{}
+{icon-min-distance: 9;font-size: 12.75;}
 node|z17[amenity=university][name],
 area|z17[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 13.75;}
-node|z17[amenity=university][!name],
-area|z17[amenity=university][!name]
-{}
+{icon-min-distance: 9;font-size: 13.75;}
 node|z18[amenity=university][name],
 area|z18[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 14.5;}
-node|z18[amenity=university][!name],
-area|z18[amenity=university][!name]
-{}
+{icon-min-distance: 10;font-size: 14.5;}
 node|z19[amenity=university][name],
 area|z19[amenity=university][name]
-{icon-image: college-m.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 14.5;}
-node|z19[amenity=university][!name],
-area|z19[amenity=university][!name]
-{}
+{icon-min-distance: 0; font-size: 14.5;}
 
+node|z15-[amenity=university][!name]
+{text: none;}
 
 
 /* 5.3 Sport */
@@ -867,16 +846,16 @@ area|z18-[shop=supermarket]
 
 node|z15[shop=car_repair][service=tyres],
 area|z15[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;text-offset: 1;-x-me-text-priority:15500;icon-min-distance: 20;font-size:12.5;}
-node|z16[shop=car_repair][service=tyres],
-area|z16[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;-x-me-text-priority:15500;font-size: 12.75;}
+{icon-image: car-repair-m.svg; text-offset: 1; icon-min-distance: 20; font-size:12.5;}
+node|z16-[shop=car_repair][service=tyres],
+area|z16-[shop=car_repair][service=tyres]
+{icon-image: car-repair-m.svg; font-size: 12.75;}
 node|z17[shop=car_repair][service=tyres],
 area|z17[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;font-size: 13.75;}
+{font-size: 13.75;}
 node|z18-[shop=car_repair][service=tyres],
 area|z18-[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;font-size: 14.5;}
+{font-size: 14.5;}
 
 
 node|z17[shop=car],

data/styles/vehicle/include/Roads.mapcss

@@ -1,7 +1,7 @@
 /* ~~~~ CONTENT OF ROADS ~~~~~
 
 1.Z-INDEX ROADS
-2.WORLD LAVEL ROAD 4-9 ZOOM
+2.WORLD LEVEL ROAD 4-9 ZOOM
 3.TRUNK & MOTORWAY 7-22 ZOOM
   3.1 Trunk & Motorway 7-22 ZOOM
   3.2 Trunk & Motorway tunnel 12-22 ZOOM
@@ -211,16 +211,14 @@ line[highway=primary_link]
 {z-index: 840;}
 
 line[highway=primary],
-line|z8-9[highway=world_towns_level],
-line|z8-9[highway=world_level],
 {z-index: 850;}
 
 line[highway=motorway_link],
 line[highway=trunk_link]
 {z-index: 890;}
 
-line|z4-7[highway=world_towns_level],
-line|z4-7[highway=world_level],
+line[highway=world_towns_level],
+line[highway=world_level],
 line[highway=trunk],
 line[highway=motorway]
 {z-index: 900;}
@@ -266,9 +264,9 @@ line[power=line]
 line[highway]
 {casing-width: 0;}
 
-/* 2.WORLD LAVEL ROAD 4-9 ZOOM */
+/* 2.WORLD LEVEL ROAD 4-9 ZOOM */
 
-line|z4-9[highway=world_towns_level],
+line|z6-9[highway=world_towns_level],
 line|z4-9[highway=world_level],
 {color: @trunk_orange_light;opacity: 1;}
 

data/styles/vehicle/include/Roads_label.mapcss

@@ -109,16 +109,12 @@ line[highway=primary_link]
 {z-index: 840;}
 
 line[highway=primary],
-line|z8-9[highway=world_towns_level],
-line|z8-9[highway=world_level],
 {z-index: 850;}
 
 line[highway=motorway_link],
 line[highway=trunk_link]
 {z-index: 890;}
 
-line|z4-7[highway=world_towns_level],
-line|z4-7[highway=world_level],
 line[highway=trunk],
 line[highway=motorway]
 {z-index: 900;}