Merge branch 'testing' of github.com:projecthorus/sondehub-tracker into testing

Author: Mark Jessop

index.html

@@ -129,6 +129,8 @@ <h2>Contribute</h2>
         <div class="slimContainer">
             <h2><i class="icon-settings rfloat"></i>Settings</h2>
             <hr/>
+            <h4>General</h4>
+            <hr/>
             <div class="row option">
                 <span><b>Interpolate gaps in telemetry</b></span>
                 <div class="switch off" id="sw_interpolate">
@@ -164,6 +166,8 @@ <h2><i class="icon-settings rfloat"></i>Settings</h2>
                     <input type="checkbox" id="opt_hide_timebox">
                 </div>
             </div>
+            <h4>Visibility</h4>
+            <hr/>
             <div class="row option">
                 <span><b>Hide receivers from the map</b></span>
                 <div class="switch off" id="sw_hide_receivers">
@@ -186,14 +190,7 @@ <h2><i class="icon-settings rfloat"></i>Settings</h2>
                 </div>
             </div>
             <div class="row option">
-                <span><b>Highlight selected vehicle</b></span>
-                <div class="switch off" id="sw_hilight_vehicle">
-                    <span class="thumb"></span>
-                    <input type="checkbox" id="opt_hilight_vehicle">
-                </div>
-            </div>
-            <div class="row option">
-                <span><b>Hide Horizon Rings</b></span>
+                <span><b>Show Horizon Rings</b></span>
                 <div class="switch off" id="sw_hide_horizon">
                     <span class="thumb"></span>
                     <input type="checkbox" id="opt_hide_horizon">
@@ -213,6 +210,15 @@ <h2><i class="icon-settings rfloat"></i>Settings</h2>
                     <input type="checkbox" id="opt_layers_launches">
                 </div>
             </div>
+            <h4>Other</h4>
+            <hr/>
+            <div class="row option">
+                <span><b>Highlight selected vehicle</b></span>
+                <div class="switch off" id="sw_hilight_vehicle">
+                    <span class="thumb"></span>
+                    <input type="checkbox" id="opt_hilight_vehicle">
+                </div>
+            </div>
             <h4>Overlays</h4>
             <hr/>
             <div class="row option">

js/app.js

@@ -802,10 +802,10 @@ $(window).ready(function() {
                 break;
             case "opt_hide_horizon":
                 if(on) {
-                    hideHorizonRings();
+                    showHorizonRings();
                 }
                 else {
-                    showHorizonRings();
+                    hideHorizonRings();
                 }
                 break;
             case "opt_hide_titles":

js/chasecar.lib.js

@@ -45,9 +45,9 @@ ChaseCar.updatePosition = function(callsign, position) {
 
 ChaseCar.markRecovered = function(){
 
-    // Distance limits removed 2021-12-04
-    //_run_checks = true;
-    //_range_limit = 200000; // 200 km
+    // Distance limits reinstated 2021-12-04
+    _run_checks = true;
+    _range_limit = 200000; // 200 km
 
     // Get the serial number to be marked recovered
     _serial = $("#pr_serial").val().trim();
@@ -88,33 +88,31 @@ ChaseCar.markRecovered = function(){
         }
 
     } else {
-        // NOTE - Distance checks now removed. 
-
         // Sonde is on the map, so run some additional checks.
         _recov_lat = vehicles[_serial].curr_position['gps_lat'];
         _recov_lon = vehicles[_serial].curr_position['gps_lon'];
 
-        // // Now get the last position of the sonde.
-        // _sonde = {
-        //     'lat':_recov_lat,
-        //     'lon':_recov_lon,
-        //     'alt':0.0
-        // };
-
-        // // Now get the chaser position.
-        // _chaser = {
-        //     'lat': parseFloat($('#cc_lat').text()),
-        //     'lon': parseFloat($('#cc_lon').text()),
-        //     'alt': 0.0
-        // };
-
-        // // Calculate the distance from the sonde
-        // _lookangles = calculate_lookangles(_chaser, _sonde);
-
-        // if( (_lookangles.range > _range_limit ) && _run_checks){
-        //     $('#pr_last_report').text("Outside distance limit.");
-        //     return;
-        // }
+        // Now get the last position of the sonde.
+        _sonde = {
+            'lat':_recov_lat,
+            'lon':_recov_lon,
+            'alt':0.0
+        };
+
+        // Now get the chaser position.
+        _chaser = {
+            'lat': parseFloat($('#cc_lat').text()),
+            'lon': parseFloat($('#cc_lon').text()),
+            'alt': 0.0
+        };
+
+        // Calculate the distance from the sonde
+        _lookangles = calculate_lookangles(_chaser, _sonde);
+
+        if( (_lookangles.range > _range_limit ) && _run_checks){
+            $('#pr_last_report').text("Outside distance limit.");
+            return;
+        }
 
         if($("#sw_use_car_pos").hasClass('on')){
             _recov_lat = parseFloat($('#cc_lat').text());

js/tracker.js

@@ -717,7 +717,7 @@ function load() {
 
     map.on('zoomend', function() {
         //do check for horizon labels
-        if (!offline.get("opt_hide_horizon")) {
+        if (offline.get("opt_hide_horizon")) {
             for (key in vehicles) {
                 if (vehicles[key]["vehicle_type"] == "balloon") {
                     if (vehicles[key]["horizon_circle"]["_map"]) 
@@ -3418,7 +3418,7 @@ function addPosition(position) {
                 } else {
                     map.addLayer(vehicle.marker.shadow);
 
-                    if(offline.get('opt_hide_horizon') == false){
+                    if(!offline.get('opt_hide_horizon') == false){
                         map.addLayer(vehicle.horizon_circle);
                         map.addLayer(vehicle.subhorizon_circle);
                         map.addLayer(vehicle.horizon_circle_title);
@@ -3492,7 +3492,7 @@ function addPosition(position) {
                 interactive: false,
             });
 
-            if (!offline.get("opt_hide_horizon")) {
+            if (offline.get("opt_hide_horizon")) {
                 horizon_circle.addTo(map);
                 horizon_circle_title.addTo(map);
             }
@@ -3524,7 +3524,7 @@ function addPosition(position) {
                 interactive: false,
             });
 
-            if (!offline.get("opt_hide_horizon")) {
+            if (offline.get("opt_hide_horizon")) {
                 subhorizon_circle.addTo(map);
                 subhorizon_circle_title.addTo(map);
             }
@@ -5374,7 +5374,6 @@ function refreshUI() {
     if(follow_vehicle !== null) update_lookangles(follow_vehicle);
 }
 
-
 function hideHorizonRings(){
     for(var vcallsign in vehicles) {
         if(vehicles[vcallsign].vehicle_type == "balloon"){
@@ -5385,6 +5384,7 @@ function hideHorizonRings(){
         }
     }
 }
+
 function showHorizonRings(){
     for(var vcallsign in vehicles) {
         if(vehicles[vcallsign].vehicle_type == "balloon"){
@@ -5403,6 +5403,7 @@ function hideTitles(){
         }
     }
 }
+
 function showTitles(){
     for(var vcallsign in vehicles) {
         if(vehicles[vcallsign].vehicle_type == "balloon" || vehicles[vcallsign].vehicle_type == "car"){