";
@@ -2255,7 +2785,7 @@ function mapInfoBox_handle_path_old(vehicle, id) {
});
}
-function mapInfoBox_handle_path_new(data, vehicle) {
+function mapInfoBox_handle_path_new(data, vehicle, date) {
if (Object.keys(data).length === 0) {
mapInfoBox.setContent("not found");
mapInfoBox.openOn(map);
@@ -2267,7 +2797,7 @@ function mapInfoBox_handle_path_new(data, vehicle) {
div = document.createElement('div');
html = "
";
- html += "
"+data.serial+"("+date+")
";
+ html += "
"+data.serial+" ("+date+")
";
html += "
";
html += "
"+roundNumber(data.lat, 5) + ', ' + roundNumber(data.lon, 5)+"
";
@@ -2566,9 +3096,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);
@@ -2739,7 +3274,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;
@@ -3350,7 +3885,7 @@ function formatData(data, live) {
if (data[entry].tx_frequency) {
dataTempEntry.data.frequency_tx = data[entry].tx_frequency;
}
- if (data[entry].humidity) {
+ if (data[entry].hasOwnProperty("humidity")) {
dataTempEntry.data.humidity = data[entry].humidity;
}
if (data[entry].manufacturer) {
@@ -3359,7 +3894,7 @@ function formatData(data, live) {
if (data[entry].sats) {
dataTempEntry.data.sats = data[entry].sats;
}
- if (data[entry].temp) {
+ if (data[entry].hasOwnProperty("temp")) {
dataTempEntry.data.temperature_external = data[entry].temp;
}
if (data[entry].type) {
@@ -3370,7 +3905,7 @@ function formatData(data, live) {
dataTempEntry.data.type = data[entry].subtype;
dataTempEntry.type = data[entry].subtype;
}
- if (data[entry].pressure) {
+ if (data[entry].hasOwnProperty("pressure")) {
dataTempEntry.data.pressure = data[entry].pressure;
}
if (data[entry].xdata) {
@@ -3438,7 +3973,7 @@ function formatData(data, live) {
if (data.tx_frequency) {
dataTempEntry.data.frequency_tx = data.tx_frequency;
}
- if (data.humidity) {
+ if (data.hasOwnProperty("humidity")) {
dataTempEntry.data.humidity = data.humidity;
}
if (data.manufacturer) {
@@ -3447,7 +3982,7 @@ function formatData(data, live) {
if (data.sats) {
dataTempEntry.data.sats = data.sats;
}
- if (data.temp) {
+ if (data.hasOwnProperty("temp")) {
dataTempEntry.data.temperature_external = data.temp;
}
if (data.type) {
@@ -3458,7 +3993,7 @@ function formatData(data, live) {
dataTempEntry.data.type = data.subtype;
dataTempEntry.type = data.subtype;
}
- if (data.pressure) {
+ if (data.hasOwnProperty("pressure")) {
dataTempEntry.data.pressure = data.pressure;
}
if (data.xdata) {
@@ -3509,7 +4044,7 @@ function formatData(data, live) {
if (data[key][i].tx_frequency) {
dataTempEntry.data.frequency_tx = data[key][i].tx_frequency;
}
- if (data[key][i].humidity) {
+ if (data[key][i].hasOwnProperty("humidity")) {
dataTempEntry.data.humidity = data[key][i].humidity;
}
if (data[key][i].manufacturer) {
@@ -3518,7 +4053,7 @@ function formatData(data, live) {
if (data[key][i].sats) {
dataTempEntry.data.sats = data[key][i].sats;
}
- if (data[key][i].temp) {
+ if (data[key][i].hasOwnProperty("temp")) {
dataTempEntry.data.temperature_external = data[key][i].temp;
}
if (data[key][i].type) {
@@ -3529,7 +4064,7 @@ function formatData(data, live) {
dataTempEntry.data.type = data[key][i].subtype;
dataTempEntry.type = data[key][i].subtype;
}
- if (data[key][i].pressure) {
+ if (data[key][i].hasOwnProperty("pressure")) {
dataTempEntry.data.pressure = data[key][i].pressure;
}
if (data[key][i].xdata) {
@@ -3601,7 +4136,7 @@ function formatData(data, live) {
if (data[i].tx_frequency) {
dataTempEntry.data.frequency_tx = data[i].tx_frequency;
}
- if (data[i].humidity) {
+ if (data[i].hasOwnProperty("humidity")) {
dataTempEntry.data.humidity = data[i].humidity;
}
if (data[i].manufacturer) {
@@ -3610,7 +4145,7 @@ function formatData(data, live) {
if (data[i].sats) {
dataTempEntry.data.sats = data[i].sats;
}
- if (data[i].temp) {
+ if (data[i].hasOwnProperty("temp")) {
dataTempEntry.data.temperature_external = data[i].temp;
}
if (data[i].type && data[i].type == "payload_telemetry") { // SondeHub V1 data
@@ -3631,7 +4166,7 @@ function formatData(data, live) {
dataTempEntry.data.type = data[i].subtype;
dataTempEntry.type = data[i].subtype;
}
- if (data[i].pressure) {
+ if (data[i].hasOwnProperty("pressure")) {
dataTempEntry.data.pressure = data[i].pressure;
}
if (data[i].xdata) {
@@ -3946,20 +4481,30 @@ function refreshRecoveries() {
$.ajax({
type: "GET",
url: recovered_sondes_url,
- //data: "last=0",
dataType: "json",
success: function(response, textStatus) {
- if(offline.get('opt_hide_recoveries')) {
- updateRecoveryPane(response);
- updateLeaderboardPane(response);
- } else {
- updateRecoveryPane(response);
- updateLeaderboardPane(response);
+ updateRecoveryPane(response);
+ if(!offline.get('opt_hide_recoveries')) {
updateRecoveries(response);
}
},
error: function() {
updateRecoveryPane([]);
+ }
+ });
+
+}
+
+function refreshRecoveryStats() {
+
+ $.ajax({
+ type: "GET",
+ url: recovered_sondes_stats_url,
+ dataType: "json",
+ success: function(response, textStatus) {
+ updateLeaderboardPane(response);
+ },
+ error: function() {
updateLeaderboardPane([]);
}
});
@@ -3991,7 +4536,7 @@ function refreshPredictions() {
}
});
- var data_str = "duration=" + wvar.mode;
+ var data_str = "duration=" + wvar.mode + "&vehicles=" + encodeURIComponent(wvar.query);
ajax_predictions = $.ajax({
type: "GET",
@@ -4008,6 +4553,60 @@ function refreshPredictions() {
});
}
+// Get initial summary data for station, courtesy of TimMcMahon
+function getHistorical (id, callback, continuation) {
+ var prefix = 'launchsites/' + id + '/';
+ var params = {
+ Prefix: prefix,
+ };
+
+ if (typeof continuation !== 'undefined') {
+ params.ContinuationToken = continuation;
+ } else {
+ tempLaunchData = {};
+ }
+
+ s3.makeUnauthenticatedRequest('listObjectsV2', params, function(err, data) {
+ if (err) {
+ console.log(err, err.stack);
+ } else {
+ var tempSerials = [];
+ for (var i = 0; i < data.Contents.length; i++) {
+ // Sort data into year and month groups
+ var date = data.Contents[i].Key.substring(prefix.length).substring(0,10);
+ var year = date.substring(0,4);
+ var month = date.substring(5,7);
+ var serial = data.Contents[i].Key.substring(prefix.length+11).slice(0, -5);
+ if (tempLaunchData.hasOwnProperty(year)) {
+ if (tempLaunchData[year].hasOwnProperty(month)) {
+ if (!tempSerials.includes(serial)) {
+ tempSerials.push(serial)
+ tempLaunchData[year][month].push(data.Contents[i].Key);
+ }
+ } else {
+ tempLaunchData[year][month] = [];
+ tempSerials = [];
+ tempSerials.push(serial)
+ tempLaunchData[year][month].push(data.Contents[i].Key);
+ }
+ } else {
+ tempLaunchData[year] = {};
+ tempLaunchData[year][month] = [];
+ tempSerials = [];
+ tempSerials.push(serial)
+ tempLaunchData[year][month].push(data.Contents[i].Key);
+ }
+ }
+ if (data.IsTruncated == true) {
+ // Requests are limited to 1000 entries so multiple may be required
+ getHistorical(id, callback, data.NextContinuationToken);
+ } else {
+ callback(tempLaunchData);
+ }
+ }
+ });
+}
+
var periodical, periodical_focus, periodical_focus_new, periodical_receivers, periodical_listeners;
var periodical_predictions = null;
var timer_seconds = 5;
@@ -4028,6 +4627,7 @@ function startAjax() {
refreshPatreons();
refreshRecoveries();
+ refreshRecoveryStats();
}
function stopAjax() {
@@ -4419,42 +5019,26 @@ function updateLeaderboardPane(r){
if(!r) return;
html = "";
- var leaderboard = {};
- var recovered = 0;
-
- var i = 0, ii = r.length;
- for(; i < ii; i++) {
- if (r[i].recovered) {
- recovered+=1;
- if (leaderboard.hasOwnProperty(r[i].recovered_by)) {
- leaderboard[r[i].recovered_by] = leaderboard[r[i].recovered_by] + 1;
- } else {
- leaderboard[r[i].recovered_by] = 1
- }
- }
- }
-
- var sortable = [];
- for (var score in leaderboard) {
- sortable.push([score, leaderboard[score]]);
- }
+ var recovered = r.recovered;
+ var total = r.total;
+ var hunters = r.chaser_count;
+ var top = r.top_chasers;
- sortable.sort(function(a, b) {
- return b[1] - a[1];
- });
- var list = sortable.slice(0,5);
-
- html += "
Total sondes recovered: " + recovered + "/" + r.length + "
";
- html += "
Total hunters: " + sortable.length + "
";
+ html += "
Total sondes recovered: " + recovered + "/" + total + "
";
+ html += "
Total hunters: " + hunters + "
";
html += "
Leaderboard:
";
- for (var i = 0; i < list.length; i++) {
- html += "
" + (parseInt(i)+1) + ". " + list[i][0] + " - " + list[i][1] + "
";
+ var i = 1;
+ for (let chaser in top) {
+ if (top.hasOwnProperty(chaser)) {
+ html += "
" + parseInt(i) + ". " + chaser + " - " + top[chaser] + "
";
+ i+=1;
+ }
}
if (r.length == 0) {
- html = "
No recent recoveries :-(
"
+ html = "
Error :-(
"
}
$("#leaderboard-list").html(html);
