diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 1d8e87fda..1544af1a9 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -222,9 +222,18 @@ area|z10-17[boundary=national_park], area|z10-17[boundary=protected_area][protect_class=1], {fill-opacity: 0.2; fill-color: @protected_nature;} +line|z10-[boundary=national_park], +line|z10-[boundary=protected_area][protect_class=1], +{width: 2; color: @protected_nature;} + area|z10-16[boundary=aboriginal_lands], {fill-opacity: 0.07; fill-color: @indigenous_lands;} +line|z10-[boundary=aboriginal_lands], +{width: 2; color: @indigenous_lands;} + +/* ToDo: Assume that military areas already have fences? */ + area|z10-[landuse=military][military=danger_area], {fill-opacity: 1.0; fill-color: @military;} diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index a3feec0a1..9fa461744 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -454,9 +454,9 @@ waterway-dam # line z14- and area z14- (a === 30 amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) -boundary-aboriginal_lands # area z10-16 (also has caption z10-16) -boundary-national_park # area z10-17 (also has icon z11-17, caption(optional) z12-17) -boundary-protected_area-1 # area z10-17 (also has icon z11-17, caption(optional) z12-17) +boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +boundary-national_park # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) +boundary-protected_area-1 # line z10- and area z10-17 (also has icon z11-17, caption(optional) z12-17) 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-17 (also has icon z11-17, caption(optional) z12-17, caption z18-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 372bc4bb8..dd41f4f4f 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -94,10 +94,10 @@ highway-trunk-bridge::shield # shield::shield z10- (also highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) === 6740 -boundary-aboriginal_lands # caption z10-16 (also has area z10-16) -boundary-national_park # icon z11-17 (also has caption(optional) z12-17, area z10-17) +boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +boundary-national_park # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) boundary-protected_area # icon z11-17 (also has caption(optional) z12-17) -boundary-protected_area-1 # icon z11-17 (also has caption(optional) z12-17, area z10-17) +boundary-protected_area-1 # icon z11-17 (also has caption(optional) z12-17, line z10-, area z10-17) boundary-protected_area-2 # icon z11-17 (also has caption(optional) z12-17) boundary-protected_area-3 # icon z11-17 (also has caption(optional) z12-17) boundary-protected_area-4 # icon z11-17 (also has caption(optional) z12-17) @@ -1311,9 +1311,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-station # caption(optional) z12- (also has icon z12-) # === -3200 -# boundary-national_park # caption(optional) z12-17 (also has icon z11-17, area z10-17) +# boundary-national_park # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) # boundary-protected_area # caption(optional) z12-17 (also has icon z11-17) -# boundary-protected_area-1 # caption(optional) z12-17 (also has icon z11-17, area z10-17) +# boundary-protected_area-1 # caption(optional) z12-17 (also has icon z11-17, line z10-, area z10-17) # boundary-protected_area-2 # caption(optional) z12-17 (also has icon z11-17) # boundary-protected_area-3 # caption(optional) z12-17 (also has icon z11-17) # boundary-protected_area-4 # caption(optional) z12-17 (also has icon z11-17) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 3ba5eba92..2bfc88746 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -456,9 +456,9 @@ waterway-dam # line z14- and area z14- (a === 30 amenity-prison # area z12- (also has icon z17-, caption(optional) z17-) -boundary-aboriginal_lands # area z10-16 (also has caption z10-16) -boundary-national_park # area z10-17 (also has icon z10-17, caption(optional) z11-17) -boundary-protected_area-1 # area z10-17 (also has icon z10-17, caption(optional) z11-17) +boundary-aboriginal_lands # line z10- and area z10-16 (also has caption z10-16) +boundary-national_park # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) +boundary-protected_area-1 # line z10- and area z10-17 (also has icon z10-17, caption(optional) z11-17) 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-17 (also has icon z10-17, caption(optional) z11-17, caption z18-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 6a98530ea..501b6c1ef 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -94,10 +94,10 @@ highway-trunk-bridge::shield # shield::shield z10- (also highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) === 6740 -boundary-aboriginal_lands # caption z10-16 (also has area z10-16) -boundary-national_park # icon z10-17 (also has caption(optional) z11-17, area z10-17) +boundary-aboriginal_lands # caption z10-16 (also has line z10-, area z10-16) +boundary-national_park # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) boundary-protected_area # icon z10-17 (also has caption(optional) z11-17) -boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, area z10-17) +boundary-protected_area-1 # icon z10-17 (also has caption(optional) z11-17, line z10-, area z10-17) boundary-protected_area-2 # icon z10-17 (also has caption(optional) z11-17) boundary-protected_area-3 # icon z10-17 (also has caption(optional) z11-17) boundary-protected_area-4 # icon z10-17 (also has caption(optional) z11-17) @@ -1314,9 +1314,9 @@ leisure-swimming_pool-private # icon z17- (also has captio # railway-station # caption(optional) z12- (also has icon z12-) # === -3200 -# boundary-national_park # caption(optional) z11-17 (also has icon z10-17, area z10-17) +# boundary-national_park # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) # boundary-protected_area # caption(optional) z11-17 (also has icon z10-17) -# boundary-protected_area-1 # caption(optional) z11-17 (also has icon z10-17, area z10-17) +# boundary-protected_area-1 # caption(optional) z11-17 (also has icon z10-17, line z10-, area z10-17) # boundary-protected_area-2 # caption(optional) z11-17 (also has icon z10-17) # boundary-protected_area-3 # caption(optional) z11-17 (also has icon z10-17) # boundary-protected_area-4 # caption(optional) z11-17 (also has icon z10-17)