diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss index 5827c597d..7dcf77558 100644 --- a/data/styles/default/dark/colors.mapcss +++ b/data/styles/default/dark/colors.mapcss @@ -74,14 +74,16 @@ @grass_12: #252819; @grass_11: #252719; @flowers: #262918; +@flowers_13: #252818; +@flowers_12: #242718; +@flowers_11: #242617; +@flowers_10: #232617; @golf: #252816; @golf_13: #242716; @golf_12: #232616; @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/dark/symbols/cemetery-m.svg b/data/styles/default/dark/symbols/cemetery-m.svg index af6f5c9ac..f6fe4ad28 100644 --- a/data/styles/default/dark/symbols/cemetery-m.svg +++ b/data/styles/default/dark/symbols/cemetery-m.svg @@ -1,10 +1 @@ - - tomb-m - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/dark/symbols/cemetery-s.svg b/data/styles/default/dark/symbols/cemetery-s.svg new file mode 100644 index 000000000..6da54fce0 --- /dev/null +++ b/data/styles/default/dark/symbols/cemetery-s.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss index 1544af1a9..e26efe845 100644 --- a/data/styles/default/include/Basemap.mapcss +++ b/data/styles/default/include/Basemap.mapcss @@ -490,19 +490,19 @@ area|z14-[piste:type=snow_park], area|z10[landuse=cemetery], area|z10[amenity=grave_yard], -{fill-color: @allotments_10;} +{fill-color: @flowers_10;} area|z11[landuse=cemetery], area|z11[amenity=grave_yard], -{fill-color: @allotments_11;} +{fill-color: @flowers_11;} area|z12[landuse=cemetery], area|z12[amenity=grave_yard], -{fill-color: @allotments_12;} +{fill-color: @flowers_12;} area|z13[landuse=cemetery], area|z13[amenity=grave_yard], -{fill-color: @allotments_13;} +{fill-color: @flowers_13;} area|z14-[landuse=cemetery], area|z14-[amenity=grave_yard], -{fill-color: @allotments;} +{fill-color: @flowers;} /* 7.5 Pedestrian areas */ diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss index b92ca749f..a9e799924 100644 --- a/data/styles/default/include/Basemap_label.mapcss +++ b/data/styles/default/include/Basemap_label.mapcss @@ -609,6 +609,9 @@ area|z18-[piste:type=snow_park], /* 7.4 Cemetery */ +area|z14[landuse=cemetery], +{icon-image: cemetery-s.svg; } + area|z15-[landuse=cemetery], node|z17-[landuse=cemetery], node|z17-[amenity=grave_yard], 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 f4c42a68b..bf30a19d2 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 @@ -47,8 +47,8 @@ leisure-sports_centre # area z13- (also has icon z 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-) +landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +landuse-cemetery-christian # area z10- (also has icon z14-, 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 ff06656ec..bb28c151b 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 z10-) -landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-) +landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +landuse-cemetery-christian # icon z14- (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-) @@ -1731,8 +1731,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 z10-) -# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, 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-) diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss index 1767b0a2b..ff1323deb 100644 --- a/data/styles/default/light/colors.mapcss +++ b/data/styles/default/light/colors.mapcss @@ -74,14 +74,16 @@ @grass_12: #C9D48A; @grass_11: #CCD58E; @flowers: #BECC76; +@flowers_13: #C0CE7B; +@flowers_12: #C3CF7F; +@flowers_11: #C7D184; +@flowers_10: #C9D189; @golf: #B9C96F; @golf_13: #BBCB73; @golf_12: #BECC78; @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/default/light/symbols/cemetery-m.svg b/data/styles/default/light/symbols/cemetery-m.svg index c517fccd0..2ab6b4240 100644 --- a/data/styles/default/light/symbols/cemetery-m.svg +++ b/data/styles/default/light/symbols/cemetery-m.svg @@ -1,10 +1 @@ - - tomb-m - - - - - - - - + \ No newline at end of file diff --git a/data/styles/default/light/symbols/cemetery-s.svg b/data/styles/default/light/symbols/cemetery-s.svg new file mode 100644 index 000000000..e74c6db80 --- /dev/null +++ b/data/styles/default/light/symbols/cemetery-s.svg @@ -0,0 +1 @@ + \ No newline at end of file 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 caad08d49..786089baa 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 @@ -47,8 +47,8 @@ leisure-sports_centre # area z13- (also has icon z 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-) +landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-) +landuse-cemetery-christian # area z10- (also has icon z14-, 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 6d9612a80..ffca13ac8 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 z10-) -landuse-cemetery-christian # icon z15- (also has caption(optional) z15-, area z10-) +landuse-cemetery # icon z14- (also has caption(optional) z15-, area z10-) +landuse-cemetery-christian # icon z14- (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-) @@ -1734,8 +1734,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 z10-) -# landuse-cemetery-christian # caption(optional) z15- (also has icon z15-, area z10-) +# landuse-cemetery # caption(optional) z15- (also has icon z14-, area z10-) +# landuse-cemetery-christian # caption(optional) z15- (also has icon z14-, 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-)