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 51c67748ee06b2777116653cbb2309d8ff940c5a
Merge: ff9d7d107b 2c396c8526
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jul 19 17:55:29 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1:
use `PseudoDatum` in `CoordinateOperationFinder`.
.../apache/sis/buildtools/gradle/Assembler.java | 2 +-
.../org/apache/sis/buildtools/gradle/UnoPkg.java | 2 +-
endorsed/build.gradle.kts | 3 +
.../apache/sis/coverage/grid/DimensionReducer.java | 2 +-
.../main/org/apache/sis/filter/TemporalFilter.java | 2 +-
.../coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../iso/quality/DefaultEvaluationMethod.java | 16 +-
.../iso/quality/DefaultMeasureReference.java | 14 +-
.../sis/metadata/privy/ImplementationHelper.java | 2 +-
.../{internal => privy}/RecordSchemaSIS.java | 5 +-
.../sis/metadata/privy/TransformationAccuracy.java | 90 --------
.../apache/sis/metadata/sql/MetadataSource.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecord.java | 2 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 2 +-
.../main/org/apache/sis/xml/MarshallerPool.java | 2 +-
.../org/apache/sis/xml/privy/XmlUtilities.java | 2 +-
.../iso/quality/DefaultQuantitativeResultTest.java | 2 +-
.../org/apache/sis/xml/test/PackageVerifier.java | 2 +-
.../sis/openoffice/ReferencingFunctionsTest.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 4 +-
.../main/org/apache/sis/referencing/CRS.java | 2 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 10 +-
.../sis/referencing/MultiRegisterOperations.java | 10 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 2 +-
.../referencing/datum/DefaultDatumEnsemble.java | 4 +-
.../apache/sis/referencing/datum/PseudoDatum.java | 242 +++++++++++++++++++--
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 42 ++--
.../sis/referencing/internal/AnnotatedMatrix.java | 1 -
.../PositionalAccuracyConstant.java | 144 ++++++++----
.../apache/sis/referencing/internal/Resources.java | 10 +
.../sis/referencing/internal/Resources.properties | 4 +-
.../referencing/internal/Resources_fr.properties | 4 +-
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/CoordinateOperationContext.java | 2 +-
.../operation/CoordinateOperationFinder.java | 71 +++---
.../operation/CoordinateOperationRegistry.java | 15 +-
.../operation/DefaultConcatenatedOperation.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 23 +-
.../referencing/privy/ReferencingUtilities.java | 24 --
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 49 ++---
.../internal/PositionalAccuracyConstantTest.java | 111 ++++++++++
.../operation/CoordinateOperationFinderTest.java | 4 +-
.../DefaultCoordinateOperationFactoryTest.java | 2 +-
.../privy/PositionalAccuracyConstantTest.java | 68 ------
.../sis/storage/geotiff/reader/CRSBuilder.java | 2 +-
.../storage/geotiff/writer/CompressionChannel.java | 2 +-
.../apache/sis/storage/base/MetadataBuilder.java | 2 +-
.../sis/util/collection/WeakValueHashMap.java | 24 ++
netbeans-project/nbproject/project.properties | 1 +
.../main/org/apache/sis/gui/internal/FontGIS.java | 2 +-
52 files changed, 661 insertions(+), 384 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
index 0ea021b3ec,75ac98142e..ee840991a4
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
@@@ -27,6 -28,8 +28,7 @@@ import java.time.temporal.Temporal
import java.io.Serializable;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
-import org.opengis.metadata.Identifier;
+ import org.opengis.metadata.quality.PositionalAccuracy;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.ObjectDomain;
import org.opengis.referencing.datum.*;
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index c8f9b22cbb,9df0ff8833..fc23726ebe
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@@ -68,11 -70,7 +70,10 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.privy.Constants;
import org.apache.sis.util.privy.DoubleDouble;
import org.apache.sis.util.resources.Vocabulary;
- import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
+// Specific to the main and geoapi-3.1 branches:
+import org.apache.sis.temporal.TemporalDate;
+
/**
* Finds a conversion or transformation path from a source CRS to a target
CRS.
