wip

1 files changed, 16 insertions, 5 deletions

diff --git a/server.py b/server.py
index 25d2826..7c89bf6 100644
--- a/server.py
+++ b/server.py
@@ -47,17 +47,28 @@ def show_unconnected_nodes():
 @post('/shortest-path')
 def shortest_path(body):
     body = json.loads(body)
+<<<<<<< HEAD
     source_id = algorithms.grid_search(grid,
                                        store.Node(-1, body['lat1'],
                                                   body['lng1']))
     target_id = algorithms.grid_search(grid,
                                        store.Node(-1, body['lat2'],
                                                   body['lng2']))
-
-    path = algorithms.find_shortest_path(nodes, source_id, target_id)
-    print(path)
-    response = {
-        "path": [(nodes[node].lat, nodes[node].lng) for node in path]}
+=======
+    transport_mode = body['transport_mode']
+
+    source_id = algorithms.get_closest_node_id(nodes,
+                                               store.Node(-1, body['lat1'],
+                                                          body['lng1'])
+                                               transport_mode)
+    target_id = algorithms.get_closest_node_id(nodes,
+                                               store.Node(-1, body['lat2'],
+                                                          body['lng2'])
+                                               transport_mode)
+>>>>>>> 532c0cb... wip
+
+    path = algorithms.find_shortest_path(nodes, source_id, target_id, transport_mode)
+    response = {"path": [(nodes[node].lat, nodes[node].lng) for node in path]}
 
     return json.dumps(response)