";
@@ -864,7 +873,16 @@ function drawHistorical (data, station) {
};
html += "
"
+
+ if (recovered) {
+ html += "
Recovered: "+recovery_info.recovered+"
";
+ html += "
Recovered by: "+recovery_info.recovered_by+"
";
+ html += "
Recovery time: "+recovery_info.datetime+"
";
+ html += "
Recovery location: "+recovery_info.position[1]+","+recovery_info.position[0] + "
";
+ html += "
Recovery notes: "+recovery_info.description+"
";
+
+ html += "
";
+ }
html += "
";
html += "
";
@@ -878,7 +896,11 @@ function drawHistorical (data, station) {
popup.setContent(html);
- var marker = L.circleMarker([landing.lat, landing.lon], {color: iconColour, radius: 5, fillOpacity:0.9});
+ if (!recovered) {
+ var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "white", color: iconColour, weight: 2, radius: 5, fillOpacity:1});
+ } else {
+ var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "grey", color: iconColour, weight: 2, radius: 5, fillOpacity:1});
+ }
marker.bindPopup(popup);
@@ -949,36 +971,62 @@ function showHistorical (station, marker) {
historicalPlots[station].data.maxTime = dateNow.getTime();
}
- for (let i = 0; i < sondes.length; i++) {
- downloadHistorical(sondes[i]).done(handleData).fail(handleError);;
- }
+ // Get station location to fetch recoveries
+ if (!historicalPlots[station].data.hasOwnProperty("recovered")) {
+ historicalPlots[station].data.recovered = {};
- var completed = 0;
+ var station_position = sites[station].position;
+ var data_str = "lat=" + station_position[0] + "&lon=" + station_position[1] + "&distance=400000&last=0";
- function handleData(data) {
- completed += 1;
- drawHistorical(data, station);
- if (completed == sondes.length) {
- submit.show();
- submitLoading.hide();
- deleteHistorical.show();
- // If modal is closed the contents needs to be forced updated
- if (!realpopup.isOpen()) {
- realpopup.setContent("");
+ $.ajax({
+ type: "GET",
+ url: recovered_sondes_url,
+ data: data_str,
+ dataType: "json",
+ success: function(json) {
+ for (var i = 0; i < json.length; i++) {
+ historicalPlots[station].data.recovered[json[i].serial] = json[i];
+ }
+ processHistorical()
+ },
+ error: function() {
+ processHistorical();
}
- }
+ });
}
- function handleError(error) {
- completed += 1;
- if (completed == sondes.length) {
- submit.show();
- submitLoading.hide();
- deleteHistorical.show();
+ function processHistorical() {
+ for (let i = 0; i < sondes.length; i++) {
+ downloadHistorical(sondes[i]).done(handleData).fail(handleError);;
}
- // If modal is closed the contents needs to be forced updated
- if (!realpopup.isOpen()) {
- realpopup.setContent("");
+
+ var completed = 0;
+
+ function handleData(data) {
+ completed += 1;
+ drawHistorical(data, station);
+ if (completed == sondes.length) {
+ submit.show();
+ submitLoading.hide();
+ deleteHistorical.show();
+ // If modal is closed the contents needs to be forced updated
+ if (!realpopup.isOpen()) {
+ realpopup.setContent("");
+ }
+ }
+ }
+
+ function handleError(error) {
+ completed += 1;
+ if (completed == sondes.length) {
+ submit.show();
+ submitLoading.hide();
+ deleteHistorical.show();
+ }
+ // If modal is closed the contents needs to be forced updated
+ if (!realpopup.isOpen()) {
+ realpopup.setContent("");
+ }
}
}
}
From 77414754d299164605f9c12de76f981f7174b364 Mon Sep 17 00:00:00 2001
From: Uskompuf <22492406+Uskompuf@users.noreply.github.com>
Date: Mon, 20 Dec 2021 21:11:57 +1100
Subject: [PATCH 6/8] various fixes
---
js/tracker.js | 67 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 57 insertions(+), 10 deletions(-)
diff --git a/js/tracker.js b/js/tracker.js
index 705cfa4..283f234 100644
--- a/js/tracker.js
+++ b/js/tracker.js
@@ -875,23 +875,22 @@ function drawHistorical (data, station) {
html += "
";
if (recovered) {
- html += "
Recovered: "+recovery_info.recovered+"
";
- html += "
Recovered by: "+recovery_info.recovered_by+"
";
- html += "
Recovery time: "+recovery_info.datetime+"
";
- html += "
Recovery location: "+recovery_info.position[1]+","+recovery_info.position[0] + "
";
+ html += "
"+(recovery_info.recovered ? "Recovered by " : "Not Recovered by ")+recovery_info.recovered_by+"
";
+ html += "
Recovery time: "+formatDate(stringToDateUTC(recovery_info.datetime))+"
";
+ html += "
Recovery location: "+recovery_info.position[1]+", "+recovery_info.position[0] + "
";
html += "
Recovery notes: "+recovery_info.description+"
";
html += "
";
}
- html += "
";
- html += "
";
+ html += "
";
+ html += "
";
html += "
";
html += "
"
if (landing.hasOwnProperty("uploader_callsign")) {
- html += "
" + landing.uploader_callsign + "
";
+ html += "
Last received by: " + landing.uploader_callsign.toLowerCase() + "
";
};
popup.setContent(html);
@@ -1053,6 +1052,15 @@ function historicalLaunchViewer(station, marker) {
return;
}
+ // Find latest year
+ var latestYear = "0";
+ var latestYears = Object.keys(data);
+ for (var i=0; i < latestYears.length; i++) {
+ if (parseInt(latestYears[i]) > parseInt(latestYear)) {
+ latestYear = latestYears[i];
+ }
+ }
+
// Generate year drop down
var yearList = document.createElement("select");
yearList.name = "year"
@@ -1066,10 +1074,43 @@ function historicalLaunchViewer(station, marker) {
var option = document.createElement("option");
option.value = year;
option.text = year;
+ if (year == latestYear) {
+ option.setAttribute("selected", "selected");
+ }
yearList.appendChild(option);
}
}
+ // Find latest month
+ var latestMonth = "0";
+ var latestMonths = Object.keys(data[latestYear]);
+ for (var i=0; i < latestMonths.length; i++) {
+ if (parseInt(latestMonths[i]) > parseInt(latestMonth)) {
+ latestMonth = latestMonths[i];
+ }
+ }
+
+ // Generate month drop down
+ var monthList = document.createElement("select");
+ monthList.name = "month"
+ monthList.id = "monthList";
+ var option = document.createElement("option");
+ option.value = "all";
+ option.text = "All";
+ monthList.appendChild(option);
+ var months = ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"];
+ var monthsText = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"];
+ for (var i=0; i < months.length; i++) {
+ var option = document.createElement("option");
+ option.value = months[i];
+ option.text = monthsText[i];
+ if (months[i] == latestMonth) {
+ option.setAttribute("selected", "selected");
+ }
+ monthList.appendChild(option);
+ }
+
+
// Calculate total launches
var totalLaunches = 0;
for (let year in data) {
@@ -1085,7 +1126,7 @@ function historicalLaunchViewer(station, marker) {
// Generate HTML
var popupContent = "
Launches Selected:
" + totalLaunches + "";
popupContent += "
";
+ popupContent += "
" + monthList.outerHTML + "";
popupContent += "
";
historical.html(popupContent);
historical.show();
@@ -1095,6 +1136,7 @@ function historicalLaunchViewer(station, marker) {
if (!realpopup.isOpen()) {
realpopup.setContent("");
}
+ getSelectedNumber(station);
}
if (historical.is(":visible")) {
// Don't regenerate if already in memory
@@ -2976,9 +3018,14 @@ function addPosition(position) {
iconAnchor: [23,90],
});
+ var tempTitle = vcallsign;
+ if (typeof position.type !== 'undefined') {
+ var tempTitle = position.type + ' ' + vcallsign;
+ }
+
marker = new L.Marker(point, {
icon: balloonIcon,
- title: position.type + ' ' + vcallsign,
+ title: tempTitle,
zIndexOffset: Z_PAYLOAD,
}).addTo(map).on('click', onClick);
@@ -3149,7 +3196,7 @@ function addPosition(position) {
if (vehicle_type == "car") {
title = marker.bindTooltip(vcallsign, {direction: 'center', permanent: 'true', className: 'serialtooltip'});
} else {
- title = marker.bindTooltip((position.type + ' ' + vcallsign), {direction: 'center', permanent: 'true', className: 'serialtooltip'});
+ title = marker.bindTooltip((tempTitle), {direction: 'center', permanent: 'true', className: 'serialtooltip'});
}
} else {
title = null;
From 99981c4ca72cde0a5e8239eaa1d3f81a6776f99c Mon Sep 17 00:00:00 2001
From: Uskompuf <22492406+Uskompuf@users.noreply.github.com>
Date: Mon, 20 Dec 2021 21:27:28 +1100
Subject: [PATCH 7/8] more changes
---
js/tracker.js | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/js/tracker.js b/js/tracker.js
index 283f234..88cc1ba 100644
--- a/js/tracker.js
+++ b/js/tracker.js
@@ -832,6 +832,8 @@ function drawHistorical (data, station) {
var time = landing.datetime;
if (!historicalPlots[station].sondes.hasOwnProperty(serial)) {
+ // Using age to detmine colour
+ /*
const date = new Date(time);
var minTime = historicalPlots[station].data.minTime;
var actualTime = date.getTime();
@@ -841,9 +843,23 @@ function drawHistorical (data, station) {
historicalPlots[station].sondes[serial].time = actualTime
- // Calculate normalised time between 0 and 1
var normalisedTime = ((actualTime-minTime)/(maxTime-minTime));
var iconColour = ConvertRGBtoHex(evaluate_cmap(normalisedTime, 'turbo'));
+ */
+
+ // Using last known alt to detmine colour
+ var minAlt = 0;
+ var actualAlt = landing.alt;
+ var maxAlt = 10000;
+
+ if (actualAlt > maxAlt) {
+ actualAlt = maxAlt;
+ } else if (actualAlt < minAlt) {
+ actualAlt = minAlt;
+ }
+
+ var normalisedAlt = ((actualAlt-minAlt)/(maxAlt-minAlt));
+ var iconColour = ConvertRGBtoHex(evaluate_cmap(normalisedAlt, 'turbo'));
// Check if we have recovery data for it
var recovered = false;
From c30eeff9ecdbad10cc13fa7db61c0d6fab785e8b Mon Sep 17 00:00:00 2001
From: Uskompuf <22492406+Uskompuf@users.noreply.github.com>
Date: Tue, 21 Dec 2021 15:56:35 +1100
Subject: [PATCH 8/8] Universal historical delete button
---
js/tracker.js | 112 +++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 87 insertions(+), 25 deletions(-)
diff --git a/js/tracker.js b/js/tracker.js
index 88cc1ba..15c450a 100644
--- a/js/tracker.js
+++ b/js/tracker.js
@@ -34,6 +34,7 @@ var launchPredictions = {};
var stationHistoricalData = {};
var historicalPlots = {};
+var historicalAjax = [];
var sites = null;
var launches = new L.LayerGroup();
@@ -579,6 +580,28 @@ function load() {
L.control.periodcontrol({ position: 'topleft' }).addTo(map);
+ L.Control.HistoricalControl = L.Control.extend({
+ onAdd: function(map) {
+ var div = L.DomUtil.create('div');
+
+ div.innerHTML = '
';
+ div.id = "historicalControlButton";
+ div.style.display = "none";
+
+ return div;
+ },
+
+ onRemove: function(map) {
+ // Nothing to do here
+ }
+ });
+
+ L.control.historicalontrol = function(opts) {
+ return new L.Control.HistoricalControl(opts);
+ }
+
+ L.control.historicalontrol({ position: 'topleft' }).addTo(map);
+
// update current position if we geolocation is available
if(currentPosition) updateCurrentPosition(currentPosition.lat, currentPosition.lon);
@@ -805,7 +828,7 @@ function getSelectedNumber (station) {
// Download summary data from AWS S3
function downloadHistorical (suffix) {
var url = "https://sondehub-history.s3.amazonaws.com/" + suffix;
- return $.ajax({
+ var ajaxReq = $.ajax({
type: "GET",
url: url,
dataType: "json",
@@ -823,6 +846,8 @@ function downloadHistorical (suffix) {
}
}
});
+ historicalAjax.push(ajaxReq);
+ return ajaxReq;
}
// Draw historic summaries to map
@@ -832,21 +857,9 @@ function drawHistorical (data, station) {
var time = landing.datetime;
if (!historicalPlots[station].sondes.hasOwnProperty(serial)) {
- // Using age to detmine colour
- /*
- const date = new Date(time);
- var minTime = historicalPlots[station].data.minTime;
- var actualTime = date.getTime();
- var maxTime = historicalPlots[station].data.maxTime;
historicalPlots[station].sondes[serial] = {};
- historicalPlots[station].sondes[serial].time = actualTime
-
- var normalisedTime = ((actualTime-minTime)/(maxTime-minTime));
- var iconColour = ConvertRGBtoHex(evaluate_cmap(normalisedTime, 'turbo'));
- */
-
// Using last known alt to detmine colour
var minAlt = 0;
var actualAlt = landing.alt;
@@ -912,9 +925,9 @@ function drawHistorical (data, station) {
popup.setContent(html);
if (!recovered) {
- var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "white", color: iconColour, weight: 2, radius: 5, fillOpacity:1});
+ var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "white", color: iconColour, weight: 3, radius: 5, fillOpacity:1});
} else {
- var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "grey", color: iconColour, weight: 2, radius: 5, fillOpacity:1});
+ var marker = L.circleMarker([landing.lat, landing.lon], {fillColor: "grey", color: iconColour, weight: 3, radius: 5, fillOpacity:1});
}
marker.bindPopup(popup);
@@ -929,6 +942,7 @@ function drawHistorical (data, station) {
function deleteHistorical (station) {
var popup = $("#popup" + station);
var deleteHistorical = popup.find("#deleteHistorical");
+ var historicalDelete = $("#historicalControlButton");
deleteHistorical.hide();
@@ -939,6 +953,45 @@ function deleteHistorical (station) {
}
delete historicalPlots[station];
+
+ var otherSondes = false;
+
+ for (station in historicalPlots) {
+ if (historicalPlots.hasOwnProperty(station)) {
+ if (Object.keys(historicalPlots[station].sondes).length > 1) {
+ otherSondes = true;
+ }
+ }
+ }
+
+ if (!otherSondes) historicalDelete.hide();
+}
+
+function deleteHistoricalButton() {
+ var historicalDelete = $("#historicalControlButton");
+
+ for (station in historicalPlots) {
+ if (historicalPlots.hasOwnProperty(station)) {
+ historicalPlots[station].data.drawing = false;
+ for (let serial in historicalPlots[station].sondes) {
+ map.removeLayer(historicalPlots[station].sondes[serial].marker);
+ }
+ var popup = $("#popup" + station);
+ var deleteHistorical = popup.find("#deleteHistorical");
+ deleteHistorical.hide();
+ }
+ }
+
+ for (i=0; i < historicalAjax.length; i++) {
+ historicalAjax[i].abort();
+ }
+
+ historicalAjax = [];
+
+ historicalPlots = {};
+
+ historicalDelete.hide();
+
}
// Master function to display historic summaries
@@ -982,8 +1035,6 @@ function showHistorical (station, marker) {
historicalPlots[station] = {};
historicalPlots[station].sondes = {};
historicalPlots[station].data = {};
- historicalPlots[station].data.minTime = 1511960400000;
- historicalPlots[station].data.maxTime = dateNow.getTime();
}
// Get station location to fetch recoveries
@@ -1008,26 +1059,36 @@ function showHistorical (station, marker) {
processHistorical();
}
});
+ } else {
+ processHistorical();
}
function processHistorical() {
+ var historicalDelete = $("#historicalControlButton");
+ historicalDelete.show();
+
+ historicalPlots[station].data.drawing = true;
+
for (let i = 0; i < sondes.length; i++) {
- downloadHistorical(sondes[i]).done(handleData).fail(handleError);;
+ downloadHistorical(sondes[i]).done(handleData).fail(handleError);
}
var completed = 0;
function handleData(data) {
completed += 1;
- drawHistorical(data, station);
+ try {
+ drawHistorical(data, station);
+ } catch(e) {};
if (completed == sondes.length) {
submit.show();
submitLoading.hide();
- deleteHistorical.show();
+ if (historicalPlots[station].data.drawing) deleteHistorical.show();
// If modal is closed the contents needs to be forced updated
if (!realpopup.isOpen()) {
realpopup.setContent("");
}
+ historicalPlots[station].data.drawing = false;
}
}
@@ -1036,11 +1097,12 @@ function showHistorical (station, marker) {
if (completed == sondes.length) {
submit.show();
submitLoading.hide();
- deleteHistorical.show();
- }
- // If modal is closed the contents needs to be forced updated
- if (!realpopup.isOpen()) {
- realpopup.setContent("");
+ if (historicalPlots[station].data.drawing) deleteHistorical.show();
+ // If modal is closed the contents needs to be forced updated
+ if (!realpopup.isOpen()) {
+ realpopup.setContent("");
+ }
+ historicalPlots[station].data.drawing = false;
}
}
}