Ticket #21630: deprecate_riverbank_2022-03-07.patch

resources/data/defaultpresets.xml

@@ -2160 +2160 @@
         <item name="Water" name_context="natural" icon="presets/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=water" />
             <space />
-            <label text="A body of standing water, such as a lake or pond." />
+            <label text="A body of water, such as a lake, pond or river." />
             <space />
             <key key="natural" value="water" />
             <text key="name" text="Name" />
@@ -2180 +2180 @@
                 <list_entry value="wastewater" />
             </combo>
             <check key="salt" text="Salt Water" disable_off="true" />
-            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
+            <check key="intermittent" text="Intermittent (does not permanently contain water)" disable_off="true" />
             <check key="tidal" text="In the tidal range" disable_off="true" />
             <text key="ele" text="Elevation (meters)" length="10" />
             <reference ref="wikipedia_wikidata" />
@@ -2194 +2194 @@
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
         </item> <!-- Coastline -->
-        <item name="Riverbank" icon="presets/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:waterway=riverbank" />
-            <space />
-            <key key="waterway" value="riverbank" />
-            <text key="name" text="Name" />
-            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
-            <check key="tidal" text="In the tidal range" disable_off="true" />
-        </item> <!-- Riverbank -->
         <separator/>
         <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=wetland" />

resources/data/validator/deprecated.mapcss

@@ -2087 +2087 @@
   group: tr("deprecated tagging");
 }
 
+/* #21630 */
+*[waterway=riverbank][!natural][!water],
+*[waterway=riverbank][natural=water][!water],
+*[waterway=riverbank][!natural][water=river],
+*[waterway=riverbank][natural=water][water=river] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
+  group: tr("deprecated tagging");
+  fixAdd: "natural=water";
+  fixAdd: "water=river";
+  fixRemove: "waterway";
+  assertMatch: "way waterway=riverbank";
+  assertMatch: "way waterway=riverbank natural=water";
+  assertMatch: "way waterway=riverbank water=river";
+  assertMatch: "way waterway=riverbank natural=water water=river";
+  assertNoMatch: "way waterway=riverbank natural=shingle";
+  assertNoMatch: "way waterway=riverbank water=lake";
+  assertNoMatch: "way waterway=riverbank natural=water water=lake";
+  assertNoMatch: "way waterway=riverbank natural=shingle water=river";
+}
+*[waterway=riverbank][natural][natural!=water],
+*[waterway=riverbank][water][water!=river] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
+  group: tr("deprecated tagging");
+  assertMatch: "way waterway=riverbank natural=shingle";
+  assertMatch: "way waterway=riverbank water=lake";
+  assertNoMatch: "way waterway=riverbank";
+  assertNoMatch: "way waterway=riverbank natural=water";
+  assertNoMatch: "way waterway=riverbank water=river";
+  assertNoMatch: "way waterway=riverbank natural=water water=river";
+}
+
 node[amenity=bench][capacity][!seats],
 way[amenity=bench][capacity][!seats] {
   throwWarning: tr("{0} is deprecated for {1}", "{1.key}", "{0.tag}");

resources/data/validator/ignoretags.cfg

@@ -688 +688 @@
 K:navigationaid=ALS (Approach lighting system)
 E:exit_to
 K:water=riverbank
+K:waterway=riverbank
 K:stream=intermittent
 K:shop=lamps
 K:access=customer