From 8f9fb5ce1630d68b40aa12fc35a7b8b9e7e6c7fe Mon Sep 17 00:00:00 2001 From: Konstantin Pastbin Date: Wed, 18 Oct 2023 18:28:36 +0300 Subject: [PATCH] [styles] Fix/add vehicle mode hatching fills Signed-off-by: Konstantin Pastbin --- data/styles/vehicle/include/Basemap.mapcss | 15 +++++++++++++-- data/styles/vehicle/include/Basemap_label.mapcss | 5 +++++ .../include/priorities_1_BG-by-size.prio.txt | 3 --- .../vehicle/include/priorities_3_FG.prio.txt | 7 +++++++ .../include/priorities_4_overlays.prio.txt | 16 ++++++++++++---- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index c2deeb3148..471c24d614 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -89,7 +89,6 @@ line|z10-[boundary=administrative][admin_level=4] area|z10-[landuse=forest], area|z10-[leisure=park], -area|z10-[leisure=nature_reserve], area|z12-[leisure=garden], area|z14-[landuse=grass], area|z14-[natural=grassland], @@ -106,7 +105,6 @@ area|z14-[landuse=field], {fill-opacity: 1;} area|z10[landuse=forest], -area|z10[leisure=nature_reserve], {fill-color: @green1;} area|z14-[landuse=grass], @@ -157,6 +155,19 @@ area|z16-[leisure=garden] area|z12-[natural=bare_rock], {fill-color: @barerock;} +/* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */ +area|z10-[leisure=nature_reserve], +area|z10-[boundary=national_park], +area|z10-[boundary=protected_area][protect_class=1], +{fill-opacity: 0.2; fill-color: @green6;} + +area|z10-[landuse=military][military=danger_area], +{fill-opacity: 1.0; fill-color: @military;} + +area|z12-[landuse=military] +{fill-opacity: 0.5; fill-color: @military;} +/* End of hardcoded */ + /* 5.BEACH, GLACIER, DESERT, etc. */ area|z0-[natural=glacier], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index bd56a2b8d4..2eec73eaab 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -482,6 +482,11 @@ area|z16-[place=square], /* 7.6 Military */ +area|z16-[landuse=military], +{icon-image: military-m.svg;} + +area|z17-[landuse=military], +{text-offset: 1; text: name; font-size: 10; text-color: @poi_label;} /* 7.7 Commercial */ diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 739b6d0932..8e9e30c7c4 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -33,9 +33,6 @@ amenity-parking-street_side-private # area z15- (also has icon z leisure-stadium # area z15- === 150 -leisure-nature_reserve # area z10- (also has icon z12-, caption(optional) z12-) -=== 140 - amenity-grave_yard # area z14- amenity-grave_yard-christian # area z14- landuse-cemetery # area z14- diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index b82320305e..922e9e0070 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -376,5 +376,12 @@ man_made-pier # line z15- and area z13- waterway-dam # line z15- and area z15- === 20 +boundary-national_park # area z10- (also has icon z12-, caption(optional) z12-) +boundary-protected_area-1 # area z10- (also has icon z12-, caption(optional) z12-) +landuse-military # area z12- (also has icon z16-, caption(optional) z17-) +landuse-military-danger_area # area z10- (also has icon z16-, caption(optional) z17-) +leisure-nature_reserve # area z10- (also has icon z12-, caption(optional) z12-) +=== 15 + man_made-bridge # area z16- === 10 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 081a37f108..db756b859b 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -248,9 +248,9 @@ amenity-parking-street_side # icon z17- (also has area z amenity-parking-street_side-fee # icon z15- (also has area z15-) === 2520 -boundary-national_park # icon z12- (also has caption(optional) z12-) +boundary-national_park # icon z12- (also has caption(optional) z12-, area z10-) boundary-protected_area # icon z12- (also has caption(optional) z12-) -boundary-protected_area-1 # icon z12- (also has caption(optional) z12-) +boundary-protected_area-1 # icon z12- (also has caption(optional) z12-, area z10-) boundary-protected_area-2 # icon z12- (also has caption(optional) z12-) boundary-protected_area-3 # icon z12- (also has caption(optional) z12-) boundary-protected_area-4 # icon z12- (also has caption(optional) z12-) @@ -663,6 +663,10 @@ railway-subway_entrance-yerevan # icon z16- (also has captio railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) === 550 +landuse-military # icon z16- (also has caption(optional) z17-, area z12-) +landuse-military-danger_area # icon z16- (also has caption(optional) z17-, area z10-) +=== 520 + amenity-parking-lane-private # icon z18- (also has caption(optional) z18-, area z15-) amenity-parking-no-access # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-private # icon z17- (also has caption(optional) z17-, area z15-) @@ -780,9 +784,9 @@ entrance-main # icon z18- (also has captio # amenity-parking-underground-fee # caption(optional) z16- (also has icon z15-) # === -7450 -# boundary-national_park # caption(optional) z12- (also has icon z12-) +# boundary-national_park # caption(optional) z12- (also has icon z12-, area z10-) # boundary-protected_area # caption(optional) z12- (also has icon z12-) -# boundary-protected_area-1 # caption(optional) z12- (also has icon z12-) +# boundary-protected_area-1 # caption(optional) z12- (also has icon z12-, area z10-) # boundary-protected_area-2 # caption(optional) z12- (also has icon z12-) # boundary-protected_area-3 # caption(optional) z12- (also has icon z12-) # boundary-protected_area-4 # caption(optional) z12- (also has icon z12-) @@ -1127,6 +1131,10 @@ entrance-main # icon z18- (also has captio # railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) # === -9450 +# landuse-military # caption(optional) z17- (also has icon z16-, area z12-) +# landuse-military-danger_area # caption(optional) z17- (also has icon z16-, area z10-) +# === -9480 + # amenity-parking-lane-private # caption(optional) z18- (also has icon z18-, area z15-) # amenity-parking-no-access # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-private # caption(optional) z17- (also has icon z17-, area z15-)