diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 99a65edbba..7fe0c33871 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -823,7 +823,7 @@ barrier|ditch;748; barrier|kissing_gate;749; barrier|turnstile;750; landuse|industrial|mine;[landuse=industrial][industrial=mine];;name;int_name;751; -deprecated|deprecated;752;x +landuse|flowerbed;752; deprecated|deprecated;753;x deprecated|deprecated;754;x deprecated|deprecated;755;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 1df10100c0..9d2a1a2e04 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -14605,6 +14605,47 @@ tr = Alan uk = Поле + [type.landuse.flowerbed] + en = Flowerbed + ar = مشتل أزهار + be = клумба + bg = Цветна леха + ca = Llit de flors + cs = Záhon + da = Blomsterseng + de = Blumenbeet + el = Παρτέρι + es = Cama de flores + et = Lillepeenar + eu = Lore-ohea + fa = باغچه + fi = Kukkapenkki + fr = Plate-bande + he = מיטת פרחים + hu = Virágágy + id = Hamparan bunga + it = Aiuola + ja = 花壇 + ko = "화단" + lt = Geliu lova + mr = फ्लॉवरबेड + nb = Blomsterbed + nl = Bloemenbed + pl = Kwietnik + pt = Canteiro de flores + pt-BR = Canteiro de flores + ro = Pat de flori + ru = Клумба + sk = Záhon + sv = Rabatt + sw = Kitanda cha maua + th = แปลงดอกไม้ + tr = Çiçeklik + uk = Квітник + vi = Giường hoa + zh-Hans = 花坛 + zh-Hant = 花壇 + [type.landuse.forest] en = Forest af = Woud diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index 89bbe6f7df..d5bdb75f99 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -98,7 +98,6 @@ area|z12-[natural=grassland], area|z12-[leisure=golf_course], area|z12-[natural=heath], area|z12-[landuse=allotments], -area|z14-[natural=scrub], area|z12-[natural=bare_rock], area|z12-[landuse=orchard], area|z12-[landuse=vineyard], @@ -106,9 +105,10 @@ area|z12-[landuse=meadow], area|z12-[landuse=recreation_ground], area|z12-[landuse=village_green], area|z12-[landuse=field], +area|z12-[natural=scrub], +area|z16-[landuse=flowerbed], {fill-opacity: 1;} - area|z10-12[leisure=park], {fill-color: @green0;} area|z13-15[leisure=park], @@ -118,6 +118,8 @@ area|z14-15[natural=scrub], {fill-color: @green2;} area|z16-[natural=scrub], {fill-color: @green3;} +area|z16-[landuse=flowerbed], +{fill-color: @flowers;} area|z14-15[landuse=grass], {fill-color: @green0;} @@ -161,6 +163,7 @@ area|z12-13[landuse=meadow], area|z12-13[landuse=recreation_ground], area|z12-13[landuse=village_green], area|z12-13[landuse=field], +area|z12-13[natural=scrub], {fill-color: @green0;} /* Next types are hardcoded to have a hatching-style fill, see drape_frontend/stylist.cpp */ diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index 3d79096912..cd2671c31a 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -65,7 +65,8 @@ aeroway-terminal # area z14- (also has captio leisure-golf_course # area z12- (also has icon z17-, caption(optional) z17-) === 140 -natural-scrub # area z14- +landuse-flowerbed # area z16- +natural-scrub # area z12- === 130 landuse-grass # area z12- diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index e4808973b8..4b371500db 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -56,6 +56,7 @@ @green5: #B0C270; @forest: #AABF65; @green6: #888C38; +@flowers: #B3C471; /* 4.LANDUSE */ /*4.1 Main landuse*/ diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 4a80760ac6..17efa4a730 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -56,6 +56,7 @@ @green4: #141C00; @green5: #141C00; @green6: #2F4000; +@flowers: #141C00; /* 4.LANDUSE */ /*4.1 Main landuse*/