This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1483fcf71b8c00dda660cddc38e34270f9f69fce
Merge: 66a5fa5253 74a6061f9e
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Apr 18 17:40:28 2024 +0200
Merge branch 'geoapi-3.1'
.../main/org/apache/sis/xml/XLink.java | 1 +
.../sis/referencing/crs/AbstractDerivedCRS.java | 10 +--
.../referencing/factory/sql/AuthorityCodes.java | 45 ++++---------
.../referencing/factory/sql/EPSGDataAccess.java | 32 +--------
.../sis/referencing/factory/sql/TableInfo.java | 4 +-
.../operation/AbstractCoordinateOperation.java | 4 +-
.../referencing/operation/DefaultConversion.java | 71 +++++++++-----------
.../DefaultCoordinateOperationFactory.java | 6 +-
.../operation/DefaultOperationMethod.java | 20 +++---
.../operation/DefaultPassThroughOperation.java | 3 +-
.../referencing/operation/DefaultProjection.java | 36 +----------
.../apache/sis/referencing/operation/SubTypes.java | 75 ----------------------
.../operation/provider/AbstractProvider.java | 6 +-
.../operation/provider/Equirectangular.java | 4 +-
.../operation/provider/MapProjection.java | 4 +-
.../operation/provider/PseudoPlateCarree.java | 3 -
.../provider/ZonedTransverseMercator.java | 4 +-
.../transform/DefaultMathTransformFactory.java | 12 ++--
.../referencing/factory/sql/EPSGFactoryTest.java | 11 +---
.../operation/CoordinateOperationFinderTest.java | 3 +-
.../operation/DefaultConversionTest.java | 21 +++---
.../operation/provider/ProvidersTest.java | 3 +-
.../transform/DefaultMathTransformFactoryTest.java | 19 +++---
.../report/CoordinateOperationMethods.java | 4 +-
24 files changed, 107 insertions(+), 294 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
index 66b225bebf,44cb55e6e2..91c6f7c16e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConversion.java
@@@ -219,8 -222,8 +222,7 @@@ public class DefaultConversion extends
* @param source the new source CRS.
* @param target the new target CRS.
* @param factory the factory to use for creating a transform from
the parameters or for performing axis changes.
- * @param actual an array of length 1 where to store the actual
operation method used by the math transform factory.
*/
- @SuppressWarnings("deprecation")
DefaultConversion(final Conversion definition,
final CoordinateReferenceSystem source,
final CoordinateReferenceSystem target,
@@@ -385,12 -369,14 +368,13 @@@
* failed.
*
* @see
DefaultMathTransformFactory#createParameterizedTransform(ParameterValueGroup,
DefaultMathTransformFactory.Context)
+ *
+ * @since 1.5
*/
- public <T extends Conversion> T specialize(final Class<T> baseType,
- final CoordinateReferenceSystem sourceCRS, final
CoordinateReferenceSystem targetCRS,
- MathTransformFactory factory) throws FactoryException
- @SuppressWarnings("deprecation")
+ public Conversion specialize(final CoordinateReferenceSystem sourceCRS,
+ final CoordinateReferenceSystem targetCRS,
+ MathTransformFactory factory) throws
FactoryException
{
- ArgumentChecks.ensureNonNull("baseType", baseType);
ArgumentChecks.ensureNonNull("sourceCRS", sourceCRS);
ArgumentChecks.ensureNonNull("targetCRS", targetCRS);
/*
