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 label mode argument.

Browse source
This commit is contained in:
Sergey Vartanov 2021-05-29 03:00:22 +03:00
parent b086b0d108
commit b0de6754c1
4 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
roentgen/mapper.py
View file

@ -36,15 +36,21 @@ class Painter:
"""
def __init__(
self, map_: Map, flinger: Flinger,
svg: svgwrite.Drawing, icon_extractor: ShapeExtractor,
scheme: Scheme, show_missing_tags: bool = False, overlap: int = 12,
mode: str = "normal", draw_captions: str = "main"
self,
map_: Map,
flinger: Flinger,
svg: svgwrite.Drawing,
icon_extractor: ShapeExtractor,
scheme: Scheme,
show_missing_tags: bool = False,
overlap: int = 12,
mode: str = "normal",
label_mode: str = "main"
):
self.show_missing_tags: bool = show_missing_tags
self.overlap: int = overlap
self.mode: str = mode
self.draw_captions: str = draw_captions
self.label_mode: str = label_mode
self.map_: Map = map_
self.flinger: Flinger = flinger
@ -263,9 +269,11 @@ class Painter:
ui.progress_bar(
steps * 2 + index, steps * 3, step=10, text="Drawing texts"
)
if (self.mode not in [CREATION_TIME_MODE, AUTHOR_MODE] and
self.draw_captions != "no"):
point.draw_texts(self.svg, occupied)
if (
self.mode not in [CREATION_TIME_MODE, AUTHOR_MODE]
and self.label_mode != "no"
):
point.draw_texts(self.svg, occupied, self.label_mode)
ui.progress_bar(-1, len(nodes), step=10, text="Drawing nodes")