1 files changed, 13 insertions, 12 deletions
diff --git a/server.py b/server.py
index 8def0ba..33372ba 100644
--- a/server.py
+++ b/server.py
@@ -31,23 +31,24 @@ def favicon():
 @post('/shortest-path')
 def shortest_path(body):
     body = json.loads(body)
-    transport_mode = body['transport_mode']
 
+    transport_mode = body['transport_mode']
     relevant_grid = grids[transport_mode]
+    relevant_nodes = nodes[transport_mode]
 
     source_id = algorithms.grid_search(relevant_grid,
-                                       store.Node(-1, body['lat1'],
-                                                      body['lng1']))
+                                       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": [(relevant_nodes[node].lat, relevant_nodes[node].lng) for node in path]}
-
-    return json.dumps(response)
+                                       body['lat2'],
+                                       body['lng2'])
+
+    path = algorithms.find_shortest_path(nodes[transport_mode],
+                                         source_id,
+                                         target_id)
+    return json.dumps({"path": [(relevant_nodes[node].lat,
+                                 relevant_nodes[node].lng)
+                       for node in path]})
 
 
 run_server()