Ticket #23770: josm_23770.patch

resources/data/validator/deprecated.mapcss

@@ -2530 +2530 @@
   suggestAlternative: "{1.key}";
 }
 
+/* deprecate cycleway=opposite* family, see #23770 */
+way[cycleway=opposite],
+way[cycleway:left=opposite],
+way[cycleway:right=opposite],
+way[cycleway:both=opposite] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  fixAdd: "oneway:bicycle=no";
+  fixRemove: "{0.key}";
+  /* No automated addition of e.g. cycleway:both=no for cycleway=opposite as it may already be tagged with e.g. cycleway:left=lane */
+}
+way[cycleway:left][cycleway:left^=opposite_],
+way[cycleway:right][cycleway:right^=opposite_] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  /* No fix: unambiguous definition */
+}
+way[cycleway][cycleway^=opposite_]:righthandtraffic {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  fixAdd: "oneway:bicycle=no";
+  fixAdd: concat("cycleway:right=", any(tag("cycleway:right"), "no"));
+  fixAdd: concat("cycleway:left=", replace("{0.value}", "opposite_", ""));
+  fixAdd: "cycleway:left:oneway=-1";
+  fixRemove: "{0.key}";
+}
+way[cycleway][cycleway^=opposite_]!:righthandtraffic {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  fixAdd: "oneway:bicycle=no";
+  fixAdd: concat("cycleway:left=", any(tag("cycleway:left"), "no"));
+  fixAdd: concat("cycleway:right=", replace("{0.value}", "opposite_", ""));
+  fixAdd: "cycleway:right:oneway=-1";
+  fixRemove: "{0.key}";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

resources/data/validator/ignoretags.cfg

@@ -258 +258 @@
 K:site=mall
 K:landform=dune_system
 K:noaddress=yes
+K:cycleway=opposite
+K:cycleway=opposite_lane
+K:cycleway=opposite_track
 ;
 ; Highway Key/Value Pairs
 ;

resources/data/defaultpresets.xml

@@ -1298 +1298 @@
         <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Bicycle" />
             <space />
-            <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane,separate" match="key" />
+            <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
             <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
             <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
             <check key="oneway:bicycle" text="Oneway (bicycle)" />