3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-06-04 03:41:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix amenity tags; fix tag matching.

Browse source
This commit is contained in:
Sergey Vartanov 2020-10-04 20:44:07 +03:00
parent d5bbe2a553
commit 061d77d9d5
2 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roentgen/scheme.py
View file

@ -35,7 +35,7 @@ class LineStyle:
priority: float = 0.0
def is_not_matched_tag(
def is_matched_tag(
matcher_tag_key: str, matcher_tag_value: str,
tags: Dict[str, str]) -> bool:
"""
@ -45,10 +45,13 @@ def is_not_matched_tag(
:param matcher_tag_value: tag value, tag value list, or "*"
:param tags: element tags to check
"""
return (matcher_tag_key not in tags or
(matcher_tag_value != "*" and
tags[matcher_tag_key] != matcher_tag_value and
tags[matcher_tag_key] not in matcher_tag_value))
return (
matcher_tag_key in tags and
(matcher_tag_value == "*" or
isinstance(matcher_tag_value, str) and
tags[matcher_tag_key] == matcher_tag_value or
isinstance(matcher_tag_value, list) and
tags[matcher_tag_key] in matcher_tag_value))
def is_matched(matcher: Dict[str, Any], tags: Dict[str, str]) -> bool:
@ -62,14 +65,14 @@ def is_matched(matcher: Dict[str, Any], tags: Dict[str, str]) -> bool:
for config_tag_key in matcher["tags"]: # type: str
tag_matcher = matcher["tags"][config_tag_key]
if is_not_matched_tag(config_tag_key, tag_matcher, tags):
if not is_matched_tag(config_tag_key, tag_matcher, tags):
matched = False
break
if "no_tags" in matcher:
for config_tag_key in matcher["no_tags"]: # type: str
tag_matcher = matcher["no_tags"][config_tag_key]
if not is_not_matched_tag(config_tag_key, tag_matcher, tags):
if is_matched_tag(config_tag_key, tag_matcher, tags):
matched = False
break