From 06e3922a5541641077b18016e272cddc7e50205b Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 17 Jul 2020 09:59:32 +0100
Subject: Map refactoring, now shows on HOME
---
bh20simplewebuploader/main.py | 2 +-
bh20simplewebuploader/static/map.js | 14 ++++++++------
bh20simplewebuploader/templates/demo-run.html | 0
bh20simplewebuploader/templates/demo.html | 21 +--------------------
bh20simplewebuploader/templates/home.html | 15 ++++++++++++++-
bh20simplewebuploader/templates/map.html | 0
bh20simplewebuploader/templates/mapheader.html | 16 ++++++++++++++++
7 files changed, 40 insertions(+), 28 deletions(-)
delete mode 100644 bh20simplewebuploader/templates/demo-run.html
delete mode 100644 bh20simplewebuploader/templates/map.html
create mode 100644 bh20simplewebuploader/templates/mapheader.html
diff --git a/bh20simplewebuploader/main.py b/bh20simplewebuploader/main.py
index e8bb507..206f884 100644
--- a/bh20simplewebuploader/main.py
+++ b/bh20simplewebuploader/main.py
@@ -253,7 +253,7 @@ def send_home():
Send the front page.
"""
- return render_template('home.html', menu='HOME')
+ return render_template('home.html', menu='HOME', load_map=True)
@app.route('/upload')
diff --git a/bh20simplewebuploader/static/map.js b/bh20simplewebuploader/static/map.js
index e1a4289..8b8ecba 100644
--- a/bh20simplewebuploader/static/map.js
+++ b/bh20simplewebuploader/static/map.js
@@ -31,6 +31,7 @@ function drawMap(){
radius: parseInt(data[i]["count"]) //not working for whatever reason
}).addTo(mymap);
}
+ // updateMapMarkers(data);
});
document.getElementById("map_view").classList.remove("invisible");
@@ -42,11 +43,11 @@ function drawMap(){
/* This function updates the map with markers
*
*/
-function updateMapMarkers() {
+function updateMapMarkers(data) {
// markers.clearLayers(); // remove all markers
// document.getElementById("results").classList.remove("invisible");
- document.getElementById("loader").classList.add("invisible");
- /*
+ // document.getElementById("loader").classList.add("invisible");
+
for (let i = 0; i < data.length; i++) {
let {"count": fastaCount, GPS, LocationLabel: label } = data[i];
let coordinates = GPS.split(" ");
@@ -57,10 +58,11 @@ function updateMapMarkers() {
let marker = L.marker([lat, lon]);
marker.bindPopup("" + label + "
" + "FastaCount: " +fastaCount);
// markers.addLayer(marker)
- }}
- */
+ }
+ }
+
// Reload the map
- map.invalidateSize();
+ // map.invalidateSize();
// document.getElementById("map_view").classList.add("invisible");
// document.getElementById("loader").classList.add("invisible");
}
diff --git a/bh20simplewebuploader/templates/demo-run.html b/bh20simplewebuploader/templates/demo-run.html
deleted file mode 100644
index e69de29..0000000
diff --git a/bh20simplewebuploader/templates/demo.html b/bh20simplewebuploader/templates/demo.html
index 3a80abf..65ba462 100644
--- a/bh20simplewebuploader/templates/demo.html
+++ b/bh20simplewebuploader/templates/demo.html
@@ -1,25 +1,7 @@
{% include 'header.html' %}
-
-
-
-
-
-
-
-
-
+ {% include 'mapheader.html' %}
{% include 'banner.html' %}
{% include 'menu.html' %}
@@ -36,7 +18,6 @@
-
diff --git a/bh20simplewebuploader/templates/home.html b/bh20simplewebuploader/templates/home.html
index b90a18d..42b08c0 100644
--- a/bh20simplewebuploader/templates/home.html
+++ b/bh20simplewebuploader/templates/home.html
@@ -1,6 +1,7 @@
{% include 'header.html' %}
+ {% include 'mapheader.html' %}
{% include 'banner.html' %}
{% include 'menu.html' %}
@@ -44,7 +45,19 @@
-{% include 'footer.html' %}
+
+
+ {% include 'footer.html' %}
+
+
+
diff --git a/bh20simplewebuploader/templates/map.html b/bh20simplewebuploader/templates/map.html
deleted file mode 100644
index e69de29..0000000
diff --git a/bh20simplewebuploader/templates/mapheader.html b/bh20simplewebuploader/templates/mapheader.html
new file mode 100644
index 0000000..ca62051
--- /dev/null
+++ b/bh20simplewebuploader/templates/mapheader.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+
--
cgit v1.2.3