Skip to content

Commit 97f0269

Browse files
LukePriorLukePrior
committed
fixes
1 parent bc2cc67 commit 97f0269

File tree

3 files changed

+43
-9
lines changed

3 files changed

+43
-9
lines changed

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<div class="container">
3737
<div class="search">
3838
<form>
39-
<input type='text' value="" placeholder="Sonde Serial" />
39+
<input type='text' value="" placeholder="Callsign" />
4040
<input type='submit' value="S" />
4141
</form>
4242
</div>

‎js/format.js‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,30 @@ function formatData(data) {
1212
if (typeof data[key] === 'object') {
1313
for (let i in data[key]) {
1414
var dataTempEntry = {};
15+
var aprsflag = false;
1516
dataTempEntry.callsign = {};
1617
if (vehicles.hasOwnProperty(data[key][i].payload_callsign)) {
1718
if (data[key][i].datetime == vehicles[data[key][i].payload_callsign].curr_position.gps_time) {
1819
dataTempEntry = vehicles[data[key][i].payload_callsign].curr_position;
1920
}
2021
}
22+
if (!data[key][i].hasOwnProperty("uploaders")) {
23+
data[key][i].uploaders = [];
24+
data[key][i].uploaders[0] = {}
25+
data[key][i].uploaders[0].uploader_callsign = data[key][i].uploader_callsign;
26+
if (data[key][i].snr) {
27+
data[key][i].uploaders[0].snr = + data[key][i].snr.toFixed(1);
28+
}
29+
if (data[key][i].rssi) {
30+
data[key][i].uploaders[0].rssi = + data[key][i].rssi.toFixed(1);
31+
}
32+
if (data[key][i].frequency) {
33+
data[key][i].uploaders[0].frequency = + data[key][i].frequency.toFixed(3);
34+
}
35+
}
2136
for (let entry in data[key][i].uploaders) {
2237
if (data[key][i].uploaders[entry].software_name == "aprs") {
38+
aprsflag = true;
2339
var stations = data[key][i].uploaders[entry].uploader_callsign.split(",");
2440
for (let uploader in stations) {
2541
dataTempEntry.callsign[stations[uploader]] = {};
@@ -41,6 +57,9 @@ function formatData(data) {
4157
}
4258
}
4359
dataTempEntry.gps_alt = parseFloat((data[key][i].alt).toPrecision(8));
60+
if (dataTempEntry.gps_alt < 1500 && aprsflag) {
61+
continue;
62+
}
4463
dataTempEntry.gps_lat = parseFloat((data[key][i].lat).toPrecision(8));
4564
dataTempEntry.gps_lon = parseFloat((data[key][i].lon).toPrecision(8));
4665
if (dataTempEntry.gps_lat == 0 && dataTempEntry.gps_lon == 0) {
@@ -53,7 +72,9 @@ function formatData(data) {
5372
dataTempEntry.server_time = data[key][i].datetime;
5473
dataTempEntry.vehicle = data[key][i].payload_callsign;
5574
dataTempEntry.position_id = data[key][i].payload_callsign + "-" + data[key][i].datetime;
56-
dataTempEntry.data = {};
75+
if (!dataTempEntry.hasOwnProperty("data")) {
76+
dataTempEntry.data = {};
77+
}
5778
if (data[key][i].hasOwnProperty("batt")) {
5879
dataTempEntry.data.batt = +data[key][i].batt.toFixed(2);
5980
}

‎js/tracker.js‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ var modeList = [
8181
"1d",
8282
"3d"
8383
];
84-
var modeDefault = "3h";
85-
var modeDefaultMobile = "1h";
84+
var modeDefault = "1d";
85+
var modeDefaultMobile = "1d";
8686

8787
// order of map elements
8888
var Z_RANGE = 1;
@@ -483,6 +483,8 @@ function clean_refresh(text, force, history_step) {
483483
if(text == wvar.mode && !force) return false;
484484
stopAjax();
485485

486+
live_data_buffer.positions.position=[];
487+
486488
if (clientActive) {
487489
clientActive = false;
488490
if (!document.getElementById("stTimer").classList.contains('friendly-dtime') ) {
@@ -492,6 +494,18 @@ function clean_refresh(text, force, history_step) {
492494
$("#stText").text("");
493495
}
494496

497+
try {
498+
client.unsubscribe(clientTopic);
499+
if (wvar.query && sondePrefix.indexOf(wvar.query) == -1) {
500+
var topic = "amateur/" + wvar.query;
501+
client.subscribe(topic);
502+
clientTopic = topic;
503+
} else {
504+
client.subscribe("amateur/#");
505+
clientTopic = "amateur/#";
506+
}
507+
} catch (err) {}
508+
495509
// reset mode if, invalid mode is specified
496510
if(modeList.indexOf(text) == -1) text = (is_mobile) ? modeDefaultMobile : modeDefault;
497511

@@ -590,7 +604,7 @@ function load() {
590604
onAdd: function(map) {
591605
var div = L.DomUtil.create('div');
592606

593-
div.innerHTML = '<select name="timeperiod" id="timeperiod" style="width:auto !important;height:30px;" onchange="clean_refresh(this.value)"><option value="1h">1 hour</option><option value="3h" selected="selected">3 hours</option><option value="6h">6 hours</option><option value="12h">12 hours</option><option value="1d">1 day</option><option value="3d">3 days</option></select>';
607+
div.innerHTML = '<select name="timeperiod" id="timeperiod" style="width:auto !important;height:30px;" onchange="clean_refresh(this.value)"><option value="0">Live Only</option><option value="1h">1 hour</option><option value="3h">3 hours</option><option value="6h">6 hours</option><option value="12h">12 hours</option><option value="1d" selected="selected">1 day</option><option value="3d">3 days</option></select>';
594608
div.innerHTML.onload = setTimeValue();
595609

596610
return div;
@@ -826,8 +840,7 @@ function habitat_data(jsondata, alternative) {
826840
"spam": true,
827841
"battery_millivolts": true,
828842
"temperature_internal_x10": true,
829-
"uplink_rssi_raw": true,
830-
"comment": true
843+
"uplink_rssi_raw": true
831844
};
832845

833846
var suffixes = globalSuffixes;
@@ -1376,7 +1389,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
13761389
'<img class="'+((vehicle.vehicle_type=="car")?'car':'')+'" src="'+image+'" />' +
13771390
'<span class="vbutton path '+((vehicle.polyline_visible) ? 'active' : '')+'" data-vcallsign="'+vcallsign+'"' + ' style="top:'+(vehicle.image_src_size[1]+55)+'px">Path</span>' +
13781391
((vehicle.vehicle_type!="car") ? '<span class="sbutton" onclick="shareVehicle(\'' + vcallsign + '\')" style="top:'+(vehicle.image_src_size[1]+85)+'px">Share</span>' : '') +
1379-
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:'+(vehicle.image_src_size[1]+115)+'px">Hysplit</span>' : '') +
1392+
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:'+(vehicle.image_src_size[1]+115)+'px">Float</span>' : '') +
13801393
'<div class="left">' +
13811394
'<dl>';
13821395
//mobile
@@ -1388,7 +1401,7 @@ function updateVehicleInfo(vcallsign, newPosition) {
13881401
'<img class="'+((vehicle.vehicle_type=="car")?'car':'')+'" src="'+image+'" />' +
13891402
'<span class="vbutton path '+((vehicle.polyline_visible) ? 'active' : '')+'" data-vcallsign="'+vcallsign+'"' + ' style="top:55px">Path</span>' +
13901403
((vehicle.vehicle_type!="car") ? '<span class="sbutton" onclick="shareVehicle(\'' + vcallsign + '\')" style="top:85px">Share</span>' : '') +
1391-
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:115px">Hysplit</span>' : '') +
1404+
((vehicle.vehicle_type!="car" && newPosition.gps_alt > 1000 && vehicle.ascent_rate < 1) ? '<span class="sbutton hysplit '+((vehicle.prediction_hysplit_visible) ? 'active' : '')+'" data-vcallsign="' + vcallsign + '" style="top:115px">Float</span>' : '') +
13921405
'<div class="left">' +
13931406
'<dl>';
13941407
var b = '</dl>' +

0 commit comments

Comments
 (0)