Skip to content

Commit

Permalink
Warn about bicycle:lanes/cycleway:lanes mixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Famlam
Famlam committed Dec 22, 2024
1 parent dc5b180 commit c97accd
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 0 deletions.
47 changes: 47 additions & 0 deletions plugins/Bicycle.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ def init(self, logger):
self.errors[30329] = self.def_class(item = 3032, level = 2, tags = mapcss.list_('tag', 'highway') + mapcss.list_('fix:chair'), title = mapcss.tr('{0} with {1}', mapcss._tag_uncapture(capture_tags, '{0.tag}'), mapcss._tag_uncapture(capture_tags, '{1.tag}')))
self.errors[40101] = self.def_class(item = 4010, level = 2, tags = mapcss.list_('tag', 'highway') + mapcss.list_('fix:chair'), title = mapcss.tr('{0} is preferred to {1}', 'psv', 'service=psv'))
self.errors[40301] = self.def_class(item = 4030, level = 2, tags = mapcss.list_('tag', 'highway') + mapcss.list_('cycleway', 'fix:chair'), title = mapcss.tr('{0} with {1} and {2}', 'cycleway', 'cycleway:right', 'cycleway:left'))
self.errors[316020] = self.def_class(item = 3160, level = 3, tags = mapcss.list_('tag', 'highway') + mapcss.list_('cycleway', 'fix:survey'), title = mapcss.tr('Uncommon value of {0}', mapcss._tag_uncapture(capture_tags, '{0.key}')))

self.re_000d3400 = re.compile(r'footway|construction|proposed')
self.re_0aaeb29d = re.compile(r'^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$')
self.re_5b286a0d = re.compile(r'no|use_sidepath')
self.re_6781a1fd = re.compile(r'no|none|separate')
self.re_67b51e41 = re.compile(r'opposite|opposite_lane')
Expand Down Expand Up @@ -184,6 +186,40 @@ def way(self, data, tags, nds):
# assertNoMatch:"way cycleway=opposite oneway=yes"
err.append({'class': 20302, 'subclass': 0, 'text': mapcss.tr('Opposite or opposite lane in the same way of the oneway')})

# way[cycleway:lanes:forward][cycleway:lanes:forward!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/]
# way[cycleway:lanes:backward][cycleway:lanes:backward!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/]
# way[cycleway:lanes][cycleway:lanes!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/]
if ('cycleway:lanes' in keys) or ('cycleway:lanes:backward' in keys) or ('cycleway:lanes:forward' in keys):
match = False
if not match:
capture_tags = {}
try: match = ((mapcss._tag_capture(capture_tags, 0, tags, 'cycleway:lanes:forward')) and (not mapcss.regexp_test(mapcss._value_const_capture(capture_tags, 1, self.re_0aaeb29d, '^((shared_lane|share_busway|no|none|lane|(\\w|:)*(advisory|exclusive|pictogram)(\\w|:)*)?(\\||$))+$'), mapcss._tag_capture(capture_tags, 1, tags, 'cycleway:lanes:forward'))))
except mapcss.RuleAbort: pass
if not match:
capture_tags = {}
try: match = ((mapcss._tag_capture(capture_tags, 0, tags, 'cycleway:lanes:backward')) and (not mapcss.regexp_test(mapcss._value_const_capture(capture_tags, 1, self.re_0aaeb29d, '^((shared_lane|share_busway|no|none|lane|(\\w|:)*(advisory|exclusive|pictogram)(\\w|:)*)?(\\||$))+$'), mapcss._tag_capture(capture_tags, 1, tags, 'cycleway:lanes:backward'))))
except mapcss.RuleAbort: pass
if not match:
capture_tags = {}
try: match = ((mapcss._tag_capture(capture_tags, 0, tags, 'cycleway:lanes')) and (not mapcss.regexp_test(mapcss._value_const_capture(capture_tags, 1, self.re_0aaeb29d, '^((shared_lane|share_busway|no|none|lane|(\\w|:)*(advisory|exclusive|pictogram)(\\w|:)*)?(\\||$))+$'), mapcss._tag_capture(capture_tags, 1, tags, 'cycleway:lanes'))))
except mapcss.RuleAbort: pass
if match:
# -osmoseTags:list("cycleway","fix:survey")
# -osmoseItemClassLevel:"3160/316020/3"
# throwWarning:tr("Uncommon value of {0}","{0.key}")
# assertMatch:"way cycleway:lanes=4"
# assertNoMatch:"way cycleway:lanes=lane note=single_lane"
# assertNoMatch:"way cycleway:lanes=lane|advisory_lane|lane_exclusive||lane:exclusive|no"
# assertNoMatch:"way cycleway:lanes=lane|||"
# assertMatch:"way cycleway:lanes=no|designated"
# assertMatch:"way cycleway:lanes=no|designated|"
# assertMatch:"way cycleway:lanes=no|lane|designated"
# assertMatch:"way cycleway:lanes=no|lane|designated|"
# assertNoMatch:"way cycleway:lanes=no|lane|shared_lane"
# assertNoMatch:"way cycleway:lanes=|lane|"
# assertNoMatch:"way cycleway:lanes=|shared_lane"
err.append({'class': 316020, 'subclass': 0, 'text': mapcss.tr('Uncommon value of {0}', mapcss._tag_uncapture(capture_tags, '{0.key}'))})

