From 0d0f1221d854be9210b1601460608e8c5f236204 Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Thu, 3 Dec 2020 21:23:09 +0100 Subject: added @get for showing favicon on web page --- server.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index 6a93018..5323bf7 100644 --- a/server.py +++ b/server.py @@ -4,7 +4,6 @@ import algorithms import store from lib import run_server, get, post, read_html - nodes = None @@ -18,16 +17,32 @@ def index(): @get('/show-area') def show_area(): rect = dict() - for (k, node) in enumerate(store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, 15.576)): + 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) +@get('/favicon.ico') +def favicon(): + with open("data/favicon.ico", "rb") as \ + image: + f = image.read() + image_bytes = bytearray(f) + + return image_bytes + + @post('/shortest-path') def shortest_path(body): 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'])) + 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) -- cgit v1.2.1 From f36259882415ca5f58bd91a5b4bbc0ccef9bf7fc Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Thu, 3 Dec 2020 21:33:52 +0100 Subject: fixed line-break --- server.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index 5323bf7..30006b4 100644 --- a/server.py +++ b/server.py @@ -26,10 +26,9 @@ def show_area(): @get('/favicon.ico') def favicon(): - with open("data/favicon.ico", "rb") as \ - image: - f = image.read() - image_bytes = bytearray(f) + with open("data/favicon.ico", "rb") as image: + read_image = image.read() + image_bytes = bytearray(read_image) return image_bytes -- cgit v1.2.1 From 4a9cfde9ddfccd283b705e5583c4855c285add33 Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Fri, 4 Dec 2020 12:09:07 +0100 Subject: fixed auto formating" --- server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index 30006b4..5fc7d54 100644 --- a/server.py +++ b/server.py @@ -18,8 +18,7 @@ def index(): def show_area(): rect = dict() for (k, node) in enumerate( - store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, - 15.576)): + store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, 15.576)): rect[node.id] = node.coord_tuple() return json.dumps(rect) -- cgit v1.2.1 From 6d08f33af57b944d236af09a47d8d72db3107fff Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Fri, 4 Dec 2020 12:10:13 +0100 Subject: fixed another formationg error --- server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'server.py') diff --git a/server.py b/server.py index 5fc7d54..9a275e9 100644 --- a/server.py +++ b/server.py @@ -17,8 +17,7 @@ def index(): @get('/show-area') def show_area(): rect = dict() - for (k, node) in enumerate( - store.select_nodes_in_rectangle(nodes, 58.3984, 58.3990, 15.5733, 15.576)): + 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) -- cgit v1.2.1