From 221b0bace6991b50ecde8d054cd5686d68ca29f3 Mon Sep 17 00:00:00 2001 From: Sergey Vartanov Date: Mon, 8 Nov 2021 03:27:36 +0300 Subject: [PATCH] Optimize imports. --- data/pylintrc | 4 ++++ map_machine/constructor.py | 18 +++++++++--------- map_machine/doc/moire_manager.py | 2 +- map_machine/feature/road.py | 4 ++-- map_machine/figure.py | 2 +- map_machine/mapcss.py | 4 ++-- map_machine/mapper.py | 6 +++--- map_machine/pictogram/point.py | 2 +- map_machine/scheme.py | 2 +- map_machine/slippy/tile.py | 4 ++-- tests/test_icons.py | 20 ++++++++------------ 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/data/pylintrc b/data/pylintrc index 0465616..87558c3 100644 --- a/data/pylintrc +++ b/data/pylintrc @@ -12,3 +12,7 @@ disable= too-many-return-statements good-names=i,j,x,y,a,b,c,n + +[SIMILARITIES] + +ignore-imports=yes diff --git a/map_machine/constructor.py b/map_machine/constructor.py index 97dab3a..e8d6c4c 100644 --- a/map_machine/constructor.py +++ b/map_machine/constructor.py @@ -10,6 +10,7 @@ import numpy as np from colour import Color from map_machine.color import get_gradient_color +from map_machine.feature.road import Road, Roads from map_machine.figure import ( Building, Crater, @@ -18,14 +19,6 @@ from map_machine.figure import ( Tree, ) from map_machine.geometry.flinger import Flinger -from map_machine.pictogram.icon import ( - DEFAULT_SMALL_SHAPE_ID, - Icon, - IconSet, - Shape, - ShapeExtractor, - ShapeSpecification, -) from map_machine.map_configuration import DrawingMode, MapConfiguration from map_machine.osm.osm_reader import ( OSMData, @@ -34,8 +27,15 @@ from map_machine.osm.osm_reader import ( OSMWay, parse_levels, ) +from map_machine.pictogram.icon import ( + DEFAULT_SMALL_SHAPE_ID, + Icon, + IconSet, + Shape, + ShapeExtractor, + ShapeSpecification, +) from map_machine.pictogram.point import Point -from map_machine.feature.road import Road, Roads from map_machine.scheme import DEFAULT_COLOR, LineStyle, RoadMatcher, Scheme from map_machine.text import Label from map_machine.ui.cli import BuildingMode diff --git a/map_machine/doc/moire_manager.py b/map_machine/doc/moire_manager.py index ecd30ff..f97f8ef 100644 --- a/map_machine/doc/moire_manager.py +++ b/map_machine/doc/moire_manager.py @@ -9,8 +9,8 @@ from typing import Any, Union from moire.default import Default, DefaultHTML, DefaultMarkdown, DefaultWiki from moire.moire import Tag -from map_machine.ui import cli from map_machine.pictogram.icon import ShapeExtractor +from map_machine.ui import cli from map_machine.ui.cli import COMMAND_LINES from map_machine.workspace import workspace diff --git a/map_machine/feature/road.py b/map_machine/feature/road.py index 4c41d80..1da7b79 100644 --- a/map_machine/feature/road.py +++ b/map_machine/feature/road.py @@ -15,8 +15,6 @@ from svgwrite.shapes import Circle from map_machine.drawing import PathCommands from map_machine.geometry.flinger import Flinger -from map_machine.osm.osm_reader import OSMNode, Tagged -from map_machine.scheme import RoadMatcher from map_machine.geometry.vector import ( Line, Polyline, @@ -24,6 +22,8 @@ from map_machine.geometry.vector import ( norm, turn_by_angle, ) +from map_machine.osm.osm_reader import OSMNode, Tagged +from map_machine.scheme import RoadMatcher __author__ = "Sergey Vartanov" __email__ = "me@enzet.ru" diff --git a/map_machine/figure.py b/map_machine/figure.py index 44a624e..d06739a 100644 --- a/map_machine/figure.py +++ b/map_machine/figure.py @@ -10,8 +10,8 @@ from svgwrite.container import Group from svgwrite.gradients import RadialGradient from svgwrite.path import Path -from map_machine.feature.direction import DirectionSet, Sector from map_machine.drawing import PathCommands +from map_machine.feature.direction import DirectionSet, Sector from map_machine.geometry.flinger import Flinger from map_machine.osm.osm_reader import OSMNode, Tagged from map_machine.scheme import LineStyle, Scheme diff --git a/map_machine/mapcss.py b/map_machine/mapcss.py index 65fc51d..bb95622 100644 --- a/map_machine/mapcss.py +++ b/map_machine/mapcss.py @@ -9,9 +9,9 @@ from typing import Optional, TextIO from colour import Color from map_machine import __project__, __url__ -from map_machine.pictogram.icon_collection import IconCollection -from map_machine.pictogram.icon import ShapeExtractor from map_machine.osm.osm_reader import STAGES_OF_DECAY +from map_machine.pictogram.icon import ShapeExtractor +from map_machine.pictogram.icon_collection import IconCollection from map_machine.scheme import Matcher, Scheme from map_machine.workspace import workspace diff --git a/map_machine/mapper.py b/map_machine/mapper.py index 26a38b4..19ecf9f 100644 --- a/map_machine/mapper.py +++ b/map_machine/mapper.py @@ -14,16 +14,16 @@ from svgwrite.container import Group from svgwrite.path import Path as SVGPath from svgwrite.shapes import Rect -from map_machine.geometry.boundary_box import BoundaryBox from map_machine.constructor import Constructor +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.pictogram.icon import ShapeExtractor from map_machine.map_configuration import LabelMode, MapConfiguration from map_machine.osm.osm_getter import NetworkError, get_osm from map_machine.osm.osm_reader import OSMData, OSMNode +from map_machine.pictogram.icon import ShapeExtractor from map_machine.pictogram.point import Occupied, Point -from map_machine.feature.road import Intersection, Road, RoadPart from map_machine.scheme import Scheme from map_machine.ui.cli import BuildingMode from map_machine.workspace import workspace diff --git a/map_machine/pictogram/point.py b/map_machine/pictogram/point.py index 135e4e0..88af53a 100644 --- a/map_machine/pictogram/point.py +++ b/map_machine/pictogram/point.py @@ -7,9 +7,9 @@ import numpy as np import svgwrite from colour import Color -from map_machine.pictogram.icon import Icon, IconSet from map_machine.map_configuration import LabelMode from map_machine.osm.osm_reader import Tagged +from map_machine.pictogram.icon import Icon, IconSet from map_machine.text import Label __author__ = "Sergey Vartanov" diff --git a/map_machine/scheme.py b/map_machine/scheme.py index 5ae4017..fd79fed 100644 --- a/map_machine/scheme.py +++ b/map_machine/scheme.py @@ -13,6 +13,7 @@ import yaml from colour import Color from map_machine.feature.direction import DirectionSet +from map_machine.map_configuration import MapConfiguration, LabelMode from map_machine.pictogram.icon import ( DEFAULT_COLOR, DEFAULT_SHAPE_ID, @@ -22,7 +23,6 @@ from map_machine.pictogram.icon import ( ShapeExtractor, ShapeSpecification, ) -from map_machine.map_configuration import MapConfiguration, LabelMode from map_machine.text import Label, construct_text __author__ = "Sergey Vartanov" diff --git a/map_machine/slippy/tile.py b/map_machine/slippy/tile.py index 5b08897..4618984 100644 --- a/map_machine/slippy/tile.py +++ b/map_machine/slippy/tile.py @@ -15,14 +15,14 @@ import numpy as np import svgwrite from PIL import Image -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_getter import NetworkError, get_osm from map_machine.osm.osm_reader import OSMData +from map_machine.pictogram.icon import ShapeExtractor from map_machine.scheme import Scheme from map_machine.workspace import workspace diff --git a/tests/test_icons.py b/tests/test_icons.py index e2b99b8..c662054 100644 --- a/tests/test_icons.py +++ b/tests/test_icons.py @@ -3,36 +3,32 @@ Test icon generation for nodes. """ from typing import Optional -import pytest from colour import Color -from map_machine.pictogram.icon_collection import IconCollection from map_machine.pictogram.icon import IconSet, ShapeSpecification, Icon +from map_machine.pictogram.icon_collection import IconCollection from tests import SCHEME, SHAPE_EXTRACTOR, workspace __author__ = "Sergey Vartanov" __email__ = "me@enzet.ru" -@pytest.fixture -def init_collection() -> IconCollection: - """Create collection of all possible icon sets.""" - return IconCollection.from_scheme(SCHEME, SHAPE_EXTRACTOR) +COLLECTION: IconCollection = IconCollection.from_scheme(SCHEME, SHAPE_EXTRACTOR) -def test_grid(init_collection: IconCollection) -> None: +def test_grid() -> None: """Test grid drawing.""" - init_collection.draw_grid(workspace.output_path / "grid.svg") + COLLECTION.draw_grid(workspace.output_path / "grid.svg") -def test_icons_by_id(init_collection: IconCollection) -> None: +def test_icons_by_id() -> None: """Test individual icons drawing.""" - init_collection.draw_icons(workspace.get_icons_by_id_path()) + COLLECTION.draw_icons(workspace.get_icons_by_id_path()) -def test_icons_by_name(init_collection: IconCollection) -> None: +def test_icons_by_name() -> None: """Test drawing individual icons that have names.""" - init_collection.draw_icons(workspace.get_icons_by_name_path(), by_name=True) + COLLECTION.draw_icons(workspace.get_icons_by_name_path(), by_name=True) def get_icon(tags: dict[str, str]) -> IconSet: