Merge branch 'dijkstra' into 'master'

Dijkstra

See merge request tdde25-2020/tdde25-2020-projekt-sg3-maps-05!2

1 files changed, 8 insertions, 5 deletions

diff --git a/store.py b/store.py
index e03ae77..9e6d4f7 100644
--- a/store.py
+++ b/store.py
@@ -6,7 +6,7 @@ class Node:
         self.id = id
         self.lat = float(lat)
         self.lng = float(lng)
-        self.neighbors = []
+        self.neighbours = []
 
 
     def coord_tuple(self):
@@ -14,7 +14,6 @@ class Node:
 
 
 parser = None  # Have a global reusable parser object
-nodes = None
 
 
 def add_neighbours(nodes):
@@ -28,15 +27,14 @@ def add_neighbours(nodes):
             node1 = road[i]
             node2 = road[i + 1]
 
-            nodes[node1].neighbors.append(nodes[node2])
-            nodes[node2].neighbors.append(nodes[node1])
+            nodes[node1].neighbours.append(nodes[node2])
+            nodes[node2].neighbours.append(nodes[node1])
 
     return nodes
 
 
 def extract_osm_nodes(f_name):
     global parser
-    global nodes
     parser = get_default_parser(f_name)
     nodes = dict()
 
@@ -45,6 +43,11 @@ def extract_osm_nodes(f_name):
 
     add_neighbours(nodes)
 
+    # remove nodes without neighbours
+    for node_id, node in nodes.copy().items():
+        if not node.neighbours:
+            del nodes[node_id]
+
     return nodes