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

Issue #10: support priority for icons.

Browse source
This commit is contained in:
Sergey Vartanov 2020-10-03 13:44:12 +03:00
parent fd70aa8f01
commit 081a6e5455
3 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
roentgen/constructor.py
View file

@ -340,11 +340,15 @@ class Constructor:
if (line.get_tag("area") == "yes" or
is_cycle(outers[0]) and line.get_tag("area") != "no" and
self.scheme.is_area(line.tags)):
icon_set: IconSet = self.scheme.get_icon(
priority: int
icon_set: IconSet
icon_set, priority = self.scheme.get_icon(
self.icon_extractor, line.tags, for_="line")
self.nodes.append(Point(
icon_set, line.tags, center_point, center_coordinates,
is_for_node=False))
is_for_node=False, priority=priority))
if not line_styles:
if DEBUG:
@ -353,11 +357,15 @@ class Constructor:
"stroke-width": 1}
self.figures.append(Figure(
line.tags, inners, outers, LineStyle(style, 1000)))
icon_set: IconSet = self.scheme.get_icon(
priority: int
icon_set: IconSet
icon_set, priority = self.scheme.get_icon(
self.icon_extractor, line.tags)
self.nodes.append(Point(
icon_set, line.tags, center_point, center_coordinates,
is_for_node=False))
is_for_node=False, priority=priority))
def construct_relations(self) -> None:
"""
@ -410,7 +418,9 @@ class Constructor:
if not self.check_level(tags):
continue
icon_set: IconSet = self.scheme.get_icon(self.icon_extractor, tags)
priority: int
icon_set: IconSet
icon_set, priority = self.scheme.get_icon(self.icon_extractor, tags)
if self.mode in ["time", "user-coloring"]:
if not tags:
@ -421,7 +431,8 @@ class Constructor:
if self.mode == "time":
icon_set.color = get_time_color(node.timestamp, self.map_.time)
self.nodes.append(Point(icon_set, tags, flung, node.coordinates))
self.nodes.append(Point(
icon_set, tags, flung, node.coordinates, priority=priority))
missing_tags.update(
f"{key}: {tags[key]}" for key in tags