From 405025879eca8930612c920aeb890025bd18504c Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Tue, 26 Aug 2025 17:29:33 +0700 Subject: [PATCH] [styles] Display labels earlier for most amenities which were z19- Signed-off-by: Konstantin Pastbin --- data/styles/default/include/Icons.mapcss | 6 ++++ .../include/priorities_1_BG-by-size.prio.txt | 4 +-- .../include/priorities_4_overlays.prio.txt | 32 +++++++++---------- .../include/priorities_1_BG-by-size.prio.txt | 4 +-- .../include/priorities_4_overlays.prio.txt | 32 +++++++++---------- 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 57be4e31d..69c83f6e4 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -792,6 +792,9 @@ node|z17-[amenity=animal_shelter], node|z17-[amenity=kindergarten], node|z17-[amenity=childcare], node|z17-[amenity=school], +node|z17-[amenity=driving_school], +node|z17-[amenity=language_school], +node|z17-[amenity=music_school], node|z17-[amenity=cinema], node|z17-[amenity=ice_cream], node|z17-[leisure=bowling_alley], @@ -817,6 +820,7 @@ node|z17-[highway=ladder], node|z18-[amenity=dojo], node|z18-[amenity=vending_machine], node|z18-[amenity=fire_station], +node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], node|z18-[emergency=assembly_point], node|z18-[emergency=lifeguard], @@ -826,6 +830,8 @@ node|z18-[amenity=bureau_de_change], node|z18-[amenity=money_transfer], node|z18-[amenity=library], node|z18-[amenity=waste_disposal], +node|z18-[amenity=recycling], +node|z18-[amenity=waste_transfer_station], node|z18-[amenity=hunting_stand], node|z18-[shop=lottery], node|z18-[shop=hearing_aids], diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt index c979f29d7..568b7423f 100644 --- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt @@ -59,7 +59,7 @@ amenity-fuel # area z15- (also has icon z amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) -amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) +amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z18-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z16-, caption(optional) z16-) @@ -166,7 +166,7 @@ landuse-forest-deciduous # area z10- (also has icon z landuse-forest-mixed # area z10- (also has icon z13-, caption(optional) z14-) === 60 -amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z19-) +amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) landuse-construction # area z13- (also has caption z15-) landuse-industrial # area z13- (also has caption z15-) landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 5e097785b..ac66869ad 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -920,11 +920,11 @@ amenity-animal_shelter # icon z17- (also has captio amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) -amenity-driving_school # icon z17- (also has caption(optional) z19-) -amenity-language_school # icon z17- (also has caption(optional) z19-) +amenity-driving_school # icon z17- (also has caption(optional) z17-) +amenity-language_school # icon z17- (also has caption(optional) z17-) amenity-money_transfer # icon z17- (also has caption(optional) z18-) -amenity-music_school # icon z17- (also has caption(optional) z19-) -amenity-recycling-centre # icon z17- (also has caption(optional) z19-, area z15-) +amenity-music_school # icon z17- (also has caption(optional) z17-) +amenity-recycling-centre # icon z17- (also has caption(optional) z18-, area z15-) amenity-veterinary # icon z16- (also has caption(optional) z16-) craft-electrician # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-) @@ -1077,7 +1077,7 @@ leisure-sports_hall # icon z17- (also has captio amenity-compressed_air # icon z18- (also has caption(optional) z19-) amenity-parcel_locker # icon z17- (also has caption(optional) z17-) amenity-payment_terminal # icon z17- (also has caption(optional) z17-) -amenity-recycling # icon z17- (also has caption(optional) z19-) +amenity-recycling # icon z17- (also has caption(optional) z18-) amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) @@ -1098,7 +1098,7 @@ amenity-grave_yard-christian # icon z17- (also has captio amenity-nursing_home # icon z17- (also has caption(optional) z17-) amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) -amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) +amenity-waste_transfer_station # icon z17- (also has caption(optional) z18-, area z13-) highway-ladder # icon z17- and pathtext z17- (also has line z15-) historic-ruins # icon z17- (also has caption(optional) z17-) landuse-farmland # caption z15- (also has area z10-) @@ -1129,7 +1129,7 @@ amenity-brothel # icon z18- (also has captio amenity-casino # icon z17- (also has caption(optional) z17-) amenity-fire_station # icon z18- (also has caption(optional) z18-, area z15-) amenity-gambling # icon z17- (also has caption(optional) z17-) -amenity-internet_cafe # icon z18- (also has caption(optional) z19-) +amenity-internet_cafe # icon z18- (also has caption(optional) z18-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) amenity-police # icon z17- (also has caption(optional) z17-, area z15-) amenity-stripclub # icon z18- (also has caption(optional) z18-) @@ -1245,7 +1245,7 @@ historic-stone # icon z18- (also has captio === 210 amenity-post_box # icon z18- -amenity-recycling-container # icon z17- (also has caption(optional) z19-) +amenity-recycling-container # icon z17- (also has caption(optional) z18-) historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) === 200 @@ -1882,11 +1882,11 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) -# amenity-driving_school # caption(optional) z19- (also has icon z17-) -# amenity-language_school # caption(optional) z19- (also has icon z17-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-) -# amenity-music_school # caption(optional) z19- (also has icon z17-) -# amenity-recycling-centre # caption(optional) z19- (also has icon z17-, area z15-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z18- (also has icon z17-, area z15-) # amenity-veterinary # caption(optional) z16- (also has icon z16-) # craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-) @@ -2035,7 +2035,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-compressed_air # caption(optional) z19- (also has icon z18-) # amenity-parcel_locker # caption(optional) z17- (also has icon z17-) # amenity-payment_terminal # caption(optional) z17- (also has icon z17-) -# amenity-recycling # caption(optional) z19- (also has icon z17-) +# amenity-recycling # caption(optional) z18- (also has icon z17-) # amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) @@ -2051,7 +2051,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-nursing_home # caption(optional) z17- (also has icon z17-) # amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) # amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) -# amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-, area z13-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) # historic-ruins # caption(optional) z17- (also has icon z17-) # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) @@ -2069,7 +2069,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-casino # caption(optional) z17- (also has icon z17-) # amenity-fire_station # caption(optional) z18- (also has icon z18-, area z15-) # amenity-gambling # caption(optional) z17- (also has icon z17-) -# amenity-internet_cafe # caption(optional) z19- (also has icon z18-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) # amenity-police # caption(optional) z17- (also has icon z17-, area z15-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) @@ -2169,7 +2169,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-stone # caption(optional) z18- (also has icon z18-) # === -9790 -# amenity-recycling-container # caption(optional) z19- (also has icon z17-) +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) # historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) # === -9800 diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt index a9f948e6f..9e4f0b4df 100644 --- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt @@ -59,7 +59,7 @@ amenity-fuel # area z15- (also has icon z amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) amenity-police # area z15- (also has icon z17-, caption(optional) z17-) amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) -amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z19-) +amenity-recycling-centre # area z15- (also has icon z17-, caption(optional) z18-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) amenity-vehicle_inspection # area z15- (also has icon z16-, caption(optional) z16-) emergency-mountain_rescue # area z13- (also has icon z12-, caption(optional) z12-) @@ -166,7 +166,7 @@ landuse-forest-deciduous # area z10- (also has icon z landuse-forest-mixed # area z10- (also has icon z12-, caption(optional) z13-) === 60 -amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z19-) +amenity-waste_transfer_station # area z13- (also has icon z17-, caption(optional) z18-) landuse-construction # area z13- (also has caption z15-) landuse-industrial # area z13- (also has caption z15-) landuse-industrial-mine # area z13- (also has icon z15-, caption(optional) z15-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index ee43dcc7e..183f516d1 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -920,11 +920,11 @@ amenity-animal_shelter # icon z17- (also has captio amenity-car_wash # icon z17- (also has caption(optional) z17-, area z15-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) -amenity-driving_school # icon z17- (also has caption(optional) z19-) -amenity-language_school # icon z17- (also has caption(optional) z19-) +amenity-driving_school # icon z17- (also has caption(optional) z17-) +amenity-language_school # icon z17- (also has caption(optional) z17-) amenity-money_transfer # icon z17- (also has caption(optional) z18-) -amenity-music_school # icon z17- (also has caption(optional) z19-) -amenity-recycling-centre # icon z17- (also has caption(optional) z19-, area z15-) +amenity-music_school # icon z17- (also has caption(optional) z17-) +amenity-recycling-centre # icon z17- (also has caption(optional) z18-, area z15-) amenity-veterinary # icon z16- (also has caption(optional) z16-) craft-electrician # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-) @@ -1077,7 +1077,7 @@ leisure-sports_hall # icon z17- (also has captio amenity-compressed_air # icon z18- (also has caption(optional) z19-) amenity-parcel_locker # icon z17- (also has caption(optional) z17-) amenity-payment_terminal # icon z17- (also has caption(optional) z17-) -amenity-recycling # icon z17- (also has caption(optional) z19-) +amenity-recycling # icon z17- (also has caption(optional) z18-) amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) @@ -1099,7 +1099,7 @@ amenity-grave_yard-christian # icon z17- (also has captio amenity-nursing_home # icon z17- (also has caption(optional) z17-) amenity-prison # icon z17- (also has caption(optional) z17-, area z12-) amenity-social_facility # icon z17- (also has caption(optional) z17-, area z15-) -amenity-waste_transfer_station # icon z17- (also has caption(optional) z19-, area z13-) +amenity-waste_transfer_station # icon z17- (also has caption(optional) z18-, area z13-) highway-ladder # icon z16- and pathtext z17- (also has line z12-) historic-ruins # icon z17- (also has caption(optional) z17-) landuse-farmland # caption z15- (also has area z10-) @@ -1130,7 +1130,7 @@ amenity-brothel # icon z18- (also has captio amenity-casino # icon z17- (also has caption(optional) z17-) amenity-fire_station # icon z18- (also has caption(optional) z18-, area z15-) amenity-gambling # icon z17- (also has caption(optional) z17-) -amenity-internet_cafe # icon z18- (also has caption(optional) z19-) +amenity-internet_cafe # icon z18- (also has caption(optional) z18-) amenity-love_hotel # icon z18- (also has caption(optional) z18-) amenity-police # icon z17- (also has caption(optional) z17-, area z15-) amenity-stripclub # icon z18- (also has caption(optional) z18-) @@ -1248,7 +1248,7 @@ historic-stone # icon z18- (also has captio === 210 amenity-post_box # icon z18- -amenity-recycling-container # icon z17- (also has caption(optional) z19-) +amenity-recycling-container # icon z17- (also has caption(optional) z18-) historic-memorial-stolperstein # icon z19- (also has caption(optional) z19-) === 200 @@ -1885,11 +1885,11 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-car_wash # caption(optional) z17- (also has icon z17-, area z15-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) -# amenity-driving_school # caption(optional) z19- (also has icon z17-) -# amenity-language_school # caption(optional) z19- (also has icon z17-) +# amenity-driving_school # caption(optional) z17- (also has icon z17-) +# amenity-language_school # caption(optional) z17- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-) -# amenity-music_school # caption(optional) z19- (also has icon z17-) -# amenity-recycling-centre # caption(optional) z19- (also has icon z17-, area z15-) +# amenity-music_school # caption(optional) z17- (also has icon z17-) +# amenity-recycling-centre # caption(optional) z18- (also has icon z17-, area z15-) # amenity-veterinary # caption(optional) z16- (also has icon z16-) # craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-) @@ -2038,7 +2038,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-compressed_air # caption(optional) z19- (also has icon z18-) # amenity-parcel_locker # caption(optional) z17- (also has icon z17-) # amenity-payment_terminal # caption(optional) z17- (also has icon z17-) -# amenity-recycling # caption(optional) z19- (also has icon z17-) +# amenity-recycling # caption(optional) z18- (also has icon z17-) # amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) @@ -2054,7 +2054,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-nursing_home # caption(optional) z17- (also has icon z17-) # amenity-prison # caption(optional) z17- (also has icon z17-, area z12-) # amenity-social_facility # caption(optional) z17- (also has icon z17-, area z15-) -# amenity-waste_transfer_station # caption(optional) z19- (also has icon z17-, area z13-) +# amenity-waste_transfer_station # caption(optional) z18- (also has icon z17-, area z13-) # historic-ruins # caption(optional) z17- (also has icon z17-) # leisure-ice_rink # caption(optional) z17- (also has icon z17-) # leisure-pitch # caption(optional) z17- (also has icon z17-, area z15-) @@ -2073,7 +2073,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-casino # caption(optional) z17- (also has icon z17-) # amenity-fire_station # caption(optional) z18- (also has icon z18-, area z15-) # amenity-gambling # caption(optional) z17- (also has icon z17-) -# amenity-internet_cafe # caption(optional) z19- (also has icon z18-) +# amenity-internet_cafe # caption(optional) z18- (also has icon z18-) # amenity-love_hotel # caption(optional) z18- (also has icon z18-) # amenity-police # caption(optional) z17- (also has icon z17-, area z15-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) @@ -2174,7 +2174,7 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-stone # caption(optional) z18- (also has icon z18-) # === -9790 -# amenity-recycling-container # caption(optional) z19- (also has icon z17-) +# amenity-recycling-container # caption(optional) z18- (also has icon z17-) # historic-memorial-stolperstein # caption(optional) z19- (also has icon z19-) # === -9800