Skip to content

Fully support SondeHub V1 Data #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukePrior merged 3 commits into from
Dec 13, 2021
Merged

Fully support SondeHub V1 Data #192

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12ae105
display V1 data correctly
LukePrior Dec 13, 2021
f1b564c
support infobox for old data
LukePrior Dec 13, 2021
ea9080b
Merge pull request #191 from LukePrior/testing
LukePrior Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support infobox for old data
  • Loading branch information
@LukePrior
LukePrior committed Dec 13, 2021
commit f1b564c064994a4ce8a8dfde8f385c4f37e9fa0e
260 changes: 175 additions & 85 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2162,114 +2162,204 @@ function mapInfoBox_handle_path_fetch(id,vehicle) {
var date = new Date(parseInt(id)).toISOString()
var url = newdata_url + "?duration=0&serial=" + vehicle.callsign + "&datetime=" + date;

$.getJSON(url, function(data) {
if (Object.keys(data).length === 0) {
$.ajax({
type: "GET",
url: url,
dataType: "json",
success: function(data) {
mapInfoBox_handle_path_new(data, vehicle)
},
error: function() {
mapInfoBox_handle_path_old(vehicle, id)
}
});
};

function mapInfoBox_handle_path_old(vehicle, id) {
var url = "https://api.v2.sondehub.org/sonde/" + vehicle.callsign;
var index = vehicle["positions_ids"][vehicle["positions_ts"].indexOf(id)].substring(vehicle.callsign.length + 1);

$.ajax({
type: "GET",
url: url,
dataType: "json",
success: function(data) {
for (var i = 0; i < data.length; i++) {
if (data[i]["datetime"] == index) {
data = data[i];
div = document.createElement('div');

html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.serial+"<span style=''>("+data.datetime+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(data.lat, 5) + ',&nbsp;' + roundNumber(data.lon, 5)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
text_alt += "&nbsp;" + ((imp) ? 'ft':'m');

html += "<div><b>Altitude:&nbsp;</b>"+text_alt+"</div>";
html += "<div><b>Time:&nbsp;</b>"+formatDate(stringToDateUTC(data.datetime))+"</div>";

var value = vehicle.path_length;

html += "<div><b>Distance:&nbsp;</b>";

if(offline.get('opt_imperial')) {
html += Math.round(value*0.000621371192) + "&nbsp;mi";
} else {
html += Math.round(value/10)/100 + "&nbsp;km";
}

html += "</div>";
html += "<div><b>Duration:&nbsp;</b>" + format_time_friendly(vehicle.start_time, convert_time(vehicle.curr_position.gps_time)) + "</div>";

html += "<hr style='margin:5px 0px'>";

if (data.hasOwnProperty("humidity")) {
html += "<div><b>Relative Humidity:&nbsp;</b>" + data.humidity + " %</div>";
};
if (data.hasOwnProperty("temp")) {
html += "<div><b>Temperature External:&nbsp;</b>" + data.temp + "°C</div>";
};
if (data.hasOwnProperty("comment")) {
html += "<div><b>Comment:&nbsp;</b>" + data.comment + "</div>";
};

html += "<hr style='margin:0px;margin-top:5px'>";
html += "<div style='font-size:11px;'>"

if (data.hasOwnProperty("uploader_callsign")) {
html += "<div>" + data.uploader_callsign + "</div>";
};

div.innerHTML = html;

mapInfoBox.setContent(div);
mapInfoBox.openOn(map);

setTimeout(function() {
div.parentElement.style.overflow = "";
div.parentElement.style.overflowWrap = "break-word";
}, 16);
}
}
},
error: function() {
mapInfoBox.setContent("not&nbsp;found");
mapInfoBox.openOn(map);
return;
}
}
});
}

function mapInfoBox_handle_path_new(data, vehicle) {
if (Object.keys(data).length === 0) {
mapInfoBox.setContent("not&nbsp;found");
mapInfoBox.openOn(map);
return;
}

data = data[vehicle.callsign][date];
data = data[vehicle.callsign][date];

div = document.createElement('div');
div = document.createElement('div');

html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.serial+"<span style=''>("+date+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(data.lat, 5) + ',&nbsp;' + roundNumber(data.lon, 5)+"</div>";
html = "<div style='line-height:16px;position:relative;'>";
html += "<div>"+data.serial+"<span style=''>("+date+")</span></div>";
html += "<hr style='margin:5px 0px'>";
html += "<div style='margin-bottom:5px;'><b><i class='icon-location'></i>&nbsp;</b>"+roundNumber(data.lat, 5) + ',&nbsp;' + roundNumber(data.lon, 5)+"</div>";

var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
text_alt += "&nbsp;" + ((imp) ? 'ft':'m');
var imp = offline.get('opt_imperial');
var text_alt = Number((imp) ? Math.floor(3.2808399 * parseInt(data.alt)) : parseInt(data.alt)).toLocaleString("us");
text_alt += "&nbsp;" + ((imp) ? 'ft':'m');

html += "<div><b>Altitude:&nbsp;</b>"+text_alt+"</div>";
html += "<div><b>Time:&nbsp;</b>"+formatDate(stringToDateUTC(date))+"</div>";
html += "<div><b>Altitude:&nbsp;</b>"+text_alt+"</div>";
html += "<div><b>Time:&nbsp;</b>"+formatDate(stringToDateUTC(date))+"</div>";

var value = vehicle.path_length;
var value = vehicle.path_length;

html += "<div><b>Distance:&nbsp;</b>";
html += "<div><b>Distance:&nbsp;</b>";

if(offline.get('opt_imperial')) {
html += Math.round(value*0.000621371192) + "mi";
} else {
html += Math.round(value/10)/100 + "&nbsp;km";
}
if(offline.get('opt_imperial')) {
html += Math.round(value*0.000621371192) + "&nbsp;mi";
} else {
html += Math.round(value/10)/100 + "&nbsp;km";
}

html += "</div>";
html += "<div><b>Duration:&nbsp;</b>" + format_time_friendly(vehicle.start_time, convert_time(vehicle.curr_position.gps_time)) + "</div>";
html += "</div>";
html += "<div><b>Duration:&nbsp;</b>" + format_time_friendly(vehicle.start_time, convert_time(vehicle.curr_position.gps_time)) + "</div>";

html += "<hr style='margin:5px 0px'>";
html += "<hr style='margin:5px 0px'>";

if (data.hasOwnProperty("batt")) {
html += "<div><b>Battery Voltage:&nbsp;</b>" + data.batt + " V</div>";
};
if (data.hasOwnProperty("tx_frequency")) {
html += "<div><b>TX Frequency:&nbsp;</b>" + data.tx_frequency + " MHz</div>";
} else if (data.hasOwnProperty("frequency")) {
html += "<div><b>Frequency:&nbsp;</b>" + data.frequency + " MHz</div>";
};
if (data.hasOwnProperty("humidity")) {
html += "<div><b>Relative Humidity:&nbsp;</b>" + data.humidity + " %</div>";
};
if (data.hasOwnProperty("manufacturer")) {
html += "<div><b>Manufacturer:&nbsp;</b>" + data.manufacturer + "</div>";
};
if (data.hasOwnProperty("sats")) {
html += "<div><b>Satellites:&nbsp;</b>" + data.sats + "</div>";
};
if (data.hasOwnProperty("temp")) {
html += "<div><b>Temperature External:&nbsp;</b>" + data.temp + "°C</div>";
};
if (data.hasOwnProperty("subtype")) {
html += "<div><b>Sonde Type:&nbsp;</b>" + data.subtype + "</div>";
} else if (data.hasOwnProperty("type")) {
html += "<div><b>Sonde Type:&nbsp;</b>" + data.type + "</div>";
};
if (data.hasOwnProperty("pressure")) {
html += "<div><b>Pressure:&nbsp;</b>" + data.pressure + " Pa</div>";
};
if (data.hasOwnProperty("xdata")) {
html += "<div><b>XDATA:&nbsp;</b>" + data.xdata + "</div>";
};
if (data.hasOwnProperty("batt")) {
html += "<div><b>Battery Voltage:&nbsp;</b>" + data.batt + " V</div>";
};
if (data.hasOwnProperty("tx_frequency")) {
html += "<div><b>TX Frequency:&nbsp;</b>" + data.tx_frequency + " MHz</div>";
} else if (data.hasOwnProperty("frequency")) {
html += "<div><b>Frequency:&nbsp;</b>" + data.frequency + " MHz</div>";
};
if (data.hasOwnProperty("humidity")) {
html += "<div><b>Relative Humidity:&nbsp;</b>" + data.humidity + " %</div>";
};
if (data.hasOwnProperty("manufacturer")) {
html += "<div><b>Manufacturer:&nbsp;</b>" + data.manufacturer + "</div>";
};
if (data.hasOwnProperty("sats")) {
html += "<div><b>Satellites:&nbsp;</b>" + data.sats + "</div>";
};
if (data.hasOwnProperty("temp")) {
html += "<div><b>Temperature External:&nbsp;</b>" + data.temp + "°C</div>";
};
if (data.hasOwnProperty("subtype")) {
html += "<div><b>Sonde Type:&nbsp;</b>" + data.subtype + "</div>";
} else if (data.hasOwnProperty("type")) {
html += "<div><b>Sonde Type:&nbsp;</b>" + data.type + "</div>";
};
if (data.hasOwnProperty("pressure")) {
html += "<div><b>Pressure:&nbsp;</b>" + data.pressure + " Pa</div>";
};
if (data.hasOwnProperty("xdata")) {
html += "<div><b>XDATA:&nbsp;</b>" + data.xdata + "</div>";
};

html += "<hr style='margin:0px;margin-top:5px'>";
html += "<div style='font-size:11px;'>"
html += "<hr style='margin:0px;margin-top:5px'>";
html += "<div style='font-size:11px;'>"

var callsign_list = [];
var callsign_list = [];

for (var i = 0; i < data.uploaders.length; i++) {
_new_call = data.uploaders[i].uploader_callsign;
tempFields = [];
if(data.uploaders[i].hasOwnProperty('snr')) {
tempFields.push(data.uploaders[i].snr.toFixed(0) + " dB");
}
if(data.uploaders[i].hasOwnProperty('rssi')) {
tempFields.push(data.uploaders[i].rssi.toFixed(0) + " dBm");
}
if(data.uploaders[i].hasOwnProperty('frequency')) {
tempFields.push(data.uploaders[i].frequency + " MHz");
}
if(tempFields.length > 0) {
_new_call += " (" + tempFields.join(", ") + ")";
}
callsign_list.push(_new_call); // catch cases where there are no fields
for (var i = 0; i < data.uploaders.length; i++) {
_new_call = data.uploaders[i].uploader_callsign;
tempFields = [];
if(data.uploaders[i].hasOwnProperty('snr')) {
tempFields.push(data.uploaders[i].snr.toFixed(0) + " dB");
}
if(data.uploaders[i].hasOwnProperty('rssi')) {
tempFields.push(data.uploaders[i].rssi.toFixed(0) + " dBm");
}
if(data.uploaders[i].hasOwnProperty('frequency')) {
tempFields.push(data.uploaders[i].frequency + " MHz");
}
if(tempFields.length > 0) {
_new_call += " (" + tempFields.join(", ") + ")";
}
callsign_list.push(_new_call); // catch cases where there are no fields
}

callsign_list = callsign_list.join("<br /> ");
callsign_list = callsign_list.join("<br /> ");

html += callsign_list + "</div>";
html += callsign_list + "</div>";

div.innerHTML = html;
div.innerHTML = html;

mapInfoBox.setContent(div);
mapInfoBox.openOn(map);
mapInfoBox.setContent(div);
mapInfoBox.openOn(map);

setTimeout(function() {
div.parentElement.style.overflow = "";
div.parentElement.style.overflowWrap = "break-word";
}, 16);
});
};
setTimeout(function() {
div.parentElement.style.overflow = "";
div.parentElement.style.overflowWrap = "break-word";
}, 16);
}

function mapInfoBox_handle_prediction(event) {
var data = event.target.pdata;
Expand Down