wip

1 files changed, 58 insertions, 29 deletions

diff --git a/store.py b/store.py
index e877eda..4821072 100644
--- a/store.py
+++ b/store.py
@@ -7,8 +7,7 @@ class Node:
         self.id = id
         self.lat = float(lat)
         self.lng = float(lng)
-        self.neighbours_bike = []
-        self.neighbours_car = []
+        self.neighbours = []
 
         self.parent = None
         self.size = 1
@@ -46,7 +45,7 @@ class Node:
 parser = None  # Have a global reusable parser object
 
 
-def add_neighbours_bike(nodes):
+def add_neighbours(nodes):
     for way in parser.iter_ways():
         if 'highway' not in way['tags']:
             continue
@@ -57,47 +56,69 @@ def add_neighbours_bike(nodes):
             node1 = road[i]
             node2 = road[i + 1]
 
-<<<<<<< HEAD
-            nodes[node1].neighbours.append(nodes[node2])
-            nodes[node2].neighbours.append(nodes[node1])
-            # These two are neighbours and should be part of the same tree.
-            nodes[node1].union(nodes[node2])
-=======
-            if suitable_car(way):
-                nodes[node1].neighbours_car.append(nodes[node2])
-                nodes[node2].neighbours_car.append(nodes[node1])
-
             if suitable_bike(way):
-                nodes[node1].neighbours_bike.append(nodes[node2])
-                nodes[node2].neighbours_bike.append(nodes[node1])
->>>>>>> 532c0cb... wip
+                bike_nodes = nodes['bike']
 
-    return nodes
+                bike_nodes[node1].neighbours.append(bike_nodes[node2])
+                bike_nodes[node2].neighbours.append(bike_nodes[node1])
 
+                # These two are neighbours and should be part of the same tree.
+                bike_nodes[node1].union(bike_nodes[node2])
 
-def add_neighbours_car(nodes):
-    for way in parser.iter_ways():
-        if 'highway' not in way['tags']:
-            continue
+            if suitable_car(way):
+                car_nodes = nodes['car']
+
+                car_nodes[node1].neighbours.append(car_nodes[node2])
+                car_nodes[node2].neighbours.append(car_nodes[node1])
+
+                # These two are neighbours and should be part of the same tree.
+                car_nodes[node1].union(car_nodes[node2])
+
+    return nodes
 
 
 def extract_osm_nodes(f_name):
     global parser
     parser = get_default_parser(f_name)
-    nodes = dict()
-    grid = defaultdict()
+    nodes = {
+        'bike': dict(),
+        'car': dict()
+    }
 
     for node in parser.iter_nodes():
-        new_node = Node(node['id'], node['lat'], node['lon'])
-        nodes[node['id']] = new_node
+        # FIXME: this can probably be solved better
+        nodes['bike'][node['id']] = Node(node['id'], node['lat'], node['lon'])
+        nodes['car'][node['id']] = Node(node['id'], node['lat'], node['lon'])
 
     add_neighbours(nodes)
 
+    # FIXME: this can probably be solved better
     # Remove nodes without neighbours
-    for node_id, node in nodes.copy().items():
-        if not node.neighbours_car or not node.neighbours_bike:
-            del nodes[node_id]
+    for node_id, node in nodes['bike'].copy().items():
+        if not node.neighbours:
+            del nodes['bike'][node_id]
 
+    for node_id, node in nodes['car'].copy().items():
+        if not node.neighbours:
+            del nodes['car'][node_id]
+
+    nodes['bike'], unconnected_bike = make_forest(nodes['bike'])
+    nodes['car'], unconnected_car = make_forest(nodes['car'])
+
+    unconnected_nodes = {
+        'bike': unconnected_bike,
+        'car': unconnected_car
+    }
+
+    grids = {
+        'bike': make_grid(nodes['bike']),
+        'car': make_grid(nodes['car'])
+    }
+
+    return nodes, grids, unconnected_nodes
+
+
+def make_forest(nodes):
     # Construct a forest of disjoint trees.
     # The forest is a { root: tree }-dict. If we construct a relation where
     # two nodes relate to each other if they are a part of the same tree,
@@ -106,6 +127,7 @@ def extract_osm_nodes(f_name):
     # becomes the root of each node since it will be the same for all nodes
     # in the same tree due our use of union-find.
     forest = defaultdict(dict)
+
     for node_id, node in nodes.items():
         forest[node.find_root().id][node_id] = node
 
@@ -129,6 +151,13 @@ def extract_osm_nodes(f_name):
             unconnected_nodes.append(node)
 
     nodes = best_tree
+
+    return nodes, unconnected_nodes
+
+
+def make_grid(nodes):
+    grid = defaultdict()
+
     # create a "grid" by grouping nearby nodes.
     for node in nodes.copy().values():
 
@@ -141,7 +170,7 @@ def extract_osm_nodes(f_name):
         else:
             grid[key] = [node]
 
-    return nodes, grid, unconnected_nodes
+    return grid
 
 
 def select_nodes_in_rectangle(nodes, min_lat, max_lat, min_long, max_long):