TORGI now assumes SOS-T sensor assignments if TORGI is not provided with an SOS-T server to contact

Author: scottlandis

torgi/build.gradle

@@ -44,14 +44,14 @@ android {
 
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha04'
     viewerImplementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     viewerImplementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha' //for charts
     viewerImplementation 'org.osmdroid:osmdroid-android:6.0.2'
     implementation 'org.apache.httpcomponents:httpclient:4.5.6' //for SOS server
     implementation 'org.nanohttpd:nanohttpd:2.3.1' //for SOS server
-    implementation 'com.github.sofwerx:swe-android:1.0'
+    implementation 'com.github.sofwerx:swe-android:1.0.1'
     implementation 'org.apache.commons:commons-math3:3.6.1' //for statistical analysis
     implementation 'mil.nga.geopackage:geopackage-android:3.1.0'
     testImplementation 'junit:junit:4.12'

torgi/src/main/java/org/sofwerx/torgi/service/TorgiService.java

@@ -202,7 +202,9 @@ private void setupSosService() {
         sosSensor.addMeasurement(sosMeasurementCn0);
         sosSensor.addMeasurement(sosMeasurementAgc);
         sosSensor.addMeasurement(sosMeasurementRisk);
-        sosService = new SosService(this, sosSensor,prefs.getString(Config.PREFS_SOS_URL,null), prefs.getBoolean(Config.PREFS_BROADCAST,true) || prefs.getBoolean(Config.PREFS_SEND_TO_SOS,true), Config.isIpcBroadcastEnabled(this));
+        if (!Config.isSosBroadcastEnabled(this))
+            assumeDefaultsForSosSensorIfNeeded();
+        sosService = new SosService(this, sosSensor,Config.isSosBroadcastEnabled(this)?prefs.getString(Config.PREFS_SOS_URL,null):null, prefs.getBoolean(Config.PREFS_BROADCAST,true) || prefs.getBoolean(Config.PREFS_SEND_TO_SOS,true), Config.isIpcBroadcastEnabled(this));
         prefChangeListener = (prefs1, key) -> {
             if (sosService != null) {
                 boolean resetSosSensor = false;
@@ -233,6 +235,22 @@ else if (Config.PREFS_BROADCAST.equalsIgnoreCase(key) && (sosService != null))
         prefs.registerOnSharedPreferenceChangeListener(prefChangeListener);
     }
 
+    /**
+     * No SOS-T server could be reached so the sensor will self-assign and broadcast
+     * results in the blind
+     */
+    private void assumeDefaultsForSosSensorIfNeeded() {
+        if ((sosSensor != null) && (sosSensor.getUniqueId() != null)) {
+            Log.d(TAG,"Contacting an outside SOS server is not enabled, so assuming default Senor assignments if needed");
+            if (sosSensor.getAssignedProcedure() == null)
+                sosSensor.setAssignedProcedure(sosSensor.getUniqueId());
+            if (sosSensor.getAssignedOffering() == null)
+                sosSensor.setAssignedOffering(sosSensor.getUniqueId()+"-sos");
+            if (sosSensor.getAssignedTemplate() == null)
+                sosSensor.setAssignedTemplate(sosSensor.getAssignedProcedure()+"#output0");
+        }
+    }
+
     public InputSourceType getInputType() {
         return inputSourceType;
     }

torgi/src/viewer/java/org/sofwerx/torgi/ui/MainActivity.java

@@ -726,13 +726,19 @@ public void onHeatmapChange(final Heatmap heatmap) {
         if (heatmap != null) {
             if (heatmap.getPolygon() != null) {
                 runOnUiThread(() -> {
-                    heatmap.getPolygon().setFillColor(HeatmapOverlay.getFillColor(heatmap.getRfiRisk()));
-                    osmMap.invalidate();
+                    try {
+                        heatmap.getPolygon().setFillColor(HeatmapOverlay.getFillColor(heatmap.getRfiRisk()));
+                        osmMap.invalidate();
+                    } catch (Exception ignore) {
+                    }
                 });
             } else {
                 runOnUiThread(() -> {
-                    overlayHeatmap.createPolygon(heatmap);
-                    osmMap.invalidate();
+                    try {
+                        overlayHeatmap.createPolygon(heatmap);
+                        osmMap.invalidate();
+                    } catch (Exception ignore) {
+                    }
                 });
             }
         }