diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml index c849ea2e84..3ec4d2033d 100644 --- a/resources/data/defaultpresets.xml +++ b/resources/data/defaultpresets.xml @@ -1307,7 +1307,7 @@ - + diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss index 7ef5c0acaf..c66a2b1847 100644 --- a/resources/data/validator/deprecated.mapcss +++ b/resources/data/validator/deprecated.mapcss @@ -2551,4 +2551,31 @@ area[parking:orientation][orientation]["parking:orientation"!=*orientation] { suggestAlternative: "natural=tundra or natural=fell"; } +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. */ diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg index ecd732cb6e..1c9933a419 100644 --- a/resources/data/validator/ignoretags.cfg +++ b/resources/data/validator/ignoretags.cfg @@ -256,6 +256,9 @@ K:site=wind_farm 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 ;