[SOS] Expose internal feature IDs in GetFeatureOfInterest response

Author: alexrobin

sensorhub-service-swe/src/main/java/org/sensorhub/impl/service/sos/SystemDataProvider.java

@@ -28,6 +28,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
 import org.sensorhub.api.common.BigId;
+import org.sensorhub.api.common.IdEncoder;
 import org.sensorhub.api.data.IDataStreamInfo;
 import org.sensorhub.api.database.IObsSystemDatabase;
 import org.sensorhub.api.datastore.SpatialFilter;
@@ -37,6 +38,7 @@
 import org.sensorhub.api.datastore.obs.DataStreamFilter;
 import org.sensorhub.api.datastore.obs.ObsFilter;
 import org.sensorhub.api.datastore.system.SystemFilter;
+import org.sensorhub.api.feature.FeatureWrapper;
 import org.sensorhub.impl.service.swe.RecordTemplate;
 import org.sensorhub.impl.system.SystemUtils;
 import org.vast.ogc.gml.IFeature;
@@ -65,6 +67,7 @@ public abstract class SystemDataProvider implements ISOSAsyncDataProvider
     protected final IObsSystemDatabase database;
     protected final SystemDataProviderConfig config;
     protected final ScheduledExecutorService threadPool;
+    protected final IdEncoder foiIdEncoder;
     DataStreamInfoCache selectedDataStream;
 
     class DataStreamInfoCache
@@ -213,6 +216,7 @@ public SystemDataProvider(final SOSServlet servlet, final IObsSystemDatabase dat
         this.database = Asserts.checkNotNull(database, IObsSystemDatabase.class);
         this.threadPool = Asserts.checkNotNull(threadPool, ExecutorService.class);
         this.config = Asserts.checkNotNull(config, "config");
+        this.foiIdEncoder = servlet.getParentHub().getIdEncoders().getFoiIdEncoder();
     }
 
 
@@ -309,12 +313,23 @@ public void getFeaturesOfInterest(GetFeatureOfInterestRequest req, Subscriber<IF
 
         foiFilter.withCurrentVersion();
 
+        // use mapper to set feature ID from key
+        var foiStream = database.getFoiStore().selectEntries(foiFilter.build()).map(e -> {
+            return (IFeature)new FeatureWrapper(e.getValue()) {
+                @Override
+                public String getId()
+                {
+                    return foiIdEncoder.encodeID(e.getKey().getInternalID());
+                }
+            };
+        });
+        
         // notify consumer with subscription
         consumer.onSubscribe(
             new StreamSubscription<>(
                 consumer,
                 100,
-                database.getFoiStore().select(foiFilter.build())
+                foiStream
             )
         );
     }

sensorhub-service-swe/src/test/java/org/sensorhub/impl/service/sos/TestSOSService.java

@@ -1278,9 +1278,6 @@ protected void testGetFoisByID(int... foiNums) throws Exception
         for (int i=0; i<nodes.getLength(); i++)
         {
             var elt = (Element)nodes.item(i);
-            int id = Integer.parseInt(dom.getAttributeValue(elt, "id").replace("F", ""));
-            assertTrue(Arrays.binarySearch(foiNums, id) >= 0);
-            
             String uid = dom.getElementValue(elt, "identifier");
             assertTrue(req.getFoiIDs().contains(uid));
         }
@@ -1308,22 +1305,15 @@ public void testGetFoisByBbox() throws Exception
     }
 
 
-    protected void testGetFoisByBbox(Bbox bbox, int... foiNums) throws Exception
+    protected void testGetFoisByBbox(Bbox bbox, int... expectedFoiNums) throws Exception
     {
         GetFeatureOfInterestRequest req = new GetFeatureOfInterestRequest();
         req.setGetServer(HTTP_ENDPOINT);
         req.setVersion("2.0");
         req.setBbox(bbox);
 
-        DOMHelper dom = sendRequest(req, false); 
-        assertEquals("Wrong number of features returned", foiNums.length, dom.getElements("*/*").getLength());
-        
-        NodeList nodes = dom.getElements("*/*");
-        for (int i=0; i<nodes.getLength(); i++)
-        {
-            String fid = dom.getAttributeValue((Element)nodes.item(i), "id");
-            assertEquals("F" + foiNums[i], fid);
-        }
+        DOMHelper dom = sendRequest(req, false);
+        checkReturnedFois(dom, expectedFoiNums);
     }
 
 
@@ -1347,22 +1337,15 @@ public void testGetFoisByProcedure() throws Exception
     }
 
 
-    protected void testGetFoisByProcedure(List<String> sysIDs, int... foiNums) throws Exception
+    protected void testGetFoisByProcedure(List<String> sysIDs, int... expectedFoiNums) throws Exception
     {
         GetFeatureOfInterestRequest req = new GetFeatureOfInterestRequest();
         req.setGetServer(HTTP_ENDPOINT);
         req.setVersion("2.0");
         req.getProcedures().addAll(sysIDs);
 
-        DOMHelper dom = sendRequest(req, false); 
-        assertEquals("Wrong number of features returned", foiNums.length, dom.getElements("*/*").getLength());
-        
-        NodeList nodes = dom.getElements("*/*");
-        for (int i=0; i<nodes.getLength(); i++)
-        {
-            String fid = dom.getAttributeValue((Element)nodes.item(i), "id");
-            assertEquals("F" + foiNums[i], fid);
-        }
+        DOMHelper dom = sendRequest(req, false);
+        checkReturnedFois(dom, expectedFoiNums);
     }
 
 
@@ -1388,21 +1371,28 @@ public void testGetFoisByObservables() throws Exception
     }
 
 
-    protected void testGetFoisByObservables(List<String> obsIDs, int... foiNums) throws Exception
+    protected void testGetFoisByObservables(List<String> obsIDs, int... expectedFoiNums) throws Exception
     {
         GetFeatureOfInterestRequest req = new GetFeatureOfInterestRequest();
         req.setGetServer(HTTP_ENDPOINT);
         req.setVersion("2.0");
         req.getObservables().addAll(obsIDs);
 
         DOMHelper dom = sendRequest(req, false); 
-        assertEquals("Wrong number of features returned", foiNums.length, dom.getElements("*/*").getLength());
+        checkReturnedFois(dom, expectedFoiNums);
+    }
+    
+    
+    protected void checkReturnedFois(DOMHelper dom, int... expectedFoiNums)
+    {
+        assertEquals("Wrong number of features returned", expectedFoiNums.length, dom.getElements("*/*").getLength());
 
         NodeList nodes = dom.getElements("*/*");
         for (int i=0; i<nodes.getLength(); i++)
         {
-            String fid = dom.getAttributeValue((Element)nodes.item(i), "id");
-            assertEquals("F" + foiNums[i], fid);
+            var uid = dom.getElementValue((Element)nodes.item(i), "identifier");
+            var expectedUid = getFoiUID(expectedFoiNums[i]);
+            assertEquals(expectedUid, uid);
         }
     }