From 304dee5572e789cf15e7b8ddb41140c239461ea4 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Mon, 7 Aug 2023 21:01:24 +0300 Subject: [PATCH] [styles] Re-space overlays priorities Signed-off-by: Konstantin Pastbin --- .../include/priorities_4_overlays.prio.txt | 308 +++++++++--------- .../include/priorities_4_overlays.prio.txt | 176 +++++----- 2 files changed, 242 insertions(+), 242 deletions(-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 9dcc684760..bd21ede420 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -11,23 +11,23 @@ # - BG-by-size: landcover areas sorted by their size place-continent # caption z1-2 -=== 2560 +=== 7700 place-ocean # caption z1- -=== 2550 +=== 7650 place-country # caption z3- -=== 2540 +=== 7600 place-city-capital-2 # caption z4- and icon z4- -=== 2520 +=== 7550 place-city-capital-3 # caption z4- place-city-capital-4 # caption z4- -=== 2500 +=== 7500 place-sea # caption z4- -=== 2495 +=== 7450 place-city-capital # caption z4- place-city-capital-10 # caption z4- @@ -37,45 +37,45 @@ place-city-capital-6 # caption z4- place-city-capital-7 # caption z4- place-city-capital-8 # caption z4- place-city-capital-9 # caption z4- -=== 2490 +=== 7400 place-city # caption z4- -=== 2480 +=== 7350 place-state-USA # caption z5-10 -=== 2470 +=== 7300 place-state # caption z6-10 -=== 2460 +=== 7250 aeroway-aerodrome-international # caption z10- and icon z7- (also has area z10-) -=== 2450 +=== 7200 place-island # caption z9- -=== 2440 +=== 7150 place-town # caption z8- -=== 2430 +=== 7100 place-suburb # caption z10-14 -=== 2320 +=== 7050 railway-station-subway-moscow # caption z12-15 and icon z11- railway-station-subway-spb # caption z12-16 and icon z11- -=== 2310 +=== 7000 aeroway-aerodrome # caption z14- and icon z14- (also has area z10-) isoline-step_1000 # pathtext z11- (also has line z11-) -=== 2280 +=== 6950 place-village # caption z11- -=== 2240 +=== 6900 railway-station # caption z12- and icon z12- -=== 2230 +=== 6850 amenity-ferry_terminal # caption z16- and icon z11- -=== 2227 +=== 6800 highway-motorway # pathtext z10- and shield z10- (also has line z7-) highway-motorway-bridge # pathtext z10- and shield z10- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-) @@ -83,7 +83,7 @@ highway-motorway-tunnel # pathtext z10- and shield z highway-trunk # pathtext z10- and shield z10- (also has line z7-) highway-trunk-bridge # pathtext z10- and shield z10- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-) highway-trunk-tunnel # pathtext z10- and shield z10- (also has line z7-, line(casing) z12-) -=== 2225 +=== 6750 boundary-national_park # caption z12- and icon z11- (also has area z10-) boundary-protected_area # caption z12- and icon z11- @@ -94,7 +94,7 @@ boundary-protected_area-4 # caption z12- and icon z11- boundary-protected_area-5 # caption z12- and icon z11- boundary-protected_area-6 # caption z12- and icon z11- leisure-nature_reserve # caption z12- and icon z11- (also has area z10-) -=== 2223 +=== 6700 landuse-reservoir # caption z10- (also has area z12-) natural-water-lake # caption z10- (also has area z1-) @@ -125,10 +125,10 @@ railway-station-subway-shanghai # caption z14- and icon z12- railway-station-subway-stockholm # caption z14- and icon z12- railway-station-subway-tokyo # caption z14- and icon z12- railway-station-subway-vienna # caption z14- and icon z12- -=== 2220 +=== 6650 barrier-toll_booth # caption z14- and icon z12- -=== 2210 +=== 6600 historic-castle # caption z12- and icon z12- historic-castle-castrum # caption z12- and icon z12- @@ -142,21 +142,21 @@ historic-castle-palace # caption z12- and icon z12- historic-castle-shiro # caption z12- and icon z12- historic-castle-stately # caption z12- and icon z12- historic-fort # caption z12- and icon z12- -=== 2200 +=== 6550 aerialway-station # caption z15- and icon z12- -=== 2190 +=== 6500 natural-peak # caption z13- and icon z12- natural-volcano # caption z10- and icon z10- -=== 2180 +=== 6450 isoline-step_500 # pathtext z12- (also has line z11-) natural-water-river # caption z10- (also has area z1-) -=== 2160 +=== 6400 amenity-bus_station # caption z14- and icon z13- -=== 2140 +=== 6350 railway-station-subway # caption z14- and icon z13- railway-station-subway-ankara # caption z14- and icon z13- @@ -244,16 +244,16 @@ railway-station-subway-washington # caption z14- and icon z13- railway-station-subway-wuhan # caption z14- and icon z13- railway-station-subway-yerevan # caption z14- and icon z13- railway-station-subway-yokohama # caption z14- and icon z13- -=== 2130 +=== 6300 railway-halt # caption z13- and icon z13- -=== 2100 +=== 6250 highway-primary # pathtext z10- and shield z10- (also has line z8-) highway-primary-bridge # pathtext z10- and shield z10- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-) highway-primary-tunnel # pathtext z10- and shield z10- (also has line z8-, line(casing) z14-) route-ferry # pathtext z10- (also has line z10-) -=== 2090 +=== 6200 highway-motorway_link # pathtext z10- and shield z10- (also has line z10-) highway-motorway_link-bridge # pathtext z10- and shield z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-) @@ -261,95 +261,95 @@ highway-motorway_link-tunnel # pathtext z10- and shield z highway-trunk_link # pathtext z10- and shield z10- (also has line z10-) highway-trunk_link-bridge # pathtext z10- and shield z10- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-) highway-trunk_link-tunnel # pathtext z10- and shield z10- (also has line z10-, line(casing) z12-) -=== 2080 +=== 6150 highway-primary_link # pathtext z10- and shield z11- (also has line z11-) highway-primary_link-bridge # pathtext z10- and shield z11- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) highway-primary_link-tunnel # pathtext z10- and shield z11- (also has line z11-, line(casing) z14-) -=== 2070 +=== 6100 tourism-zoo # caption z13- and icon z13- -=== 2050 +=== 6050 leisure-stadium # caption z13- and icon z13- (also has area z15-) -=== 2040 +=== 6000 tourism-museum # caption z13- and icon z13- -=== 2030 +=== 5950 historic-monument # caption z13- and icon z13- -=== 2020 +=== 5900 historic-city_gate # caption z13- and icon z13- -=== 2010 +=== 5850 railway-tram_stop # caption z17- and icon z14- waterway-waterfall # caption z11- and icon z11- -=== 1960 +=== 5800 place-hamlet # caption z13- -=== 1900 +=== 5750 place-locality # caption z13- place-neighbourhood # caption z13- -=== 1890 +=== 5700 amenity-charging_station-motorcar # caption z14- and icon z14- amenity-fuel # caption z14- and icon z14- -=== 1880 +=== 5650 highway-secondary # pathtext z10- and shield z12- (also has line z10-) highway-secondary-bridge # pathtext z10- and shield z12- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary-tunnel # pathtext z10- and shield z12- (also has line z10-, line(casing) z16-) -=== 1875 +=== 5600 shop-mall # caption z14- and icon z14- -=== 1870 +=== 5550 place-square # caption z14- and icon z14- tourism-theme_park # caption z14- and icon z14- -=== 1850 +=== 5500 amenity-community_centre # caption z15- and icon z15- -=== 1840 +=== 5450 amenity-theatre # caption z14- and icon z14- -=== 1830 +=== 5400 man_made-lighthouse # caption z14- and icon z14- -=== 1820 +=== 5350 highway-services # caption z14- and icon z14- -=== 1800 +=== 5300 mountain_pass # caption z14- and icon z14- natural-saddle # caption z14- and icon z14- -=== 1790 +=== 5250 natural-geyser # caption z14- and icon z14- natural-hot_spring # caption z14- and icon z14- natural-spring # caption z14- and icon z14- -=== 1780 +=== 5200 railway-rail-tourism # pathtext z14- (also has line z10-, line::dash z16-) railway-rail-tourism-bridge # pathtext z14- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-) railway-rail-tourism-tunnel # pathtext z14- (also has line z10-, line(casing) z14-, line::dash z16-) -=== 1770 +=== 5150 amenity-hospital # caption z15- and icon z14- (also has area z14-) amenity-university # caption z14- and icon z14- (also has area z14-) -=== 1760 +=== 5100 leisure-park # caption z14- and icon z14- (also has area z10-) leisure-park-permissive # caption z14- and icon z14- (also has area z10-) natural-cave_entrance # caption z11- and icon z11- -=== 1740 +=== 5050 tourism-attraction # caption z14- and icon z14- -=== 1737 +=== 5000 tourism-viewpoint # caption z14- and icon z14- -=== 1736 +=== 4950 amenity-place_of_worship-buddhist # caption z14- and icon z14- (also has area z16-) amenity-place_of_worship-christian # caption z14- and icon z14- (also has area z16-) @@ -358,49 +358,49 @@ amenity-place_of_worship-jewish # caption z14- and icon z14- amenity-place_of_worship-muslim # caption z14- and icon z14- (also has area z16-) amenity-place_of_worship-shinto # caption z14- and icon z14- (also has area z16-) amenity-place_of_worship-taoist # caption z14- and icon z14- (also has area z16-) -=== 1735 +=== 4900 amenity-place_of_worship # caption z14- and icon z14- (also has area z16-) -=== 1734 +=== 4850 landuse-forest # caption z13- and icon z12- (also has area z10-) landuse-forest-coniferous # caption z13- and icon z12- (also has area z10-) landuse-forest-deciduous # caption z13- and icon z12- (also has area z10-) landuse-forest-mixed # caption z13- and icon z12- (also has area z10-) -=== 1730 +=== 4800 natural-water # caption z10- (also has area z1-) natural-water-pond # caption z10- (also has area z1-) -=== 1690 +=== 4750 natural-bare_rock # caption z14- (also has area z12-) -=== 1590 +=== 4700 landuse-recreation_ground # caption z15- (also has area z12-) -=== 1580 +=== 4650 natural-desert # caption z14- (also has area z1-) -=== 1570 +=== 4600 place-islet # caption z14- (also has area z10-) -=== 1560 +=== 4550 natural-bay # caption z14- natural-cape # caption z14- place-isolated_dwelling # caption z14- -=== 1550 +=== 4500 railway-subway_entrance-moscow # caption z15- and icon z15- -=== 1540 +=== 4450 waterway-dam # pathtext z15- (also has area z14-, line z14-) -=== 1530 +=== 4400 railway-subway_entrance-spb # caption z16- and icon z15- -=== 1520 +=== 4350 tourism-gallery # caption z15- and icon z15- -=== 1510 +=== 4300 historic-battlefield # caption z15- and icon z15- historic-memorial # caption z15- and icon z15- @@ -412,31 +412,31 @@ tourism-artwork-architecture # caption z15- and icon z15- tourism-artwork-painting # caption z15- and icon z15- tourism-artwork-sculpture # caption z15- and icon z15- tourism-artwork-statue # caption z15- and icon z15- -=== 1500 +=== 4250 tourism-attraction-animal # caption z14- and icon z14- tourism-attraction-specified # caption z14- and icon z14- -=== 1495 +=== 4200 amenity-cafe # caption z15- and icon z15- -=== 1490 +=== 4150 amenity-restaurant # caption z15- and icon z15- -=== 1480 +=== 4100 amenity-fast_food # caption z15- and icon z15- amenity-food_court # caption z15- and icon z15- -=== 1470 +=== 4050 amenity-bar # caption z15- and icon z15- -=== 1460 +=== 4000 amenity-biergarten # caption z15- and icon z15- amenity-pub # caption z15- and icon z15- -=== 1450 +=== 3950 barrier-border_control # caption z15- and icon z15- -=== 1440 +=== 3900 aerialway-cable_car # pathtext z15- (also has line z12-, line::dash z12-) aerialway-chair_lift # pathtext z15- (also has line z13-, line::dash z13-) @@ -449,46 +449,46 @@ aerialway-platter # pathtext z15- (also has li aerialway-rope_tow # pathtext z15- (also has line z13-, line::dash z13-) aerialway-t-bar # pathtext z15- (also has line z13-, line::dash z13-) shop-car_repair-tyres # caption z15- and icon z15- -=== 1430 +=== 3850 highway-rest_area # caption z15- and icon z15- tourism-camp_site # caption z15- and icon z15- tourism-caravan_site # caption z16- and icon z16- -=== 1420 +=== 3800 amenity-sanitary_dump_station # caption z15- and icon z15- -=== 1410 +=== 3750 amenity-drinking_water # caption z19 and icon z15- amenity-water_point # caption z19 and icon z15- man_made-water_tap # icon z15- man_made-water_well # icon z15- -=== 1400 +=== 3700 waterway-weir # pathtext z15- (also has line z14-) -=== 1390 +=== 3650 isoline-step_100 # pathtext z14- (also has line z12-) -=== 1340 +=== 3600 man_made-flagpole # icon z15- natural-rock # icon z15- -=== 1330 +=== 3550 highway-motorway_junction # caption z15- -=== 1180 +=== 3500 aeroway-terminal # caption z15- (also has area z14-) -=== 1160 +=== 3450 area:highway-footway # caption z15- (also has area z14-) area:highway-pedestrian # caption z15- (also has area z14-) -=== 1150 +=== 3400 natural-beach # caption z15- (also has area z10-) natural-beach-gravel # caption z15- (also has area z10-) natural-beach-sand # caption z15- (also has area z10-) -=== 1120 +=== 3350 place-farm # caption z14- railway-subway_entrance # caption z17- and icon z16- @@ -600,7 +600,7 @@ railway-subway_entrance-washington # caption z17- and icon z16- railway-subway_entrance-wuhan # caption z17- and icon z16- railway-subway_entrance-yerevan # caption z17- and icon z16- railway-subway_entrance-yokohama # caption z17- and icon z16- -=== 1110 +=== 3300 amenity-charging_station # caption z16- and icon z16- amenity-charging_station-bicycle # caption z16- and icon z16- @@ -615,10 +615,10 @@ tourism-alpine_hut # caption z16- and icon z16- tourism-chalet # caption z16- and icon z16- tourism-information-office # caption z16- and icon z16- tourism-wilderness_hut # caption z16- and icon z16- -=== 1107 +=== 3250 highway-bus_stop # caption z17- and icon z16- -=== 1105 +=== 3200 amenity-pharmacy # caption z17- and icon z16- highway-pedestrian # pathtext z14- (also has line z13-) @@ -631,13 +631,13 @@ highway-tertiary-tunnel # pathtext z12- and shield z natural-strait # caption z13- (also has line z13-) waterway-river # pathtext z11- (also has line z10-) waterway-riverbank # pathtext z11- (also has area z1-, line z10-) -=== 1100 +=== 3150 highway-unclassified # pathtext z13- (also has line z11-) highway-unclassified-area # pathtext z13- (also has line z11-) highway-unclassified-bridge # pathtext z13- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) highway-unclassified-tunnel # pathtext z13- (also has line z11-, line(casing) z16-) -=== 1095 +=== 3100 amenity-fountain # caption z16- and icon z16- (also has area z16-) amenity-parking # caption z18- and icon z16- (also has area z15-) @@ -645,7 +645,7 @@ amenity-parking-fee # caption z18- and icon z16- amenity-parking-multi-storey # caption z18- and icon z16- (also has area z15-) amenity-parking-park_and_ride # caption z18- and icon z16- (also has area z15-) highway-raceway # pathtext z16- (also has line z14-) -=== 1093 +=== 3050 highway-residential # pathtext z13- and shield z18- (also has line z12-) highway-residential-area # pathtext z13- and shield z18- (also has line z12-) @@ -657,7 +657,7 @@ highway-road-tunnel # pathtext z14- (also has li highway-secondary_link # pathtext z16- (also has line z14-) highway-secondary_link-bridge # pathtext z16- (also has line z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary_link-tunnel # pathtext z16- (also has line z14-, line(casing) z16-) -=== 1090 +=== 3000 highway-cycleway # pathtext z15- (also has line z13-) highway-cycleway-bridge # pathtext z15- (also has line z13-) @@ -670,7 +670,7 @@ highway-footway-tunnel # pathtext z15- (also has li highway-tertiary_link # pathtext z18- (also has line z15-) highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z16-) -=== 1085 +=== 2950 historic-ship # caption z16- and icon z16- natural-water-basin # caption z10- (also has area z1-) @@ -680,7 +680,7 @@ waterway-fish_pass # pathtext z13- (also has li waterway-stream # pathtext z13- (also has line z13-) waterway-stream-ephemeral # pathtext z13- (also has line z13-) waterway-stream-intermittent # pathtext z13- (also has line z13-) -=== 1080 +=== 2900 amenity-shelter # caption z16- and icon z16- highway-ford # icon z16- and pathtext z16- (also has line z13-) @@ -689,7 +689,7 @@ tourism-information # caption z16- and icon z16- tourism-information-board # caption z16- and icon z16- tourism-information-guidepost # caption z16- and icon z16- tourism-information-map # caption z16- and icon z16- -=== 1078 +=== 2850 highway-bridleway # pathtext z15- (also has line z14-) highway-bridleway-bridge # pathtext z15- (also has line z14-) @@ -735,24 +735,24 @@ highway-track-grade5 # pathtext z15- (also has li highway-track-no-access # pathtext z15- (also has line z14-) highway-track-permissive # pathtext z15- (also has line z14-) highway-track-tunnel # pathtext z15- (also has line z14-) -=== 1075 +=== 2800 tourism-hotel # caption z16- and icon z16- tourism-resort # caption z16- and icon z16- -=== 1070 +=== 2750 tourism-motel # caption z16- and icon z16- -=== 1060 +=== 2700 tourism-hostel # caption z16- and icon z16- -=== 1050 +=== 2650 tourism-apartment # caption z16- and icon z16- tourism-guest_house # caption z16- and icon z16- -=== 1030 +=== 2600 amenity-ice_cream # caption z19 and icon z16- -=== 1020 +=== 2550 aeroway-helipad # caption z16- and icon z16- amenity-bank # caption z16- and icon z16- @@ -760,7 +760,7 @@ amenity-marketplace # caption z16- and icon z16- amenity-nightclub # caption z16- and icon z16- amenity-townhall # caption z16- and icon z16- shop-caravan # caption z16- and icon z16- -=== 1010 +=== 2500 highway-construction # pathtext z15- (also has line z13-) highway-living_street # pathtext z14- (also has line z12-) @@ -771,7 +771,7 @@ shop-antiques # caption z16- and icon z16- shop-charity # caption z16- and icon z16- shop-second_hand # caption z16- and icon z16- tourism-picnic_site # caption z16- and icon z16- -=== 990 +=== 2450 shop-alcohol # caption z16- and icon z16- shop-art # caption z16- and icon z16- @@ -842,7 +842,7 @@ shop-tyres # caption z16- and icon z16- shop-video # caption z16- and icon z16- shop-video_games # caption z16- and icon z16- shop-wine # caption z16- and icon z16- -=== 980 +=== 2400 amenity-bicycle_parking # caption z17- and icon z17- amenity-hunting_stand # caption z18- and icon z18- @@ -853,7 +853,7 @@ barrier-lift_gate # caption z16- and icon z16- leisure-dog_park # caption z16- and icon z16- leisure-water_park # caption z16- and icon z16- man_made-windmill # caption z16- and icon z16- -=== 970 +=== 2350 amenity-conference_centre # caption z16- and icon z16- amenity-events_venue # caption z16- and icon z16- @@ -865,35 +865,35 @@ historic-tomb # caption z16- and icon z16- historic-wayside_cross # caption z16- and icon z16- historic-wayside_shrine # caption z17- and icon z16- man_made-chimney # caption z18- and icon z16- -=== 960 +=== 2300 highway-busway # pathtext z16- (also has line z15-) highway-busway-bridge # pathtext z16- (also has line z15-) highway-busway-tunnel # pathtext z16- (also has line z15-) -=== 900 +=== 2250 waterway-lock_gate # icon z16- -=== 880 +=== 2200 amenity-parking-no-access # caption z18- and icon z16- (also has area z15-) amenity-parking-permissive # caption z18- and icon z16- (also has area z15-) amenity-parking-private # caption z18- and icon z16- (also has area z15-) amenity-parking-underground # caption z18- and icon z16- (also has area z15-) -=== 870 +=== 2150 leisure-marina # caption z16- and icon z16- -=== 860 +=== 2100 leisure-garden # caption z16- and icon z16- (also has area z12-) -=== 850 +=== 2050 amenity-college # caption z16- and icon z16- (also has area z15-) landuse-military # caption z17- and icon z16- (also has area z12-) landuse-military-danger_area # caption z17- and icon z16- (also has area z10-) -=== 840 +=== 2000 leisure-beach_resort # caption z16- and icon z16- (also has area z10-) -=== 830 +=== 1950 barrier-block # caption z16- and icon z16- barrier-bollard # caption z16- and icon z16- @@ -909,11 +909,11 @@ man_made-silo # caption z18- and icon z16- man_made-storage_tank # caption z18- and icon z16- man_made-works # caption z18- and icon z16- power-tower # icon z16- -=== 820 +=== 1900 leisure-park-no-access # caption z14- and icon z14- (also has area z10-) leisure-park-private # caption z14- and icon z14- (also has area z10-) -=== 800 +=== 1850 landuse-construction # caption z15- (also has area z15-) landuse-farmyard # caption z15- (also has area z10-) @@ -921,25 +921,25 @@ landuse-industrial # caption z15- (also has are landuse-landfill # caption z15- and icon z15- (also has area z15-) landuse-quarry # caption z15- (also has area z15-) landuse-railway # caption z15- (also has area z15-) -=== 790 +=== 1800 leisure-track # caption z16- (also has line z15-) leisure-track-area # caption z16- (also has area z15-) -=== 630 +=== 1750 building-train_station # caption z16- (also has area z14-) -=== 620 +=== 1700 railway-platform # caption z16- (also has area z16-) -=== 610 +=== 1650 natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) -=== 590 +=== 1600 historic-memorial-cross # caption z17- and icon z17- -=== 540 +=== 1550 amenity-cinema # caption z17- and icon z17- amenity-clinic # caption z17- and icon z17- @@ -966,7 +966,7 @@ leisure-swimming_pool-private # caption z17- and icon z17- office-diplomatic # caption z17- and icon z17- office-lawyer # caption z17- and icon z17- railway-level_crossing # icon z17- -=== 530 +=== 1500 aeroway-gate # caption z17- and icon z17- amenity-bicycle_rental # caption z17- and icon z17- @@ -977,7 +977,7 @@ amenity-money_transfer # caption z18- and icon z17- shop-pawnbroker # caption z17- and icon z17- sport-skiing # caption z17- and icon z17- sport-tennis # caption z17- and icon z17- -=== 520 +=== 1450 sport-american_football # caption z17- and icon z17- sport-athletics # caption z17- and icon z17- @@ -997,7 +997,7 @@ sport-swimming # caption z17- and icon z17- sport-table_tennis # caption z17- and icon z17- sport-volleyball # caption z17- and icon z17- sport-yoga # caption z17- and icon z17- -=== 510 +=== 1400 sport-10pin # caption z17- and icon z17- sport-9pin # caption z17- and icon z17- @@ -1013,7 +1013,7 @@ sport-equestrian # caption z17- and icon z17- sport-futsal # caption z17- and icon z17- sport-scuba_diving # caption z17- and icon z17- sport-shooting # caption z17- and icon z17- -=== 500 +=== 1350 shop-massage # caption z18- and icon z17- shop-money_lender # caption z17- and icon z17- @@ -1021,7 +1021,7 @@ shop-newsagent # caption z18- and icon z17- shop-variety_store # caption z17- and icon z17- sport-multi # caption z17- and icon z17- (also has area z15-) sport-soccer # caption z17- and icon z17- (also has area z15-) -=== 490 +=== 1300 amenity-casino # caption z17- and icon z17- amenity-childcare # caption z17- and icon z17- @@ -1043,7 +1043,7 @@ craft-tailor # caption z18- and icon z17- historic-ruins # caption z17- and icon z17- leisure-playground # caption z17- and icon z17- (also has area z16-) power-station # caption z17- and icon z17- -=== 480 +=== 1250 amenity-parcel_locker # caption z17- and icon z17- amenity-recycling # caption z19 and icon z17- @@ -1055,30 +1055,30 @@ amenity-vending_machine-parking_tickets # caption z17- and icon z17- amenity-vending_machine-public_transport_tickets # caption z17- and icon z17- amenity-waste_transfer_station # caption z19 and icon z17- emergency-phone # icon z17- -=== 470 +=== 1200 highway-elevator # icon z17- -=== 460 +=== 1150 amenity-grave_yard # caption z17- and icon z17- (also has area z14-) amenity-grave_yard-christian # caption z17- and icon z17- (also has area z14-) cemetery-grave # caption z17- and icon z17- -=== 450 +=== 1100 leisure-golf_course # caption z17- and icon z17- (also has area z12-) -=== 440 +=== 1050 isoline-step_10 # pathtext z17- (also has line z15-) isoline-step_50 # pathtext z16- (also has line z14-) isoline-zero # pathtext z17- (also has line z15-) -=== 430 +=== 1000 leisure-pitch # caption z17- and icon z17- (also has area z15-) -=== 420 +=== 950 amenity-kindergarten # caption z17- and icon z17- (also has area z15-) amenity-school # caption z17- and icon z17- (also has area z15-) -=== 410 +=== 900 amenity-arts_centre # caption z17- and icon z17- amenity-driving_school # caption z19 and icon z17- @@ -1105,19 +1105,19 @@ power-plant-gas # icon z17- power-plant-hydro # icon z17- power-plant-solar # icon z17- power-plant-wind # icon z17- -=== 400 +=== 850 junction # caption z17- junction-circular # caption z17- junction-roundabout # caption z17- -=== 300 +=== 800 public_transport-platform # caption z17- (also has area z16-) -=== 270 +=== 750 man_made-breakwater # caption z17- (also has area z12-, line z14-) man_made-pier # caption z17- (also has area z12-, line z14-) -=== 260 +=== 700 landuse-commercial # caption z17- landuse-residential # caption z17- @@ -1126,10 +1126,10 @@ leisure-dance # caption z17- leisure-landscape_reserve # caption z17- leisure-recreation_ground # caption z17- leisure-slipway # caption z17- -=== 250 +=== 650 historic-memorial-plaque # caption z18- and icon z18- -=== 240 +=== 600 amenity-atm # caption z18- and icon z18- amenity-car_rental # caption z18- and icon z18- @@ -1143,7 +1143,7 @@ office-government # caption z18- and icon z18- office-insurance # caption z18- and icon z18- office-ngo # caption z18- and icon z18- office-telecommunication # caption z18- and icon z18- -=== 230 +=== 550 shop # caption z18- and icon z18- shop-agrarian # caption z18- and icon z18- @@ -1180,7 +1180,7 @@ shop-trade # caption z18- and icon z18- shop-travel_agency # caption z18- and icon z18- shop-watches # caption z18- and icon z18- shop-wholesale # caption z18- and icon z18- -=== 220 +=== 500 amenity-bbq # caption z18- and icon z18- amenity-internet_cafe # caption z19 and icon z18- @@ -1190,7 +1190,7 @@ craft-hvac # caption z18- and icon z18- craft-key_cutter # caption z18- and icon z18- craft-locksmith # caption z18- and icon z18- craft-winery # caption z18- and icon z18- -=== 210 +=== 450 amenity-post_box # caption z18- and icon z18- amenity-recycling-container # caption z19 and icon z17- @@ -1198,7 +1198,7 @@ building # caption z16- (also has are building-garage # caption z16- (also has area z14-) building-has_parts # caption z16- (also has area z14-) entrance-main # caption z18- and icon z18- -=== 200 +=== 400 amenity-vending_machine # caption z18- and icon z18- amenity-vending_machine-cigarettes # caption z18- and icon z18- @@ -1209,7 +1209,7 @@ amenity-vending_machine-excrement_bags # caption z18- and icon z18- amenity-vending_machine-food # caption z18- and icon z18- amenity-vending_machine-newspapers # caption z18- and icon z18- amenity-vending_machine-sweets # caption z18- and icon z18- -=== 180 +=== 350 amenity-bench # caption z19 and icon z18- amenity-parking_space-disabled # caption z19 and icon z18- @@ -1217,21 +1217,21 @@ amenity-waste_basket # caption z19 and icon z18- amenity-waste_disposal # caption z18- and icon z18- emergency-defibrillator # caption z18- and icon z18- emergency-fire_hydrant # caption z18- and icon z18- -=== 160 +=== 300 leisure-garden-residential # caption z18- (also has area z12-) -=== 90 +=== 250 historic-memorial-stolperstein # caption z19 and icon z19 -=== 60 +=== 200 power-substation # caption z19 and icon z19 -=== 50 +=== 150 amenity-loading_dock # caption z18- and icon z18- entrance # caption z19 and icon z19 entrance-exit # caption z18- and icon z18- -=== 40 +=== 100 building-address # caption z16- -=== 10 +=== 50 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index ef02a58f3f..b42f3c1391 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -11,7 +11,7 @@ # - BG-by-size: landcover areas sorted by their size highway-speed_camera # icon z13- -=== 1510 +=== 4400 highway-motorway # pathtext z10- and shield z10- (also has line z7-, line(casing) z14-) highway-motorway-bridge # pathtext z10- and shield z10- (also has line z7-, line(casing) z14-, line::bridgeblack z13-, line::bridgewhite z13-) @@ -19,12 +19,12 @@ highway-motorway-tunnel # pathtext z10- and shield z highway-trunk # pathtext z10- and shield z10- (also has line z7-, line(casing) z14-) highway-trunk-bridge # pathtext z10- and shield z10- (also has line z7-, line(casing) z14-, line::bridgeblack z13-, line::bridgewhite z13-) highway-trunk-tunnel # pathtext z10- and shield z10- (also has line z7-, line(casing) z12-) -=== 1500 +=== 4350 highway-primary # pathtext z10- and shield z10- (also has line z8-, line(casing) z14-) highway-primary-bridge # pathtext z10- and shield z10- (also has line z8-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-primary-tunnel # pathtext z10- and shield z10- (also has line z8-, line(casing) z14-) -=== 1490 +=== 4300 highway-motorway_link # pathtext z10- and shield z10- (also has line z10-, line(casing) z14-) highway-motorway_link-bridge # pathtext z10- and shield z10- (also has line z10-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) @@ -32,72 +32,72 @@ highway-motorway_link-tunnel # pathtext z10- and shield z highway-trunk_link # pathtext z10- and shield z10- (also has line z10-, line(casing) z14-) highway-trunk_link-bridge # pathtext z10- and shield z10- (also has line z10-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-trunk_link-tunnel # pathtext z10- and shield z10- (also has line z10-, line(casing) z12-) -=== 1480 +=== 4250 highway-motorway_junction # caption z15- highway-primary_link # pathtext z10- and shield z11- (also has line z11-, line(casing) z14-) highway-primary_link-bridge # pathtext z10- and shield z11- (also has line z11-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-primary_link-tunnel # pathtext z10- and shield z11- (also has line z11-, line(casing) z14-) highway-services # caption z13- and icon z12- -=== 1470 +=== 4200 highway-ford # icon z14- highway-rest_area # caption z14- and icon z14- highway-secondary # pathtext z10- and shield z12- (also has line z10-, line(casing) z14-) highway-secondary-bridge # pathtext z10- and shield z12- (also has line z10-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary-tunnel # pathtext z10- and shield z12- (also has line z10-, line(casing) z14-) -=== 1460 +=== 4150 highway-tertiary # pathtext z12- and shield z15- (also has line z11-, line(casing) z15-) highway-tertiary-bridge # pathtext z12- and shield z15- (also has line z11-, line(casing) z15-, line::bridgeblack z14-, line::bridgewhite z14-) highway-tertiary-tunnel # pathtext z12- and shield z15- (also has line z11-, line(casing) z15-) -=== 1450 +=== 4100 highway-secondary_link # pathtext z16- (also has line z14-, line(casing) z14-) highway-secondary_link-bridge # pathtext z16- (also has line z14-, line(casing) z14-, line::bridgeblack z14-, line::bridgewhite z14-) highway-secondary_link-tunnel # pathtext z16- (also has line z14-, line(casing) z14-) -=== 1440 +=== 4050 highway-unclassified # pathtext z14- (also has line z11-) highway-unclassified-area # pathtext z14- (also has line z11-) highway-unclassified-bridge # pathtext z14- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-) highway-unclassified-tunnel # pathtext z14- (also has line z11-, line(casing) z16-) -=== 1430 +=== 4000 highway-residential # pathtext z12- and shield z18- (also has line z12-, line(casing) z15-) highway-residential-area # pathtext z12- and shield z18- (also has line z12-, line(casing) z15-) highway-residential-bridge # pathtext z12- and shield z18- (also has line z12-, line(casing) z15-, line::bridgeblack z14-, line::bridgewhite z14-) highway-residential-tunnel # pathtext z12- and shield z18- (also has line z12-, line(casing) z15-) -=== 1420 +=== 3950 highway-road # pathtext z14- (also has line z12-) highway-road-bridge # pathtext z14- (also has line z12-) highway-road-tunnel # pathtext z14- (also has line z12-) -=== 1410 +=== 3900 highway-tertiary_link # pathtext z18- (also has line z15-, line(casing) z15-) highway-tertiary_link-bridge # pathtext z18- (also has line z15-, line(casing) z15-, line::bridgeblack z15-, line::bridgewhite z15-) highway-tertiary_link-tunnel # pathtext z18- (also has line z15-, line(casing) z15-) -=== 1400 +=== 3850 place-continent # caption z1-2 -=== 1310 +=== 3800 place-ocean # caption z1- -=== 1300 +=== 3750 place-country # caption z3- -=== 1290 +=== 3700 place-city-capital-2 # caption z4- and icon z4- -=== 1280 +=== 3650 place-city-capital-3 # caption z4- place-city-capital-4 # caption z4- -=== 1260 +=== 3600 place-sea # caption z4- -=== 1250 +=== 3550 place-city-capital # caption z4- place-city-capital-10 # caption z4- @@ -107,76 +107,76 @@ place-city-capital-6 # caption z4- place-city-capital-7 # caption z4- place-city-capital-8 # caption z4- place-city-capital-9 # caption z4- -=== 1240 +=== 3500 place-city # caption z4- -=== 1230 +=== 3450 place-state-USA # caption z5-10 -=== 1220 +=== 3400 place-state # caption z6-10 -=== 1210 +=== 3350 aeroway-aerodrome-international # caption z10- and icon z7- (also has area z10-) -=== 1200 +=== 3300 place-town # caption z8- -=== 1180 +=== 3250 amenity-charging_station-motorcar # caption z14- and icon z14- amenity-fuel # caption z12- and icon z12- -=== 1170 +=== 3200 amenity-charging_station # caption z16- and icon z16- amenity-vending_machine-fuel # caption z17- and icon z17- -=== 1150 +=== 3150 railway-station-subway-moscow # caption z12- and icon z11- railway-station-subway-spb # caption z12- and icon z11- -=== 1110 +=== 3100 aeroway-aerodrome # caption z14- and icon z14- (also has area z10-) place-village # caption z11- -=== 1080 +=== 3050 railway-station # caption z13- and icon z12- -=== 1070 +=== 3000 landuse-reservoir # caption z10- (also has area z12-) natural-water-lake # caption z10- (also has area z1-) natural-water-reservoir # caption z10- (also has area z1-) -=== 1065 +=== 2950 railway-station-funicular # caption z13- and icon z12- railway-station-light_rail # caption z13- and icon z12- railway-station-monorail # caption z13- and icon z12- -=== 1060 +=== 2900 barrier-toll_booth # caption z14- and icon z12- -=== 1050 +=== 2850 junction # caption z17- junction-circular # caption z17- junction-roundabout # caption z17- -=== 1048 +=== 2800 barrier-lift_gate # caption z16- and icon z16- -=== 1047 +=== 2750 railway-level_crossing # icon z17- -=== 1046 +=== 2700 amenity-car_wash # caption z17- and icon z17- amenity-vending_machine-parking_tickets # caption z17- and icon z17- shop-car_parts # icon z17- shop-car_repair # icon z17- shop-car_repair-tyres # caption z15- and icon z15- -=== 1045 +=== 2650 amenity-sanitary_dump_station # caption z15- and icon z15- shop-caravan # icon z17- -=== 1044 +=== 2600 amenity-parking # caption z16- and icon z15- (also has area z15-) amenity-parking-fee # caption z16- and icon z15- (also has area z15-) @@ -184,7 +184,7 @@ amenity-parking-multi-storey # caption z16- and icon z15- amenity-parking-park_and_ride # caption z16- and icon z15- (also has area z15-) amenity-parking-permissive # caption z16- and icon z15- (also has area z15-) amenity-parking-underground # caption z16- and icon z15- (also has area z15-) -=== 1043 +=== 2550 boundary-national_park # caption z12- and icon z12- boundary-protected_area # caption z12- and icon z12- @@ -195,7 +195,7 @@ boundary-protected_area-4 # caption z12- and icon z12- boundary-protected_area-5 # caption z12- and icon z12- boundary-protected_area-6 # caption z12- and icon z12- leisure-nature_reserve # caption z12- and icon z12- (also has area z10-) -=== 1042 +=== 2500 historic-castle # caption z15- and icon z12- historic-castle-castrum # caption z15- and icon z12- @@ -209,44 +209,44 @@ historic-castle-palace # caption z15- and icon z12- historic-castle-shiro # caption z15- and icon z12- historic-castle-stately # caption z15- and icon z12- historic-fort # caption z15- and icon z12- -=== 1040 +=== 2450 amenity-car_rental # caption z18- and icon z18- amenity-car_sharing # caption z18- and icon z18- shop-car # icon z17- -=== 1037 +=== 2400 highway-living_street # pathtext z14- (also has line z12-) highway-living_street-bridge # pathtext z14- (also has line z12-) highway-living_street-tunnel # pathtext z14- (also has line z12-, line(casing) z16-) -=== 1035 +=== 2350 highway-service # pathtext z16- (also has line z14-) highway-service-area # pathtext z16- (also has line z14-) highway-service-bridge # pathtext z16- (also has line z14-) highway-service-tunnel # pathtext z16- (also has line z14-) -=== 1030 +=== 2300 leisure-park # caption z14- and icon z14- (also has area z10-) leisure-park-permissive # caption z14- and icon z14- (also has area z10-) -=== 1020 +=== 2250 landuse-forest # caption z12- and icon z12- (also has area z10-) landuse-forest-coniferous # caption z12- and icon z12- (also has area z10-) landuse-forest-deciduous # caption z12- and icon z12- (also has area z10-) landuse-forest-mixed # caption z12- and icon z12- (also has area z10-) -=== 1010 +=== 2200 highway-service-busway # pathtext z16- (also has line z14-) highway-service-driveway # pathtext z16- (also has line z15-) highway-service-parking_aisle # pathtext z16- (also has line z14-) -=== 950 +=== 2150 place-island # caption z12-14 -=== 920 +=== 2100 natural-water-river # caption z10- (also has area z1-) -=== 915 +=== 2050 railway-station-subway # caption z13- and icon z13- railway-station-subway-adana # caption z13- and icon z12- @@ -357,42 +357,42 @@ railway-station-subway-washington # caption z13- and icon z13- railway-station-subway-wuhan # caption z13- and icon z13- railway-station-subway-yerevan # caption z13- and icon z13- railway-station-subway-yokohama # caption z13- and icon z13- -=== 900 +=== 2000 barrier-border_control # caption z15- and icon z15- historic-city_gate # caption z15- and icon z13- historic-monument # caption z15- and icon z13- -=== 880 +=== 1950 place-hamlet # caption z13- -=== 850 +=== 1900 place-locality # caption z13- -=== 840 +=== 1850 tourism-viewpoint # caption z15- and icon z14- -=== 820 +=== 1800 railway-halt # caption z14- and icon z14- -=== 810 +=== 1750 tourism-theme_park # caption z15- and icon z14- -=== 790 +=== 1700 shop-supermarket # caption z14- and icon z14- -=== 780 +=== 1650 highway-pedestrian # pathtext z14- highway-pedestrian-area # pathtext z14- highway-pedestrian-bridge # pathtext z14- highway-pedestrian-tunnel # pathtext z14- -=== 760 +=== 1600 natural-strait # caption z13- waterway-river # pathtext z11- (also has line z10-) waterway-river-tunnel # pathtext z11- waterway-riverbank # pathtext z11- (also has area z1-, line z10-) -=== 720 +=== 1550 natural-water # caption z10- (also has area z1-) natural-water-basin # caption z10- (also has area z1-) @@ -401,25 +401,25 @@ natural-water-pond # caption z10- (also has are shop-mall # caption z14- and icon z14- waterway-canal # pathtext z13- waterway-canal-tunnel # pathtext z13- -=== 660 +=== 1500 natural-desert # caption z14- (also has area z1-) -=== 640 +=== 1450 natural-bay # caption z14- natural-cape # caption z14- place-farm # caption z14- place-isolated_dwelling # caption z14- -=== 630 +=== 1400 tourism-zoo # caption z15- and icon z15- -=== 600 +=== 1350 tourism-museum # caption z15- and icon z15- -=== 590 +=== 1300 tourism-gallery # caption z15- and icon z15- -=== 580 +=== 1250 historic-battlefield # caption z15- and icon z15- historic-memorial # caption z15- and icon z15- @@ -429,7 +429,7 @@ historic-memorial-war_memorial # caption z15- and icon z15- tourism-attraction # caption z15- and icon z15- tourism-attraction-animal # caption z15- and icon z15- tourism-attraction-specified # caption z15- and icon z15- -=== 570 +=== 1200 amenity-community_centre # caption z16- and icon z16- tourism-artwork # caption z15- and icon z15- @@ -437,29 +437,29 @@ tourism-artwork-architecture # caption z15- and icon z15- tourism-artwork-painting # caption z15- and icon z15- tourism-artwork-sculpture # caption z15- and icon z15- tourism-artwork-statue # caption z15- and icon z15- -=== 560 +=== 1150 amenity-cafe # caption z15- and icon z15- amenity-theatre # caption z15- and icon z15- -=== 540 +=== 1100 amenity-university # caption z15- and icon z15- -=== 530 +=== 1050 amenity-hospital # caption z15- and icon z15- -=== 520 +=== 1000 aeroway-terminal # caption z15- (also has area z14-) -=== 410 +=== 950 leisure-beach_resort # caption z15- (also has area z10-) natural-beach # caption z15- (also has area z10-) natural-beach-gravel # caption z15- (also has area z10-) natural-beach-sand # caption z15- (also has area z10-) -=== 390 +=== 900 amenity-charging_station-bicycle # caption z16- and icon z16- -=== 370 +=== 850 historic-boundary_stone # caption z16- and icon z16- historic-gallows # caption z16- and icon z16- @@ -468,15 +468,15 @@ historic-ship # caption z16- and icon z16- historic-tomb # caption z16- and icon z16- historic-wayside_cross # caption z16- and icon z16- historic-wayside_shrine # caption z17- and icon z16- -=== 350 +=== 800 amenity-restaurant # caption z16- and icon z16- -=== 340 +=== 750 railway-rail-tourism # pathtext z16- (also has line z10-, line::dash z16-) railway-rail-tourism-bridge # pathtext z16- (also has line z10-, line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-) railway-rail-tourism-tunnel # pathtext z16- (also has line z10-, line(casing) z14-, line::dash z16-) -=== 330 +=== 700 amenity-place_of_worship # caption z17- and icon z16- amenity-place_of_worship-buddhist # caption z17- and icon z16- @@ -486,10 +486,10 @@ amenity-place_of_worship-jewish # caption z17- and icon z16- amenity-place_of_worship-muslim # caption z17- and icon z16- amenity-place_of_worship-shinto # caption z17- and icon z16- amenity-place_of_worship-taoist # caption z17- and icon z16- -=== 300 +=== 650 waterway-lock_gate # icon z16- -=== 290 +=== 600 amenity-conference_centre # icon z16- amenity-events_venue # icon z16- @@ -607,49 +607,49 @@ railway-subway_entrance-washington # caption z17- and icon z16- railway-subway_entrance-wuhan # caption z17- and icon z16- railway-subway_entrance-yerevan # caption z17- and icon z16- railway-subway_entrance-yokohama # caption z17- and icon z16- -=== 280 +=== 550 amenity-parking-no-access # caption z16- and icon z15- (also has area z15-) amenity-parking-private # caption z16- and icon z15- (also has area z15-) -=== 250 +=== 500 natural-wetland # caption z16- (also has area z11-) natural-wetland-bog # caption z16- (also has area z11-) natural-wetland-marsh # caption z16- (also has area z11-) -=== 220 +=== 450 railway-tram_stop # caption z17- and icon z17- -=== 200 +=== 400 historic-memorial-cross # caption z17- and icon z17- -=== 180 +=== 350 amenity-arts_centre # caption z17- and icon z17- historic-archaeological_site # caption z17- and icon z17- historic-ruins # caption z17- and icon z17- -=== 170 +=== 300 amenity-fast_food # caption z17- and icon z17- -=== 150 +=== 250 amenity-bank # caption z17- and icon z17- amenity-parcel_locker # caption z17- and icon z17- amenity-police # icon z17- amenity-post_office # caption z17- and icon z17- shop-motorcycle # icon z17- -=== 140 +=== 200 landuse-landfill # caption z15- (also has area z15-) landuse-quarry # caption z15- (also has area z15-) landuse-railway # caption z15- (also has area z15-) -=== 60 +=== 150 leisure-park-no-access # caption z14- and icon z14- (also has area z10-) leisure-park-private # caption z14- and icon z14- (also has area z10-) -=== 50 +=== 100 building # caption z18- (also has area z15-) building-address # caption z18- building-garage # caption z18- (also has area z15-) building-has_parts # caption z18- (also has area z15-) -=== 20 +=== 50