From 3e4015d2c06935b9c2c3da92f586df02c1b903d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 1 Dec 2020 10:55:33 +0100 Subject: no global parser --- store.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/store.py b/store.py index 9e6d4f7..1cee81a 100644 --- a/store.py +++ b/store.py @@ -13,10 +13,8 @@ class Node: return self.lat, self.lng -parser = None # Have a global reusable parser object - - -def add_neighbours(nodes): +def add_neighbours(nodes, parser): + print("adding neighbours") for way in parser.iter_ways(): if 'highway' not in way['tags']: continue @@ -34,14 +32,13 @@ def add_neighbours(nodes): def extract_osm_nodes(f_name): - global parser parser = get_default_parser(f_name) nodes = dict() for node in parser.iter_nodes(): nodes[node['id']] = Node(node['id'], node['lat'], node['lon']) - add_neighbours(nodes) + add_neighbours(nodes, parser) # remove nodes without neighbours for node_id, node in nodes.copy().items(): -- cgit v1.2.1