From 814319e050f4d24441782f405be00cba5734ac80 Mon Sep 17 00:00:00 2001
From: Luke Prior <22492406+LukePrior@users.noreply.github.com>
Date: Sat, 19 Jun 2021 16:49:51 +1000
Subject: [PATCH] Show SondeHub map in web interface (#90)

* sondehub

* sondehub map in interface

* fixes

* include notice

* more fixes

* fix

* fix

* fix

* Delete RX_FSK.ino.cpp

* default to station position

* tracker fix

* fix check to be more robust

* revert

Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com>
---
 RX_FSK/RX_FSK.ino      | 33 ++++++++++++++++++++++++++++++++-
 RX_FSK/data/index.html |  5 +++++
 RX_FSK/data/style.css  |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino
index ef89be6..0aa9575 100644
--- a/RX_FSK/RX_FSK.ino
+++ b/RX_FSK/RX_FSK.ino
@@ -410,6 +410,29 @@ const char *createWIFIForm() {
   return message;
 }
 
+const char *createSondeHubMap() {
+  SondeInfo *s = &sonde.sondeList[0];
+  char *ptr = message;
+  strcpy(ptr, HTMLHEAD); strcat(ptr, "</head>");
+  HTMLBODY(ptr, "map.html");
+  if (!sonde.config.sondehub.active) {
+    strcat(ptr, "<div>NOTE: SondeHub uploading is not enabled, detected sonde will not be visable on map</div>");
+    if ((*s->ser == 0) && (strcmp(sonde.config.sondehub.lat,"null"))) {
+      sprintf(ptr + strlen(ptr), "<iframe src=\"https://tracker.sondehub.org/&mc=%s,%s\" style=\"border:1px solid #00A3D3;border-radius:20px;height:95vh\"></iframe>", sonde.config.sondehub.lat, sonde.config.sondehub.lon);
+    } else {
+      sprintf(ptr + strlen(ptr), "<iframe src=\"https://tracker.sondehub.org/%s\" style=\"border:1px solid #00A3D3;border-radius:20px;height:95vh\"></iframe>", s-> ser);
+    }
+  } else {
+    if ((*s->ser == 0) && (strcmp(sonde.config.sondehub.lat,"null"))) {
+      sprintf(ptr, "<iframe src=\"https://tracker.sondehub.org/&mc=%s,%s\" style=\"border:1px solid #00A3D3;border-radius:20px;height:98vh;width:100%%\"></iframe>", sonde.config.sondehub.lat, sonde.config.sondehub.lon);
+    } else {
+      sprintf(ptr, "<iframe src=\"https://tracker.sondehub.org/%s\" style=\"border:1px solid #00A3D3;border-radius:20px;height:98vh;width:100%%\"></iframe>", s-> ser);
+    }
+  }
+  HTMLBODYEND(ptr);
+  return message;
+}
+
 const char *handleWIFIPost(AsyncWebServerRequest *request) {
   char label[10];
   // parameters: a_i, f_1, t_i  (active/frequency/type)
@@ -471,7 +494,7 @@ void addSondeStatus(char *ptr, int i)
   sprintf(ptr + strlen(ptr), "<tr><td><a target=\"_empty\" href=\"geo:%.6f,%.6f\">GEO-App</a> - ", s->lat, s->lon);
   sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://wetterson.de/karte/?%s\">wetterson.de</a> - ", s->id);
   sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://radiosondy.info/sonde_archive.php?sondenumber=%s\">radiosondy.info</a> - ", s->id);
-  sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://tracker.sondehub.org/%s\">SondeHub Tracker</a> - ", s->id);
+  sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://tracker.sondehub.org/%s\">SondeHub Tracker</a> - ", s->ser);
   sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.openstreetmap.org/?mlat=%.6f&mlon=%.6f&zoom=14\">OSM</a> - ", s->lat, s->lon);
   sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.google.com/maps/search/?api=1&query=%.6f,%.6f\">Google</a></td></tr>", s->lat, s->lon);
 
@@ -1127,6 +1150,14 @@ void SetupAsyncServer() {
     request->send(200, "text/html", createWIFIForm());
   });
 
+  server.on("/map.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
+    request->send(200, "text/html", createSondeHubMap());
+  });
+  server.on("/map.html", HTTP_POST, [](AsyncWebServerRequest * request) {
+    handleWIFIPost(request);
+    request->send(200, "text/html", createSondeHubMap());
+  });
+
   server.on("/config.html", HTTP_GET,  [](AsyncWebServerRequest * request) {
     request->send(200, "text/html", createConfigForm());
   });
diff --git a/RX_FSK/data/index.html b/RX_FSK/data/index.html
index d3e1cb4..81e842d 100644
--- a/RX_FSK/data/index.html
+++ b/RX_FSK/data/index.html
@@ -15,6 +15,7 @@
 	  <button class="tablinks" onclick="selTab(event,'QRG')" id="defaultTab">QRG</button>
 	  <button class="tablinks" onclick="selTab(event,'WiFi')">WiFi</button>
 	  <button class="tablinks" onclick="selTab(event,'Data')">Data</button>
+	  <button class="tablinks" onclick="selTab(event,'Map')">Map</button>
 	  <button class="tablinks" onclick="selTab(event,'Config')">Config</button>
 	  <button class="tablinks" onclick="selTab(event,'Control')">Control</button>
 	  <button class="tablinks" onclick="selTab(event,'About')">About</button>
@@ -33,6 +34,10 @@
 	<iframe class="tci" src="" ></iframe>
 </div>
 
+<div id="Map" class="tabcontent" data-src="map.html">
+	<iframe class="tci" src="" ></iframe>
+</div>
+
 <div id="Config" class="tabcontent" data-src="config.html">
 	<iframe class="tci" src="" ></iframe>
 </div>
diff --git a/RX_FSK/data/style.css b/RX_FSK/data/style.css
index e098874..6fb7ea2 100644
--- a/RX_FSK/data/style.css
+++ b/RX_FSK/data/style.css
@@ -44,7 +44,7 @@ td#sfreq {
 	outline: none;
 	cursor: pointer;
 	padding: 10px 10px;
-	width: 16vw;
+	width: 14vw;
 	transition: 0.3s;
 }