diff --git a/roentgen/mapper.py b/roentgen/mapper.py index 792bda1..a80913e 100644 --- a/roentgen/mapper.py +++ b/roentgen/mapper.py @@ -1,7 +1,7 @@ """ Simple OpenStreetMap renderer. """ -from typing import Any, Dict, Set, Iterator +from typing import Any, Dict, Iterator, Set import numpy as np import svgwrite @@ -18,7 +18,7 @@ from roentgen.flinger import Flinger from roentgen.icon import ShapeExtractor from roentgen.osm_reader import Map, OSMNode from roentgen.point import Occupied, Point -from roentgen.road import RoadPart, Intersection +from roentgen.road import Intersection, RoadPart from roentgen.scheme import Scheme __author__ = "Sergey Vartanov" diff --git a/roentgen/road.py b/roentgen/road.py index 07e0ce9..dbdebaf 100644 --- a/roentgen/road.py +++ b/roentgen/road.py @@ -8,8 +8,8 @@ import numpy as np import svgwrite from roentgen.flinger import Flinger -from roentgen.vector import angle, turn_by_angle, norm, Line from roentgen.osm_reader import OSMNode +from roentgen.vector import Line, angle, norm, turn_by_angle @dataclass diff --git a/roentgen/server.py b/roentgen/server.py index 36ac71e..dfb9370 100644 --- a/roentgen/server.py +++ b/roentgen/server.py @@ -1,6 +1,5 @@ import logging -from http.server import BaseHTTPRequestHandler -from http.server import HTTPServer +from http.server import BaseHTTPRequestHandler, HTTPServer from pathlib import Path from typing import Optional diff --git a/roentgen/tile.py b/roentgen/tile.py index 1cb2f7a..84fc2d9 100644 --- a/roentgen/tile.py +++ b/roentgen/tile.py @@ -7,7 +7,7 @@ import argparse import sys from dataclasses import dataclass from pathlib import Path -from typing import Tuple, Optional, List +from typing import List, Optional, Tuple import numpy as np import svgwrite @@ -15,7 +15,7 @@ import svgwrite from roentgen.constructor import Constructor from roentgen.flinger import Flinger from roentgen.icon import ShapeExtractor -from roentgen.mapper import TAGS_FILE_NAME, ICONS_FILE_NAME, Painter +from roentgen.mapper import ICONS_FILE_NAME, Painter, TAGS_FILE_NAME from roentgen.osm_getter import get_osm from roentgen.osm_reader import Map, OSMReader from roentgen.scheme import Scheme diff --git a/test/test_color.py b/test/test_color.py index c573885..94e8014 100644 --- a/test/test_color.py +++ b/test/test_color.py @@ -3,7 +3,7 @@ Test color functions. """ from colour import Color -from roentgen.color import is_bright, get_gradient_color +from roentgen.color import get_gradient_color, is_bright from roentgen.util import MinMax __author__ = "Sergey Vartanov" diff --git a/test/test_direction.py b/test/test_direction.py index 901833a..63fe63a 100644 --- a/test/test_direction.py +++ b/test/test_direction.py @@ -3,7 +3,7 @@ Test direction processing. """ import numpy as np -from roentgen.direction import parse_vector, DirectionSet +from roentgen.direction import DirectionSet, parse_vector __author__ = "Sergey Vartanov" __email__ = "me@enzet.ru" diff --git a/test/test_flinger.py b/test/test_flinger.py index f02c1d5..25ca25c 100644 --- a/test/test_flinger.py +++ b/test/test_flinger.py @@ -4,8 +4,7 @@ Test coordinates computation. import numpy as np from roentgen.flinger import ( - pseudo_mercator, - osm_zoom_level_to_pixels_per_meter, + osm_zoom_level_to_pixels_per_meter, pseudo_mercator ) __author__ = "Sergey Vartanov" diff --git a/test/test_icons.py b/test/test_icons.py index 1a2fe4c..36632f5 100644 --- a/test/test_icons.py +++ b/test/test_icons.py @@ -2,12 +2,12 @@ Test icon generation for nodes. """ from pathlib import Path -from typing import Dict, Tuple, Set +from typing import Dict, Set, Tuple import pytest -from roentgen.icon import IconSet from roentgen.grid import IconCollection +from roentgen.icon import IconSet from test import SCHEME, SHAPE_EXTRACTOR __author__ = "Sergey Vartanov" diff --git a/test/test_osm_reader.py b/test/test_osm_reader.py index 030500a..f3d6216 100644 --- a/test/test_osm_reader.py +++ b/test/test_osm_reader.py @@ -2,6 +2,7 @@ Test OSM XML parsing. """ import numpy as np + from roentgen.osm_reader import OSMNode, OSMReader, OSMRelation, OSMWay __author__ = "Sergey Vartanov" diff --git a/test/test_tag.py b/test/test_tag.py index 062ed88..eb1d994 100644 --- a/test/test_tag.py +++ b/test/test_tag.py @@ -5,7 +5,6 @@ from typing import Optional from roentgen.osm_reader import Tagged - __author__ = "Sergey Vartanov" __email__ = "me@enzet.ru"