Reduce the org.opengis.temporal package to the minimal number of IS…

…O 19108 interfaces needed for supporting ISO 19115 and ISO 19111, then promote to the main `geoapi` module.
opengeospatial · Jun 8, 2024 · b5dc426 · b5dc426
1 parent df67b03
commit b5dc426
Show file tree

Hide file tree

Showing 29 changed files with 451 additions and 603 deletions.
diff --git a/geoapi-conformance/src/main/java/org/opengis/test/referencing/ReferencingTestCase.java b/geoapi-conformance/src/main/java/org/opengis/test/referencing/ReferencingTestCase.java
@@ -104,7 +104,7 @@ private static double julian(final Instant time) {
     private static Instant union(final Instant bound, final TemporalPrimitive extent, final boolean begin) {
         if (extent instanceof Period) {
             final var period = (Period) extent;
-            final Temporal date = begin ? period.getBeginning() : period.getEnding();
+            final Temporal date = (begin ? period.getBeginning() : period.getEnding()).getPosition();
             final Instant instant;
             if (date instanceof Instant) {
                 instant = (Instant) date;

diff --git a/geoapi-pending/src/main/java/org/opengis/coverage/DomainObject.java b/geoapi-pending/src/main/java/org/opengis/coverage/DomainObject.java
@@ -19,7 +19,7 @@
 
 import java.util.Set;
 import org.opengis.geometry.Geometry;
-import org.opengis.temporal.TemporalGeometricPrimitive;
+import org.opengis.temporal.TemporalPrimitive;
 import org.opengis.annotation.UML;
 
 import static org.opengis.annotation.Obligation.*;
@@ -58,5 +58,5 @@ public interface DomainObject<G extends Geometry> {
      * @return the temporal component of the domain.
      */
     @UML(identifier="temporalElement", obligation=OPTIONAL, specification=ISO_19123)
-    Set<TemporalGeometricPrimitive> getTemporalElements();
+    Set<TemporalPrimitive> getTemporalElements();
 }
diff --git a/geoapi-pending/src/main/java/org/opengis/observation/Observation.java b/geoapi-pending/src/main/java/org/opengis/observation/Observation.java
@@ -19,7 +19,7 @@
 
 import org.opengis.metadata.Metadata;
 import org.opengis.metadata.quality.Element;
-import org.opengis.temporal.TemporalObject;
+import org.opengis.temporal.TemporalPrimitive;
 import org.opengis.annotation.UML;
 
 import static org.opengis.annotation.Specification.*;
@@ -64,7 +64,7 @@ public interface Observation {
     Object getProcedureParameter();
 
     @UML(identifier="resultTime", obligation=OPTIONAL, specification=OGC_07022)
-    TemporalObject getProcedureTime();
+    TemporalPrimitive getProcedureTime();
 
     /**
      * Instance-specific quality assessment or measure.
@@ -81,7 +81,7 @@ public interface Observation {
     * This is the time usually required for geospatial analysis of the result.
     */
     @UML(identifier="samplingTime", obligation=MANDATORY, specification=OGC_07022)
-    TemporalObject getSamplingTime();
+    TemporalPrimitive getSamplingTime();
 
      /**
      * The featureOfInterest is a feature of any type (ISO 19109, ISO 19101),
@@ -124,5 +124,4 @@ public interface Observation {
      */
     @UML(identifier="procedure", obligation=MANDATORY, specification=OGC_07022)
     Process getProcedure();
-
 }
diff --git a/geoapi-pending/src/main/java/org/opengis/observation/sampling/Specimen.java b/geoapi-pending/src/main/java/org/opengis/observation/sampling/Specimen.java
@@ -19,7 +19,7 @@
 
 import org.opengis.observation.Measure;
 import org.opengis.observation.ProcessModel;
-import org.opengis.temporal.TemporalGeometricPrimitive;
+import org.opengis.temporal.TemporalPrimitive;
 import org.opengis.util.GenericName;
 import org.opengis.annotation.UML;
 
@@ -68,12 +68,12 @@ public interface Specimen extends SamplingFeature {
      * Time and date when the specimen was initially retrieved
      */
     @UML(identifier="samplingTime", obligation=MANDATORY, specification=OGC_07022)
-    TemporalGeometricPrimitive getSamplingTime();
+    TemporalPrimitive getSamplingTime();
 
     /**
      * The size of the specimen: mass, length, volume, etc.
      */
     @UML(identifier="size", obligation=OPTIONAL, specification=OGC_07022)
     Measure getSize();
-    
+
 }
diff --git a/geoapi-pending/src/main/java/org/opengis/observation/sampling/SurveyProcedure.java b/geoapi-pending/src/main/java/org/opengis/observation/sampling/SurveyProcedure.java
@@ -20,7 +20,7 @@
 import org.opengis.observation.Measure;
 import org.opengis.metadata.citation.ResponsibleParty;
 import org.opengis.referencing.datum.Datum;
-import org.opengis.temporal.TemporalObject;
+import org.opengis.temporal.TemporalPrimitive;
 import org.opengis.util.GenericName;
 import org.opengis.annotation.UML;
 
@@ -63,6 +63,6 @@ public interface SurveyProcedure {
     GenericName getProjection() ;
 
     @UML(identifier="surveyTime", obligation=OPTIONAL, specification=OGC_07022)
-    TemporalObject getSurveyTime();
+    TemporalPrimitive getSurveyTime();
 
 }
diff --git a/geoapi-pending/src/main/java/org/opengis/temporal/Period.java b/geoapi-pending/src/main/java/org/opengis/temporal/Period.java
diff --git a/geoapi-pending/src/main/java/org/opengis/temporal/RelativePosition.java b/geoapi-pending/src/main/java/org/opengis/temporal/RelativePosition.java
diff --git a/geoapi-pending/src/main/java/org/opengis/temporal/Separation.java b/geoapi-pending/src/main/java/org/opengis/temporal/Separation.java
diff --git a/geoapi-pending/src/main/java/org/opengis/temporal/TemporalGeometricPrimitive.java b/geoapi-pending/src/main/java/org/opengis/temporal/TemporalGeometricPrimitive.java