From 2eef624ac866070dbfec8a88e4b76cba4a4593d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 5 Nov 2020 16:41:03 +0100 Subject: neighbor -> neighbour --- store.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'store.py') diff --git a/store.py b/store.py index e03ae77..fa5e5dc 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): @@ -28,8 +28,8 @@ 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 -- cgit v1.2.1 From 5bd68cac4b2aa953bcc63e8e903ed8c5f2aec5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 5 Nov 2020 16:42:34 +0100 Subject: remove nodes without neighbours --- store.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'store.py') diff --git a/store.py b/store.py index fa5e5dc..253087d 100644 --- a/store.py +++ b/store.py @@ -45,6 +45,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 -- cgit v1.2.1 From 7f66e5c211ced9bc0286b893b9a86534fe9ec43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 5 Nov 2020 16:43:16 +0100 Subject: initial dijkstra --- store.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'store.py') diff --git a/store.py b/store.py index 253087d..9e6d4f7 100644 --- a/store.py +++ b/store.py @@ -14,7 +14,6 @@ class Node: parser = None # Have a global reusable parser object -nodes = None def add_neighbours(nodes): @@ -36,7 +35,6 @@ def add_neighbours(nodes): def extract_osm_nodes(f_name): global parser - global nodes parser = get_default_parser(f_name) nodes = dict() -- cgit v1.2.1