Update recovery options

Author: darksidelemm

index.html

@@ -311,7 +311,7 @@ <h3>Payload Recovery</h3>
                 <span><b>Under Testing - Not Yet Functional!</b></span>
             </div>
             <div class="row">
-            <span>You can mark a sonde as recovered using the following fields. Enter the serial number (manually, as a check), tick recovered/not recovered, and add some notes. You must have location enabled and be within 5km of the radiosonde position.</span>
+            <span>You can mark a sonde as recovered using the following fields. Enter the serial number (manually, as a check), tick recovered/not recovered, and add some notes. You must have location enabled and be within 50km of the radiosonde position.</span>
             </div>
             <div class="row">
                 <span><b>Serial</b></span>
@@ -336,9 +336,12 @@ <h3>Payload Recovery</h3>
                 <span class="r"><input type="text" id="pr_notes" style="width: 140px;"/></span>
             </div>
             <div class="row">
-                <span><b>Report Success</b></span>
+                <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>
@@ -386,6 +389,7 @@ <h3>Payload Recovery</h3>
     </div>
     <!-- Was 3.31-->
     <script src="https://maps.google.com/maps/api/js?v=3.44&libraries=map,common,controls,util,marker,onion,kml,ga,infowindow,stats,poly,overlay,weather,weather_impl,geometry&language=en_us&key=AIzaSyCiFklq0gbg7DqUn81NqYBN17bwgK4YFf0" type="text/javascript"></script>
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
     <script type="text/javascript" language="javascript" src="js/mobile.js"></script>
     <!--
     <script type="text/javascript" language="javascript" src="js/gmaps_extentions.js"></script>

js/chasecar.lib.js

@@ -45,8 +45,8 @@ ChaseCar.updatePosition = function(callsign, position) {
 
 ChaseCar.markRecovered = function(){
 
-    _run_checks = false;//true;
-    _range_limit = 5000; // Metres
+    _run_checks = true;
+    _range_limit = 50000; // 50 km
 
     // Get the serial number to be marked recovered
     _serial = $("#pr_serial").val().trim();
@@ -105,19 +105,32 @@ ChaseCar.markRecovered = function(){
         "description": _notes
     };
 
-    console.log(_doc);
+    // 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;
+    }
 
     $.ajax({
         type: "PUT",
         url: ChaseCar.recovery_uri,
         contentType: "application/json; charset=utf-8",
         dataType: "json",
         data: JSON.stringify(_doc),
-    }).done(function() {
+    }).done(function(data) {
+        console.log(data);
         $('#pr_last_report').text("Reported OK!");
     })
-    .fail(function() {
-    $('#pr_last_report').text("Failed to report.");
+    .fail(function(jqXHR, textStatus, error) {
+        try {
+            _fail_resp = JSON.parse(jqXHR.responseText);
+            $('#pr_last_report').text(_fail_resp.message);
+        } catch(err) {
+            $('#pr_last_report').text("Failed to report.");
+        }
     })
 
 }

js/tracker.js

@@ -3,7 +3,7 @@ var position_id = 0;
 var data_url = "https://api.v2.sondehub.org/datanew";
 var receivers_url = "https://api.v2.sondehub.org/listeners";
 var predictions_url = "https://api.v2.sondehub.org/predictions?vehicles=";
-var recovered_sondes_url = "https://api.v2.sondehub.org/recoveries";
+var recovered_sondes_url = "https://api.v2.sondehub.org/recovered";
 
 var habitat_max = 400;
 //var habitat_url = "//habitat.habhub.org/habitat/";
@@ -2574,9 +2574,6 @@ function refreshRecoveries() {
     // TODO: Option to hide recoveries
     if(offline.get('opt_hide_recoveries')) return;
 
-    // API not ready yet!
-    return;
-
     $.ajax({
         type: "GET",
         url: recovered_sondes_url,