[SML] Fix time range in conversion from generic feature to SML object

Author: alexrobin

lib-ogc/sensorml-core/src/main/java/org/vast/sensorML/SMLBuilders.java

@@ -35,6 +35,7 @@
 import net.opengis.gml.v32.AbstractGeometry;
 import net.opengis.gml.v32.Point;
 import net.opengis.gml.v32.TimeIndeterminateValue;
+import net.opengis.gml.v32.TimePeriod;
 import net.opengis.gml.v32.impl.ReferenceImpl;
 import net.opengis.sensorml.v20.AbstractPhysicalProcess;
 import net.opengis.sensorml.v20.AbstractProcess;
@@ -245,6 +246,12 @@ public B addClassifier(TermBuilder term)
             return addClassifier(term.build());
         }
 
+        public B validTimePeriod(TimePeriod tp)
+        {
+            instance.addValidTimeAsTimePeriod(tp);
+            return (B)this;
+        }
+        
         public B validTimePeriod(OffsetDateTime begin, OffsetDateTime end)
         {
             var beginPos = gmlFac.newTimePosition();

sensorhub-service-consys/src/main/java/org/sensorhub/impl/service/consys/sensorml/SMLConverter.java

@@ -14,8 +14,8 @@
 
 package org.sensorhub.impl.service.consys.sensorml;
 
-import java.time.ZoneOffset;
 import javax.xml.namespace.QName;
+import org.vast.ogc.gml.GMLUtils;
 import org.vast.ogc.gml.IFeature;
 import org.vast.ogc.xlink.IXlinkReference;
 import org.vast.sensorML.SMLBuilders.AbstractProcessBuilder;
@@ -25,6 +25,7 @@
 import org.vast.sensorML.SMLFactory;
 import org.vast.sensorML.SMLHelper;
 import net.opengis.gml.v32.Point;
+import net.opengis.gml.v32.TimePeriod;
 import net.opengis.sensorml.v20.AbstractProcess;
 import net.opengis.sensorml.v20.Deployment;
 
@@ -85,9 +86,8 @@ public AbstractProcess genericFeatureToSystem(IFeature f)
             var validTime = f.getValidTime();
             if (f.getValidTime() != null)
             {
-                builder.validTimePeriod(
-                    validTime.begin().atOffset(ZoneOffset.UTC),
-                    validTime.end().atOffset(ZoneOffset.UTC));
+                var timePrimitive = GMLUtils.timeExtentToTimePrimitive(validTime, true);
+                builder.validTimePeriod((TimePeriod)timePrimitive);
             }
 
             if (f.getGeometry() != null && builder instanceof PhysicalSystemBuilder)
@@ -154,9 +154,8 @@ else if (SWEConstants.DEF_PROCEDURE.equals(type) ||
         var validTime = f.getValidTime();
         if (f.getValidTime() != null)
         {
-            builder.validTimePeriod(
-                validTime.begin().atOffset(ZoneOffset.UTC),
-                validTime.end().atOffset(ZoneOffset.UTC));
+            var timePrimitive = GMLUtils.timeExtentToTimePrimitive(validTime, true);
+            builder.validTimePeriod((TimePeriod)timePrimitive);
         }
 
         return builder.build();
@@ -176,6 +175,13 @@ public Deployment genericFeatureToDeployment(IFeature f)
                 .name(f.getName())
                 .description(f.getDescription());
 
+            var validTime = f.getValidTime();
+            if (f.getValidTime() != null)
+            {
+                var timePrimitive = GMLUtils.timeExtentToTimePrimitive(validTime, true);
+                builder.validTimePeriod((TimePeriod)timePrimitive);
+            }
+            
             if (f.getGeometry() != null)
                 ((DeploymentBuilder)builder).location(f.getGeometry());
         }