From 2daf40479a269be806c3cf461984520943ee6fc4 Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Thu, 23 Oct 2025 13:35:08 +0200 Subject: [PATCH] [styles] Show police and fire stations earlier Signed-off-by: Yannik Bloscheck --- data/styles/default/include/Icons.mapcss | 8 +++++--- .../default/include/priorities_1_BG-by-size.prio.txt | 4 ++-- .../styles/default/include/priorities_4_overlays.prio.txt | 8 ++++---- .../outdoors/include/priorities_1_BG-by-size.prio.txt | 4 ++-- .../outdoors/include/priorities_4_overlays.prio.txt | 8 ++++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 0fb9a597f..4c2f6d0fb 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -885,7 +885,7 @@ node|z15-[leisure=sports_centre][sport=swimming], node|z17-[highway=ladder], node|z18-[amenity=dojo], node|z18-[amenity=vending_machine], -node|z18-[amenity=fire_station], +node|z17-[amenity=fire_station], node|z18-[amenity=internet_cafe], node|z18-[emergency=defibrillator], node|z18-[emergency=assembly_point], @@ -1411,7 +1411,7 @@ node|z17-[leisure=bowling_alley], node|z18-[leisure=bowling_alley], {font-size: 11;} -node|z17-[amenity=police], +node|z16-[amenity=police], {icon-image: police-m.svg;} node|z18-[amenity=police], {font-size: 11;} @@ -1537,8 +1537,10 @@ node|z17-[amenity=bureau_de_change], node|z17-[amenity=money_transfer], {icon-image: banknote-m.svg;font-size: 11;} +node|z16-[amenity=fire_station], +{icon-image: fire_station-m.svg;} node|z18-[amenity=fire_station], -{icon-image: fire_station-m.svg;font-size: 11;} +{font-size: 11;} node|z18-[amenity=toilets], {icon-image: toilets-m.svg;font-size: 11;} node|z18-[amenity=atm], 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 e2421fc37..83c9922d3 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 @@ -88,10 +88,10 @@ amenity-car_wash # area z15- (also has icon z amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) amenity-charging_station-motorcar-small # area z15- (also has icon z16-, caption(optional) z16-) amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) -amenity-fire_station # area z15- (also has icon z18-, caption(optional) z18-) +amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) -amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-police # area z15- (also has icon z16-, caption(optional) z17-) amenity-ranger_station # area z13- (also has icon z15-, caption(optional) z15-) amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 895e50a1e..db4e22de5 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1171,11 +1171,11 @@ waterway-lock_gate # icon z16- amenity-brothel # icon z18- (also has caption(optional) z18-) amenity-casino # icon z17- (also has caption(optional) z17-) -amenity-fire_station # icon z18- (also has caption(optional) z18-, area z15-) +amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) amenity-gambling # icon z17- (also has caption(optional) z17-) 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-police # icon z16- (also has caption(optional) z17-, area z15-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -2156,11 +2156,11 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-brothel # caption(optional) z18- (also has icon z18-) # amenity-casino # caption(optional) z17- (also has icon z17-) -# amenity-fire_station # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) # amenity-gambling # caption(optional) z17- (also has icon z17-) # 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-police # caption(optional) z17- (also has icon z16-, area z15-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-) 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 e74d49303..432b738bd 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 @@ -88,10 +88,10 @@ amenity-car_wash # area z15- (also has icon z amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-) amenity-charging_station-motorcar-small # area z15- (also has icon z16-, caption(optional) z16-) amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-) -amenity-fire_station # area z15- (also has icon z18-, caption(optional) z18-) +amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-) amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-) amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-) -amenity-police # area z15- (also has icon z17-, caption(optional) z17-) +amenity-police # area z15- (also has icon z16-, caption(optional) z17-) amenity-ranger_station # area z13- (also has icon z13-, caption(optional) z14-) amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-) amenity-social_facility # area z15- (also has icon z17-, caption(optional) z17-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index d4141cf5c..518e91c8f 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1172,11 +1172,11 @@ waterway-lock_gate # icon z16- amenity-brothel # icon z18- (also has caption(optional) z18-) amenity-casino # icon z17- (also has caption(optional) z17-) -amenity-fire_station # icon z18- (also has caption(optional) z18-, area z15-) +amenity-fire_station # icon z16- (also has caption(optional) z17-, area z15-) amenity-gambling # icon z17- (also has caption(optional) z17-) 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-police # icon z16- (also has caption(optional) z17-, area z15-) amenity-stripclub # icon z18- (also has caption(optional) z18-) craft # icon z18- (also has caption(optional) z18-) craft-beekeeper # icon z17- (also has caption(optional) z18-) @@ -2161,11 +2161,11 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-brothel # caption(optional) z18- (also has icon z18-) # amenity-casino # caption(optional) z17- (also has icon z17-) -# amenity-fire_station # caption(optional) z18- (also has icon z18-, area z15-) +# amenity-fire_station # caption(optional) z17- (also has icon z16-, area z15-) # amenity-gambling # caption(optional) z17- (also has icon z17-) # 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-police # caption(optional) z17- (also has icon z16-, area z15-) # amenity-stripclub # caption(optional) z18- (also has icon z18-) # craft # caption(optional) z18- (also has icon z18-) # craft-beekeeper # caption(optional) z18- (also has icon z17-)