Add recovery warning popup when at zoom >=13

Author: Mark Jessop

index.template.html

@@ -91,11 +91,13 @@
         <div class="slimContainer">
             <h3><i class="icon-habhub rfloat"></i>Report Recovery</h3>
             <hr/>
-            <div class="row">
-            <span>You can report a recovery here. Enter the serial number (e.g. 'S1234567'), tick recovered/not recovered, and add some notes. <a href="https://github.com/projecthorus/sondehub-infra/wiki/Radiosonde-Serial-Numbers" target="_blank" rel="noopener">Click here</a> for information on how to locate a sonde's serial number.</a> If the sonde is not on the map, type its serial into the top-left search box (may require landscape mode on mobile) and press enter to retrieve historical data. You can then mark it as recovered or planned. Optionally, you can use your location instead of the sonde's last location.</span>
+            <div class="row">            
+            <span><b>Please report recovered radiosondes! Don't waste others time and effort with a frustrating failed recovery!</b></span>
+            <span>Enter the serial number, select recovered / planned, and add some notes. If marking as planned, please add contact information!</span>
+            <span>If the sonde is not on the map, type its serial into the top-left search box (may require landscape mode on mobile) and press enter to retrieve historical data.</span>
             </div>
             <div class="row">
-                <span><b>Serial</b></span>
+                <span><b>Serial</b> <a href="https://github.com/projecthorus/sondehub-infra/wiki/Radiosonde-Serial-Numbers" target="_blank" rel="noopener">(Help)</a></span>
                 <span class="r"><input type="text" id="pr_serial" style="width: 140px;"/></span>
             </div>
             <div class="row">
@@ -117,7 +119,7 @@ <h3><i class="icon-habhub rfloat"></i>Report Recovery</h3>
                 </div>
             </div>
             <div class="row option">
-                <span><b>Use Car Position</b></span>
+                <span><b>Use Browser Position</b></span>
                 <div class="switch off" id="sw_use_car_pos">
                     <span class="thumb"></span>
                     <input type="checkbox" id="use_car_pos">
@@ -411,6 +413,9 @@ <h2><i class="icon-car rfloat"></i>Chase Mode</h2>
             <div id="zoom_warning" class="lfloat slickbox" style="width:250px; bottom: 0px;   left: 50%; transform: translate(-50%, -50%);">
                 <div style="width:250px">Zoom in for realtime data!</div>
             </div>
+            <div id="recovery_notice" class="lfloat slickbox" onclick="show_recoveries();" style="width:270px; bottom: 0px; left: 50%; transform: translate(-50%, -50%); display:none;">
+                <div style="width:270px"><b>Please report radiosonde recoveries!<b/></div>
+            </div>
         </div>
         <div id="timebox" class="present slickbox animate" style="display: none">
             <svg width="40" height="40" viewbox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1" version="1.1" class="lfloat">
@@ -450,8 +455,8 @@ <h2><i class="icon-car rfloat"></i>Chase Mode</h2>
         </div>
     </div>
 
-    <div id="reload_warning">This version of SondeHub is out of date. <a href="javascript:window.location.reload(true)">Click here to reload</a>. Page will reload automatically in <span id="reload_timer"></span>
-    </div>
+    <div id="reload_warning">This version of SondeHub is out of date. <a href="javascript:window.location.reload(true)">Click here to reload</a>. Page will reload automatically in <span id="reload_timer"></span></div>
+
 
     <!-- Was 3.31-->
 

js/app.js

@@ -684,9 +684,9 @@ $(window).ready(function() {
         } else {
             wvar.box = null
         }
-        console.log("aaa")
-        console.log(wvar.box)
-        console.log("bbbb")
+        //console.log("aaa")
+        //console.log(wvar.box)
+        //console.log("bbbb")
         lhash_update(true);
         checkSize();
     });

js/sondehub.js

@@ -1058,6 +1058,7 @@ function load() {
             }
         }
         updateZoom();
+        recoveryPopup();
     });
 
     map.on('movestart', function() {
@@ -1497,6 +1498,63 @@ function drawLOSPaths(vcallsign) {
     });
 }
 
+var recovery_popup = true;
+function recoveryPopup(){
+        // Conditions for showing this are:
+        // Zoom level >= 13
+        // A sonde is in the map view area. (Use the subscribed sondes for this)
+        // If a user position is available, that position is within 500km of the sonde.
+        recovery_popup_limit = 500000;
+
+        if( (map.getZoom() >= 13) && (clientTopic.length >= 2)){
+            if(recovery_popup == true){
+                // Logic to not show a popup if the centre of the map is > 500km from the viewer location,
+                _viewer_lat = parseFloat($('#cc_lat').text())
+                _viewer_lon = parseFloat($('#cc_lon').text())
+
+                if ( (_viewer_lat != 0.0) && (_viewer_lon != 0.0) ){
+
+                    _map_centre = {
+                        'lat':map.getCenter().lat,
+                        'lon':map.getCenter().lng,
+                        'alt':0.0
+                    };
+                    _viewer = {
+                        'lat': _viewer_lat,
+                        'lon': _viewer_lon,
+                        'alt': 0.0
+                    };
+            
+                    // Calculate the distance from the sonde
+                    _lookangles = calculate_lookangles(_viewer, _map_centre);
+
+                    if(_lookangles.range > recovery_popup_limit){
+                        return;
+                    }
+                }
+
+                // If we're here, then we either don't have a valid viewer location,
+                // Or the viewer is within 500km. Show the popup.
+                console.log("Triggering Recovery Popup.")
+                document.getElementById("recovery_notice").style.display = "block";
+                // Don't re-activate the popup again
+                recovery_popup = false;
+                return;
+            }
+        }
+        document.getElementById("recovery_notice").style.display = "none";
+}
+
+function show_recoveries(){
+    if ($("#recoveriesbox").is(':visible') == false){
+        $('.nav .recoveries').click();
+    }
+    
+    document.getElementById("recovery_notice").style.display = "none";
+    recovery_popup = false;
+}
+
+
 function focusVehicle(vcallsign, ignoreOpt) {
     if(!offline.get('opt_hilight_vehicle') && ignoreOpt === undefined) return;