Merge remote-tracking branch 'upstream/main'

Author: Mark Jessop

js/tracker.js

@@ -1372,41 +1372,86 @@ function updateVehicleInfo(vcallsign, newPosition) {
 
   var callsign_list = [];
 
-  if($.type(newPosition.callsign) === "string"){
-      // Single callsign entry, as a string (chase cars)
-      callsign_list = newPosition.callsign;
-  } else {
-    // Multiple callsigns, as an object
-    for(var rxcall in newPosition.callsign){
-        if(newPosition.callsign.hasOwnProperty(rxcall)) {
-            _new_call = rxcall;
-            tempFields = [];
-            if(newPosition.callsign[rxcall].hasOwnProperty('snr')){
-                if(newPosition.callsign[rxcall].snr){
-                    tempFields.push(newPosition.callsign[rxcall].snr.toFixed(0) + " dB");
+  var current_time = convert_time(newPosition.server_time)
+
+  for(var i = 0; i < vehicle.receiver_info.length; i++){
+    if (vehicle.receiver_info[i]["time"] < current_time - 15000) {
+        vehicle.receiver_info.splice(i,1);
+    }
+  }
+
+  function addReceiver(callsign) {
+    for(var i = 0; i < vehicle.receiver_info.length; i++){
+        if (vehicle.receiver_info[i]["callsign"] === callsign) {
+            vehicle.receiver_info[i]["time"] = current_time
+            if(newPosition.callsign[callsign].hasOwnProperty('snr')){
+                if(newPosition.callsign[callsign].snr){
+                    vehicle.receiver_info[i].snr = newPosition.callsign[rxcall].snr.toFixed(0)
                 }
             }
-            if(newPosition.callsign[rxcall].hasOwnProperty('rssi')){
-                if(newPosition.callsign[rxcall].rssi){
-                    tempFields.push(newPosition.callsign[rxcall].rssi.toFixed(0) + " dBm");
+            if(newPosition.callsign[callsign].hasOwnProperty('rssi')){
+                if(newPosition.callsign[callsign].rssi){
+                    vehicle.receiver_info[i].rssi = newPosition.callsign[rxcall].rssi.toFixed(0)
                 }
             }
-            if(newPosition.callsign[rxcall].hasOwnProperty('frequency')){
-                if(newPosition.callsign[rxcall].frequency){
-                    tempFields.push(newPosition.callsign[rxcall].frequency + " MHz");
+            if(newPosition.callsign[callsign].hasOwnProperty('frequency')){
+                if(newPosition.callsign[callsign].frequency){
+                    vehicle.receiver_info[i].frequency = newPosition.callsign[rxcall].frequency.toFixed(4)
                 }
             }
-            if(tempFields.length > 0) {
-                _new_call += " (" + tempFields.join(", ") + ")";
-            }
-            callsign_list.push(_new_call); // catch cases where there are no fields
+            return
+        }
+      }
+    var temp_receiver = {callsign: callsign, time: current_time}
+    if(newPosition.callsign[callsign].hasOwnProperty('snr')){
+        if(newPosition.callsign[callsign].snr){
+            temp_receiver.snr = newPosition.callsign[rxcall].snr.toFixed(0)
+        }
+    }
+    if(newPosition.callsign[callsign].hasOwnProperty('rssi')){
+        if(newPosition.callsign[callsign].rssi){
+            temp_receiver.rssi = newPosition.callsign[rxcall].rssi.toFixed(0)
+        }
+    }
+    if(newPosition.callsign[callsign].hasOwnProperty('frequency')){
+        if(newPosition.callsign[callsign].frequency){
+            temp_receiver.frequency = newPosition.callsign[rxcall].frequency.toFixed(4)
+        }
+    }
+    vehicle.receiver_info.push(temp_receiver)
+  }
+
+  if($.type(newPosition.callsign) === "string"){
+      // Single callsign entry, as a string (chase cars)
+      callsign_list = newPosition.callsign;
+  } else {
+    // Multiple callsigns, as an object
+    for(var rxcall in newPosition.callsign){
+        addReceiver(rxcall)
+    }
+
+    for(var receiver in vehicle.receiver_info){
+        _new_call = "- " + vehicle.receiver_info[receiver].callsign;
+        tempFields = [];
+        if(vehicle.receiver_info[receiver].hasOwnProperty('snr')){
+            tempFields.push(vehicle.receiver_info[receiver].snr + " dB");
+        }
+        if(vehicle.receiver_info[receiver].hasOwnProperty('rssi')){
+            tempFields.push(vehicle.receiver_info[receiver].rssi + " dBm");
+        }
+        if(vehicle.receiver_info[receiver].hasOwnProperty('frequency')){
+            tempFields.push(vehicle.receiver_info[receiver].frequency + " MHz");
         }
+        if(tempFields.length > 0) {
+            _new_call += " (" + tempFields.join(", ") + ")";
+        }
+        callsign_list.push(_new_call); // catch cases where there are no fields
     }
-    callsign_list = callsign_list.join(", ");
+    callsign_list = callsign_list.join("<br>");
   }
 
   var timeNow = new Date();
-  var timeSent = convert_time(newPosition.server_time);
+  var timeSent = convert_time(newPosition.gps_time);
   var timeChosen = null;
 
   if (timeSent > timeNow) {
@@ -2551,7 +2596,8 @@ function addPosition(position) {
                             graph_data: [],
                             graph_yaxes: [],
                             updated: false,
-                            start_time: 2147483647000
+                            start_time: 2147483647000,
+                            receiver_info: []
                             };
 
         // deep copy yaxes config for graph
@@ -2658,24 +2704,29 @@ function addPosition(position) {
         if(vehicle.num_positions > 0 && dt > 0) {
             var search_ts = new_ts - 10000
 
-            function searchPositions(time) {
-                return time <= search_ts
+            function searchPositions(times) {
+                for (i = times.length; i >= 0; i--) {
+                    if (times[i] <= search_ts) {
+                        return times[i]
+                    }
+                }
+                return null
             }
 
-            var search_matches = vehicle.positions_ts.filter(searchPositions)
+            var search_match = searchPositions(vehicle.positions_ts)
+            var search_index = vehicle.positions_ts.indexOf(search_match)
 
-            if (search_matches.length > 0 && search_matches[search_matches.length-1] >= search_ts - 5000) {
-                var search_match = search_matches[search_matches.length-1]
+            if (search_match != null && search_match >= search_ts - 5000) {
                 var dtt = (curr_ts - search_match) / 1000;
 
                 // calculate vertical rate
-                var rate = (position.gps_alt - vehicle.positions_alts[search_matches.length-1]) / dtt;
+                var rate = (position.gps_alt - vehicle.positions_alts[search_index]) / dtt;
                 if (!isNaN(rate) && isFinite(rate)) {
                     vehicle.ascent_rate = 0.2 * rate + 0.8 * vehicle.ascent_rate;
                 }
 
                 // calculate horizontal rate
-                horizontal_rate_temp = new_latlng.distanceTo(vehicle.positions[search_matches.length-1]) / dtt;
+                horizontal_rate_temp = new_latlng.distanceTo(vehicle.positions[search_index]) / dtt;
                 if (!isNaN(horizontal_rate_temp) && isFinite(horizontal_rate_temp)) {
                     vehicle.horizontal_rate = horizontal_rate_temp;
                 }
@@ -3310,6 +3361,7 @@ function refreshReceivers() {
                 updateReceivers(response);
             },
             complete: function(request, textStatus) {
+                periodical_receivers = setTimeout(function() {refreshReceivers(false)}, 60 * 5 * 1000);
                 if (!offline.get("opt_hide_chase")) {
                     refreshNewReceivers(true);
                 }