Implement mode of transport

1 files changed, 11 insertions, 7 deletions

diff --git a/server.py b/server.py
index 5992aa2..15145e5 100644
--- a/server.py
+++ b/server.py
@@ -52,15 +52,19 @@ def shortest_path(body):
     body = json.loads(body)
     transport_mode = body['transport_mode']
 
-    source_id = algorithms.get_closest_node(grids[transport_mode],
-                                            store.Node(-1, body['lat1'],
-                                                           body['lng1']))
-    target_id = algorithms.get_closest_node(grids[transport_mode],
-                                            store.Node(-1, body['lat2'],
-                                                           body['lng2']))
+    relevant_grid = grids[transport_mode]
+
+    source_id = algorithms.grid_search(relevant_grid,
+                                       store.Node(-1, body['lat1'],
+                                                      body['lng1']))
+    target_id = algorithms.grid_search(relevant_grid,
+                                       store.Node(-1, body['lat2'],
+                                                      body['lng2']))
+
+    relevant_nodes = nodes[transport_mode]
 
     path = algorithms.find_shortest_path(nodes[transport_mode], source_id, target_id)
-    response = {"path": [(nodes[node].lat, nodes[node].lng) for node in path]}
+    response = {"path": [(relevant_nodes[node].lat, relevant_nodes[node].lng) for node in path]}
 
     return json.dumps(response)