Changeset 19212 in josm for trunk/resources

Timestamp:

2024-09-06T12:47:00+02:00 (3 months ago)

Author:

taylor.smock

Message:

Fix #23770: Deprecate cycleway=opposite* family (patch by Famlam)

The cycleway=opposite* family was deprecated in
​osmwiki:Proposal:Deprecate_cycleway=opposite_family on 2024-06-22.

This removes the opposite* values from the cycleway tags in defaultpresets.xml
and adds a deprecation warning for them.

Location:

trunk/resources/data

Files:

• defaultpresets.xml (modified) (1 diff)
• validator/deprecated.mapcss (modified) (1 diff)
• validator/ignoretags.cfg (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -1308 +1308 @@
             <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" />

trunk/resources/data/validator/deprecated.mapcss

@@ -2552 +2552 @@
 }
 
+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");
+  suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:left:oneway=-1";
+}
+way[cycleway][cycleway^=opposite_]!:righthandtraffic {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  group: tr("deprecated tagging");
+  suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:right:oneway=-1";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */

trunk/resources/data/validator/ignoretags.cfg

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