Skip to content

Commit 0c42076

Browse files
committed
partial working max alt aprs filter
1 parent 595216f commit 0c42076

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

js/format.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ function formatData(data) {
4747
var dataTempEntry = {};
4848
var aprsflag = false;
4949
dataTempEntry.callsign = {};
50+
maximumAltitude = 0;
5051
if (vehicles.hasOwnProperty(data[key][i].payload_callsign)) {
52+
maximumAltitude = vehicles[data[key][i].payload_callsign].max_alt;
5153
if (data[key][i].datetime == vehicles[data[key][i].payload_callsign].curr_position.gps_time) {
5254
dataTempEntry = vehicles[data[key][i].payload_callsign].curr_position;
5355
}
@@ -90,7 +92,10 @@ function formatData(data) {
9092
}
9193
}
9294
dataTempEntry.gps_alt = parseFloat((data[key][i].alt).toPrecision(8));
93-
if (dataTempEntry.gps_alt < 1500 && aprsflag && !hideAprs) {
95+
if (dataTempEntry.gps_alt > maximumAltitude) {
96+
maximumAltitude = dataTempEntry.gps_alt;
97+
}
98+
if (maximumAltitude < 1500 && aprsflag && !hideAprs) {
9499
continue;
95100
}
96101
dataTempEntry.gps_lat = parseFloat((data[key][i].lat).toPrecision(8));

js/tracker.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,6 @@ function habitat_data(jsondata, alternative) {
905905
}
906906
}
907907

908-
console.log(array);
909-
910908
for(var i = 0, ii = array.length; i < ii; i++) {
911909
var k = array[i][0]; // key
912910
var v = array[i][1]; // value
@@ -3018,7 +3016,7 @@ function refresh() {
30183016
if (wvar.query != null && JSON.stringify(data).indexOf(wvar.query) == -1) {
30193017
refreshSingle(wvar.query);
30203018
} else {
3021-
response = formatData(data, false);
3019+
response = formatData(data);
30223020
update(response, true);
30233021
$("#stTimer").attr("data-timestamp", response.fetch_timestamp);
30243022
}
@@ -3058,7 +3056,7 @@ function refreshSingle(serial) {
30583056
url: data_url,
30593057
dataType: "json",
30603058
success: function(data, textStatus) {
3061-
response = formatData(data, false);
3059+
response = formatData(data);
30623060
update(response, true);
30633061
$("#stText").text("");
30643062
},
@@ -3099,7 +3097,7 @@ function refreshSingleNew(serial) {
30993097
data: data_str,
31003098
dataType: "json",
31013099
success: function(data, textStatus) {
3102-
response = formatData(data, false);
3100+
response = formatData(data);
31033101
update(response, true);
31043102
},
31053103
error: function() {
@@ -3176,7 +3174,7 @@ function liveData() {
31763174
var tempDate = new Date(frame[frame.length - 1]["1"].time_received).getTime()
31773175
}
31783176
if ((dateNow - tempDate) < 30000) {
3179-
var test = formatData(frame, true);
3177+
var test = formatData(frame);
31803178
if (clientActive) {
31813179
live_data_buffer.positions.position.push.apply(live_data_buffer.positions.position,test.positions.position)
31823180
}

0 commit comments

Comments
 (0)