Recovery Reporting Changes (projecthorus#400)

Co-authored-by: Mark Jessop <[email protected]>
Co-authored-by: xssfox <[email protected]>

Author: 3 people

css/main.css

@@ -99,11 +99,13 @@ body {
 #timebox {
     top: 7px;
     right: 5px;
+    width: 205px;
 }
 
 #lookanglesbox {
     top: 40px;
     right: 5px;
+    width: 205px;
 }
 
 #timebox.past svg path {

index.template.html

@@ -28,7 +28,6 @@
         <link rel="stylesheet" href="css/leaflet.fullscreen.css"/>
         <link rel="stylesheet" href="css/skewt.css"/>
 
-        <script type="text/javascript" language="javascript" src="https://www.google.com/recaptcha/api.js" async defer></script>
         <script type="text/javascript" language="javascript" src="js/skewt.js?v={VER}"></script>
         <script type="text/javascript" language="javascript" src="js/aws-sdk-2.1029.0.min.js"></script>
         <script type="text/javascript" language="javascript" src="js/leaflet.js?v={VER}"></script>
@@ -89,16 +88,64 @@
 
     <div id="recoveriesbox" style="display: none" class="flatpage">
         <div class="slimContainer">
-            <h2><i class="icon-habhub rfloat"></i>Recoveries</h2>
+            <h3><i class="icon-habhub rfloat"></i>Report Recovery</h3>
             <hr/>
-            <p>Recovery reports can be added on the Chase-Car pane.</p>
+            <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> <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">
+                <span><b>Recovered By</b></span>
+                <span class="r"><input type="text" id="recovery_callsign" style="width: 140px;" maxlength="15"/></span>
+            </div>
+            <div class="row option">
+                <span><b>Recovery Success</b></span>
+                <div class="switchyn on" id="sw_recovery_ok">
+                    <span class="thumb"></span>
+                    <input type="checkbox" id="recovery_ok">
+                </div>
+            </div>
+            <div class="row option">
+                <span><b>Recovery Planned</b></span>
+                <div class="switchyn off" id="sw_recovery_planned">
+                    <span class="thumb"></span>
+                    <input type="checkbox" id="recovery_planned">
+                </div>
+            </div>
+            <div class="row option">
+                <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">
+                </div>
+            </div>
+            <div class="row">
+                <span><b>Notes</b></span>
+            </div>
+            <div class="row">
+                <span>
+                    <textarea name="pr_notes" id="pr_notes" style="width:280px;height:60px;"></textarea>
+                </span>
+            </div>
+            <div class="row">
+                <span><b>Report Result</b></span>
+                <span class="r" id="pr_last_report">none</span>
+            </div>
+            <div class="row">
+                <span class="r"><input type="button" value="Submit" id="pr_submit" onclick="ChaseCar.markRecovered();"/></span>
+            </div>
             <hr/>
-            <div id="recovery-list"><img style="width:90px;height:30px;display:block;margin:auto;" src="img/hab-spinner.gif"/><br></div>
-        </div>
-        <div class="slimContainer">
-            <h2>Statistics</h2>
+            <h3>Statistics</h3>
             <hr/>
             <div id="leaderboard-list"><img style="width:90px;height:30px;display:block;margin:auto;" src="img/hab-spinner.gif"/><br></div>
+            <hr/>
+            <h3>Recoveries</h3>
+            <div id="recovery-list"><img style="width:90px;height:30px;display:block;margin:auto;" src="img/hab-spinner.gif"/><br></div>
         </div>
     </div>
     <div id="aboutbox" style="display: none" class="flatpage">
@@ -119,7 +166,7 @@ <h4>Radiosondes?</h4>
                 <br/>
 
                 <h4>Found a Radiosonde?</h4>
-                Click the 'car' icon on the top-right to submit a recovery notification.
+                <b>Please click the 'balloon' icon on the top-right to submit a recovery notification!</b>
 
                 <h4>Support Us!</h4>
                 If you use SondeHub regularly, please consider <a href="https://www.patreon.com/sondehub" target="_blank" rel="noopener">supporting us on Patreon</a>, or with a <a href="https://sondehub.org/go/donate" target="_blank" rel="noopener">donation on Paypal</a>.</br>
