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

Changes from all commits
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
34 changes: 16 additions & 18 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3167,25 +3167,23 @@ function liveData() {
try {
if (clientActive) {
var frame = [{"1":JSON.parse(message.payloadString.toString())}];
if (wvar.query == "" || sondePrefix.indexOf(wvar.query) > -1 || wvar.query == frame.payload_callsign) {
if (frame.length == null) {
var tempDate = new Date(frame.time_received).getTime();
} else {
var tempDate = new Date(frame[frame.length - 1]["1"].time_received).getTime()
}
if ((dateNow - tempDate) < 30000) {
var test = formatData(frame);
if (clientActive) {
live_data_buffer.positions.position.push.apply(live_data_buffer.positions.position,test.positions.position)
}
$("#stTimer").attr("data-timestamp", dateNow);
$("#stText").text("websocket |");
} else if ((dateNow - new Date(frame[0]["1"].time_received).getTime()) > 150000) {
$("#stText").text("error |");
refresh();
} else {
$("#stText").text("error |");
if (frame.length == null) {
var tempDate = new Date(frame.time_received).getTime();
} else {
var tempDate = new Date(frame[frame.length - 1]["1"].time_received).getTime()
}
if ((dateNow - tempDate) < 30000) {
var test = formatData(frame);
if (clientActive) {
live_data_buffer.positions.position.push.apply(live_data_buffer.positions.position,test.positions.position)
}
$("#stTimer").attr("data-timestamp", dateNow);
$("#stText").text("websocket |");
} else if ((dateNow - new Date(frame[0]["1"].time_received).getTime()) > 150000) {
$("#stText").text("error |");
refresh();
} else {
$("#stText").text("error |");
}
}
}
Expand Down