return err


Expand Down Expand Up @@ -220,3 +256,14 @@ class father:
self.check_err(n.way(data, {'cycleway': 'opposite'}, [0]), expected={'class': 20301, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:right': 'opposite', 'oneway': 'yes'}, [0]), expected={'class': 20302, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway': 'opposite', 'oneway': 'yes'}, [0]), expected={'class': 20302, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:lanes': '4'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': 'lane', 'note': 'single_lane'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': 'lane|advisory_lane|lane_exclusive||lane:exclusive|no'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': 'lane|||'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:lanes': 'no|designated'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:lanes': 'no|designated|'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:lanes': 'no|lane|designated'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_err(n.way(data, {'cycleway:lanes': 'no|lane|designated|'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': 'no|lane|shared_lane'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': '|lane|'}, [0]), expected={'class': 316020, 'subclass': 0})
self.check_not_err(n.way(data, {'cycleway:lanes': '|shared_lane'}, [0]), expected={'class': 316020, 'subclass': 0})
22 changes: 22 additions & 0 deletions plugins/Bicycle.validator.mapcss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,25 @@ way!:righthandtraffic["cycleway:right"=~/opposite|opposite_lane/][oneway="-1"] {
assertMatch: "way cycleway:right=opposite oneway=yes";
assertNoMatch: "way cycleway=opposite oneway=yes";
}


/* Warn about cycleway:lanes having incorrect values, e.g. confusion with bicycle:lanes */
/* Tolerate everything with a value of cycleway:lane (advisory/exclusive/pictogram) as there is no agreed upon scheme to tag lane-type-per-lane yet */
way[cycleway:lanes:forward][cycleway:lanes:forward!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/],
way[cycleway:lanes:backward][cycleway:lanes:backward!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/],
way[cycleway:lanes][cycleway:lanes!~/^((shared_lane|share_busway|no|none|lane|(\w|:)*(advisory|exclusive|pictogram)(\w|:)*)?(\||$))+$/] {
throwWarning: tr("Uncommon value of {0}", "{0.key}");
-osmoseItemClassLevel: "3160/316020/3";
-osmoseTags: list("cycleway", "fix:survey");
assertMatch: "way cycleway:lanes=4";
assertMatch: "way cycleway:lanes=no|designated";
assertMatch: "way cycleway:lanes=no|designated|";
assertMatch: "way cycleway:lanes=no|lane|designated";
assertMatch: "way cycleway:lanes=no|lane|designated|";
assertNoMatch: "way cycleway:lanes=no|lane|shared_lane";
assertNoMatch: "way cycleway:lanes=|lane|";
assertNoMatch: "way cycleway:lanes=lane|||";
assertNoMatch: "way cycleway:lanes=|shared_lane";
assertNoMatch: "way cycleway:lanes=lane note=single_lane";
assertNoMatch: "way cycleway:lanes=lane|advisory_lane|lane_exclusive||lane:exclusive|no"; /* tolerate everything with lane specifics */
}

0 comments on commit c97accd

Please sign in to comment.