Merge remote-tracking branch 'origin/xml-iterparse'

1 files changed, 2 insertions, 6 deletions

diff --git a/store.py b/store.py
index c988e47..87cd940 100644
--- a/store.py
+++ b/store.py
@@ -42,10 +42,7 @@ class Node:
         return self.lat, self.lng
 
 
-parser = None  # Have a global reusable parser object
-
-
-def add_neighbours(nodes):
+def add_neighbours(nodes, parser):
     for way in parser.iter_ways():
         if 'highway' not in way['tags']:
             continue
@@ -65,7 +62,6 @@ def add_neighbours(nodes):
 
 
 def extract_osm_nodes(f_name):
-    global parser
     parser = get_default_parser(f_name)
     nodes = dict()
     grid = defaultdict()
@@ -74,7 +70,7 @@ def extract_osm_nodes(f_name):
         new_node = Node(node['id'], node['lat'], node['lon'])
         nodes[node['id']] = new_node
 
-    add_neighbours(nodes)
+    add_neighbours(nodes, parser)
 
     # Remove nodes without neighbours
     for node_id, node in nodes.copy().items():