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 2024/04/18 10:11:05 UTC
(sis) branch main updated (161a5fe3c8 -> 66a5fa5253)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 161a5fe3c8 Merge branch 'geoapi-3.1', but without the assumption that `ProjectedCRS` extends `DerivedCRS`. IT means that `GeneralDerivedCRS` needs to be used more often than on the `geoapi-3.1` branch.
add 5bfa0612ca Remove usage of `PlanarProjection`, `ConicProjection` and `CylindricalProjection` sub-interfaces.
add 1182c4c724 Change in the type of ProjectedCRS.baseCRS: relaxed from GeographicCRS to GeodeticCRS for conformance to ISO 19111.
add 883dfe7e9b Merge branch 'geoapi-4.0' into geoapi-3.1: removal of non-standard PlanarProjection, ConicProjection and CylindricalProjection interfaces.
new 66a5fa5253 Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597
The 1 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:
.../org/apache/sis/buildtools/book/OGC.lst | 1 -
.../org/apache/sis/portrayal/CanvasContext.java | 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 4 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 19 ++--
.../referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 3 -
.../operation/DefaultConicProjection.java | 108 ---------------------
.../referencing/operation/DefaultConversion.java | 41 ++++----
.../DefaultCoordinateOperationFactory.java | 15 +--
.../operation/DefaultCylindricalProjection.java | 108 ---------------------
.../operation/DefaultOperationMethod.java | 5 +-
.../operation/DefaultPlanarProjection.java | 108 ---------------------
.../referencing/operation/DefaultProjection.java | 13 ++-
.../apache/sis/referencing/operation/SubTypes.java | 40 +-------
.../operation/provider/AbstractLambert.java | 3 +-
.../operation/provider/AbstractMercator.java | 3 +-
.../operation/provider/AbstractStereographic.java | 3 +-
.../operation/provider/AlbersEqualArea.java | 3 +-
.../provider/AzimuthalEquidistantSpherical.java | 3 +-
.../operation/provider/CassiniSoldner.java | 3 +-
.../operation/provider/Equirectangular.java | 4 +-
.../provider/LambertAzimuthalEqualArea.java | 3 +-
.../provider/LambertCylindricalEqualArea.java | 3 +-
.../LambertCylindricalEqualAreaSpherical.java | 3 +-
.../operation/provider/MapProjection.java | 9 +-
.../provider/ModifiedAzimuthalEquidistant.java | 3 +-
.../referencing/operation/provider/Mollweide.java | 3 +-
.../operation/provider/Orthographic.java | 3 +-
.../referencing/operation/provider/Polyconic.java | 3 +-
.../operation/provider/SatelliteTracking.java | 3 +-
.../referencing/operation/provider/Sinusoidal.java | 3 +-
.../org/apache/sis/geometry/TransformTestCase.java | 15 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../transform/OperationMethodSetTest.java | 52 +++++-----
.../report/CoordinateOperationMethods.java | 19 ++--
.../integration/CoordinateReferenceSystemTest.java | 6 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 4 +-
39 files changed, 115 insertions(+), 521 deletions(-)
delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConicProjection.java
delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java
delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultPlanarProjection.java
(sis) 01/01: Merge branch 'geoapi-3.1' https://issues.apache.org/jira/browse/SIS-597
Posted by de...@apache.org.
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 66a5fa525339c2c97828c86046d8c7dc09fb2d46
Merge: 161a5fe3c8 883dfe7e9b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Apr 18 12:09:12 2024 +0200
Merge branch 'geoapi-3.1'
https://issues.apache.org/jira/browse/SIS-597
.../org/apache/sis/buildtools/book/OGC.lst | 1 -
.../org/apache/sis/portrayal/CanvasContext.java | 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 4 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 19 ++--
.../referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 3 -
.../operation/DefaultConicProjection.java | 108 ---------------------
.../referencing/operation/DefaultConversion.java | 41 ++++----
.../DefaultCoordinateOperationFactory.java | 15 +--
.../operation/DefaultCylindricalProjection.java | 108 ---------------------
.../operation/DefaultOperationMethod.java | 5 +-
.../operation/DefaultPlanarProjection.java | 108 ---------------------
.../referencing/operation/DefaultProjection.java | 13 ++-
.../apache/sis/referencing/operation/SubTypes.java | 40 +-------
.../operation/provider/AbstractLambert.java | 3 +-
.../operation/provider/AbstractMercator.java | 3 +-
.../operation/provider/AbstractStereographic.java | 3 +-
.../operation/provider/AlbersEqualArea.java | 3 +-
.../provider/AzimuthalEquidistantSpherical.java | 3 +-
.../operation/provider/CassiniSoldner.java | 3 +-
.../operation/provider/Equirectangular.java | 4 +-
.../provider/LambertAzimuthalEqualArea.java | 3 +-
.../provider/LambertCylindricalEqualArea.java | 3 +-
.../LambertCylindricalEqualAreaSpherical.java | 3 +-
.../operation/provider/MapProjection.java | 9 +-
.../provider/ModifiedAzimuthalEquidistant.java | 3 +-
.../referencing/operation/provider/Mollweide.java | 3 +-
.../operation/provider/Orthographic.java | 3 +-
.../referencing/operation/provider/Polyconic.java | 3 +-
.../operation/provider/SatelliteTracking.java | 3 +-
.../referencing/operation/provider/Sinusoidal.java | 3 +-
.../org/apache/sis/geometry/TransformTestCase.java | 15 +--
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 4 +-
.../referencing/factory/sql/EPSGFactoryTest.java | 3 +-
.../transform/OperationMethodSetTest.java | 52 +++++-----
.../report/CoordinateOperationMethods.java | 19 ++--
.../integration/CoordinateReferenceSystemTest.java | 6 +-
.../sis/storage/geotiff/reader/CRSBuilder.java | 4 +-
39 files changed, 115 insertions(+), 521 deletions(-)
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
index 587c3a6910,b6a07c54f1..6eafbe03b1
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@@ -21,11 -21,11 +21,11 @@@ import java.util.Map
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.opengis.parameter.ParameterDescriptorGroup;
- import org.opengis.referencing.operation.Projection;
- import org.opengis.referencing.operation.ConicProjection;
- import org.opengis.referencing.operation.PlanarProjection;
- import org.opengis.referencing.operation.CylindricalProjection;
+ import org.opengis.referencing.operation.Conversion;
+ import org.opengis.referencing.operation.Transformation;
import org.opengis.referencing.operation.OperationMethod;
+ import org.opengis.referencing.operation.SingleOperation;
-import org.opengis.referencing.operation.PointMotionOperation;
++import org.opengis.referencing.operation.PassThroughOperation;
import org.apache.sis.referencing.operation.DefaultOperationMethod;
import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
import org.apache.sis.util.privy.UnmodifiableArrayList;
@@@ -143,14 -145,14 +145,14 @@@ public final class OperationMethodSetTe
assertFalse (mercators.isEmpty());
assertEquals(3, mercators.size());
/*
- * Lambert case. Test twice since the two excecutions will take different code paths.
+ * NADCON case. Test twice because the two excecutions will take different code paths.
*/
- assertEquals(Set.of(lamb), lambert);
- assertEquals(Set.of(lamb), lambert);
+ assertEquals(Set.of(nad), shifts);
+ assertEquals(Set.of(nad), shifts);
/*
- * Test filtering: the test should not contain any conic projection.
- * Test filtering: the test should not contain any point motion operation.
++ * Test filtering: the test should not contain any pass-through operation.
*/
- assertEmpty(create(PlanarProjection.class, methods));
- assertEmpty(create(PointMotionOperation.class, methods));
++ assertEmpty(create(PassThroughOperation.class, methods));
/*
* Opportunist tests.
*/
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index d74ea2bf71,9f0731a943..8a63da90e0
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
@@@ -69,11 -68,11 +69,11 @@@ public final class CoordinateReferenceS
assertInstanceOf(DerivedCRS .class, crs);
assertInstanceOf(GeodeticCRS.class, crs);
assertInstanceOf(CartesianCS.class, crs.getCoordinateSystem());
- assertInstanceOf(CartesianCS.class, ((DerivedCRS) crs).getBaseCRS().getCoordinateSystem());
+ assertInstanceOf(CartesianCS.class, ((GeneralDerivedCRS) crs).getBaseCRS().getCoordinateSystem());
/*
- * Some tests are disabled because `EPSGDataAccess` confuse this derived CRS
- * with a projected CRS. We are waiting for upgrade to EPSG database 10+
- * before to re-evaluate how to fix this issue.
+ * Some tests are disabled because `EPSGDataAccess` confuses CRS type.
+ * We are waiting for upgrade to EPSG database 10+ before to re-evaluate
+ * how to fix this issue.
*
* https://issues.apache.org/jira/browse/SIS-518
*/