Skip to content

Fix Search Bug #35

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
merged 7 commits into from
Jun 4, 2022
Merged

Fix Search Bug #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b65680b
Fix float
LukePrior May 11, 2022
ba74132
Merge branch 'projecthorus:main' into main
LukePrior May 11, 2022
595216f
support unique data fields
LukePrior May 11, 2022
0c42076
partial working max alt aprs filter
LukePrior May 11, 2022
efb86c5
Merge branch 'projecthorus:main' into main
LukePrior May 11, 2022
7cb77c7
Merge branch 'projecthorus:main' into main
LukePrior Jun 4, 2022
e932f8d
fix search bug
LukePrior Jun 4, 2022
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
partial working max alt aprs filter
  • Loading branch information
@LukePrior
LukePrior committed May 11, 2022
commit 0c42076c89bd0ef6a00fd64510e8ab4072f68a0e
7 changes: 6 additions & 1 deletion js/format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ function formatData(data) {
var dataTempEntry = {};
var aprsflag = false;
dataTempEntry.callsign = {};
maximumAltitude = 0;
if (vehicles.hasOwnProperty(data[key][i].payload_callsign)) {
maximumAltitude = vehicles[data[key][i].payload_callsign].max_alt;
if (data[key][i].datetime == vehicles[data[key][i].payload_callsign].curr_position.gps_time) {
dataTempEntry = vehicles[data[key][i].payload_callsign].curr_position;
}
Expand Down Expand Up @@ -90,7 +92,10 @@ function formatData(data) {
}
}
dataTempEntry.gps_alt = parseFloat((data[key][i].alt).toPrecision(8));
if (dataTempEntry.gps_alt < 1500 && aprsflag && !hideAprs) {
if (dataTempEntry.gps_alt > maximumAltitude) {
maximumAltitude = dataTempEntry.gps_alt;
}
if (maximumAltitude < 1500 && aprsflag && !hideAprs) {
continue;
}
dataTempEntry.gps_lat = parseFloat((data[key][i].lat).toPrecision(8));
Expand Down
10 changes: 4 additions & 6 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,8 +905,6 @@ function habitat_data(jsondata, alternative) {
}
}

console.log(array);

for(var i = 0, ii = array.length; i < ii; i++) {
var k = array[i][0]; // key
var v = array[i][1]; // value
Expand Down Expand Up @@ -3018,7 +3016,7 @@ function refresh() {
if (wvar.query != null && JSON.stringify(data).indexOf(wvar.query) == -1) {
refreshSingle(wvar.query);
} else {
response = formatData(data, false);
response = formatData(data);
update(response, true);
$("#stTimer").attr("data-timestamp", response.fetch_timestamp);
}
Expand Down Expand Up @@ -3058,7 +3056,7 @@ function refreshSingle(serial) {
url: data_url,
dataType: "json",
success: function(data, textStatus) {
response = formatData(data, false);
response = formatData(data);
update(response, true);
$("#stText").text("");
},
Expand Down Expand Up @@ -3099,7 +3097,7 @@ function refreshSingleNew(serial) {
data: data_str,
dataType: "json",
success: function(data, textStatus) {
response = formatData(data, false);
response = formatData(data);
update(response, true);
},
error: function() {
Expand Down Expand Up @@ -3176,7 +3174,7 @@ function liveData() {
var tempDate = new Date(frame[frame.length - 1]["1"].time_received).getTime()
}
if ((dateNow - tempDate) < 30000) {
var test = formatData(frame, true);
var test = formatData(frame);
if (clientActive) {
live_data_buffer.positions.position.push.apply(live_data_buffer.positions.position,test.positions.position)
}
Expand Down