3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-07-11 13:47:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify scheme parsing.

Browse source
This commit is contained in:
Sergey Vartanov 2022-11-02 00:22:51 +04:00
parent b67fe8e574
commit 96244220ac
1 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
map_machine/scheme.py
View file

@ -321,11 +321,9 @@ class Scheme:
for element in group["tags"]: for element in group["tags"]:
self.node_matchers.append(NodeMatcher(element, group)) self.node_matchers.append(NodeMatcher(element, group))
self.colors: dict[str, str] = ( self.colors: dict[str, str] = content.get("colors", {})
content["colors"] if "colors" in content else {} self.material_colors: dict[str, str] = content.get(
) "material_colors", {}
self.material_colors: dict[str, str] = (
content["material_colors"] if "material_colors" in content else {}
) )
self.way_matchers: list[WayMatcher] = ( self.way_matchers: list[WayMatcher] = (
@ -343,21 +341,11 @@ class Scheme:
if "area_tags" in content if "area_tags" in content
else [] else []
) )
self.keys_to_write: list[str] = ( self.keys_to_write: list[str] = content.get("keys_to_write", [])
content["keys_to_write"] if "keys_to_write" in content else [] self.prefix_to_write: list[str] = content.get("prefix_to_write", [])
) self.keys_to_skip: list[str] = content.get("keys_to_skip", [])
self.prefix_to_write: list[str] = ( self.prefix_to_skip: list[str] = content.get("prefix_to_skip", [])
content["prefix_to_write"] if "prefix_to_write" in content else [] self.tags_to_skip: dict[str, str] = content.get("tags_to_skip", {})
)
self.keys_to_skip: list[str] = (
content["keys_to_skip"] if "keys_to_skip" in content else []
)
self.prefix_to_skip: list[str] = (
content["prefix_to_skip"] if "prefix_to_skip" in content else []
)
self.tags_to_skip: dict[str, str] = (
content["tags_to_skip"] if "tags_to_skip" in content else {}
)
# Storage for created icon sets. # Storage for created icon sets.
self.cache: dict[str, tuple[IconSet, int]] = {} self.cache: dict[str, tuple[IconSet, int]] = {}