Skip to content

Commit 2002127

Browse files
author
taylor.smock
committed
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. git-svn-id: https://josm.openstreetmap.de/svn/trunk@19212 0c6e7542-c601-0410-84e7-c038aed88b3b
1 parent 7eabe1d commit 2002127

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

resources/data/defaultpresets.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@
13071307
<item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
13081308
<link wiki="Bicycle" />
13091309
<space />
1310-
<combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane,separate" match="key" />
1310+
<combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
13111311
<combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
13121312
<combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,share_busway,shared_lane,separate" match="key" />
13131313
<check key="oneway:bicycle" text="Oneway (bicycle)" />

resources/data/validator/deprecated.mapcss

+27
Original file line numberDiff line numberDiff line change
@@ -2551,4 +2551,31 @@ area[parking:orientation][orientation]["parking:orientation"!=*orientation] {
25512551
suggestAlternative: "natural=tundra or natural=fell";
25522552
}
25532553

2554+
way[cycleway=opposite],
2555+
way[cycleway:left=opposite],
2556+
way[cycleway:right=opposite],
2557+
way[cycleway:both=opposite] {
2558+
throwWarning: tr("{0} is deprecated", "{0.tag}");
2559+
group: tr("deprecated tagging");
2560+
fixAdd: "oneway:bicycle=no";
2561+
fixRemove: "{0.key}";
2562+
/* No automated addition of e.g. cycleway:both=no for cycleway=opposite as it may already be tagged with e.g. cycleway:left=lane */
2563+
}
2564+
way[cycleway:left][cycleway:left^=opposite_],
2565+
way[cycleway:right][cycleway:right^=opposite_] {
2566+
throwWarning: tr("{0} is deprecated", "{0.tag}");
2567+
group: tr("deprecated tagging");
2568+
/* No fix: unambiguous definition */
2569+
}
2570+
way[cycleway][cycleway^=opposite_]:righthandtraffic {
2571+
throwWarning: tr("{0} is deprecated", "{0.tag}");
2572+
group: tr("deprecated tagging");
2573+
suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:left:oneway=-1";
2574+
}
2575+
way[cycleway][cycleway^=opposite_]!:righthandtraffic {
2576+
throwWarning: tr("{0} is deprecated", "{0.tag}");
2577+
group: tr("deprecated tagging");
2578+
suggestAlternative: "oneway:bicycle=no + cycleway:right=* + cycleway:left=* + cycleway:right:oneway=-1";
2579+
}
2580+
25542581
/* When tags are deprecated they should be added to ignoretags.cfg too. */

resources/data/validator/ignoretags.cfg

+3
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ K:site=wind_farm
256256
K:site=mall
257257
K:landform=dune_system
258258
K:noaddress=yes
259+
K:cycleway=opposite
260+
K:cycleway=opposite_lane
261+
K:cycleway=opposite_track
259262
;
260263
; Highway Key/Value Pairs
261264
;

0 commit comments

Comments
 (0)