Predictions via websockets

Author: xss

js/tracker.js

@@ -736,12 +736,16 @@ function sub_to_nearby_sondes(){
         // If zoomed in then we sub to specific sondes
         for (let vehicle in vehicles){
             let topic = "sondes/"+vehicle;
+            let prediction_topic = "prediction/"+vehicle;
+            let reverse_topic = "reverse-prediction/"+vehicle;
             inside_bounds = bounds.contains(vehicles[vehicle].marker._latlng)
             if (inside_bounds){
                 if (!clientTopic.includes(topic)){
                     if (sub_logging) console.log("Subbing to " + topic)
                     if (client.isConnected()) {
                         client.subscribe(topic);
+                        client.subscribe(prediction_topic);
+                        client.subscribe(reverse_topic);
                     }
                     clientTopic.push(topic)
                 }
@@ -752,7 +756,9 @@ function sub_to_nearby_sondes(){
                     } else {
                         if (sub_logging) console.log("unsubbing from " + topic)
                         if (client.isConnected()) {
-                            client.unsubscribe(topic)
+                            client.unsubscribe(topic);
+                            client.unsubscribe(prediction_topic);
+                            client.unsubscribe(reverse_topic);
                         }
                         var topic_index = clientTopic.indexOf(topic)
                         if (topic_index > -1) {
@@ -790,6 +796,8 @@ function clean_refresh(text, force, history_step) {
         if (wvar.query && sondePrefix.indexOf(wvar.query) == -1) {
             var topic = "sondes/" + wvar.query;
             client.subscribe(topic);
+            client.subscribe("prediction/"+wvar.query);
+            client.subscribe("reverse-prediction/"+wvar.query);
             clientTopic = [topic];
         } else {
             client.subscribe("sondes-new/#");
@@ -1161,6 +1169,33 @@ function panTo(vcallsign) {
             set_polyline_visibility(serial,false);
         }
     }
+
+    // update predictions
+    $.ajax({
+        type: "GET",
+        url: predictions_url + vcallsign,
+        data: "",
+        dataType: "json",
+        serial: vcallsign,
+        success: function(response, textStatus) {
+            updatePredictions(response);
+            set_polyline_visibility(serial,true);
+        }
+    });
+
+    var data_str = "duration=" + wvar.mode + "&vehicles=" + vcallsign;
+    $.ajax({
+                type: "GET",
+                url: launch_predictions_url,
+                data: data_str,
+                dataType: "json",
+                serial: vcallsign,
+                success: function(response, textStatus) {
+                    updateLaunchPredictions(response);
+                    set_polyline_visibility(serial,true);
+                }
+    });
+
     vehicles[vcallsign].polyline_visible = true;
     set_polyline_visibility(vcallsign,true);
     // update lookangles
@@ -3821,6 +3856,8 @@ function liveData() {
         if (wvar.query && sondePrefix.indexOf(wvar.query) == -1) {
             var topic = "sondes/" + wvar.query;
             client.subscribe(topic);
+            client.subscribe("prediction/"+wvar.query);
+            client.subscribe("reverse-prediction/"+wvar.query);
             clientTopic = [topic];
         } else {
             client.subscribe("sondes-new/#");
@@ -3901,7 +3938,32 @@ function liveData() {
                     } else {
                         updateReceivers(formatted_frame, single=true);
                     }
+                } else if (message.topic.startsWith("prediction")) {
+                    var frame = JSON.parse(message.payloadString.toString());
 
+                    var pred_data = [
+                        {
+                            "vehicle": frame.serial,
+                            "time": frame.datetime,
+                            "latitude": frame.position[1],
+                            "longitude": frame.position[0],
+                            "altitude": frame.altitude,
+                            "ascent_rate": frame.ascent_rate,
+                            "descent_rate": frame.descent_rate,
+                            "burst_altitude": frame.burst_altitude,
+                            "descending": frame.descending ? 1 : 0,
+                            "landed": frame.descending ? 1 : 0,
+                            "data": JSON.stringify(frame.data)
+                        }
+                    ]
+                    updatePredictions(pred_data);
+                } else if (message.topic.startsWith("reverse-prediction")) {
+                    var frame = JSON.parse(message.payloadString.toString());
+                    var serial = frame["serial"];
+                    var pred_data = {
+                    }
+                    pred_data[serial] = frame
+                    updateLaunchPredictions(pred_data);
                 } else {
                     var frame = JSON.parse(message.payloadString.toString());
 
@@ -4137,45 +4199,45 @@ function refreshRecoveryStats() {
 
 var ajax_predictions = null;
 
-function refreshPredictions() {
-    if(ajax_inprogress) {
-      clearTimeout(periodical_predictions);
-      periodical_predictions = setTimeout(refreshPredictions, 1000);
-      return;
-    }
-
-    ajax_predictions = $.ajax({
-        type: "GET",
-        url: predictions_url + encodeURIComponent(wvar.query),
-        data: "",
-        dataType: "json",
-        success: function(response, textStatus) {
-            updatePredictions(response);
-        },
-        error: function() {
-        },
-        complete: function(request, textStatus) {
-            clearTimeout(periodical_predictions);
-            periodical_predictions = setTimeout(refreshPredictions, 60 * 1000);
-        }
-    });
-
-    var data_str = "duration=" + wvar.mode + "&vehicles=" + encodeURIComponent(wvar.query);
-
-    ajax_predictions = $.ajax({
-        type: "GET",
-        url: launch_predictions_url,
-        data: data_str,
-        dataType: "json",
-        success: function(response, textStatus) {
-            updateLaunchPredictions(response);
-        },
-        error: function() {
-        },
-        complete: function(request, textStatus) {
-        }
-    });
-}
+// function refreshPredictions() {
+//     if(ajax_inprogress) {
+//       clearTimeout(periodical_predictions);
+//       periodical_predictions = setTimeout(refreshPredictions, 1000);
+//       return;
+//     }
+
+//     ajax_predictions = $.ajax({
+//         type: "GET",
+//         url: predictions_url + encodeURIComponent(wvar.query),
+//         data: "",
+//         dataType: "json",
+//         success: function(response, textStatus) {
+//             updatePredictions(response);
+//         },
+//         error: function() {
+//         },
+//         complete: function(request, textStatus) {
+//             clearTimeout(periodical_predictions);
+//             periodical_predictions = setTimeout(refreshPredictions, 60 * 1000);
+//         }
+//     });
+
+//     var data_str = "duration=" + wvar.mode + "&vehicles=" + encodeURIComponent(wvar.query);
+
+//     ajax_predictions = $.ajax({
+//         type: "GET",
+//         url: launch_predictions_url,
+//         data: data_str,
+//         dataType: "json",
+//         success: function(response, textStatus) {
+//             updateLaunchPredictions(response);
+//         },
+//         error: function() {
+//         },
+//         complete: function(request, textStatus) {
+//         }
+//     });
+// }
 
 var periodical, periodical_focus, periodical_focus_new, periodical_receivers, periodical_listeners, periodical_recoveries;
 var periodical_predictions = null;
@@ -4883,7 +4945,7 @@ function update(response, none) {
 
             }
 
-            if(periodical_predictions === null) refreshPredictions();
+            //if(periodical_predictions === null) refreshPredictions();
         },
 
     };