3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-08-02 08:09:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix tags processing.

Browse source
This commit is contained in:
Sergey Vartanov 2021-06-26 23:42:41 +03:00
parent e31719eda7
commit eaa90663e9
6 changed files with 59 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roentgen/text.py
View file

@ -22,7 +22,9 @@ class Label:
size: float = 10.0
def get_address(tags: Dict[str, Any], draw_captions_mode: str) -> List[str]:
def get_address(
tags: Dict[str, Any], draw_captions_mode: str, processed: Set[str]
) -> List[str]:
"""
Construct address text list from the tags.
@ -34,23 +36,23 @@ def get_address(tags: Dict[str, Any], draw_captions_mode: str) -> List[str]:
if draw_captions_mode == "address":
if "addr:postcode" in tags:
address.append(tags["addr:postcode"])
tags.pop("addr:postcode", None)
processed.add("addr:postcode")
if "addr:country" in tags:
address.append(tags["addr:country"])
tags.pop("addr:country", None)
processed.add("addr:country")
if "addr:city" in tags:
address.append(tags["addr:city"])
tags.pop("addr:city", None)
processed.add("addr:city")
if "addr:street" in tags:
street = tags["addr:street"]
if street.startswith("улица "):
street = "ул. " + street[len("улица "):]
address.append(street)
tags.pop("addr:street", None)
processed.add("addr:street")
if "addr:housenumber" in tags:
address.append(tags["addr:housenumber"])
tags.pop("addr:housenumber", None)
processed.add("addr:housenumber")
return address