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

Refactor icons; update images.

Browse source
This commit is contained in:
Sergey Vartanov 2021-05-02 10:46:40 +01:00
parent 2939351b54
commit c4d7821f79
8 changed files with 70 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
roentgen/constructor.py
View file

@ -19,7 +19,7 @@ from roentgen.osm_reader import (
Map, OSMMember, OSMNode, OSMRelation, OSMWay, Tagged
)
from roentgen.point import Point
from roentgen.scheme import IconSet, LineStyle, Scheme
from roentgen.scheme import Icon, LineStyle, Scheme
from roentgen.util import MinMax
DEBUG: bool = False
@ -352,7 +352,7 @@ class Constructor:
self.scheme.is_area(line.tags)):
priority: int
icon_set: IconSet
icon_set: Icon
icon_set, priority = self.scheme.get_icon(
self.icon_extractor, line.tags, for_="line")
@ -369,7 +369,7 @@ class Constructor:
line.tags, inners, outers, LineStyle(style, 1000)))
priority: int
icon_set: IconSet
icon_set: Icon
icon_set, priority = self.scheme.get_icon(
self.icon_extractor, line.tags)
@ -429,7 +429,7 @@ class Constructor:
continue
priority: int
icon_set: IconSet
icon_set: Icon
draw_outline: bool = True
if self.mode in ["time", "user-coloring"]:
@ -440,7 +440,7 @@ class Constructor:
if self.mode == "time":
color = get_time_color(node.timestamp, self.map_.time)
dot, _ = self.icon_extractor.get_path(DEFAULT_SMALL_SHAPE_ID)
icon_set = IconSet([dot], [], color, set(), True)
icon_set = Icon([dot], [], color, set(), True)
priority = 0
draw_outline = False
else: