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

Fix code style.

Browse source
This commit is contained in:
Sergey Vartanov 2020-09-23 03:24:53 +03:00
parent 2ffac6f98b
commit 535d939806
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
roentgen/constructor.py
View file

@ -13,7 +13,8 @@ from typing import Any, Dict, List, Optional, Set
from roentgen import ui
from roentgen.extract_icon import DEFAULT_SMALL_SHAPE_ID
from roentgen.flinger import Flinger
from roentgen.osm_reader import Map, OSMMember, OSMRelation, OSMWay, OSMNode, Tagged
from roentgen.osm_reader import Map, OSMMember, OSMRelation, OSMWay, OSMNode, \
Tagged
from roentgen.scheme import IconSet, Scheme
from roentgen.util import MinMax
from roentgen.color import get_gradient_color
@ -32,8 +33,10 @@ def is_clockwise(polygon: List[OSMNode]) -> bool:
for index in range(len(polygon)): # type: int
next_index: int = 0 if index == len(polygon) - 1 else index + 1
count += (
(polygon[next_index].coordinates[0] - polygon[index].coordinates[0]) *
(polygon[next_index].coordinates[1] + polygon[index].coordinates[1]))
(polygon[next_index].coordinates[0] -
polygon[index].coordinates[0]) *
(polygon[next_index].coordinates[1] +
polygon[index].coordinates[1]))
return count >= 0
@ -82,16 +85,17 @@ class Figure(Tagged):
Some figure on the map: way or area.
"""
def __init__(
self, tags: Dict[str, str], inners, outers, style: Dict[str, Any],
self, tags: Dict[str, str], inners: List[List[OSMNode]],
outers: List[List[OSMNode]], style: Dict[str, Any],
layer: float = 0.0):
super().__init__()
self.tags: Dict[str, str] = tags
self.inners = []
self.outers = []
self.inners: List[List[OSMNode]] = []
self.outers: List[List[OSMNode]] = []
self.style: Dict[str, Any] = style
self.layer = layer
self.layer: float = layer
for inner_nodes in inners:
self.inners.append(make_clockwise(inner_nodes))
@ -132,6 +136,9 @@ class Segment:
class Building(Figure):
"""
Building on the map.
"""
def __init__(
self, tags: Dict[str, str], inners, outers, flinger: Flinger,
style: Dict[str, Any], layer: float):
@ -156,6 +163,9 @@ class Building(Figure):
class TextStruct:
"""
Some label on the map with attributes.
"""
def __init__(
self, text: str, fill: Color = Color("#444444"), size: float = 10):
self.text = text

4
roentgen/mapper.py
View file

@ -246,9 +246,9 @@ class Painter:
length: float = self.flinger.get_scale()
for way in constructor.buildings: # type: Building
shift = [2 * way.get_levels(), 0 * way.get_levels()]
shift = np.array((length * way.get_levels(), 0))
for nodes11 in way.inners + way.outers:
for i in range(len(nodes11) - 1):
for i in range(len(nodes11) - 1): # type: int
flung_1 = self.flinger.fling(nodes11[i].coordinates)
flung_2 = self.flinger.fling(nodes11[i + 1].coordinates)
building_shade.add(Path(