- added ability to get sensor information on demand from SOS server

Author: jvinall

Example/app/debug/app-debug.apk

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]

Example/app/debug/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

Example/app/release/app-release.apk

@@ -10,11 +10,16 @@
 import android.util.Log;
 import android.util.Pair;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
 import android.widget.SeekBar;
+import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -26,6 +31,7 @@
 import org.sofwerx.ogc.sos.HttpHelper;
 import org.sofwerx.ogc.sos.OperationGetCapabilities;
 import org.sofwerx.ogc.sos.OperationGetCapabilitiesResponse;
+import org.sofwerx.ogc.sos.OperationGetResults;
 import org.sofwerx.ogc.sos.SensorMeasurement;
 import org.sofwerx.ogc.sos.SensorMeasurementTime;
 import org.sofwerx.ogc.sos.SensorResultTemplateField;
@@ -42,6 +48,7 @@
 public class PullExampleActivity extends AppCompatActivity implements SosMessageListener {
     private SosService sosService;
     private ArrayList<SosSensor> sensors;
+    private SosSensor currentSensor = null;
 
     @Override
     public void onDestroy() {
@@ -59,6 +66,10 @@ public void onDestroy() {
     private TextView textCannotSendWarning, textResult;
     private Button sendButton;
     private View viewMeasurements;
+    private ProgressBar progressBar;
+    private Spinner spinner;
+    private ArrayAdapter spinnerArrayAdapter = null;
+    private boolean isWaiting = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -74,6 +85,19 @@ protected void onCreate(Bundle savedInstanceState) {
         sendButton = findViewById(R.id.send);
         viewMeasurements = findViewById(R.id.viewMeasurements);
         sendButton.setOnClickListener(v -> sendQuery());
+        spinner = findViewById(R.id.spinner);
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                if ((sensors != null) && (position < sensors.size()))
+                    currentSensor = sensors.get(position);
+                updateVisibility();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) { }
+        });
+        progressBar = findViewById(R.id.progressBar);
         checkSendIpc.setOnCheckedChangeListener((buttonView, isChecked) -> {
             updateVisibility();
             if (sosService != null)
@@ -89,6 +113,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void sendQuery() {
+        isWaiting = true;
         if (sosService == null) {
             String url;
             if (checkSendNet.isChecked())
@@ -100,7 +125,11 @@ private void sendQuery() {
             log("Querying server...");
             sosService = new SosService(PullExampleActivity.this, null, url, username, sosPassword, true, checkSendIpc.isChecked());
         }
-        sosService.broadcast(new OperationGetCapabilities());
+        updateVisibility();
+        if ((sensors == null) || sensors.isEmpty())
+            sosService.broadcast(new OperationGetCapabilities());
+        else
+            sosService.broadcast(new OperationGetResults(currentSensor));
     }
 
     private final static String PREFS_SEND_IPC = "ipc";
@@ -152,6 +181,28 @@ private void updateVisibility() {
             editSosPassword.setVisibility(View.GONE);
         }
         checkSendingPrereqs();
+        progressBar.setVisibility(isWaiting?View.VISIBLE:View.GONE);
+        if ((sensors == null) || sensors.isEmpty()) {
+            spinner.setVisibility(View.INVISIBLE);
+            sendButton.setText("Request List of Sensors");
+        } else {
+            if (spinnerArrayAdapter == null) {
+                String[] values = new String[sensors.size()];
+                for (int i=0;i<sensors.size();i++) {
+                    if ((sensors.get(i) == null) || (sensors.get(i).getId() == null))
+                        values[i] = "- unknown -";
+                    else
+                        values[i] = sensors.get(i).getId();
+                }
+                spinnerArrayAdapter = new ArrayAdapter(this,
+                        android.R.layout.simple_spinner_dropdown_item,
+                        values);
+                spinner.setAdapter(spinnerArrayAdapter);
+                spinner.setVisibility(View.VISIBLE);
+                spinner.setSelection(0);
+            }
+            sendButton.setText("Request Sensor Results");
+        }
     }
 
     @SuppressLint("SetTextI18n")
@@ -228,49 +279,55 @@ private String getMissingPrereqs() {
 
     @Override
     public void onSosOperationReceived(final AbstractSosOperation operation) {
+        isWaiting = false;
         if (operation != null) {
             runOnUiThread(() -> {
-                log(operation.getClass().getSimpleName() + " received");
                 updateVisibility();
             });
             if (operation instanceof OperationGetCapabilitiesResponse) {
                 ArrayList<SosSensor> opSensors = ((OperationGetCapabilitiesResponse) operation).getSensors();
                 if ((opSensors != null) && !opSensors.isEmpty()) {
                     Log.d(SosIpcTransceiver.TAG,opSensors.size()+" sensors described by server");
                     for (SosSensor sensor:opSensors) {
-                        //TODO testing
-                        if ((sensor.getId() != null) && sensor.getId().contains("405-TORGI")) {
-                            Log.d(SosIpcTransceiver.TAG,"... to include a TORGI sensor. Requesting most recent readings...");
-                            sosService.getSensorResultFromServer(sensor);
-                            SosSensor current = findSensor(sensor);
-                            if (sensors == null)
-                                sensors = new ArrayList<>();
-                            if (current == null)
-                                sensors.add(sensor);
-                            else
-                                current.update(sensor);
-                        }
+                        SosSensor current = findSensor(sensor);
+                        if (sensors == null)
+                            sensors = new ArrayList<>();
+                        if (current == null)
+                            sensors.add(sensor);
+                        else
+                            current.update(sensor);
                     }
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            if ((sensors != null) && !sensors.isEmpty()) {
-                                StringWriter out = new StringWriter();
-                                boolean first = true;
-                                for (SosSensor a:sensors) {
-                                    if (first)
-                                        first = false;
-                                    else
-                                        out.append("\r\n");
-                                    out.append(a.toString());
-                                }
-                                log(out.toString());
-                            } else
-                                log("No sensor data received");
-                        }
+                    runOnUiThread(() -> {
+                        if ((sensors != null) && !sensors.isEmpty()) {
+                            Toast.makeText(PullExampleActivity.this,sensors.size()+" sensor"+((sensors.size()==1)?"":"s")+" available",Toast.LENGTH_SHORT).show();
+                            StringWriter out = new StringWriter();
+                            out.append("Available sensors:\r\n");
+                            boolean first = true;
+                            for (SosSensor a:sensors) {
+                                if (first)
+                                    first = false;
+                                else
+                                    out.append("\r\n");
+                                out.append(a.toString());
+                            }
+                            log(out.toString());
+                            log("\r\n");
+                        } else
+                            log("No sensor data received");
                     });
                 }
+            } else if (operation instanceof OperationGetResults) {
+                final SosSensor received = ((OperationGetResults)operation).getSensor();
+                runOnUiThread(() -> {
+                    if (received == null)
+                        log("GetResults failed to get any sensor information");
+                    else
+                        log(received.toString());
+                });
             }
+            runOnUiThread(() -> {
+                updateVisibility();
+            });
         }
     }
 
@@ -286,8 +343,10 @@ private SosSensor findSensor(SosSensor sensor) {
 
     @Override
     public void onSosError(final String message) {
+        isWaiting = false;
         runOnUiThread(() -> {
             log(message);
+            updateVisibility();
         });
     }
 

Example/app/release/output.json

@@ -96,8 +96,7 @@
 
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.3"
+        android:layout_height="wrap_content"
         app:cardCornerRadius="4dp"
         app:cardElevation="4dp"
         android:padding="6dp"
@@ -134,6 +133,11 @@
                 android:layout_margin="6dp"
                 android:visibility="gone"/>
 
+            <Spinner
+                android:id="@+id/spinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
             <Button
                 android:id="@+id/send"
                 android:layout_width="match_parent"
@@ -167,6 +171,13 @@
                 android:textStyle="bold"
                 android:padding="4dp"/>
 
+            <ProgressBar
+                android:id="@+id/progressBar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true" />
+
             <TextView
                 android:id="@+id/result"
                 android:layout_width="match_parent"

Example/app/src/main/java/org/sofwerx/swe/example/PullExampleActivity.java

@@ -0,0 +1,76 @@
+package org.sofwerx.ogc.sos;
+
+import android.util.Pair;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+public class OperationGetResults extends AbstractSosOperation {
+    private SosSensor sensor;
+
+    public OperationGetResults() {
+        super();
+    }
+
+    public OperationGetResults(SosSensor sensor) {
+        super();
+        this.sensor = sensor;
+    }
+
+    @Override
+    public boolean isValid() {
+        return (sensor != null) && (sensor.getAssignedOffering() != null) && (sensor.getAssignedOffering() != null);
+    }
+
+    public SosSensor getSensor() { return sensor; }
+    public void setSensor(SosSensor sensor) { this.sensor = sensor; }
+
+    public ArrayList<Pair<String,String>> getPairs() {
+        ArrayList<Pair<String,String>> pairs = new ArrayList<>();
+        pairs.add(new Pair("service","SOS"));
+        pairs.add(new Pair("version","2.0"));
+        pairs.add(new Pair("request","GetResult"));
+        pairs.add(new Pair("offering",sensor.getAssignedOffering()));
+        pairs.add(new Pair("observedProperty",sensor.getFirstObservableProperty()));
+        pairs.add(new Pair("responseFormat","application/json"));
+        return pairs;
+    }
+
+    public JSONObject toJSON() {
+        ArrayList<Pair<String,String>> pairs = getPairs();
+        JSONObject obj = new JSONObject();
+
+        try {
+            for (Pair<String,String> pair:pairs) {
+                obj.putOpt(pair.first,pair.second);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return obj;
+    }
+
+    public void parse(JSONObject obj) {
+        if ((sensor != null) && (obj != null))
+            sensor.parseSensors(obj);
+    }
+
+    @Override
+    public void parse(Element getCapabilities) {
+        //ignore, GetResults is handled as JSON only for now
+    }
+
+    @Override
+    public Document toXML() throws ParserConfigurationException {
+        //ignored, GetResults is handled as JSON only for now
+        return null;
+    }
+}

Example/app/src/main/res/layout/activity_pull.xml

@@ -2,7 +2,6 @@
 
 import android.util.Log;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -326,8 +325,8 @@ public String toString() {
         StringWriter out = new StringWriter();
         if (id != null)
             out.append(id);
-        out.append(": ");
         if ((measurements != null) && !measurements.isEmpty()) {
+            out.append(": ");
             boolean first = true;
             for (SensorMeasurement measurement:measurements) {
                 if (first)
@@ -336,8 +335,7 @@ public String toString() {
                     out.append(", ");
                 out.append(measurement.toString());
             }
-        } else
-            out.append("no measurements");
+        }
         return out.toString();
     }
 }