summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--algorithms.py2
-rw-r--r--server.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/algorithms.py b/algorithms.py
index 21d5348..855c69e 100644
--- a/algorithms.py
+++ b/algorithms.py
@@ -18,7 +18,6 @@ def length_haversine(p1, p2):
return 6372797.560856 * c # return the distance in meters
-<<<<<<< HEAD
def grid_search(grid, source_node):
"""
Finds closest node to source node by comparing distance to nodes within
@@ -81,6 +80,7 @@ def get_closest_node_id(nodes, source_node, transport_mode):
min_value = None
for node in nodes:
+ print(node)
length = length_haversine(source_node, node)
relevant_neighbours = get_relevant_neighbours(node, transport_mode)
diff --git a/server.py b/server.py
index 7c89bf6..b928400 100644
--- a/server.py
+++ b/server.py
@@ -59,11 +59,11 @@ def shortest_path(body):
source_id = algorithms.get_closest_node_id(nodes,
store.Node(-1, body['lat1'],
- body['lng1'])
+ body['lng1']),
transport_mode)
target_id = algorithms.get_closest_node_id(nodes,
store.Node(-1, body['lat2'],
- body['lng2'])
+ body['lng2']),
transport_mode)
>>>>>>> 532c0cb... wip