From f514c5fc686568f6a3a17ee6874c0a6973cd2a54 Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Thu, 3 Dec 2020 21:22:32 +0100 Subject: added function show favicon --- templates/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/index.js b/templates/index.js index b7b3b58..3a1ef8f 100644 --- a/templates/index.js +++ b/templates/index.js @@ -61,3 +61,10 @@ async function showMarkers() { } showMarkers() + +async function showFavicon() { + res = await fetch('/favicon.ico'); + res = await res.json(); +} + +showFavicon() -- cgit v1.2.1 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(-) 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 1564409435d10a67b4a880d73a21df35b9be2787 Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Thu, 3 Dec 2020 21:23:55 +0100 Subject: now according to PEP8 --- store.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/store.py b/store.py index 9e6d4f7..4af13ef 100644 --- a/store.py +++ b/store.py @@ -8,7 +8,6 @@ class Node: self.lng = float(lng) self.neighbours = [] - def coord_tuple(self): return self.lat, self.lng @@ -55,4 +54,3 @@ def select_nodes_in_rectangle(nodes, min_lat, max_lat, min_long, max_long): return [node for node in nodes.values() if min_lat <= node.lat <= max_lat and min_long <= node.lng <= max_long] - -- 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(-) 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 1b137d9e8dfeb23769dcd63b1134c0c44f3373f1 Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Fri, 4 Dec 2020 10:59:54 +0100 Subject: removed unneccessary variables --- templates/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/index.js b/templates/index.js index 3a1ef8f..7996f46 100644 --- a/templates/index.js +++ b/templates/index.js @@ -63,8 +63,8 @@ async function showMarkers() { showMarkers() async function showFavicon() { - res = await fetch('/favicon.ico'); - res = await res.json(); + await fetch('/favicon.ico'); + await res.json(); } showFavicon() -- 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(-) 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(-) 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 From d4540e1322b7aa029e909696a83d7cfd3201299c Mon Sep 17 00:00:00 2001 From: Max Bringemo Date: Fri, 4 Dec 2020 12:16:58 +0100 Subject: removed unneccessary code --- templates/index.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/templates/index.js b/templates/index.js index 7996f46..b7b3b58 100644 --- a/templates/index.js +++ b/templates/index.js @@ -61,10 +61,3 @@ async function showMarkers() { } showMarkers() - -async function showFavicon() { - await fetch('/favicon.ico'); - await res.json(); -} - -showFavicon() -- cgit v1.2.1