diff --git a/roentgen.py b/roentgen.py index 40e0220..55ea436 100644 --- a/roentgen.py +++ b/roentgen.py @@ -6,8 +6,9 @@ Author: Sergey Vartanov (me@enzet.ru). import argparse import os import sys -import svgwrite + import numpy as np +import svgwrite from roentgen import ui from roentgen.constructor import Constructor @@ -15,13 +16,13 @@ from roentgen.flinger import Flinger from roentgen.grid import draw_all_icons from roentgen.icon import IconExtractor from roentgen.mapper import ( - Painter, check_level_number, check_level_overground, - ICONS_FILE_NAME, AUTHOR_MODE, CREATION_TIME_MODE, TAGS_FILE_NAME + AUTHOR_MODE, CREATION_TIME_MODE, ICONS_FILE_NAME, Painter, TAGS_FILE_NAME, + check_level_number, check_level_overground ) from roentgen.osm_getter import get_osm from roentgen.osm_reader import Map, OSMReader, OverpassReader from roentgen.point import Point -from roentgen.scheme import Scheme, LineStyle +from roentgen.scheme import LineStyle, Scheme from roentgen.util import MinMax diff --git a/roentgen/grid.py b/roentgen/grid.py index 4f3e31a..b6af702 100644 --- a/roentgen/grid.py +++ b/roentgen/grid.py @@ -10,7 +10,7 @@ import numpy as np from colour import Color from svgwrite import Drawing -from roentgen.icon import Shape, IconExtractor +from roentgen.icon import IconExtractor, Shape from roentgen.scheme import Scheme diff --git a/roentgen/mapper.py b/roentgen/mapper.py index 79da8a1..f8d911d 100644 --- a/roentgen/mapper.py +++ b/roentgen/mapper.py @@ -3,9 +3,6 @@ Simple OpenStreetMap renderer. Author: Sergey Vartanov (me@enzet.ru). """ -import argparse -import os -import sys from typing import Any, Dict import numpy as np @@ -19,13 +16,10 @@ from roentgen import ui from roentgen.constructor import Building, Constructor, Figure, Segment from roentgen.direction import DirectionSet, Sector from roentgen.flinger import Flinger -from roentgen.grid import draw_all_icons from roentgen.icon import IconExtractor -from roentgen.osm_getter import get_osm -from roentgen.osm_reader import Map, OSMReader, OverpassReader +from roentgen.osm_reader import Map from roentgen.point import Occupied, Point from roentgen.scheme import Scheme -from roentgen.util import MinMax ICONS_FILE_NAME: str = "icons/icons.svg" TAGS_FILE_NAME: str = "data/tags.yml" diff --git a/roentgen/point.py b/roentgen/point.py index ddae6fe..3331200 100644 --- a/roentgen/point.py +++ b/roentgen/point.py @@ -1,4 +1,3 @@ -from dataclasses import dataclass from typing import Dict, List, Optional import numpy as np diff --git a/roentgen/scheme.py b/roentgen/scheme.py index f8a2294..e9cb008 100644 --- a/roentgen/scheme.py +++ b/roentgen/scheme.py @@ -11,7 +11,7 @@ from typing import Any, Dict, List, Optional, Set, Tuple, Union import yaml from colour import Color -from roentgen.icon import DEFAULT_SHAPE_ID, Shape, IconExtractor +from roentgen.icon import DEFAULT_SHAPE_ID, IconExtractor, Shape from roentgen.text import Label, get_address, get_text DEFAULT_COLOR: Color = Color("#444444") diff --git a/roentgen/text.py b/roentgen/text.py index 1ca19a3..3023d17 100644 --- a/roentgen/text.py +++ b/roentgen/text.py @@ -7,6 +7,7 @@ from dataclasses import dataclass from typing import Any, Dict, List from colour import Color + DEFAULT_COLOR: Color = Color("#444444") diff --git a/test/test_icons.py b/test/test_icons.py index d72a6a9..558e83b 100644 --- a/test/test_icons.py +++ b/test/test_icons.py @@ -4,8 +4,8 @@ Author: Sergey Vartanov (me@enzet.ru). from os import makedirs from typing import Dict -from roentgen.icon import IconExtractor from roentgen.grid import draw_all_icons +from roentgen.icon import IconExtractor from roentgen.scheme import Scheme