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 <[email protected]> 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.
