You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2025/09/02 14:37:25 UTC
(sis) branch geoapi-3.1 updated (027cd1b753 -> bb738fc51c)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
from 027cd1b753 Merge of automatic reorganization of imports order.
new f1b755d4c7 Upgrade the GeoAPI dependency.
add 1afd594078 More update for CRS that may be associated ot `DatumEnsemble` instead of `Datum`. This include an update of GeoAPI snapshot for the GeoAPI conformance tests.
add 8ac2e436ae Fix more test failures relative to the WGS84 being a datum ensemble since EPSG version 10. Most of the remaining test failures are about new operation types not yet supported.
new bb738fc51c Merge branch 'geoapi-4.0' into geoapi-3.1.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sis/console/MetadataCommandTest.java | 3 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 5 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 107 ++++++++++++++------
.../sis/referencing/EPSGFactoryFallback.java | 32 ++++--
.../sis/referencing/StandardDefinitions.java | 18 ++--
.../sis/referencing/datum/DatumOrEnsemble.java | 75 ++++++++++++++
.../referencing/datum/DefaultDatumEnsemble.java | 4 +-
.../referencing/datum/DefaultGeodeticDatum.java | 4 +-
.../factory/GeodeticAuthorityFactory.java | 18 +++-
.../referencing/factory/GeodeticObjectFactory.java | 110 ++++++++++++++++++++-
.../referencing/factory/sql/EPSGDataAccess.java | 36 ++-----
.../operation/CoordinateOperationFinder.java | 7 +-
.../org/apache/sis/referencing/Assertions.java | 20 +++-
.../test/org/apache/sis/referencing/CRSTest.java | 2 +
.../org/apache/sis/referencing/CommonCRSTest.java | 8 +-
.../sis/referencing/EPSGFactoryFallbackTest.java | 25 +++--
.../sis/referencing/GeodeticObjectVerifier.java | 7 +-
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 1 +
.../report/CoordinateReferenceSystems.java | 2 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 +-
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 2 +-
.../org/apache/sis/storage/CoverageSubsetTest.java | 4 +-
geoapi/snapshot | 2 +-
26 files changed, 384 insertions(+), 121 deletions(-)
(sis) 01/02: Upgrade the GeoAPI dependency.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit f1b755d4c71544a0376b176f896fb5aae6c933ca
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Sep 2 16:31:01 2025 +0200
Upgrade the GeoAPI dependency.
---
.../referencing/factory/GeodeticAuthorityFactory.java | 16 ++++++++++++++++
geoapi/snapshot | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index c684889ab8..c60d32a692 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@ -173,6 +173,22 @@ public abstract class GeodeticAuthorityFactory extends AbstractFactory implement
return Optional.ofNullable(IdentifiedObjects.getDisplayName(createObject(type, code)));
}
+ /**
+ * Returns a description of the object corresponding to a code.
+ *
+ * @param code value allocated by authority.
+ * @return a description of the object, or empty if the object corresponding to the specified code has no description.
+ * @throws FactoryException if an error occurred while fetching the description.
+ *
+ * @deprecated Replaced by {@link #getDescriptionText(Class, String)} because authority code without type are ambiguous.
+ */
+ @Override
+ @Deprecated(since="1.5")
+ @SuppressWarnings("removal") // Cannot be removed before a migration to GeoAPI 4.0.
+ public InternationalString getDescriptionText(final String code) throws FactoryException {
+ return getDescriptionText(CoordinateReferenceSystem.class, code).orElse(null);
+ }
+
/**
* Returns an object of the specified type from a code. This implementation forwards
* the method call to the most specialized methods determined by the given type.
diff --git a/geoapi/snapshot b/geoapi/snapshot
index 8170551f45..ec781af595 160000
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@ -1 +1 @@
-Subproject commit 8170551f45eac993404798f839e9cc5e5cbf8f75
+Subproject commit ec781af595a5b8a234550237ea5d6f4e4eb876f8
(sis) 02/02: Merge branch 'geoapi-4.0' into geoapi-3.1.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit bb738fc51c40bdef8b1327e803cc9ae504894b5a
Merge: f1b755d4c7 8ac2e436ae
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Sep 2 16:34:57 2025 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
.../apache/sis/console/MetadataCommandTest.java | 3 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 5 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 107 ++++++++++++++------
.../sis/referencing/EPSGFactoryFallback.java | 32 ++++--
.../sis/referencing/StandardDefinitions.java | 18 ++--
.../sis/referencing/datum/DatumOrEnsemble.java | 75 ++++++++++++++
.../referencing/datum/DefaultDatumEnsemble.java | 4 +-
.../referencing/datum/DefaultGeodeticDatum.java | 4 +-
.../factory/GeodeticAuthorityFactory.java | 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 110 ++++++++++++++++++++-
.../referencing/factory/sql/EPSGDataAccess.java | 36 ++-----
.../operation/CoordinateOperationFinder.java | 7 +-
.../org/apache/sis/referencing/Assertions.java | 20 +++-
.../test/org/apache/sis/referencing/CRSTest.java | 2 +
.../org/apache/sis/referencing/CommonCRSTest.java | 8 +-
.../sis/referencing/EPSGFactoryFallbackTest.java | 25 +++--
.../sis/referencing/GeodeticObjectVerifier.java | 7 +-
.../sis/referencing/StandardDefinitionsTest.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 1 +
.../report/CoordinateReferenceSystems.java | 2 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 2 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 7 +-
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 2 +-
.../org/apache/sis/storage/CoverageSubsetTest.java | 4 +-
25 files changed, 367 insertions(+), 120 deletions(-)
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index 5d6f57441a,83fca7a59e..4ab57382bd
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@@ -52,9 -52,12 +52,12 @@@ import org.apache.sis.setup.Installatio
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Units;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.crs.GeocentricCRS;
+
+ // Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.datum.DatumEnsemble;
+
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.GeodeticCRS;
-
/**
* The authority factory to use as a fallback when the real EPSG factory is not available.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index b06c7b6291,f2a2c0da46..c1691e4fe1
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@@ -77,11 -77,9 +77,12 @@@ import org.apache.sis.measure.Units
import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+ import org.opengis.referencing.datum.DatumEnsemble;
import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
+// Specific to the geoapi-3.1 branch:
+import org.opengis.referencing.datum.RealizationMethod;
+
/**
* Definitions of referencing objects identified by the {@link CommonCRS} enumeration values.