From b52a7325c1e0d1b6e87e2bbe96ebafcc22be167a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 6 Jan 2021 18:55:57 +0100 Subject: pep8 --- algorithms.py | 8 +------- lib.py | 2 +- osm_parser.py | 3 ++- server.py | 2 +- store.py | 4 +++- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/algorithms.py b/algorithms.py index 9f3fd78..e2da8f0 100644 --- a/algorithms.py +++ b/algorithms.py @@ -10,8 +10,7 @@ def length_haversine(p1, p2): lat1, lng1, lat2, lng2 = map(math.radians, [lat1, lng1, lat2, lng2]) dlat = lat2 - lat1 dlng = lng2 - lng1 - a = math.sin(dlat / 2) ** 2 + math.cos(lat1) * math.cos(lat2) * math.sin( - dlng / 2) ** 2 + a = math.sin(dlat / 2) ** 2 + math.cos(lat1) * math.cos(lat2) * math.sin(dlng / 2) ** 2 c = 2 * math.asin(math.sqrt(a)) return 6372797.560856 * c # return the distance in meters @@ -33,7 +32,6 @@ def grid_search(grid, source_node): closest_nodes.append(get_closest_node(tile_nodes, source_node)) closest_node_id = get_closest_node(closest_nodes, source_node).id - return closest_node_id @@ -56,14 +54,10 @@ def look_for_nodes(offset, grid, source_key): tiles = [] for i in range(-offset, offset + 1): for j in range(-offset, offset + 1): - if i in (-offset, offset) or j in (-offset, offset): - key = (source_key[0] + j, source_key[1] + i) - if key in grid.keys(): tiles.append(grid[key]) - return tiles diff --git a/lib.py b/lib.py index 8a31276..d00d7ee 100644 --- a/lib.py +++ b/lib.py @@ -162,4 +162,4 @@ def run_server(port=8314): server_address = ('127.0.0.1', port) # Should make the port a command line argument server = HTTPServer(server_address, Handler) print('Starting server on http://{}:{}.'.format(*server_address)) - server.serve_forever() \ No newline at end of file + server.serve_forever() diff --git a/osm_parser.py b/osm_parser.py index 7145726..b3eed86 100644 --- a/osm_parser.py +++ b/osm_parser.py @@ -121,7 +121,8 @@ class OSMParser: for node in el.iter(OSM_WAYNODE)) tags = {tag.get(OSM_TAG_KEY): tag.get(OSM_TAG_VALUE) for tag in el.iter(OSM_TAG) - if self.allow_all or tag.get(OSM_TAG_KEY) in self.way_tags} + if self.allow_all + or tag.get(OSM_TAG_KEY) in self.way_tags} # Yield the edge id, the road and the tags yield { diff --git a/server.py b/server.py index 7790a61..8def0ba 100644 --- a/server.py +++ b/server.py @@ -8,12 +8,12 @@ grids = None nodes = None unconnected_nodes = None + @get('/') def index(): global nodes global grids global unconnected_nodes - nodes, grids, unconnected_nodes = store.extract_osm_nodes("linkoping.osm") return read_html('templates/index.html') diff --git a/store.py b/store.py index 4bca5ee..5438740 100644 --- a/store.py +++ b/store.py @@ -189,6 +189,7 @@ suitable_highway_types_bike = [ 'path' ] + def suitable_bike(way): tags = way['tags'] @@ -213,8 +214,9 @@ suitable_highway_types_car = [ 'tertiary_link', # Special road types 'living_street', 'service', - 'pedestrian', 'road' # FIXME: Handle predestrian and road differently? + 'pedestrian', 'road' # FIXME: Handle predestrian and road differently? ] + def suitable_car(way): return way['tags']['highway'] in suitable_highway_types_car -- cgit v1.2.1