(sis) branch main updated (428919e44a -> dadfde5d17)
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 428919e44a Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`. add aacdba9e62 Post-merge cleanup: automatic reorder of commits. add 12371196a0 Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports. new dadfde5d17 Merge branch 'geoapi-3.1': automatic imports reorganization. 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: .../apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 4 +++- .../main/org/apache/sis/referencing/CommonCRS.java | 6 -- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../apache/sis/referencing/EllipsoidalHeightSeparator.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++- .../org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 -- .../apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++- .../apache/sis/referencing/datum/DefaultVerticalDatum.java | 4 +++- .../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++- .../apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++- .../org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +- .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypes.java | 12 .../referencing/operation/AbstractCoordinateOperation.java | 4 +++- .../referencing/operation/CoordinateOperationRegistry.java | 4 +++- .../apache/sis/referencing/operation/DefaultConversion.java | 4 ++-- .../operation/DefaultCoordinateOperationFactory.java | 6 -- .../sis/referencing/operation/DefaultOperationMethod.java| 6 -- .../apache/sis/referencing/privy/CoordinateOperations.java | 4 +++- .../org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../apache/sis/referencing/privy/NilReferencingObject.java | 2 +- .../test/org/apache/sis/io/wkt/TransliteratorTest.java | 4 +++- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../sis/referencing/datum/DefaultVerticalDatumTest.java | 6 -- .../org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../sis/referencing/internal/VerticalDatumTypesTest.java | 4 +++- .../operation/transform/OperationMethodSetTest.java | 4 +++- .../sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java | 8 ++-- .../apache/sis/test/integration/MetadataVerticalTest.java| 2 +- .../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++- 38 files changed, 106 insertions(+), 50 deletions(-)
(sis) 01/01: Merge branch 'geoapi-3.1': automatic imports reorganization.
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 dadfde5d17da6cb0d59969bc9633e1b4bb71f61e Merge: 428919e44a 12371196a0 Author: Martin Desruisseaux AuthorDate: Mon Apr 22 16:17:21 2024 +0200 Merge branch 'geoapi-3.1': automatic imports reorganization. .../apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 4 +++- .../main/org/apache/sis/referencing/CommonCRS.java | 6 -- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../apache/sis/referencing/EllipsoidalHeightSeparator.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++- .../org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 -- .../apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++- .../apache/sis/referencing/datum/DefaultVerticalDatum.java | 4 +++- .../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++- .../apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++- .../org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +- .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypes.java | 12 .../referencing/operation/AbstractCoordinateOperation.java | 4 +++- .../referencing/operation/CoordinateOperationRegistry.java | 4 +++- .../apache/sis/referencing/operation/DefaultConversion.java | 4 ++-- .../operation/DefaultCoordinateOperationFactory.java | 6 -- .../sis/referencing/operation/DefaultOperationMethod.java| 6 -- .../apache/sis/referencing/privy/CoordinateOperations.java | 4 +++- .../org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../apache/sis/referencing/privy/NilReferencingObject.java | 2 +- .../test/org/apache/sis/io/wkt/TransliteratorTest.java | 4 +++- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../sis/referencing/datum/DefaultVerticalDatumTest.java | 6 -- .../org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../sis/referencing/internal/VerticalDatumTypesTest.java | 4 +++- .../operation/transform/OperationMethodSetTest.java | 4 +++- .../sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java | 8 ++-- .../apache/sis/test/integration/MetadataVerticalTest.java| 2 +- .../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++- 38 files changed, 106 insertions(+), 50 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java index e74b1642b4,0ef3b23ce2..2f47a1cadf --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java @@@ -47,9 -46,12 +46,12 @@@ import org.apache.sis.util.resources.Er import org.apache.sis.util.privy.Constants; import org.apache.sis.metadata.iso.citation.Citations; + // Specific to the main and geoapi-3.1 branches: + import org.opengis.referencing.crs.GeneralDerivedCRS; + -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.filter.SpatialOperatorName; -import org.opengis.filter.DistanceOperatorName; +// Specific to the main branch: +import org.apache.sis.pending.geoapi.filter.SpatialOperatorName; +import org.apache.sis.pending.geoapi.filter.DistanceOperatorName; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java index b4ec7fc882,14478406e7..56feed4b21 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java @@@ -70,9 -69,9 +69,10 @@@ import static org.apache.sis.util.colle import static org.apache.sis.util.privy.CollectionsExt.nonNull; import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.geometry.MismatchedReferenceSystemException; -import org.opengis.referencing.datum.RealizationMethod; +// Specific to the main branch: +import
(sis) branch geoapi-3.1 updated (ff6542a3f7 -> 12371196a0)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. add aacdba9e62 Post-merge cleanup: automatic reorder of commits. new 12371196a0 Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports. 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/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../main/org/apache/sis/referencing/CRS.java | 6 -- .../main/org/apache/sis/referencing/CommonCRS.java| 4 +++- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../org/apache/sis/referencing/EllipsoidalHeightSeparator.java| 4 +++- .../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 -- .../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java| 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 6 -- .../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++- .../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java| 4 +++- .../main/org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +- .../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++-- .../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++-- .../sis/referencing/operation/AbstractCoordinateOperation.java| 6 -- .../sis/referencing/operation/CoordinateOperationRegistry.java| 4 +++- .../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++-- .../referencing/operation/DefaultCoordinateOperationFactory.java | 6 -- .../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 -- .../org/apache/sis/referencing/privy/CoordinateOperations.java| 4 +++- .../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +- .../test/org/apache/sis/referencing/CommonCRSTest.java| 2 +- .../apache/sis/referencing/datum/DefaultVerticalDatumTest.java| 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++-- .../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++- .../referencing/operation/transform/OperationMethodSetTest.java | 4 +++- .../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++- .../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++- 37 files changed, 107 insertions(+), 49 deletions(-)
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: automatic reorganization of imports.
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 12371196a02296c3fb2bac05e17fc9f63efbf92b
Merge: ff6542a3f7 aacdba9e62
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 16:14:58 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1:
automatic reorganization of imports.
.../org/apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++-
.../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +-
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java| 2 +-
.../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++---
.../main/org/apache/sis/referencing/CRS.java | 6 --
.../main/org/apache/sis/referencing/CommonCRS.java| 4 +++-
.../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++-
.../org/apache/sis/referencing/EllipsoidalHeightSeparator.java| 4 +++-
.../main/org/apache/sis/referencing/StandardDefinitions.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 4 +++-
.../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 6 --
.../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java| 4 +++-
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java| 6 --
.../sis/referencing/factory/sql/CoordinateOperationSet.java | 4 +++-
.../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java| 4 +++-
.../main/org/apache/sis/referencing/factory/sql/TableInfo.java| 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 4 ++--
.../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 8 ++--
.../sis/referencing/operation/AbstractCoordinateOperation.java| 6 --
.../sis/referencing/operation/CoordinateOperationRegistry.java| 4 +++-
.../org/apache/sis/referencing/operation/DefaultConversion.java | 4 ++--
.../referencing/operation/DefaultCoordinateOperationFactory.java | 6 --
.../apache/sis/referencing/operation/DefaultOperationMethod.java | 6 --
.../org/apache/sis/referencing/privy/CoordinateOperations.java| 4 +++-
.../main/org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++-
.../org/apache/sis/referencing/privy/NilReferencingObject.java| 2 +-
.../test/org/apache/sis/referencing/CommonCRSTest.java| 2 +-
.../apache/sis/referencing/datum/DefaultVerticalDatumTest.java| 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +-
.../apache/sis/referencing/internal/VerticalDatumTypesTest.java | 8 ++--
.../apache/sis/referencing/operation/provider/ProvidersTest.java | 4 +++-
.../referencing/operation/transform/OperationMethodSetTest.java | 4 +++-
.../apache/sis/referencing/report/CoordinateOperationMethods.java | 2 +-
.../sis/test/integration/CoordinateReferenceSystemTest.java | 4 +++-
.../main/org/apache/sis/gui/referencing/CRSChooser.java | 4 +++-
37 files changed, 107 insertions(+), 49 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index ed14df684c,208b00e466..0ef3b23ce2
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@@ -47,6 -46,6 +46,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.util.privy.Constants;
import org.apache.sis.metadata.iso.citation.Citations;
++// Specific to the main and geoapi-3.1 branches:
++import org.opengis.referencing.crs.GeneralDerivedCRS;
++
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 4ea1c59659,5063035c46..441c62d0fd
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -28,10 -28,6 +28,10 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
+// Specific to the main and geoapi-3.1 branches:
- import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.opengis.metadata.extent.Extent;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a
primary name.
diff --cc
(sis) branch geoapi-4.0 updated: Post-merge cleanup: automatic reorder of commits.
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new aacdba9e62 Post-merge cleanup: automatic reorder of commits. aacdba9e62 is described below commit aacdba9e621661c411853ba2f6b9270b718f75c0 Author: Martin Desruisseaux AuthorDate: Mon Apr 22 16:09:23 2024 +0200 Post-merge cleanup: automatic reorder of commits. --- .../apache/sis/geometry/wrapper/SpatialOperationContext.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../test/org/apache/sis/metadata/iso/extent/ExtentsTest.java | 6 +++--- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 4 +++- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 4 +++- .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultPrimeMeridian.java | 4 +++- .../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 10 +- .../apache/sis/referencing/factory/CommonAuthorityFactory.java | 4 +++- .../sis/referencing/factory/sql/CoordinateOperationSet.java| 4 +++- .../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 4 +++- .../main/org/apache/sis/referencing/factory/sql/TableInfo.java | 2 +- .../apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +- .../apache/sis/referencing/internal/VerticalDatumTypes.java| 4 +++- .../sis/referencing/operation/AbstractCoordinateOperation.java | 2 +- .../sis/referencing/operation/CoordinateOperationRegistry.java | 4 +++- .../apache/sis/referencing/operation/DefaultConversion.java| 4 +++- .../sis/referencing/operation/DefaultOperationMethod.java | 4 +++- .../org/apache/sis/referencing/privy/CoordinateOperations.java | 4 +++- .../org/apache/sis/referencing/privy/DefinitionVerifier.java | 4 +++- .../apache/sis/referencing/privy/GeodeticObjectBuilder.java| 4 +++- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../test/org/apache/sis/referencing/cs/NormalizerTest.java | 4 +++- .../apache/sis/referencing/datum/DefaultVerticalDatumTest.java | 4 +++- .../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 2 +- .../sis/referencing/internal/VerticalDatumTypesTest.java | 4 +++- .../sis/referencing/operation/provider/ProvidersTest.java | 4 +++- .../operation/transform/OperationMethodSetTest.java| 4 +++- .../org/apache/sis/referencing/privy/AxisDirectionsTest.java | 4 +++- .../sis/referencing/report/CoordinateOperationMethods.java | 2 +- .../sis/test/integration/CoordinateReferenceSystemTest.java| 4 +++- .../main/org/apache/sis/gui/referencing/CRSChooser.java| 4 +++- 34 files changed, 88 insertions(+), 40 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java index c372eff258..208b00e466 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java @@ -30,7 +30,6 @@ import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.cs.CoordinateSystemAxis; import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.crs.GeographicCRS; -import org.opengis.referencing.crs.DerivedCRS; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.OperationMethod; import org.opengis.referencing.operation.TransformException; @@ -51,6 +50,9 @@ import org.apache.sis.metadata.iso.citation.Citations; import org.opengis.filter.SpatialOperatorName; import org.opengis.filter.DistanceOperatorName; +// Specific to the geoapi-4.0 branch: +import org.opengis.referencing.crs.DerivedCRS; + /** * Context (such as desired CRS) in which a spatial operator will be executed. diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java index 2fda0bf211..14478406e7 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java @@ -49,7 +49,6 @@ import org.opengis.referencing.crs.VerticalCRS; import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.crs.CoordinateReferenceSystem; import
(sis) branch main updated (1483fcf71b -> 428919e44a)
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 1483fcf71b Merge branch 'geoapi-3.1' add 918e07bcbc Avoid usage of the deprecated `AxisDirection.OTHER` code list value. add adbe2180c3 ISO 19111 upgrade: VerticalDatumType removed, replaced by RealizationMethod. add 43241772b6 Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`. add 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`. add ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. new 428919e44a Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`. 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: .../apache/sis/coverage/grid/GridExtentCRS.java| 6 +- .../apache/sis/metadata/iso/extent/Extents.java| 62 - .../sis/metadata/iso/extent/ExtentsTest.java | 9 +- .../apache/sis/io/wkt/GeodeticObjectParser.java| 22 +-- .../main/org/apache/sis/referencing/CRS.java | 4 +- .../main/org/apache/sis/referencing/CommonCRS.java | 24 ++-- .../org/apache/sis/referencing/cs/AbstractCS.java | 4 +- .../main/org/apache/sis/referencing/cs/Codes.java | 24 ++-- .../org/apache/sis/referencing/cs/Normalizer.java | 4 +- .../referencing/datum/DefaultVerticalDatum.java| 14 +- .../referencing/factory/sql/EPSGCodeFinder.java| 7 - .../referencing/factory/sql/EPSGDataAccess.java| 14 +- .../sis/referencing/factory/sql/TableInfo.java | 1 - .../apache/sis/referencing/internal/Legacy.java| 8 +- .../referencing/internal/VerticalDatumTypes.java | 147 - .../operation/CoordinateOperationRegistry.java | 2 +- .../sis/referencing/operation/matrix/Matrices.java | 2 +- .../sis/referencing/privy/AxisDirections.java | 27 ++-- .../privy/EllipsoidalHeightCombiner.java | 3 +- .../referencing/privy/ReferencingUtilities.java| 7 +- .../org/apache/sis/io/wkt/TransliteratorTest.java | 13 +- .../org/apache/sis/referencing/CommonCRSTest.java | 20 +-- .../apache/sis/referencing/cs/HardCodedAxes.java | 4 +- .../datum/DefaultVerticalDatumTest.java| 4 +- .../sis/referencing/datum/HardCodedDatum.java | 2 +- .../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +- .../internal/VerticalDatumTypesTest.java | 32 +++-- .../sis/referencing/privy/AxisDirectionsTest.java | 21 +-- .../org/apache/sis/storage/netcdf/base/Axis.java | 2 +- 29 files changed, 251 insertions(+), 240 deletions(-)
(sis) 01/01: Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and `VerticalDatumType`.
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 428919e44a91cd9c40080b2d1630132d0ad322d4
Merge: 1483fcf71b ff6542a3f7
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 15:55:59 2024 +0200
Merge branch 'geoapi-3.1': reduce usage of `AxisDirection.OTHER` and
`VerticalDatumType`.
.../apache/sis/coverage/grid/GridExtentCRS.java| 6 +-
.../apache/sis/metadata/iso/extent/Extents.java| 62 -
.../sis/metadata/iso/extent/ExtentsTest.java | 9 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java| 22 +--
.../main/org/apache/sis/referencing/CRS.java | 4 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 24 ++--
.../org/apache/sis/referencing/cs/AbstractCS.java | 4 +-
.../main/org/apache/sis/referencing/cs/Codes.java | 24 ++--
.../org/apache/sis/referencing/cs/Normalizer.java | 4 +-
.../referencing/datum/DefaultVerticalDatum.java| 14 +-
.../referencing/factory/sql/EPSGCodeFinder.java| 7 -
.../referencing/factory/sql/EPSGDataAccess.java| 14 +-
.../sis/referencing/factory/sql/TableInfo.java | 1 -
.../apache/sis/referencing/internal/Legacy.java| 8 +-
.../referencing/internal/VerticalDatumTypes.java | 147 -
.../operation/CoordinateOperationRegistry.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../sis/referencing/privy/AxisDirections.java | 27 ++--
.../privy/EllipsoidalHeightCombiner.java | 3 +-
.../referencing/privy/ReferencingUtilities.java| 7 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 13 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 20 +--
.../apache/sis/referencing/cs/HardCodedAxes.java | 4 +-
.../datum/DefaultVerticalDatumTest.java| 4 +-
.../sis/referencing/datum/HardCodedDatum.java | 2 +-
.../referencing/datum/VerticalDatum (GML 3.1).xml | 2 +-
.../internal/VerticalDatumTypesTest.java | 32 +++--
.../sis/referencing/privy/AxisDirectionsTest.java | 21 +--
.../org/apache/sis/storage/netcdf/base/Axis.java | 2 +-
29 files changed, 251 insertions(+), 240 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
index ae28430fdb,95020e45e4..8d078fddfd
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtentCRS.java
@@@ -296,7 -299,7 +296,7 @@@ final class GridExtentCRS
abbreviation = "t"; direction = AxisDirection.FUTURE;
hasTime = true;
} else {
abbreviation = abbreviation(target);
- direction = AxisDirection.OTHER;
-direction = AxisDirection.UNSPECIFIED;
++direction = AxisDirections.UNSPECIFIED;
hasOther = true;
}
/*
@@@ -308,7 -311,7 +308,7 @@@
final CoordinateSystemAxis previous = axes[k];
if (previous != null) {
if
(direction.equals(AxisDirections.absolute(previous.getDirection( {
- direction = AxisDirection.OTHER;
-direction = AxisDirection.UNSPECIFIED;
++direction = AxisDirections.UNSPECIFIED;
hasOther = true;
}
if (abbreviation.equals(previous.getAbbreviation())) {
@@@ -331,7 -334,7 +331,7 @@@
if (axes[j] == null) {
final String name =
Vocabulary.forLocale(locale).getString(Vocabulary.Keys.Dimension_1, j);
final String abbreviation = abbreviation(j);
- axes[j] = axis(csFactory, name, abbreviation,
AxisDirection.OTHER);
-axes[j] = axis(csFactory, name, abbreviation,
AxisDirection.UNSPECIFIED);
++axes[j] = axis(csFactory, name, abbreviation,
AxisDirections.UNSPECIFIED);
}
}
/*
diff --cc
endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index 360b50cc81,2fda0bf211..b4ec7fc882
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@@ -371,16 -362,15 +365,15 @@@ public final class Extents extends Stat
* performs a choice based on the vertical datum and the unit of
measurement:
*
*
- * Choice based on vertical datum
+ * Choice based on realization method
- * Only the extents associated (indirectly, through their CRS) to the
same non-null {@link RealizationMethod}
+ * Only
(sis) branch geoapi-4.0 updated: Post-merge adjustments in `VerticalDatumTypes`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`.
3e79841b4c is described below
commit 3e79841b4c2fc5eac551b2ff9e8540853125c7c0
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 12:54:51 2024 +0200
Post-merge adjustments in `VerticalDatumTypes`.
---
.../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++-
.../sis/referencing/StandardDefinitions.java | 3 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +--
.../apache/sis/referencing/internal/Legacy.java| 2 +-
.../referencing/internal/VerticalDatumTypes.java | 39 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../privy/EllipsoidalHeightCombiner.java | 3 +-
.../internal/VerticalDatumTypesTest.java | 12 +++
9 files changed, 55 insertions(+), 21 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 659162db6a..613eabf205 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -689,7 +689,6 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator defaultUnit, final Datum
datum) throws ParseException, FactoryException
{
@@ -772,8 +771,8 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator unit = defaultUnit; // Depth, height
or time axis unit.
switch (type) {
/*
- * Cartesian — we can create axes only for geodetic datum, in
which case the axes are for
- * two-dimensional Projected or three-dimensional Geocentric
CRS.
+ * Cartesian — we can create axes only for geodetic datum, in
which case the axes
+ * are for two- or three-dimensional Projected or
three-dimensional Geocentric CRS.
*/
case WKTKeywords.Cartesian: {
if (datum != null && !(datum instanceof GeodeticDatum)) {
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index de5cd6e482..8abad5348b 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@ -1467,7 +1467,11 @@ public enum CommonCRS {
if (isEPSG) {
object =
StandardDefinitions.createVerticalDatum(datum);
} else {
-// BAROMETRIC and ELLIPSOIDAL cases.
+/*
+ * All cases where the first constructor argument
is `false`, currently BAROMETRIC and
+ * ELLIPSOIDAL. The way to construct the
ellipsoidal pseudo-method shall be equivalent
+ * to a call to `VerticalDatumTypes.ellipsoidal()`.
+ */
RealizationMethod method = null;
if (this != OTHER_SURFACE) {
method = RealizationMethod.valueOf(name());
diff --git
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
index f872175d90..882f14cc30 100644
---
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
@@ -74,7 +74,6 @@ 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.RealizationMethod;
import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
@@ -348,7 +347,7 @@ final class StandardDefinitions {
case 5103: name = "North American Vertical Datum 1988"; alias =
"NAVD88"; break;
default: throw new AssertionError(code);
}
-return new DefaultVerticalDatum(properties(code, name, alias, true),
RealizationMethod.GEOID);
+return new DefaultVerticalDatum(properties(code, name, alias, true),
null);
(sis) branch geoapi-3.1 updated (43241772b6 -> ff6542a3f7)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from 43241772b6 Merge branch 'geoapi-4.0' into geoapi-3.1: reduce usage of deprecated `AxisDirection.OTHER` and `VerticalDatumType`. add 3e79841b4c Post-merge adjustments in `VerticalDatumTypes`. new ff6542a3f7 Merge 'geoapi-4.0' into geoapi-3.1. 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: .../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++- .../main/org/apache/sis/referencing/CommonCRS.java | 6 +++- .../sis/referencing/StandardDefinitions.java | 2 +- .../referencing/factory/GeodeticObjectFactory.java | 4 +-- .../apache/sis/referencing/internal/Legacy.java| 2 +- .../referencing/internal/VerticalDatumTypes.java | 39 +- .../operation/CoordinateOperationRegistry.java | 2 +- .../privy/EllipsoidalHeightCombiner.java | 3 +- .../internal/VerticalDatumTypesTest.java | 12 +++ 9 files changed, 55 insertions(+), 20 deletions(-)
(sis) 01/01: Merge 'geoapi-4.0' into geoapi-3.1.
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 ff6542a3f7c116c3afb4db935c1385899da71971
Merge: 43241772b6 3e79841b4c
Author: Martin Desruisseaux
AuthorDate: Mon Apr 22 13:02:25 2024 +0200
Merge 'geoapi-4.0' into geoapi-3.1.
.../apache/sis/io/wkt/GeodeticObjectParser.java| 5 ++-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +++-
.../sis/referencing/StandardDefinitions.java | 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +--
.../apache/sis/referencing/internal/Legacy.java| 2 +-
.../referencing/internal/VerticalDatumTypes.java | 39 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../privy/EllipsoidalHeightCombiner.java | 3 +-
.../internal/VerticalDatumTypesTest.java | 12 +++
9 files changed, 55 insertions(+), 20 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index d0f57b09ec,882f14cc30..0438435cad
---
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
@@@ -348,7 -347,7 +348,7 @@@ final class StandardDefinitions
case 5103: name = "North American Vertical Datum 1988"; alias =
"NAVD88"; break;
default: throw new AssertionError(code);
}
- return new DefaultVerticalDatum(properties(code, name, alias, true),
RealizationMethod.GEOID);
-return new DefaultVerticalDatum(properties(code, name, alias, true),
null);
++return new DefaultVerticalDatum(properties(code, name, alias, true),
(RealizationMethod) null);
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index d7ff9b2036,d1e2e82a46..11f58d1e6d
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@@ -109,13 -127,12 +128,13 @@@ public final class VerticalDatumTypes
* Returns the legacy code for the datum type, or 2000 (other surface) if
unknown.
* This method is used for WKT 1 formatting.
*
- * @param method the realization method, or {@code null} if unknown.
+ * @param type the vertical datum type, or {@code null} if unknown.
* @return the legacy code for the given datum type, or 0 if unknown.
*/
-public static int toLegacy(final RealizationMethod method) {
-if (method != null) {
-switch (method.name().toUpperCase(Locale.US)) {
+@SuppressWarnings("deprecation")
+public static int toLegacy(final VerticalDatumType type) {
+if (type != null) {
- switch (type.name()) {
++switch (type.name().toUpperCase(Locale.US)) {
case ORTHOMETRIC: return 2001; // CS_VD_Orthometric
case ELLIPSOIDAL: return 2002; // CS_VD_Ellipsoidal
case BAROMETRIC: return 2003; //
CS_VD_AltitudeBarometric
@@@ -130,18 -147,18 +149,19 @@@
* Returns the vertical datum type from a realization method.
* If the given method cannot be mapped to a legacy type, then this
method returns "other surface".
* This is because the vertical datum type was a mandatory property in
legacy OGC/ISO standards.
+ * This method is used for writing GML documents older than GML 3.2.
*
* @param method the realization method, or {@code null}.
- * @return the vertical datum type name (never null).
+ * @return the vertical datum type (never null).
*/
-public static String toName(final RealizationMethod method) {
-if (method == RealizationMethod.GEOID) return "geoidal";
-if (method == RealizationMethod.TIDAL) return "depth";
+@SuppressWarnings("deprecation")
+public static VerticalDatumType fromMethod(final RealizationMethod
method) {
+if (method == RealizationMethod.GEOID) return
VerticalDatumType.GEOIDAL;
+if (method == RealizationMethod.TIDAL) return VerticalDatumType.DEPTH;
if (method != null) {
-return method.name().toLowerCase(Locale.US);
+return
VerticalDatumType.valueOf(method.name().toUpperCase(Locale.US));
}
-return "other surface";
+return VerticalDatumType.OTHER_SURFACE;
}
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/VerticalDatumTypesTest.java
index 98bc4ab01d,8e98da4827..2b846e8736
---
