diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 2b76c6c426..b0bd5acc56 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -517,11 +517,11 @@ amenity|parking|fee|lane;[amenity=parking][fee?][parking=lane];;name;int_name;44 amenity|parking|fee|street_side;[amenity=parking][fee?][parking=street_side];;name;int_name;443; highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444; earthquake:damage|spontaneous_camp;445; -deprecated|deprecated;446;x +natural|water|drain;[natural=water][water=drain];;name;int_name;446; deprecated:railway|yard:06.2023;447;x -deprecated|deprecated;448;x -deprecated:natural|meadow:10.2021;449;landuse|meadow -deprecated|deprecated;450;x +natural|water|ditch;[natural=water][water=ditch];;name;int_name;448; +natural|water|moat;[natural=water][water=moat];;name;int_name;449; +natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450; deprecated:railway|razed:06.2023;451;x highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452; deprecated|deprecated;453;x diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 9cc56effac..4bc63f80e3 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -5179,7 +5179,48 @@ tr = Bisiklet Bariyeri uk = Велосипедна перешкода - [type.barrier.ditch] + [type.waterway.ditch] + en = Drainage Ditch + ar = حفرة الصرف الصحي + be = Дрэнажная канава + bg = Отводнителна канавка + ca = Sèquia de drenatge + cs = Drenážní příkop + da = Afvandingsgrøft + de = Entwässerungsgraben + el = Αποστραγγιστική Τάφρο + es = Zanja de drenaje + et = Drenaažikraav + eu = Drainatze Zanga + fa = خندق زهکشی + fi = Viemäröinti oja + fr = Fossé de drainage + he = תעלת ניקוז + hu = Árok + id = Parit saluran air + it = Fossato di drenaggio + ja = 排水溝 + ko = 배수구 + lt = Drenažo griovys + mr = ड्रेनेज खंदक + nb = Dreneringsgrøft + nl = Sloot + pl = Rów melioracyjny + pt = Vala de drenagem + pt-BR = Vala de drenagem + ro = Șanț de drenaj + ru = Дренажная канава + sk = Drenážna priekopa + sv = Dräneringsdike + sw = Mfereji wa mifereji ya maji + th = คูระบายน้ำ + tr = Drenaj çukuru + uk = Дренажна канава + vi = Mương thoát nước + zh-Hans = 排水沟 + zh-Hant = 排水溝 + + [type.natural.water.moat] en = Moat af = Grag ar = حفرة @@ -5206,7 +5247,7 @@ pl = Rów pt = Fosso ro = Şanţ - ru = Ров + ru = Оборонительный ров sk = Priekopa sv = Vallgrav sw = Moti @@ -5217,6 +5258,47 @@ zh-Hans = 沟渠 zh-Hant = 護城河 + [type.natural.water.wastewater] + en = Wastewater + ar = مياه الصرف + be = Сцёкавыя вады + bg = Отпадъчни води + ca = Aigües residuals + cs = Odpadní voda + da = Spildevand + de = Abwasser + el = Λυμάτων + es = Aguas residuales + et = Reovesi + eu = Hondakin-urak + fa = فاضلاب + fi = Jätevesi + fr = Eaux usées + he = שפכים + hu = Szennyvíz + id = Air limbah + it = Acque reflue + ja = 廃水 + ko = 폐수 + lt = Nuotekos + mr = सांडपाणी + nb = Avløpsvann + nl = Afvalwater + pl = Ścieki + pt = Águas residuais + pt-BR = Águas residuais + ro = Ape uzate + ru = Сточные воды + sk = Odpadová voda + sv = Avloppsvatten + sw = Maji machafu + th = น้ำเสีย + tr = Atık su + uk = Стічні води + vi = Nước thải + zh-Hans = 废水 + zh-Hant = 廢水 + [type.barrier.entrance] en = Entrance af = Ingang @@ -28088,7 +28170,7 @@ uk = Дамба zh-Hans = 水坝 - [type.waterway.ditch] + [type.barrier.ditch] en = Ditch af = Sloot de = Graben @@ -28102,24 +28184,54 @@ nl = Sloot pt = Vala pt-BR = Vala - ru = Канава + ru = Ров tr = Hendek uk = Канава zh-Hans = 水沟 - [type.waterway.ditch.tunnel] + [type.natural.water.ditch] ref = type.waterway.ditch + + [type.waterway.ditch.tunnel] en = Culvert + ar = عبارة + be = Водопропускная труба + bg = водосток + ca = Embaixada + cs = Propustek + da = Kulvert de = Durchlass + el = Υπόγειος οχετός es = Obra de drenaje - et = Truup + et = Truupp + eu = Zuloa + fa = کولورت + fi = Holvirumpu fr = Drain + he = גִשׁרוֹן + hu = Vízelvezető + id = Gorong-gorong it = Cunicolo ja = 暗渠 + ko = 암거 + lt = Pralaida + mr = कल्व्हर्ट + nb = Kulvert nl = Duiker + pl = Przepust + pt = Bueiro + pt-BR = Bueiro + ro = Canal de scurgere ru = Водопропускная труба + sk = Priepust + sv = Kulvert + sw = Culvert + th = ท่อระบายน้ำ + tr = Menfez uk = Водопропускна труба + vi = Cống zh-Hans = 涵洞 + zh-Hant = 涵洞 [type.waterway.dock] en = Waterway Dock @@ -28157,6 +28269,9 @@ uk = Водовiдвiд zh-Hans = 渠 + [type.natural.water.drain] + ref = type.waterway.drain + [type.waterway.drain.tunnel] ref = type.waterway.ditch.tunnel diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss index e404dbff1d..89bbe6f7df 100644 --- a/data/styles/clear/include/Basemap.mapcss +++ b/data/styles/clear/include/Basemap.mapcss @@ -220,8 +220,6 @@ line|z10-[waterway=riverbank], line|z13-[waterway=stream], line|z13-[waterway=canal], line|z13-[waterway=fish_pass], -line|z17-[waterway=ditch], -line|z17-[waterway=drain], line|z13-[natural=strait], {opacity: 1; color: @river;} @@ -238,6 +236,16 @@ area|z15-[natural=water][tunnel], area|z16-[amenity=fountain], {fill-color: @water;} +area|z0-[natural=water][water=ditch], +area|z0-[natural=water][water=drain], +area|z0-[natural=water][water=wastewater], +{fill-color: none;} + +area|z13-[natural=water][water=ditch], +area|z13-[natural=water][water=drain], +area|z12-[natural=water][water=wastewater], +{fill-color: @water_bad;} + area|z11-[natural=wetland] {fill-color: @wetland;} @@ -287,11 +295,12 @@ line|z15-[waterway=stream][intermittent=yes] node|z16-[waterway=lock_gate], {icon-image: dot-m.svg;} -line|z17-[waterway=ditch], -line|z17-[barrier=ditch], -line|z17-[waterway=drain], -{width: 1.8;opacity: 1;color: @river;dashes: 0.9,0.9;} - +line|z13-[waterway=ditch], +line|z13-[waterway=drain], +{opacity: 1; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} +line|z16-[waterway=ditch], +line|z16-[waterway=drain], +{width: 3;} /* Do not draw tunnel waterways */ line[waterway][tunnel] @@ -606,6 +615,10 @@ line|z19-[natural=earth_bank], {width: 11.9; dashes: 5,7,10,1.9; opacity: 0.7;} +line|z16-[barrier=ditch], +{width: 1.8;opacity: 1;color: @cliff;dashes: 0.9,0.9;} + + line|z16-[barrier=retaining_wall], {color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;} line|z17[barrier=retaining_wall], diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index 826fbdc109..457df7222e 100644 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -501,6 +501,13 @@ area|z12-[landuse=reservoir][bbox_area<4000000], area|z10-13[natural=water][!tunnel][bbox_area<4000000], {text: none;} +/*only render caption z17-*/ +area|z10-16[natural=water][water=moat], +area|z10-16[natural=water][water=ditch], +area|z10-16[natural=water][water=drain], +area|z10-16[natural=water][water=wastewater], +{text: none;} + node|z14-15[natural=bay], node|z14-15[natural=strait], area|z14-15[natural=water][!tunnel][bbox_area>=4000000], diff --git a/data/styles/clear/include/priorities_2_BG-top.prio.txt b/data/styles/clear/include/priorities_2_BG-top.prio.txt index 21efec7c9f..0e475f31ca 100644 --- a/data/styles/clear/include/priorities_2_BG-top.prio.txt +++ b/data/styles/clear/include/priorities_2_BG-top.prio.txt @@ -21,20 +21,24 @@ landuse-reservoir # area z12- (also has captio landuse-salt_pond # area z1- natural-water # area z1- (also has caption z10-) natural-water-basin # area z1- (also has caption z10-) +natural-water-ditch # area z1- (also has caption z17-) +natural-water-drain # area z1- (also has caption z17-) natural-water-lake # area z1- (also has caption z10-) natural-water-lock # area z1- (also has caption z10-) +natural-water-moat # area z1- (also has caption z17-) natural-water-pond # area z1- (also has caption z10-) natural-water-reservoir # area z1- (also has caption z10-) natural-water-river # area z1- (also has caption z10-) natural-water-tunnel # area z15- +natural-water-wastewater # area z1- (also has caption z17-) waterway-dock # area z1- waterway-riverbank # line z10- and area z1- (also has pathtext z11-) === 20 natural-strait # line z13- (also has caption z13-) waterway-canal # line z13- (also has pathtext z13-) -waterway-ditch # line z17- -waterway-drain # line z17- +waterway-ditch # line z14- +waterway-drain # line z14- waterway-fish_pass # line z13- (also has pathtext z13-) waterway-river # line z10- (also has pathtext z11-) waterway-stream # line z13- (also has pathtext z13-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index 9e158db0a2..f4266f4398 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -675,7 +675,11 @@ highway-tertiary_link-tunnel # pathtext z18- (also has li historic-ship # icon z16- (also has caption(optional) z16-) natural-water-basin # caption z10- (also has area z1-) +natural-water-ditch # caption z17- (also has area z1-) +natural-water-drain # caption z17- (also has area z1-) natural-water-lock # caption z10- (also has area z1-) +natural-water-moat # caption z17- (also has area z1-) +natural-water-wastewater # caption z17- (also has area z1-) waterway-canal # pathtext z13- (also has line z13-) waterway-fish_pass # pathtext z13- (also has line z13-) waterway-stream # pathtext z13- (also has line z13-) diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss index 9ce206cdc5..eb556d4bc3 100644 --- a/data/styles/clear/style-clear/colors.mapcss +++ b/data/styles/clear/style-clear/colors.mapcss @@ -39,6 +39,7 @@ @glacier: #FFFFFF; @water: #8BD3E0; +@water_bad: #9dc7c1; @river: #36B0BF; @wetland: #c9ddd6; @beach: #FCEC7E; diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss index b46f75aa1f..1dd7d692eb 100644 --- a/data/styles/clear/style-night/colors.mapcss +++ b/data/styles/clear/style-night/colors.mapcss @@ -39,6 +39,7 @@ @glacier: #111111; @water: #002222; +@water_bad: #00261e; @river: #062026; @wetland: #001919; @beach: #28281A; diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss index e5520eca3a..99aac527b8 100644 --- a/data/styles/vehicle/include/Basemap.mapcss +++ b/data/styles/vehicle/include/Basemap.mapcss @@ -193,8 +193,6 @@ line|z10-[waterway=river], line|z10-[waterway=riverbank], line|z13-[waterway=stream], line|z13-[waterway=canal], -line|z17-[waterway=ditch], -line|z17-[waterway=drain], line|z13-[natural=strait], {opacity: 1; color: @river;} @@ -209,6 +207,16 @@ area|z12-[landuse=reservoir], area|z13-[leisure=swimming_pool], {fill-color: @water;} +area|z0-[natural=water][water=ditch], +area|z0-[natural=water][water=drain], +area|z0-[natural=water][water=wastewater], +{fill-color: none;} + +area|z13-[natural=water][water=ditch], +area|z13-[natural=water][water=drain], +area|z12-[natural=water][water=wastewater], +{fill-color: @water_bad;fill-opacity: 1;} + area|z11-[natural=wetland], {fill-color: @wetland;fill-opacity: 1;} @@ -255,10 +263,12 @@ line|z15-[waterway=stream][intermittent=yes] node|z16-[waterway=lock_gate], {icon-image: dot-m.svg;} -line|z17-[waterway=ditch], -line|z17-[barrier=ditch], -line|z17-[waterway=drain], -{width: 1.8;opacity: 1;color: @river;dashes: 0.9,0.9;} +line|z13-[waterway=ditch], +line|z13-[waterway=drain], +{opacity: 1; color: @water_bad; width: 1.5; dashes: 2.7,2.7;} +line|z16-[waterway=ditch], +line|z16-[waterway=drain], +{width: 3;} /* Do not draw tunnel waterways */ @@ -499,6 +509,10 @@ line|z19-[natural=earth_bank], {width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;} +line|z17-[barrier=ditch], +{width: 1.8;opacity: 1;color: @cliff;dashes: 0.9,0.9;} + + line|z17-[barrier=retaining_wall], {color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;} line|z18-[barrier=retaining_wall], diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index c53bee5980..e2d858ec72 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -434,6 +434,13 @@ area|z16-[natural=wetland], area|z16-[natural=water][!tunnel][bbox_area<4000000], {font-size: 10.5;} +/*don't render caption in vehicle style*/ +area|z10-[natural=water][water=moat], +area|z10-[natural=water][water=ditch], +area|z10-[natural=water][water=drain], +area|z10-[natural=water][water=wastewater], +{text: none;} + /* 6.2 Line water(river,canal etc.) Do not draw tunnel waterways */ line[waterway] diff --git a/data/styles/vehicle/include/priorities_2_BG-top.prio.txt b/data/styles/vehicle/include/priorities_2_BG-top.prio.txt index 87c3422052..6674b6a4c2 100644 --- a/data/styles/vehicle/include/priorities_2_BG-top.prio.txt +++ b/data/styles/vehicle/include/priorities_2_BG-top.prio.txt @@ -21,16 +21,20 @@ landuse-reservoir # area z12- (also has captio landuse-salt_pond # area z1- natural-water # area z1- (also has caption z10-) natural-water-basin # area z1- (also has caption z10-) +natural-water-ditch # area z1- +natural-water-drain # area z1- natural-water-lake # area z1- (also has caption z10-) natural-water-lock # area z1- (also has caption z10-) +natural-water-moat # area z1- natural-water-pond # area z1- (also has caption z10-) natural-water-reservoir # area z1- (also has caption z10-) natural-water-river # area z1- (also has caption z10-) +natural-water-wastewater # area z1- waterway-dock # area z1- waterway-riverbank # line z10- and area z1- (also has pathtext z11-) === 20 -waterway-ditch # line z17- -waterway-drain # line z17- +waterway-ditch # line z14- +waterway-drain # line z14- waterway-river # line z10- (also has pathtext z11-) === 10 diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss index c589cc99e5..db6af84033 100644 --- a/data/styles/vehicle/style-clear/colors.mapcss +++ b/data/styles/vehicle/style-clear/colors.mapcss @@ -91,6 +91,7 @@ /* NATURAL */ @glacier: #FFFFFF; @water: #8BD3E0; +@water_bad: #9dc7c1; /*@water_1: #9AD2D9;*/ @river: #36B0BF; /*@river_1: #9AD2D9;*/ diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss index a98c8f6e08..12dd31a5d8 100644 --- a/data/styles/vehicle/style-night/colors.mapcss +++ b/data/styles/vehicle/style-night/colors.mapcss @@ -39,6 +39,7 @@ @glacier: #111111; @water: #002222; +@water_bad: #00261e; @river: #062026; @wetland: #001919; @beach: #28281A;