@@ -351,48 +398,7 @@ <h2><i class="icon-car rfloat"></i>Chase Mode</h2>
                 <span class="r" id="cc_speed">none</span>
             </div>
             <hr>
-            <h3>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 and press enter to retrieve historical data. You can then mark it as recovered. Optionally, you can use your location instead of the sonde's last location.</span>
-            </div>
-            <div class="row">
-                <span><b>Serial</b></span>
-                <span class="r"><input type="text" id="pr_serial" style="width: 140px;"/></span>
-            </div>
-            <div class="row option">
-                <span><b>Recovery Success</b></span>
-                <div class="switchyn on" id="sw_recovery_ok">
-                    <span class="thumb"></span>
-                    <input type="checkbox" id="recovery_ok">
-                </div>
-            </div>
-            <div class="row option">
-                <span><b>Use Car Position</b></span>
-                <div class="switch off" id="sw_use_car_pos">
-                    <span class="thumb"></span>
-                    <input type="checkbox" id="use_car_pos">
-                </div>
-            </div>
-            <div class="row">
-                <span><b>Notes</b></span>
-            </div>
-            <div class="row">
-                <span>
-                    <!--<input type="text" id="pr_notes" style="width: 140px;"/>-->
-                    <textarea name="pr_notes" id="pr_notes" style="width:280px;height:60px;"></textarea>
-                </span>
-            </div>
-            <div class="row">
-                <span><b>Report Result</b></span>
-                <span class="r" id="pr_last_report">none</span>
-            </div>
-            <div class="row">
-                <div class="g-recaptcha" data-sitekey="6LcEkBUbAAAAABTgn2lktm6UPeP0lbyqIDBBujSF"></div>
-            </div>
-            <div class="row">
-                <span class="r"><input type="button" value="Submit" id="pr_submit" onclick="ChaseCar.markRecovered();"/></span>
-            </div>
+            Recovery reporting is now on the recoveries tab! (Balloon icon)
 
         </div>
     </div>
@@ -402,6 +408,9 @@ <h3>Report Recovery</h3>
             <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:225px; bottom: 35px; left: 50%; transform: translate(-50%, -50%); display:none;">
+                <div style="width:225px"><b>Please report recovered sondes!</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">
@@ -441,8 +450,8 @@ <h3>Report Recovery</h3>
         </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

@@ -486,20 +486,22 @@ var format_time_friendly = function(start, end) {
 var format_coordinates = function(lat, lon, name) {
     var coords_text;
     var ua =  navigator.userAgent.toLowerCase();
-  
+    var span = document.createElement('span')
+    var a = document.createElement("a")
+    span.appendChild(a)
     // determine how to link the coordinates to a native app, if on a mobile device
     if(ua.indexOf('iphone') > -1) {
-        coords_text = '<a href="maps://?q='+lat+','+lon+'">' +
-                      roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
+        a.href = 'maps://?q='+lat+','+lon
     } else if(ua.indexOf('android') > -1) {
-        coords_text = '<a href="geo:'+lat+','+lon+'?q='+lat+','+lon+'('+name+')">' +
-                      roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
+        a.href = 'geo:'+lat+','+lon+'?q='+lat+','+lon+'('+name+')'
     } else {
-        coords_text = '<a href="https://www.google.com/maps/search/?api=1&query='+lat+','+lon+'" target="_blank" rel="noopener noreferrer">' +
-            roundNumber(lat, 5) + ', ' + roundNumber(lon, 5) +'</a>';
+        a.href = 'https://www.google.com/maps/search/?api=1&query='+lat+','+lon
+        a.target="_blank"
+        a.rel="noopener noreferrer"
     }
+    a.innerText = roundNumber(lat, 5) + ', ' + roundNumber(lon, 5)
 
-    return coords_text;
+    return span.innerHTML;
 };
 
 // runs every second
@@ -684,9 +686,7 @@ $(window).ready(function() {
         } else {
             wvar.box = null
         }
-        console.log("aaa")
-        console.log(wvar.box)
-        console.log("bbbb")
+
         lhash_update(true);
         checkSize();
     });
