From 7f66e5c211ced9bc0286b893b9a86534fe9ec43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 5 Nov 2020 16:43:16 +0100 Subject: initial dijkstra --- server.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index e6ff6c2..6424466 100644 --- a/server.py +++ b/server.py @@ -5,29 +5,36 @@ import store from lib import run_server, get, post, read_html +nodes = None + + @get('/') def index(): + global nodes + nodes = store.extract_osm_nodes("university.osm") return read_html('templates/index.html') @get('/show-area') def show_area(): - all = dict() - for (k, node) in enumerate(store.select_nodes_in_rectangle(store.extract_osm_nodes("university.osm"), 58.3984, 58.3990, 15.5733, 15.576)): - all[node.id] = node.coord_tuple() - return json.dumps(all) + global nodes + rect = dict() + for (k, node) in enumerate(store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, 15.576)): + rect[node.id] = node.coord_tuple() + return json.dumps(rect) @post('/shortest-path') def shortest_path(body): + global nodes body = json.loads(body) - source_id = algorithms.get_closest_node_id(store.nodes, store.Node(-1, body['lat1'], body['lng1'])) - target_id = algorithms.get_closest_node_id(store.nodes, store.Node(-1, body['lat2'], body['lng2'])) - print(source_id, target_id) - source_node = store.nodes[source_id] - target_node = store.nodes[target_id] - path = [(source_node.lat, source_node.lng), (target_node.lat, target_node.lng)] - response = {'path': path} + source_id = algorithms.get_closest_node_id(nodes, store.Node(-1, body['lat1'], body['lng1'])) + target_id = algorithms.get_closest_node_id(nodes, 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]} + return json.dumps(response) -- cgit v1.2.1 From b6898e9503fda2b7f7ae4366da0895c0e140c133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 6 Nov 2020 10:33:53 +0100 Subject: remobe unnecessary globals --- server.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index 6424466..6a93018 100644 --- a/server.py +++ b/server.py @@ -17,7 +17,6 @@ def index(): @get('/show-area') def show_area(): - global nodes rect = dict() for (k, node) in enumerate(store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, 15.576)): rect[node.id] = node.coord_tuple() @@ -26,7 +25,6 @@ def show_area(): @post('/shortest-path') def shortest_path(body): - global nodes body = json.loads(body) source_id = algorithms.get_closest_node_id(nodes, store.Node(-1, body['lat1'], body['lng1'])) target_id = algorithms.get_closest_node_id(nodes, store.Node(-1, body['lat2'], body['lng2'])) -- cgit v1.2.1