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

Merge main.

Browse source
This commit is contained in:
Sergey Vartanov 2022-05-15 20:13:58 +03:00
commit 518e8f9590
14 changed files with 192 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

12
map_machine/mapper.py
View file

@ -18,7 +18,6 @@ from map_machine.constructor import Constructor
from map_machine.drawing import draw_text
from map_machine.feature.building import Building, draw_walls, BUILDING_SCALE
from map_machine.feature.road import Intersection, Road, RoadPart
from map_machine.figure import StyledFigure
from map_machine.geometry.boundary_box import BoundaryBox
from map_machine.geometry.flinger import Flinger
from map_machine.geometry.vector import Segment
@ -59,16 +58,13 @@ class Map:
self.svg.add(
Rect((0.0, 0.0), self.flinger.size, fill=self.background_color)
)
ways: List[StyledFigure] = sorted(
constructor.figures, key=lambda x: x.line_style.priority
)
logging.info("Drawing ways...")
for way in ways:
path_commands: str = way.get_path(self.flinger)
for figure in constructor.get_sorted_figures():
path_commands: str = figure.get_path(self.flinger)
if path_commands:
path: SVGPath = SVGPath(d=path_commands)
path.update(way.line_style.style)
path.update(figure.line_style.style)
self.svg.add(path)
constructor.roads.draw(self.svg, self.flinger)
@ -135,7 +131,7 @@ class Map:
building.draw_shade(building_shade, self.flinger)
self.svg.add(building_shade)
walls: dict[Segment, Building] = {}
walls: Dict[Segment, Building] = {}
for building in constructor.buildings:
for part in building.parts: