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 2019/06/22 20:48:37 UTC
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. They are
simplifications enabled by https://issues.apache.org/jira/browse/SIS-463
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 e270be9cb23d17f5e7ef879f553af46a940e4adf
Merge: 2058ee3 5aea881
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Jun 22 14:52:16 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
They are simplifications enabled by https://issues.apache.org/jira/browse/SIS-463
.../org/apache/sis/gui/dataset/ResourceTree.java | 4 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 2 +-
.../apache/sis/internal/metadata/Identifiers.java | 269 +++++++++++
.../sis/internal/metadata/NameToIdentifier.java | 14 +
.../sis/internal/metadata/ReferencingServices.java | 303 +-----------
.../sis/internal/metadata/ServicesForUtility.java | 13 +
.../internal/simple/SimpleIdentifiedObject.java | 8 +-
.../sis/internal/simple/SimpleIdentifier.java | 5 +-
.../sis/metadata/iso/citation/Citations.java | 233 ++++++++-
.../metadata/iso/extent/DefaultVerticalExtent.java | 4 +-
.../iso/identification/DefaultCoupledResource.java | 6 +-
.../apache/sis/metadata/sql/MetadataWriter.java | 4 +-
.../org/apache/sis/util/iso/DefaultNameSpace.java | 3 +-
.../sis/internal/metadata/IdentifiersTest.java | 106 ++++
.../sis/metadata/iso/citation/CitationsTest.java | 23 +-
.../apache/sis/test/suite/MetadataTestSuite.java | 3 +-
.../sis/geometry/AbstractDirectPosition.java | 2 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 3 +-
.../sis/internal/referencing}/AxisDirections.java | 5 +-
.../internal/referencing/CoordinateOperations.java | 101 +++-
.../internal/referencing/DefinitionVerifier.java | 4 +-
.../referencing}/EllipsoidalHeightCombiner.java | 74 ++-
.../referencing/GeodeticObjectBuilder.java | 9 +-
.../referencing/ReferencingFactoryContainer.java | 125 ++++-
.../internal/referencing/ReferencingUtilities.java | 19 +-
.../internal/referencing/ServicesForMetadata.java | 309 +-----------
.../internal/referencing}/VerticalDatumTypes.java | 2 +-
.../sis/internal/referencing}/WKTKeywords.java | 2 +-
.../sis/internal/referencing/WKTUtilities.java | 36 ++
.../internal/referencing/WraparoundAdjustment.java | 1 -
.../referencing/provider/GeocentricAffine.java | 2 +-
.../referencing/provider/Geographic3Dto2D.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Element.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 20 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 168 +++----
.../org/apache/sis/io/wkt/MathTransformParser.java | 32 +-
.../java/org/apache/sis/io/wkt/Transliterator.java | 4 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 29 +-
.../sis/metadata/iso/ImmutableIdentifier.java | 8 +-
.../sis/parameter/AbstractParameterDescriptor.java | 2 +-
.../sis/parameter/DefaultParameterValue.java | 2 +-
.../apache/sis/parameter/ParameterTableRow.java | 2 +-
.../org/apache/sis/parameter/TensorValues.java | 2 +-
.../main/java/org/apache/sis/referencing/CRS.java | 14 +-
.../sis/referencing/EPSGFactoryFallback.java | 3 +-
.../referencing/EllipsoidalHeightSeparator.java | 6 +-
.../apache/sis/referencing/IdentifiedObjects.java | 29 +-
.../sis/referencing/crs/AbstractDerivedCRS.java | 4 +-
.../sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 2 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 4 +-
.../sis/referencing/crs/DefaultImageCRS.java | 2 +-
.../sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../sis/referencing/crs/DefaultProjectedCRS.java | 4 +-
.../sis/referencing/crs/DefaultTemporalCRS.java | 2 +-
.../sis/referencing/crs/DefaultVerticalCRS.java | 2 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 4 +-
.../apache/sis/referencing/cs/AxesConvention.java | 2 +-
.../sis/referencing/cs/CoordinateSystems.java | 2 +-
.../apache/sis/referencing/cs/DefaultAffineCS.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCS.java | 2 +-
.../cs/DefaultCoordinateSystemAxis.java | 4 +-
.../sis/referencing/cs/DefaultCylindricalCS.java | 2 +-
.../sis/referencing/cs/DefaultEllipsoidalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultLinearCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultPolarCS.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCS.java | 2 +-
.../apache/sis/referencing/cs/DefaultTimeCS.java | 2 +-
.../sis/referencing/cs/DefaultVerticalCS.java | 2 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 4 +-
.../org/apache/sis/referencing/cs/Normalizer.java | 2 +-
.../sis/referencing/datum/AbstractDatum.java | 3 +-
.../sis/referencing/datum/BursaWolfParameters.java | 2 +-
.../sis/referencing/datum/DefaultEllipsoid.java | 2 +-
.../referencing/datum/DefaultEngineeringDatum.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 6 +-
.../sis/referencing/datum/DefaultImageDatum.java | 2 +-
.../referencing/datum/DefaultParametricDatum.java | 2 +-
.../referencing/datum/DefaultPrimeMeridian.java | 2 +-
.../referencing/datum/DefaultTemporalDatum.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 4 +-
.../factory/AuthorityFactoryIdentifier.java | 6 +-
.../factory/CommonAuthorityFactory.java | 5 +-
.../factory/GeodeticAuthorityFactory.java | 14 +-
.../referencing/factory/GeodeticObjectFactory.java | 4 +-
.../factory/IdentifiedObjectFinder.java | 4 +-
.../factory/MultiAuthoritiesFactory.java | 12 +-
.../referencing/factory/sql/EPSGDataAccess.java | 16 +-
.../sis/referencing/factory/sql/TableInfo.java | 2 +-
.../operation/AbstractCoordinateOperation.java | 2 +-
.../operation/AbstractSingleOperation.java | 4 +-
.../referencing/operation/CompoundCRSBuilder.java | 57 ---
.../operation/CoordinateOperationFinder.java | 7 +-
.../operation/CoordinateOperationRegistry.java | 14 +-
.../DefaultCoordinateOperationFactory.java | 25 +-
.../sis/referencing/operation/DefaultFormula.java | 2 +-
.../operation/DefaultOperationMethod.java | 6 +-
.../operation/InverseOperationMethod.java | 4 +-
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../operation/projection/NormalizedProjection.java | 5 +-
.../operation/transform/AbstractMathTransform.java | 2 +-
.../operation/transform/ConcatenatedTransform.java | 2 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 5 +-
.../operation/transform/PassThroughTransform.java | 2 +-
.../AxisDirectionsTest.java | 8 +-
.../EllipsoidalHeightCombinerTest.java | 13 +-
.../referencing}/VerticalDatumTypesTest.java | 2 +-
.../sis/internal/referencing}/WKTKeywordsTest.java | 2 +-
.../sis/internal/referencing/WKTUtilitiesTest.java | 1 -
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../sis/referencing/cs/DefaultCompoundCSTest.java | 2 +-
.../referencing/cs/DefaultCylindricalCSTest.java | 2 +-
.../sis/referencing/cs/DefaultPolarCSTest.java | 2 +-
.../sis/referencing/cs/DefaultSphericalCSTest.java | 2 +-
.../referencing/cs/DirectionAlongMeridianTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../sis/referencing/datum/HardCodedDatum.java | 2 +-
.../operation/DefaultConversionTest.java | 4 +-
.../operation/DefaultTransformationTest.java | 4 +-
.../org/apache/sis/test/ReferencingAssert.java | 5 +-
.../sis/test/suite/ReferencingTestSuite.java | 6 +-
.../org/apache/sis/internal/util/Citations.java | 536 ---------------------
.../apache/sis/internal/util/CollectionsExt.java | 22 +
.../org/apache/sis/internal/util/Constants.java | 8 +
.../apache/sis/internal/util/MetadataServices.java | 12 +
.../org/apache/sis/io/IdentifiedObjectFormat.java | 7 +-
.../java/org/apache/sis/measure/UnitFormat.java | 3 +-
.../org/apache/sis/internal/util/CitationMock.java | 106 ----
.../apache/sis/internal/util/CitationsTest.java | 123 -----
.../apache/sis/test/suite/UtilityTestSuite.java | 1 -
.../java/org/apache/sis/storage/gdal/Proj4.java | 2 +-
.../org/apache/sis/storage/gdal/Proj4Factory.java | 20 +-
.../org/apache/sis/storage/geotiff/CRSBuilder.java | 7 +-
.../java/org/apache/sis/internal/netcdf/Axis.java | 2 +-
.../java/org/apache/sis/internal/netcdf/Grid.java | 2 +-
.../apache/sis/internal/netcdf/GridMapping.java | 2 +-
.../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +-
.../apache/sis/internal/netcdf/impl/GridInfo.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 2 +-
.../sis/internal/storage/StoreUtilities.java | 6 +-
.../sis/internal/storage/wkt/StoreProvider.java | 2 +-
146 files changed, 1352 insertions(+), 1898 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
index acb9595,4626f51..c8a267d
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
@@@ -22,9 -22,9 +22,10 @@@ import java.util.Collection
import org.opengis.util.NameSpace;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
+ import org.opengis.referencing.IdentifiedObject;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
+import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.iso.DefaultNameSpace;
import org.apache.sis.util.CharSequences;
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
index 12eeadb,17d2b7b..15e3514
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
@@@ -27,9 -27,8 +27,9 @@@ import org.opengis.metadata.Identifier
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.internal.util.Citations;
- import org.apache.sis.util.iso.DefaultNameSpace;
+ import org.apache.sis.internal.metadata.Identifiers;
+ import org.apache.sis.internal.util.Constants;
import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.ComparisonMode;
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
index 83a3547,8ee20eb..57b65bd
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleIdentifier.java
@@@ -19,17 -19,16 +19,16 @@@ package org.apache.sis.internal.simple
import java.util.Objects;
import java.io.Serializable;
import org.opengis.util.InternationalString;
-import org.opengis.metadata.Identifier;
+import org.opengis.referencing.ReferenceIdentifier;
import org.opengis.metadata.citation.Citation;
+ import org.apache.sis.internal.util.Constants;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Deprecable;
- import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR;
-
/**
- * An implementation of {@link Identifier} as a wrapper around a {@link Citation}.
+ * An implementation of {@link ReferenceIdentifier} as a wrapper around a {@link Citation}.
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.0
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index a7cd799,91feda4..d75d7e7
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@@ -788,9 -788,9 +788,9 @@@ class CoordinateOperationRegistry
* be prepared to see the 'redimension' call fails. In such case, we will try to get
* the SIS implementation of the operation method and try again.
*/
- if (operation instanceof SingleOperation) {
+ if (SubTypes.isSingleOperation(operation)) {
final SingleOperation single = (SingleOperation) operation;
- properties.put(ReferencingServices.PARAMETERS_KEY, single.getParameterValues());
+ properties.put(CoordinateOperations.PARAMETERS_KEY, single.getParameterValues());
if (method == null) {
final int sourceDimensions = transform.getSourceDimensions();
final int targetDimensions = transform.getTargetDimensions();