@@ -748,6 +748,23 @@ $(window).ready(function() {
         // turning the switch on
         } else {
             e.removeClass('off').addClass('on');
+            // Remove any planned recovery check.
+            $("#sw_recovery_planned").removeClass('on').addClass('off');
+        }
+    });
+    // Logic to switch the recovery Planned button
+    $("#sw_recovery_planned").click(function() {
+        var e = $(this);
+
+        // turning the switch off
+        if(e.hasClass('on')) {
+            e.removeClass('on').addClass('off');
+
+        // turning the switch on
+        } else {
+            e.removeClass('off').addClass('on');
+            // Set recovery OK to false.
+            $("#sw_recovery_ok").removeClass('on').addClass('off');
         }
     });
     // Logic to switch the use car position button
@@ -768,11 +785,21 @@ $(window).ready(function() {
         callsign = $(this).val().trim();
         offline.set('callsign', callsign); // put in localStorage
         CHASE_listenerSent = false;
+        $('#recovery_callsign').val(callsign);
     });
 
+    $("#recovery_callsign").on('change keyup', function() {
+        callsign = $(this).val().trim();
+        offline.set('callsign', callsign); // put in localStorage
+        CHASE_listenerSent = false;
+        $('#cc_callsign').val(callsign);
+    });
+
+
     // load value from localStorage
     callsign = offline.get('callsign');
     $('#cc_callsign').val(callsign);
+    $('#recovery_callsign').val(callsign);
 
     // settings page
 

js/chasecar.lib.js

@@ -45,8 +45,8 @@ ChaseCar.updatePosition = function(callsign, position) {
 
 ChaseCar.markRecovered = function(){
 
-    // Distance limits reinstated 2021-12-04
-    _run_checks = true;
+    // Remove range checks - 2025-01-24
+    _range_check = false;
     _range_limit = 500000; // 200 km
 
     // Get the serial number to be marked recovered
@@ -55,15 +55,15 @@ ChaseCar.markRecovered = function(){
     _notes = $("#pr_notes").val().trim();
 
     // Check it exists.
-    if(_serial.includes("chase") && _run_checks){
+    if(_serial.includes("chase")){
         $('#pr_last_report').text("Invalid sonde callsign.");
         return;
     }
 
-    _callsign = $("#cc_callsign").val().trim();
+    _callsign = $("#recovery_callsign").val().trim();
     if (_callsign == "" || _callsign == undefined || _callsign.length == 0)
     {
-        $('#pr_last_report').text("Enter a callsign in the chase-car section above!");
+        $('#pr_last_report').text("Enter a callsign/name in the 'Recovered by' field!");
         return;
     }
 
@@ -109,7 +109,7 @@ ChaseCar.markRecovered = function(){
         // Calculate the distance from the sonde
         _lookangles = calculate_lookangles(_chaser, _sonde);
 
-        if( (_lookangles.range > _range_limit ) && _run_checks){
+        if( (_lookangles.range > _range_limit ) && _range_check){
             $('#pr_last_report').text("Outside distance limit (500km).");
             return;
         }
@@ -120,28 +120,26 @@ ChaseCar.markRecovered = function(){
         }
     }
 
+    // Logic to make recovery & planned mutually exclusive is in app.js
+    _recovered = $("#sw_recovery_ok").hasClass('on');
+    _planned = $("#sw_recovery_planned").hasClass('on');
+
 
     var _doc = {
         "serial": _serial,
         "lat": _recov_lat,
         "lon": _recov_lon,
         "alt": 0.0,
-        "recovered": $("#sw_recovery_ok").hasClass('on'),
+        "recovered": _recovered,
+        "planned": _planned,
         "recovered_by": _callsign,
         "description": _notes
     };
 
-    // Yes this is not the right way to do this...
-    // .. but it adds an extra bit of check.
-    var res = grecaptcha.getResponse();
-    if (res == "" || res == undefined || res.length == 0)
-    {
-        $('#pr_last_report').text("Do Recaptcha first!");
-        return;
-    }
 
     $('#pr_last_report').text("Submitting report...");
 
+
     $.ajax({
         type: "PUT",
         url: ChaseCar.recovery_uri,