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

Fix imports.

Browse source
This commit is contained in:
Sergey Vartanov 2022-08-05 00:05:36 +03:00
parent 49db628d76
commit 5361725820
3 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
map_machine/element/grid.py
View file

@ -5,13 +5,12 @@ import numpy as np
from svgwrite import Drawing from svgwrite import Drawing
from svgwrite.text import Text from svgwrite.text import Text
from constructor import Constructor from map_machine.constructor import Constructor
from element.way import DEFAULT_ZOOM, SCHEME, SHAPE_EXTRACTOR from map_machine.geometry.boundary_box import BoundaryBox
from geometry.boundary_box import BoundaryBox from map_machine.geometry.flinger import Flinger
from geometry.flinger import Flinger from map_machine.map_configuration import MapConfiguration
from map_configuration import MapConfiguration from map_machine.mapper import Map
from mapper import Map from map_machine.osm.osm_reader import (
from osm.osm_reader import (
OSMNode, OSMNode,
OSMData, OSMData,
Tags, Tags,
@ -19,6 +18,17 @@ from osm.osm_reader import (
OSMMember, OSMMember,
OSMRelation, OSMRelation,
) )
from map_machine.pictogram.icon import ShapeExtractor
from map_machine.scheme import Scheme
from map_machine.workspace import Workspace
workspace: Workspace = Workspace(Path("temp"))
SCHEME: Scheme = Scheme.from_file(workspace.DEFAULT_SCHEME_PATH)
SHAPE_EXTRACTOR: ShapeExtractor = ShapeExtractor(
workspace.ICONS_PATH, workspace.ICONS_CONFIG_PATH
)
DEFAULT_ZOOM: float = 18.0
class Grid: class Grid:

5
map_machine/element/node.py
View file

@ -7,8 +7,9 @@ import numpy as np
import svgwrite import svgwrite
from svgwrite.path import Path as SVGPath from svgwrite.path import Path as SVGPath
from element.grid import Grid from map_machine.element.grid import Grid
from map_machine.map_configuration import LabelMode from map_machine.map_configuration import LabelMode
from map_machine.osm.osm_reader import Tags
from map_machine.pictogram.icon import ShapeExtractor from map_machine.pictogram.icon import ShapeExtractor
from map_machine.pictogram.point import Point from map_machine.pictogram.point import Point
from map_machine.scheme import LineStyle, Scheme from map_machine.scheme import LineStyle, Scheme
@ -18,8 +19,6 @@ from map_machine.workspace import workspace
__author__ = "Sergey Vartanov" __author__ = "Sergey Vartanov"
__email__ = "me@enzet.ru" __email__ = "me@enzet.ru"
from osm.osm_reader import Tags
def draw_node(tags: Tags) -> None: def draw_node(tags: Tags) -> None:
grid: Grid = Grid() grid: Grid = Grid()

18
map_machine/element/way.py
View file

@ -3,28 +3,14 @@ import logging
from pathlib import Path from pathlib import Path
from typing import Optional from typing import Optional
from element.grid import Grid from map_machine.element.grid import Grid
from map_machine.osm.osm_reader import ( from map_machine.osm.osm_reader import OSMNode, OSMMember
OSMNode,
OSMMember,
)
from map_machine.osm.tags import ( from map_machine.osm.tags import (
HIGHWAY_VALUES, HIGHWAY_VALUES,
AEROWAY_VALUES, AEROWAY_VALUES,
RAILWAY_VALUES, RAILWAY_VALUES,
ROAD_VALUES, ROAD_VALUES,
) )
from map_machine.pictogram.icon import ShapeExtractor
from map_machine.scheme import Scheme
from map_machine.workspace import Workspace
workspace: Workspace = Workspace(Path("temp"))
SCHEME: Scheme = Scheme.from_file(workspace.DEFAULT_SCHEME_PATH)
SHAPE_EXTRACTOR: ShapeExtractor = ShapeExtractor(
workspace.ICONS_PATH, workspace.ICONS_CONFIG_PATH
)
DEFAULT_ZOOM: float = 18.0
ROAD_WIDTHS_AND_FEATURES: list[dict[str, str]] = [ ROAD_WIDTHS_AND_FEATURES: list[dict[str, str]] = [
{"width": "4"}, {"width": "4"},