diff --git a/map_machine/constructor.py b/map_machine/constructor.py index bf1c50c..76d7e98 100644 --- a/map_machine/constructor.py +++ b/map_machine/constructor.py @@ -15,10 +15,8 @@ from map_machine.feature.building import Building, BUILDING_SCALE from map_machine.feature.crater import Crater from map_machine.feature.direction import DirectionSector from map_machine.feature.road import Road, Roads -from map_machine.figure import ( - StyledFigure, -) from map_machine.feature.tree import Tree +from map_machine.figure import StyledFigure from map_machine.geometry.flinger import Flinger from map_machine.map_configuration import DrawingMode, MapConfiguration from map_machine.osm.osm_reader import ( diff --git a/map_machine/doc/doc_collections.py b/map_machine/doc/doc_collections.py index a3e8904..181a644 100644 --- a/map_machine/doc/doc_collections.py +++ b/map_machine/doc/doc_collections.py @@ -9,8 +9,8 @@ from typing import Any, Optional import numpy as np import svgwrite from svgwrite import Drawing -from svgwrite.text import Text from svgwrite.shapes import Line, Rect +from svgwrite.text import Text from map_machine.map_configuration import MapConfiguration from map_machine.osm.osm_reader import Tags diff --git a/map_machine/doc/icons.py b/map_machine/doc/icons.py index 7ec9df8..376059b 100644 --- a/map_machine/doc/icons.py +++ b/map_machine/doc/icons.py @@ -15,7 +15,6 @@ from map_machine.pictogram.icon import ( from map_machine.pictogram.icon_collection import IconCollection from map_machine.workspace import workspace - SKIP: bool = True diff --git a/map_machine/doc/preview.py b/map_machine/doc/preview.py index 2c5f5d7..1cb7035 100755 --- a/map_machine/doc/preview.py +++ b/map_machine/doc/preview.py @@ -9,19 +9,19 @@ from typing import Optional import numpy as np import svgwrite -from map_machine.geometry.boundary_box import BoundaryBox from map_machine.constructor import Constructor +from map_machine.geometry.boundary_box import BoundaryBox from map_machine.geometry.flinger import Flinger -from map_machine.pictogram.icon import ShapeExtractor -from map_machine.mapper import Map from map_machine.map_configuration import ( BuildingMode, DrawingMode, LabelMode, MapConfiguration, ) +from map_machine.mapper import Map from map_machine.osm.osm_getter import get_osm from map_machine.osm.osm_reader import OSMData +from map_machine.pictogram.icon import ShapeExtractor from map_machine.scheme import Scheme doc_path: Path = Path("doc") diff --git a/map_machine/doc/wiki.py b/map_machine/doc/wiki.py index 1a5ede4..516b432 100644 --- a/map_machine/doc/wiki.py +++ b/map_machine/doc/wiki.py @@ -6,6 +6,7 @@ from pathlib import Path from typing import Optional from map_machine.doc.collections import Collection + from map_machine.map_configuration import MapConfiguration from map_machine.osm.osm_reader import Tags from map_machine.pictogram.icon import Icon, ShapeExtractor diff --git a/map_machine/element/test_elements.py b/map_machine/element/test_elements.py index 2e68e6b..a75860b 100644 --- a/map_machine/element/test_elements.py +++ b/map_machine/element/test_elements.py @@ -8,13 +8,13 @@ from typing import Optional import numpy as np from svgwrite import Drawing -from map_machine.geometry.boundary_box import BoundaryBox from map_machine.constructor import Constructor +from map_machine.geometry.boundary_box import BoundaryBox from map_machine.geometry.flinger import Flinger -from map_machine.pictogram.icon import ShapeExtractor from map_machine.map_configuration import MapConfiguration from map_machine.mapper import Map from map_machine.osm.osm_reader import OSMData, OSMNode, OSMWay +from map_machine.pictogram.icon import ShapeExtractor from map_machine.scheme import Scheme from map_machine.workspace import Workspace diff --git a/tests/test_ways.py b/tests/test_ways.py index 3708c24..cb6ba93 100644 --- a/tests/test_ways.py +++ b/tests/test_ways.py @@ -1,10 +1,10 @@ import numpy as np +from map_machine.constructor import Constructor from map_machine.figure import Figure from map_machine.geometry.boundary_box import BoundaryBox from map_machine.geometry.flinger import Flinger from map_machine.map_configuration import MapConfiguration -from map_machine.constructor import Constructor from map_machine.osm.osm_reader import OSMData, OSMWay, OSMNode from tests import SCHEME, SHAPE_EXTRACTOR