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

Refactor text labels.

Browse source
This commit is contained in:
Sergey Vartanov 2021-05-13 04:10:35 +03:00
parent c3828ec92f
commit afdf9416d5
5 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roentgen/scheme.py
View file

@ -10,8 +10,10 @@ from typing import Any, Dict, List, Optional, Set, Tuple, Union
import yaml
from colour import Color
from roentgen.icon import (DEFAULT_COLOR, DEFAULT_SHAPE_ID, Icon, IconSet,
ShapeExtractor, ShapeSpecification)
from roentgen.icon import (
DEFAULT_COLOR, DEFAULT_SHAPE_ID, Icon, IconSet, ShapeExtractor,
ShapeSpecification
)
from roentgen.text import Label, get_address, get_text
@ -296,7 +298,9 @@ class Scheme:
return line_styles
def construct_text(self, tags, draw_captions) -> List[Label]:
def construct_text(
self, tags: Dict[str, str], draw_captions: str
) -> List[Label]:
"""
Construct labels for not processed tags.
"""
@ -343,9 +347,7 @@ class Scheme:
if draw_captions == "main":
return texts
for text in get_text(tags): # type: str
if text:
texts.append(Label(text))
texts += get_text(tags)
if "route_ref" in tags:
texts.append(Label(tags["route_ref"].replace(";", " ")))