From 3b5d5e882bdc2970e0ed0d436737787280352948 Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 20 Aug 2025 00:27:27 +0700 Subject: [PATCH] [styles] Make entrances visible earlier Signed-off-by: Konstantin Pastbin --- .../default/include/Basemap_label.mapcss | 14 +++++++++---- .../include/priorities_4_overlays.prio.txt | 20 +++++++++---------- .../include/priorities_4_overlays.prio.txt | 20 +++++++++---------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index 6f80b6540..e0a9c6230 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -705,14 +705,20 @@ node|z18-[addr:housenumber][addr:street], node|z16-[addr:housenumber][addr:street]::int_name, {font-size: 8;} -node|z19-[entrance], +node|z17[entrance], +node|z18[amenity=loading_dock], +node|z16[entrance=main], +node|z16[emergency=emergency_ward_entrance], +{icon-image: dot-m.svg;} + +node|z18-[entrance], node|z19-[amenity=loading_dock], {icon-image: entrance-s.svg; font-size: 10; text-offset: 1;} -node|z19-[entrance=exit], +node|z18-[entrance=exit], {icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;} -node|z18-[entrance=main], +node|z17-[entrance=main], {icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;} -node|z18-[emergency=emergency_ward_entrance], +node|z17-[emergency=emergency_ward_entrance], {icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;} /* 8.3 Airports */ diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 9e5b17b97..f15dc1d6f 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1216,7 +1216,7 @@ amenity-motorcycle_parking # icon z17- (also has captio amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) -emergency-emergency_ward_entrance # icon z18- (also has caption(optional) z18-) +emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) === 250 building # caption z16- (also has area z14-) @@ -1231,7 +1231,7 @@ power-plant-wind # icon z15- (also has captio === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z18- (also has caption(optional) z18-) +entrance-main # icon z16- (also has caption(optional) z18-) === 220 highway-traffic_signals # icon z19- @@ -2151,14 +2151,14 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) -# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z18-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) # === -9750 # power-plant-wind # caption(optional) z16- (also has icon z15-, area z13-) # === -9770 # barrier-entrance # caption(optional) z16- (also has icon z16-) -# entrance-main # caption(optional) z18- (also has icon z18-) +# entrance-main # caption(optional) z18- (also has icon z16-) # === -9780 # historic-anchor # caption(optional) z18- (also has icon z18-) @@ -2205,7 +2205,7 @@ tourism-information-map # icon z16- (also has captio amenity # caption z19- amenity-telephone # icon z17- (also has caption(optional) z19-) -entrance # icon z19- (also has caption(optional) z19-) +entrance # icon z17- (also has caption(optional) z19-) === -9960 amenity-parking_space # caption z19- @@ -2238,8 +2238,8 @@ power-substation # icon z19- (also has captio === -9990 # amenity-bench # caption(optional) z19- (also has icon z18-) -amenity-loading_dock # icon z19- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +amenity-loading_dock # icon z18- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) # amenity-vending_machine # caption(optional) z18- (also has icon z18-) @@ -2256,9 +2256,9 @@ amenity-loading_dock # icon z19- (also has captio # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) -# entrance # caption(optional) z19- (also has icon z19-) -entrance-exit # icon z19- (also has caption(optional) z19-) -# entrance-exit # caption(optional) z19- (also has icon z19-) +# entrance # caption(optional) z19- (also has icon z17-) +entrance-exit # icon z17- (also has caption(optional) z19-) +# entrance-exit # caption(optional) z19- (also has icon z17-) # man_made-cairn # caption(optional) z19- (also has icon z19-) # man_made-survey_point # caption(optional) z18- (also has icon z18-) # power-substation # caption(optional) z19- (also has icon z19-, area z13-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index ff51442d3..3b14846e5 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1217,7 +1217,7 @@ amenity-motorcycle_parking # icon z17- (also has captio amenity-parking-permissive # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking_entrance # icon z17- (also has caption(optional) z19-) amenity-parking_entrance-permissive # icon z17- (also has caption(optional) z19-) -emergency-emergency_ward_entrance # icon z18- (also has caption(optional) z18-) +emergency-emergency_ward_entrance # icon z16- (also has caption(optional) z18-) === 250 building # caption z16- (also has area z14-) @@ -1234,7 +1234,7 @@ power-pole # icon z15- === 230 barrier-entrance # icon z16- (also has caption(optional) z16-) -entrance-main # icon z18- (also has caption(optional) z18-) +entrance-main # icon z16- (also has caption(optional) z18-) === 220 highway-traffic_signals # icon z19- @@ -2156,14 +2156,14 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-parking-permissive # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking_entrance # caption(optional) z19- (also has icon z17-) # amenity-parking_entrance-permissive # caption(optional) z19- (also has icon z17-) -# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z18-) +# emergency-emergency_ward_entrance # caption(optional) z18- (also has icon z16-) # === -9750 # power-plant-wind # caption(optional) z16- (also has icon z13-, area z13-) # === -9770 # barrier-entrance # caption(optional) z16- (also has icon z16-) -# entrance-main # caption(optional) z18- (also has icon z18-) +# entrance-main # caption(optional) z18- (also has icon z16-) # === -9780 # historic-anchor # caption(optional) z18- (also has icon z18-) @@ -2210,7 +2210,7 @@ tourism-information-map # icon z15- (also has captio amenity # caption z19- amenity-telephone # icon z17- (also has caption(optional) z19-) -entrance # icon z19- (also has caption(optional) z19-) +entrance # icon z17- (also has caption(optional) z19-) === -9960 amenity-parking_space # caption z19- @@ -2243,8 +2243,8 @@ power-substation # icon z19- (also has captio === -9990 # amenity-bench # caption(optional) z19- (also has icon z18-) -amenity-loading_dock # icon z19- (also has caption(optional) z19-) -# amenity-loading_dock # caption(optional) z19- (also has icon z19-) +amenity-loading_dock # icon z18- (also has caption(optional) z19-) +# amenity-loading_dock # caption(optional) z19- (also has icon z18-) # amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-) # amenity-telephone # caption(optional) z19- (also has icon z17-) # amenity-vending_machine # caption(optional) z18- (also has icon z18-) @@ -2261,9 +2261,9 @@ amenity-loading_dock # icon z19- (also has captio # emergency-assembly_point # caption(optional) z18- (also has icon z18-) # emergency-defibrillator # caption(optional) z18- (also has icon z18-) # emergency-fire_hydrant # caption(optional) z19- (also has icon z19-) -# entrance # caption(optional) z19- (also has icon z19-) -entrance-exit # icon z19- (also has caption(optional) z19-) -# entrance-exit # caption(optional) z19- (also has icon z19-) +# entrance # caption(optional) z19- (also has icon z17-) +entrance-exit # icon z17- (also has caption(optional) z19-) +# entrance-exit # caption(optional) z19- (also has icon z17-) # man_made-cairn # caption(optional) z17- (also has icon z17-) # man_made-survey_point # caption(optional) z15- (also has icon z14-) # power-substation # caption(optional) z19- (also has icon z19-, area z13-)