From 0b6dfe11608cb432719ff896422079b663741dca Mon Sep 17 00:00:00 2001 From: Yannik Bloscheck Date: Wed, 10 Sep 2025 13:11:27 +0200 Subject: [PATCH] [styles] Display cemeteries earlier and with a more distinct color Signed-off-by: Yannik Bloscheck --- data/styles/default/dark/colors.mapcss | 2 ++ data/styles/default/include/Basemap.mapcss | 16 ++++++++++++++-- .../include/priorities_1_BG-by-size.prio.txt | 8 ++++---- .../include/priorities_4_overlays.prio.txt | 16 ++++++++-------- data/styles/default/light/colors.mapcss | 2 ++ .../include/priorities_1_BG-by-size.prio.txt | 8 ++++---- .../include/priorities_4_overlays.prio.txt | 16 ++++++++-------- 7 files changed, 42 insertions(+), 26 deletions(-) diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 57da6adf3..5827c597d 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -80,6 +80,8 @@ @allotments: #2B2A1E; @allotments_13: #2A291D; @allotments_12: #29281D; +@allotments_11: #29271D; +@allotments_10: #27271C; @scrubs: #222713; @scrubs_13: #212613; @scrubs_12: #212513; diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 436dccc31..1d8e87fda 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -479,9 +479,21 @@ area|z14-[piste:type=snow_park], /* 7.4 Cemetery */ +area|z10[landuse=cemetery], +area|z10[amenity=grave_yard], +{fill-color: @allotments_10;} +area|z11[landuse=cemetery], +area|z11[amenity=grave_yard], +{fill-color: @allotments_11;} +area|z12[landuse=cemetery], +area|z12[amenity=grave_yard], +{fill-color: @allotments_12;} +area|z13[landuse=cemetery], +area|z13[amenity=grave_yard], +{fill-color: @allotments_13;} area|z14-[landuse=cemetery], -area|z14-[amenity=grave_yard] -{fill-color: @flowers;} +area|z14-[amenity=grave_yard], +{fill-color: @allotments;} /* 7.5 Pedestrian areas */ 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 430bd5262..f4c42a68b 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 @@ -45,10 +45,10 @@ amenity-fountain # area z16- (also has icon z leisure-sports_centre # area z13- (also has icon z17-, caption(optional) z17-) === 190 -amenity-grave_yard # area z14- (also has icon z17-, caption(optional) z17-) -amenity-grave_yard-christian # area z14- (also has icon z17-, caption(optional) z17-) -landuse-cemetery # area z14- (also has icon z15-, caption(optional) z15-) -landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) +amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +landuse-cemetery # area z10- (also has icon z15-, caption(optional) z15-) +landuse-cemetery-christian # area z10- (also has icon z15-, caption(optional) z15-) === 180 amenity-car_wash # 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 ed8873eb5..c6d41f143 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -608,8 +608,8 @@ historic-ship # icon z15- (also has captio historic-tank # icon z16- (also has caption(optional) z16-) historic-wreck # icon z16- (also has caption(optional) z16-) landuse-allotments # caption z15- (also has area z12-) -landuse-cemetery # icon z15- (also has caption(optional) z15-, area z14-) -landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z14-) +landuse-cemetery # icon z15- (also has caption(optional) z15-, area z10-) +landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-) man_made-water_tap # icon z16- (also has caption(optional) z18-) man_made-water_well # icon z16- (also has caption(optional) z18-) man_made-windmill # icon z16- (also has caption(optional) z16-) @@ -1094,8 +1094,8 @@ isoline-step_10 # pathtext z17- (also has li isoline-zero # pathtext z17- (also has line z15-) === 1000 -amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z14-) -amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z14-) +amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) 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-) @@ -1729,8 +1729,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-ship # caption(optional) z15- (also has icon z15-) # historic-tank # caption(optional) z16- (also has icon z16-) # historic-wreck # caption(optional) z16- (also has icon z16-) -# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z14-) -# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z14-) +# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-) # man_made-water_tap # caption(optional) z18- (also has icon z16-) # man_made-water_well # caption(optional) z18- (also has icon z16-) # man_made-windmill # caption(optional) z16- (also has icon z16-) @@ -2050,8 +2050,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-) # === -8800 -# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z14-) -# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z14-) +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # 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-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 7b4ee0647..1767b0a2b 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -80,6 +80,8 @@ @allotments: #D5D395; @allotments_13: #D6D498; @allotments_12: #D8D59B; +@allotments_11: #DAD79F; +@allotments_10: #DBD7A2; @scrubs: #ACC261; @scrubs_13: #AFC467; @scrubs_12: #B3C66D; 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 e077879db..caad08d49 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 @@ -45,10 +45,10 @@ amenity-fountain # area z16- (also has icon z leisure-sports_centre # area z13- (also has icon z17-, caption(optional) z17-) === 190 -amenity-grave_yard # area z14- (also has icon z17-, caption(optional) z17-) -amenity-grave_yard-christian # area z14- (also has icon z17-, caption(optional) z17-) -landuse-cemetery # area z14- (also has icon z15-, caption(optional) z15-) -landuse-cemetery-christian # area z14- (also has icon z15-, caption(optional) z15-) +amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-) +amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-) +landuse-cemetery # area z10- (also has icon z15-, caption(optional) z15-) +landuse-cemetery-christian # area z10- (also has icon z15-, caption(optional) z15-) === 180 amenity-car_wash # 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 abb4bbc03..dbc986ed5 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -608,8 +608,8 @@ historic-ship # icon z15- (also has captio historic-tank # icon z16- (also has caption(optional) z16-) historic-wreck # icon z16- (also has caption(optional) z16-) landuse-allotments # caption z15- (also has area z12-) -landuse-cemetery # icon z15- (also has caption(optional) z15-, area z14-) -landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z14-) +landuse-cemetery # icon z15- (also has caption(optional) z15-, area z10-) +landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-) man_made-water_tap # icon z12- (also has caption(optional) z14-) man_made-water_well # icon z12- (also has caption(optional) z14-) man_made-windmill # icon z16- (also has caption(optional) z16-) @@ -1095,8 +1095,8 @@ isoline-zero # pathtext z15- (also has li power-line # pathtext z15- (also has line z13-, line::dash z13-) === 1000 -amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z14-) -amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z14-) +amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-) +amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-) 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-) @@ -1732,8 +1732,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # historic-ship # caption(optional) z15- (also has icon z15-) # historic-tank # caption(optional) z16- (also has icon z16-) # historic-wreck # caption(optional) z16- (also has icon z16-) -# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z14-) -# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z14-) +# landuse-cemetery # caption(optional) z15- (also has icon z15-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-) # man_made-water_tap # caption(optional) z14- (also has icon z12-) # man_made-water_well # caption(optional) z14- (also has icon z12-) # man_made-windmill # caption(optional) z16- (also has icon z16-) @@ -2053,8 +2053,8 @@ leisure-swimming_pool-private # icon z17- (also has captio # natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-) # === -8800 -# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z14-) -# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z14-) +# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-) +# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-) # 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-)