diff --git a/js/tracker.js b/js/tracker.js index c37a592..3d666fe 100644 --- a/js/tracker.js +++ b/js/tracker.js @@ -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 |"); } } } @@ -3497,8 +3495,8 @@ function updateReceivers(r) { receiver.lon = lon; receiver.alt = alt; receiver.age = age.toISOString(); - receiver.description = ""+receiver.name+"

Radio: " + last.software_name + "-" + last.software_version - + "
Antenna: " + last.uploader_antenna + "
Last Contact: " + age.toISOString() + "
"; + receiver.description = ""+receiver.name+"

Software: " + last.software_name + "-" + last.software_version + + "
Radio: " + last.uploader_radio + "
Antenna: " + last.uploader_antenna + "
Last Contact: " + age.toISOString() + "
"; receiver.fresh = true; updateReceiverMarker(receiver);