Prediction link and planned icon

Added link to prediction popup. Also added a temp icon for 'planned' recoveries

Author: smithse

js/sondehub.js

@@ -4765,6 +4765,13 @@ function updateRecoveryMarker(recovery) {
         _recovery_icon = host_url + markers_url + "payload-not-recovered.png";
       }
 
+    // Override icon if 'is planned' field exists and is true
+        if(recovery.hasOwnProperty('planned')){
+            if(recovery.planned == true){
+                _recovery_icon = host_url + markers_url + "payload-recovery-planned.png";
+            }
+      }
+
       recoveryIcon = new L.icon({
         iconUrl: _recovery_icon,
         iconSize: [17, 19],

js/station.js

@@ -705,6 +705,7 @@ function launchSitePredictions(times, station, properties, marker, id) {
     }
 }
 
+//VK6DI Changes
 function plotPrediction (data, dates, marker, properties) {
     if (!launchPredictions.hasOwnProperty(marker)) {
         launchPredictions[marker] = {};
@@ -768,17 +769,109 @@ function plotPrediction (data, dates, marker, properties) {
         icon: new L.NumberedDivIcon({number: dates.indexOf(data.request.launch_datetime)+1})
     }).addTo(map);
 
+    var coords_text = format_coordinates(landingPoint.latitude, landingLongitude, "Prediction");
+
     var landingTime = new Date(landingPoint.datetime);
     if (properties[3] != "" && properties[4] != "") {
         var landingTooltip = "<b>Time:</b> " + landingTime.toLocaleString() + "<br><b>Model Dataset:</b> " + data.request.dataset + 
+        "<br><b>Prediction:</b> " + coords_text + 
         "<br><b>Model Assumptions:</b><br>- " + data.request.ascent_rate + "m/s ascent<br>- " + data.request.burst_altitude + "m burst altitude (" + properties[3] + " samples)<br>- " + data.request.descent_rate + "m/s descent (" + properties[4] + " samples)";
     } else {
         var landingTooltip = "<b>Time:</b> " + landingTime.toLocaleString() + "<br><b>Model Dataset:</b> " + data.request.dataset + 
+        "<br><b>Prediction:</b>" + coords_text + 
         "<br><b>Model Assumptions:</b><br>- " + data.request.ascent_rate + "m/s ascent<br>- " + data.request.burst_altitude + "m burst altitude<br>- " + data.request.descent_rate + "m/s descent";
     }
-    plot.landingMarker.bindTooltip(landingTooltip, {offset: [13,-28]});
+ 
+    plot.landingMarker.bindPopup(landingTooltip, { autoClose: false, closeOnClick: false })
+    .on('click', function (e) {
+        this.openPopup();
+    });
+
 }
 
+////Existing function
+// function plotPrediction (data, dates, marker, properties) {
+//     if (!launchPredictions.hasOwnProperty(marker)) {
+//         launchPredictions[marker] = {};
+//     }
+//     launchPredictions[marker][dates.indexOf(data.request.launch_datetime)+1] = {};
+//     plot = launchPredictions[marker][dates.indexOf(data.request.launch_datetime)+1];
+
+//     ascent = data.prediction[0].trajectory;
+//     descent = data.prediction[1].trajectory;
+//     var predictionPath = [];
+//     for (var i = 0; i < ascent.length; i++) {
+//         if (ascent[i].longitude > 180.0) {
+//             var longitude = ascent[i].longitude - 360.0;
+//         } else {
+//             var longitude = ascent[i].longitude;
+//         }
+//         predictionPath.push([ascent[i].latitude, longitude]);
+//     };
+//     for (var x = 0; x < descent.length; x++) {
+//         if (descent[x].longitude > 180.0) {
+//             var longitude = descent[x].longitude - 360.0;
+//         } else {
+//             var longitude = descent[x].longitude;
+//         }
+//         predictionPath.push([descent[x].latitude, longitude]);
+//     };
+//     var burstPoint = ascent[ascent.length-1];
+//     var landingPoint = descent[descent.length-1];
+
+//     plot.predictionPath = new L.polyline(predictionPath, {color: 'red'}).addTo(map);
+
+//     burstIconImage = host_url + markers_url + "balloon-pop.png";
+
+//     burstIcon = new L.icon({
+//         iconUrl: burstIconImage,
+//         iconSize: [20,20],
+//         iconAnchor: [10, 10],
+//     });
+
+//     if (burstPoint.longitude > 180.0) {
+//         var burstLongitude = burstPoint.longitude - 360.0;
+//     } else {
+//         var burstLongitude = burstPoint.longitude;
+//     }
+
+//     plot.burstMarker = new L.marker([burstPoint.latitude, burstLongitude], {
+//         icon: burstIcon
+//     }).addTo(map);
+
+//     var burstTime = new Date(burstPoint.datetime);
+//     var burstTooltip = "<b>Time: </b>" + burstTime.toLocaleString() + "<br><b>Altitude: </b>" + Math.round(burstPoint.altitude) + "m";
+//     plot.burstMarker.bindTooltip(burstTooltip, {offset: [5,0]});
+
+
+    
+
+//     if (landingPoint.longitude > 180.0) {
+//         var landingLongitude = landingPoint.longitude - 360.0;
+//     } else {
+//         var landingLongitude = landingPoint.longitude;
+//     }
+
+//     plot.landingMarker = new L.marker([landingPoint.latitude, landingLongitude], {
+//         icon: new L.NumberedDivIcon({number: dates.indexOf(data.request.launch_datetime)+1})
+//     }).addTo(map);
+
+//     var coords_text = format_coordinates(landingPoint.latitude, landingLongitude, "Prediction");
+
+//     var landingTime = new Date(landingPoint.datetime);
+//     if (properties[3] != "" && properties[4] != "") {
+//         var landingTooltip = "<b>Time:</b> " + landingTime.toLocaleString() + "<br><b>Model Dataset:</b> " + data.request.dataset + 
+//         "<br><b>Prediction:</b>" + coords_text + 
+//         "<br><b>Model Assumptions:</b><br>- " + data.request.ascent_rate + "m/s ascent<br>- " + data.request.burst_altitude + "m burst altitude (" + properties[3] + " samples)<br>- " + data.request.descent_rate + "m/s descent (" + properties[4] + " samples)";
+//     } else {
+//         var landingTooltip = "<b>Time:</b> " + landingTime.toLocaleString() + "<br><b>Model Dataset:</b> " + data.request.dataset + 
+//         "<br><b>Prediction:</b>" + coords_text + 
+//         "<br><b>Model Assumptions:</b><br>- " + data.request.ascent_rate + "m/s ascent<br>- " + data.request.burst_altitude + "m burst altitude<br>- " + data.request.descent_rate + "m/s descent";
+//     }
+//     plot.landingMarker.bindTooltip(landingTooltip, {offset: [13,-28]});
+//     //var popup = new L.popup({ autoClose: false, closeOnClick: false }).setContent(serial);
+// }
+
 function showPrediction(url) {
     var ajaxReq = $.ajax({
         type: "GET",