Merge pull request projecthorus#87 from darksidelemm/main

Fix low altitude APRS setting, add hide testing payloads setting

Author: darksidelemm

index.html

@@ -217,9 +217,16 @@ <h4>Visibility</h4>
             </div>
             <div class="row option">
                 <span><b>Show Low Altitude APRS</b></span>
-                <div class="switch off" id="sw_hide_aprs">
+                <div class="switch off" id="sw_show_aprs">
                     <span class="thumb"></span>
-                    <input type="checkbox" id="opt_hide_aprs">
+                    <input type="checkbox" id="opt_show_aprs">
+                </div>
+            </div>
+            <div class="row option">
+                <span><b>Show Testing Payloads</b></span>
+                <div class="switch on" id="sw_show_testing">
+                    <span class="thumb"></span>
+                    <input type="checkbox" id="opt_show_testing">
                 </div>
             </div>
             <h4>Other</h4>

js/app.js

@@ -728,7 +728,8 @@ $(window).ready(function() {
         '#sw_hide_horizon',
         '#sw_hide_titles',
         '#sw_selective_sidebar',
-        '#sw_hide_aprs',
+        '#sw_show_aprs',
+        '#sw_show_testing',
         "#sw_nowelcome",
         "#sw_interpolate",
         "#sw_float_constrained"
@@ -826,7 +827,10 @@ $(window).ready(function() {
             case "opt_selective_sidebar":
                 sidebar_update();
                 break;
-            case "opt_hide_aprs":
+            case "opt_show_aprs":
+                clean_refresh(wvar.mode, true, false);
+                break;
+            case "opt_show_testing":
                 clean_refresh(wvar.mode, true, false);
                 break;
             case "opt_interpolate":

js/format.js

@@ -27,7 +27,8 @@ var excludedFields = [
     "uploader_radio",
     "uploader_antenna",
     "raw",
-    "aprs_tocall"
+    "aprs_tocall",
+    "telemetry_hidden"
 ];
 
 var uniqueKeys = {
@@ -37,7 +38,8 @@ var uniqueKeys = {
 }
 
 function formatData(data) {
-    var hideAprs = offline.get('opt_hide_aprs');
+    var showAprs = offline.get('opt_show_aprs');
+    var showTesting = offline.get("opt_show_testing");
     var response = {};
     response.positions = {};
     var dataTemp = [];
@@ -70,7 +72,8 @@ function formatData(data) {
                         } 
                     }
                     for (let entry in data[key][i].uploaders) {
-                        if (data[key][i].software_name == "aprs") {
+                        // This check should probably be done using a modulation field, but this still works I guess..
+                        if (data[key][i].software_name.includes("APRS")) {
                             aprsflag = true;
                             var stations = data[key][i].uploaders[entry].uploader_callsign.split(",");
                             for (let uploader in stations) {
@@ -96,9 +99,15 @@ function formatData(data) {
                     if (dataTempEntry.gps_alt > maximumAltitude) {
                         maximumAltitude = dataTempEntry.gps_alt;
                     }
-                    if (maximumAltitude < 1500 && aprsflag && !hideAprs) {
+                    // APRS Altitude filter.
+                    if (maximumAltitude < 1500 && aprsflag && !showAprs) {
                         continue;
                     }
+                    // Testing payload filter.
+                    if (data[key][i].telemetry_hidden && !showTesting){
+                        continue;
+                    }
+                    //
                     dataTempEntry.gps_lat = parseFloat((data[key][i].lat).toPrecision(8));
                     dataTempEntry.gps_lon = parseFloat((data[key][i].lon).toPrecision(8));
                     if (dataTempEntry.gps_lat == 0 && dataTempEntry.gps_lon == 0) {