Refactor figures; get use of Python 3.9 features.

This commit is contained in:
Sergey Vartanov 2021-08-18 08:38:33 +03:00
parent 053324451a
commit 3bcf026862
36 changed files with 698 additions and 750 deletions

View file

@ -3,35 +3,31 @@ Test OSM XML parsing.
"""
import numpy as np
from roentgen.osm_reader import OSMNode, OSMReader, OSMRelation, OSMWay
from roentgen.osm_reader import OSMNode, OSMReader, OSMRelation, OSMWay, OSMData
__author__ = "Sergey Vartanov"
__email__ = "me@enzet.ru"
def test_node() -> None:
"""
Test OSM node parsing from XML.
"""
reader = OSMReader()
map_ = reader.parse_osm_text(
"""Test OSM node parsing from XML."""
reader: OSMReader = OSMReader()
osm_data: OSMData = reader.parse_osm_text(
"""<?xml version="1.0"?>
<osm>
<node id="42" lon="5" lat="10" />
</osm>"""
)
assert 42 in map_.nodes
node: OSMNode = map_.nodes[42]
assert 42 in osm_data.nodes
node: OSMNode = osm_data.nodes[42]
assert node.id_ == 42
assert np.allclose(node.coordinates, np.array([10, 5]))
def test_node_with_tag() -> None:
"""
Test OSM node parsing from XML.
"""
"""Test OSM node parsing from XML."""
reader = OSMReader()
map_ = reader.parse_osm_text(
osm_data: OSMData = reader.parse_osm_text(
"""<?xml version="1.0"?>
<osm>
<node id="42" lon="5" lat="10">
@ -39,35 +35,31 @@ def test_node_with_tag() -> None:
</node>
</osm>"""
)
assert 42 in map_.nodes
node: OSMNode = map_.nodes[42]
assert 42 in osm_data.nodes
node: OSMNode = osm_data.nodes[42]
assert node.id_ == 42
assert np.allclose(node.coordinates, np.array([10, 5]))
assert node.tags["key"] == "value"
def test_way() -> None:
"""
Test OSM way parsing from XML.
"""
reader = OSMReader()
map_ = reader.parse_osm_text(
"""Test OSM way parsing from XML."""
reader: OSMReader = OSMReader()
osm_data: OSMData = reader.parse_osm_text(
"""<?xml version="1.0"?>
<osm>
<way id="42" />
</osm>"""
)
assert 42 in map_.ways
way: OSMWay = map_.ways[42]
assert 42 in osm_data.ways
way: OSMWay = osm_data.ways[42]
assert way.id_ == 42
def test_nodes() -> None:
"""
Test OSM node parsing from XML.
"""
"""Test OSM node parsing from XML."""
reader = OSMReader()
map_ = reader.parse_osm_text(
osm_data: OSMData = reader.parse_osm_text(
"""<?xml version="1.0"?>
<osm>
<node id="1" lon="5" lat="10" />
@ -77,18 +69,16 @@ def test_nodes() -> None:
</way>
</osm>"""
)
way: OSMWay = map_.ways[2]
way: OSMWay = osm_data.ways[2]
assert len(way.nodes) == 1
assert way.nodes[0].id_ == 1
assert way.tags["key"] == "value"
def test_relation() -> None:
"""
Test OSM node parsing from XML.
"""
reader = OSMReader()
map_ = reader.parse_osm_text(
"""Test OSM node parsing from XML."""
reader: OSMReader = OSMReader()
osm_data: OSMData = reader.parse_osm_text(
"""<?xml version="1.0"?>
<osm>
<node id="1" lon="5" lat="10" />
@ -101,8 +91,8 @@ def test_relation() -> None:
</relation>
</osm>"""
)
assert 3 in map_.relations
relation: OSMRelation = map_.relations[3]
assert 3 in osm_data.relations
relation: OSMRelation = osm_data.relations[3]
assert relation.id_ == 3
assert relation.tags["key"] == "value"
assert len(relation.members) == 1