diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 041aabe133..a0fb5b7201 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -522,8 +522,8 @@ healthcare|sample_collection;435; sport|australian_football;436; leisure|bowling_alley;437; healthcare|speech_therapist;438; -deprecated|deprecated;439;x -deprecated|deprecated;440;x +natural|scree;439; +natural|shingle;440; aerialway|t-bar;441; amenity|parking|lane|fee;[amenity=parking][parking=lane][fee];;name;int_name;442; amenity|parking|street_side|fee;[amenity=parking][parking=street_side][fee];;name;int_name;443; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index d402cd42a3..6b5a9662c5 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -18165,12 +18165,13 @@ zh-Hant = 自然 [type.natural.bare_rock] + comment = A rocky land cover. en = Bare Rock af = Kaal rots ar = صخور عارية az = Çılpaq qaya - be = Голая скала - bg = Гола скала + be = Каменная парода + bg = Рок cs = Holá skála da = Blottet klippe de = Felsgestein @@ -18189,21 +18190,105 @@ ko = 베어 락 mr = खडक nb = Bar stein - nl = Kale steen + nl = Kale rots pl = Odkryte skały pt = Zona rochosa ro = Piatră goală - ru = Скалы + ru = Каменная порода sk = Holá skala sv = Kala stenar sw = Mwamba tupu th = เปลือยร็อค tr = Çıplak Kaya - uk = Скелi + uk = Кам'яна порода vi = Đá trần zh-Hans = 岩石 zh-Hant = 岩石 + [type.natural.shingle] + comment = A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. + en = Shingle + af = Gordelroos + ar = الحصى + az = Şingle + be = Галька + bg = Камъчета + ca = Còdol + cs = Oblázky + da = Småsten + de = Kieselsteine + el = Βότσαλα + es = Guijarros + et = Pebbles + eu = Harri koskor + fa = سنگریزه ها + fi = Pebbles + fr = Galets + he = אבנים + hi = कंकड़ + hu = Kavicsok + id = Kerikil + it = Ciottoli + ja = 小石 + ko = 페블 + lt = Akmenukai + mr = खडे + nb = Småstein + nl = Kiezels + pl = Kamyki + pt = Seixos + ro = Pietriș + ru = Галька + sk = Kamienky + sv = Småsten + th = ก้อนกรวด + tr = Çakıl Taşları + uk = Галька + vi = Ván lợp + zh-Hans = 鹅卵石 + zh-Hant = 卵石 + + [type.natural.scree] + comment = A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. + en = Scree + ar = حصى + be = Камяністая асып + bg = Сипеи + cs = Kamenité sutě + da = Stenet skrænt + de = Steiniges Geröll + el = Σάρα + es = Pedregal + et = Kiviklibu + eu = Srika + fa = اسکری + fi = Kivinen rapakivi + fr = Éboulis pierreux + he = דרדרת + hi = रोड़ी + hu = Köves törmelék + id = Scree berbatu + it = Ghiaia pietrosa + ja = 石がゴロゴロしている + ko = 스토니 스크리 + lt = Akmenuoti skardžiai + mr = स्क्री + nb = Steinete rasmark + nl = Puinhelling + pl = Kamienisty piarg + pt = Pedregulho + pt-BR = Pedregulho pedregoso + ro = Grohotiș + ru = Каменистая осыпь + sk = Kamenisté sutiny + sv = Stenig rasbrant + th = หินกรวด + tr = Kayşat + uk = Кам'янистий осип + vi = Sàng + zh-Hans = 石质碎石 + zh-Hant = 碎石 + [type.natural.bay] en = Bay af = Baai @@ -19302,8 +19387,8 @@ af = Klip ar = صخر az = Qaya - be = Горная парода - bg = Скала + be = Камень + bg = Камък cs = Hornina da = Bjergart de = Fels diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index bfb768befb..90a4b652e2 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -98,6 +98,8 @@ area|z12-[leisure=golf_course], area|z12-[natural=heath], area|z12-[landuse=allotments], area|z12-[natural=bare_rock], +area|z12-[natural=shingle], +area|z11-[natural=scree], area|z12-[landuse=orchard], area|z12-[landuse=vineyard], area|z12-[landuse=meadow], @@ -184,6 +186,10 @@ area|z12-[amenity=prison] {fill-opacity: 0.5; fill-color: @prison;} /* End of hardcoded */ +area|z11-[natural=scree], +area|z12-[natural=shingle], +{fill-color: @scree;} + area|z12-[natural=bare_rock], {fill-color: @barerock;} 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 def4748c3a..0a907ccdbb 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 @@ -116,6 +116,8 @@ landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) natural-bare_rock # area z12- (also has caption z14-) +natural-shingle +natural-scree === 80 leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 3ace9f6044..aac8bdd266 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -44,7 +44,8 @@ @river: #36B0BF; @wetland: #c9ddd6; @beach: #FCEC7E; -@barerock: #EDE5DC; +@barerock: #D9D2BF; +@scree: #CCC7BA; @desert: #EEE5B2; /*3.2 Vegetation*/ diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index 5904e860b5..72db026734 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -45,6 +45,7 @@ @wetland: #001919; @beach: #28281A; @barerock: #302A2A; +@scree: #242020; @desert: #191007; /*3.2 Vegetation*/ 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 fc715dbe34..474d6fc84a 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 @@ -116,6 +116,8 @@ landuse-village_green # area z12- landuse-vineyard # area z12- (also has caption z15-) leisure-pitch # area z15- (also has icon z17-, caption(optional) z17-) natural-bare_rock # area z12- (also has caption z13-) +natural-shingle +natural-scree === 80 leisure-garden # area z12- (also has icon z16-, caption(optional) z16-) diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index 28907fb5b2..e52c4bac68 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -83,7 +83,7 @@ @park: #C8DBAD; /*A5BF60 #A4B275 #BCCC74*/ @natpark: #C8DBAD; @beach: #FCEC7E; -@barerock: #EDE5DC; +@barerock: #D9D2BF; @desert: #EEE5B2; /*forest-park*/