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 f0d4a254e4122b119e2939a5ac73b6dfca8052f3 Merge: 9696bd8bfe 184ea54db1 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sat Apr 13 11:08:30 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/io/wkt/GeodeticObjectParser.java | 13 +- .../sis/referencing/PropertiesConverter.java | 3 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 20 ++- .../referencing/factory/GeodeticObjectFactory.java | 22 +-- .../apache/sis/referencing/internal/Resources.java | 7 +- .../sis/referencing/internal/Resources.properties | 1 - .../referencing/internal/Resources_fr.properties | 1 - .../operation/CoordinateOperationFinder.java | 8 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../operation/DefaultOperationMethod.java | 2 +- .../operation/projection/NormalizedProjection.java | 8 +- .../operation/provider/AbridgedMolodensky.java | 46 +---- .../operation/provider/AbstractMercator.java | 3 +- .../operation/provider/AbstractProvider.java | 199 ++++++++------------- .../operation/provider/AbstractStereographic.java | 3 +- .../sis/referencing/operation/provider/Affine.java | 88 +++------ .../operation/provider/AxisOrderReversal.java | 84 ++++++--- .../operation/provider/AxisOrderReversal3D.java | 23 ++- .../provider/CoordinateFrameRotation2D.java | 34 ++-- .../provider/CoordinateFrameRotation3D.java | 41 +++-- .../operation/provider/Equirectangular.java | 17 +- .../provider/FranceGeocentricInterpolation.java | 91 ++-------- .../operation/provider/GeocentricAffine.java | 71 ++++---- .../GeocentricAffineBetweenGeographic.java | 64 +++---- .../operation/provider/GeocentricToGeographic.java | 64 ++----- .../provider/GeocentricToTopocentric.java | 41 ++--- .../provider/GeocentricTranslation2D.java | 34 ++-- .../provider/GeocentricTranslation3D.java | 42 +++-- .../operation/provider/GeodeticOperation.java | 188 ------------------- .../operation/provider/Geographic2Dto3D.java | 66 ++++--- .../operation/provider/Geographic3Dto2D.java | 100 ++++++----- .../provider/GeographicAndVerticalOffsets.java | 31 +--- .../operation/provider/GeographicOffsets.java | 94 +++++----- .../operation/provider/GeographicOffsets2D.java | 44 +++-- .../operation/provider/GeographicRedimension.java | 95 ---------- .../operation/provider/GeographicToGeocentric.java | 113 +++--------- .../provider/GeographicToTopocentric.java | 33 +--- .../operation/provider/Interpolation1D.java | 36 +--- .../operation/provider/LongitudeRotation.java | 44 +---- .../operation/provider/MapProjection.java | 85 ++++----- .../operation/provider/MapProjection3D.java | 92 ---------- .../referencing/operation/provider/Molodensky.java | 77 ++------ .../sis/referencing/operation/provider/NADCON.java | 16 +- .../sis/referencing/operation/provider/NTv1.java | 14 +- .../sis/referencing/operation/provider/NTv2.java | 24 +-- .../operation/provider/NorthPoleRotation.java | 16 +- .../operation/provider/ObliqueMercator.java | 2 +- .../operation/provider/ObliqueStereographic.java | 3 +- .../operation/provider/PositionVector7Param2D.java | 34 ++-- .../operation/provider/PositionVector7Param3D.java | 41 +++-- .../operation/provider/PseudoPlateCarree.java | 15 +- .../operation/provider/SatelliteTracking.java | 3 +- .../referencing/operation/provider/Sinusoidal.java | 3 +- .../operation/provider/SouthPoleRotation.java | 16 +- .../operation/provider/VerticalOffset.java | 28 +-- .../referencing/operation/provider/Wraparound.java | 19 +- .../provider/ZonedTransverseMercator.java | 14 +- .../transform/DefaultMathTransformFactory.java | 106 +++++++---- .../transform/EllipsoidToCentricTransform.java | 4 + .../operation/transform/MathTransformProvider.java | 172 +++++++++++++++--- .../operation/transform/MolodenskyTransform.java | 1 + .../referencing/crs/DefaultProjectedCRSTest.java | 53 +++++- .../operation/CoordinateOperationRegistryTest.java | 4 +- .../FranceGeocentricInterpolationTest.java | 8 - .../operation/provider/Geographic3Dto2DTest.java | 19 +- .../operation/provider/LongitudeRotationTest.java | 9 +- .../operation/provider/MolodenskyTest.java | 60 ------- .../operation/provider/ProviderMock.java | 16 +- .../operation/provider/ProvidersTest.java | 119 ++++-------- geoapi/snapshot | 2 +- 70 files changed, 1131 insertions(+), 1820 deletions(-) diff --cc geoapi/snapshot index d7b6639c48,0c4eba464e..b03ead17de --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit d7b6639c48044ae88ed1da656f9aa62092b2cac5 -Subproject commit 0c4eba464e80d307637806cb76cf56fa494e1f75 ++Subproject commit b03ead17de5dc8672a45579b128590dd3554bad8