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 4afa8fd56aede4066b289a7f8777bd7fc8e6bedb
Merge: 27cab0a6de 0d157264f6
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Jul 3 12:42:12 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
They are the commits from pull request #34.
.../org/apache/sis/internal/gui/Resources.java | 39 ++-
.../org/apache/sis/internal/gui/Resources_en.java | 18 +-
.../org/apache/sis/internal/gui/Resources_fr.java | 18 +-
.../apache/sis/cloud/aws/internal/Resources.java | 35 ++-
.../sis/cloud/aws/internal/Resources_en.java | 18 +-
.../sis/cloud/aws/internal/Resources_fr.java | 18 +-
.../sis/coverage/grid/DimensionalityReduction.java | 10 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 6 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 13 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 2 +-
.../apache/sis/coverage/grid/GridExtentCRS.java | 8 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 4 +-
.../org/apache/sis/feature/CharacteristicMap.java | 5 +-
.../java/org/apache/sis/feature/DenseFeature.java | 5 +-
.../apache/sis/feature/ExpressionOperation.java | 2 +-
.../apache/sis/feature/MultiValuedAttribute.java | 5 +-
.../org/apache/sis/feature/SingletonAttribute.java | 5 +-
.../java/org/apache/sis/feature/SparseFeature.java | 5 +-
.../sis/feature/builder/FeatureTypeBuilder.java | 6 +-
.../org/apache/sis/filter/ConvertFunction.java | 2 +-
.../java/org/apache/sis/image/ImageProcessor.java | 4 +-
.../sis/internal/coverage/j2d/ObservableImage.java | 2 +-
.../org/apache/sis/internal/feature/Resources.java | 35 ++-
.../apache/sis/internal/feature/Resources_en.java} | 18 +-
.../apache/sis/internal/feature/Resources_fr.java} | 18 +-
.../sis/feature/DefaultAssociationRoleTest.java | 8 +-
.../apache/sis/feature/DefaultFeatureTypeTest.java | 8 +-
.../sis/internal/jaxb/SpecializedIdentifier.java | 5 +-
.../apache/sis/internal/jaxb/TypeRegistration.java | 59 +++--
.../apache/sis/internal/jaxb/cat/CodeListUID.java | 5 +-
.../apache/sis/internal/jaxb/cat/package-info.java | 2 +-
.../apache/sis/internal/jaxb/gml/TM_Primitive.java | 2 +-
.../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +-
.../sis/internal/metadata/ReferencingServices.java | 10 +-
.../apache/sis/internal/metadata/Resources.java | 35 ++-
.../Resources_en.java} | 18 +-
.../Resources_fr.java} | 18 +-
.../sis/internal/metadata}/TemporalUtilities.java | 47 +++-
.../apache/sis/internal/metadata/package-info.java | 2 +-
.../sis/internal/metadata/sql/Initializer.java | 18 +-
.../sis/internal/metadata/sql/LocalDataSource.java | 6 +-
.../org/apache/sis/metadata/MetadataStandard.java | 25 +-
.../sis/metadata/StandardImplementation.java | 6 +-
.../metadata/iso/extent/DefaultTemporalExtent.java | 2 +-
.../metadata/iso/lineage/DefaultProcessStep.java | 2 +-
.../iso/quality/DefaultEvaluationMethod.java | 3 +-
.../java/org/apache/sis/util/iso/AbstractName.java | 7 +-
.../apache/sis/util/iso/DefaultNameFactory.java | 25 +-
.../apache/sis/util/iso/DefaultRecordSchema.java | 5 +-
.../main/java/org/apache/sis/util/iso/Names.java | 19 +-
.../main/java/org/apache/sis/util/iso/Types.java | 54 +++--
.../main/java/org/apache/sis/xml/LegacyCodes.java | 2 +-
.../java/org/apache/sis/xml/MarshalContext.java | 2 +-
.../java/org/apache/sis/xml/MarshallerPool.java | 4 +-
.../main/java/org/apache/sis/xml/Transformer.java | 16 +-
.../sis/internal/jaxb/gml/TimePeriodTest.java | 2 +-
.../sis/metadata/iso/CustomMetadataTest.java | 4 +-
.../identification/DefaultCoupledResourceTest.java | 6 +-
.../DefaultServiceIdentificationTest.java | 4 +-
.../apache/sis/util/iso/NameMarshallingTest.java | 11 +-
.../java/org/apache/sis/util/iso/NamesTest.java | 8 +-
.../org/apache/sis/util/iso/TypeNamesTest.java | 7 +-
.../java/org/apache/sis/util/iso/TypesTest.java | 8 +-
.../apache/sis/internal/map/SymbologyVisitor.java | 2 +-
.../sis/internal/map/coverage/RenderingData.java | 3 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 3 +-
.../java/org/apache/sis/portrayal/MapLayers.java | 6 +-
.../main/java/org/apache/sis/style/se1/Rule.java | 4 +-
.../org/apache/sis/style/se1/StyleElement.java | 2 +-
.../java/org/apache/sis/style/se1/Symbolizer.java | 2 +
.../org/apache/sis/style/se1/StyleTestCase.java | 2 +-
.../apache/sis/internal/gazetteer/Resources.java | 35 ++-
.../sis/internal/gazetteer/Resources_en.java} | 18 +-
.../sis/internal/gazetteer/Resources_fr.java} | 18 +-
.../java/org/apache/sis/geometry/Envelopes.java | 5 +-
.../jaxb/referencing/CC_OperationMethod.java | 4 +-
.../sis/internal/referencing/AnnotatedMatrix.java | 5 +-
.../internal/referencing/CoordinateOperations.java | 87 +++----
.../apache/sis/internal/referencing/LazySet.java | 93 +++-----
.../internal/referencing/PositionTransformer.java | 6 +-
.../referencing/ReferencingFactoryContainer.java | 222 ++++++++++-------
.../apache/sis/internal/referencing/Resources.java | 35 ++-
.../sis/internal/referencing/Resources_en.java} | 18 +-
.../sis/internal/referencing/Resources_fr.java} | 18 +-
.../internal/referencing/ServicesForMetadata.java | 7 +-
.../sis/internal/referencing/j2d/AffineMatrix.java | 3 +-
.../referencing/j2d/AffineTransform2D.java | 2 +-
.../referencing/provider/AbridgedMolodensky.java | 36 ++-
.../referencing/provider/AbstractProvider.java | 80 ++++++-
.../sis/internal/referencing/provider/Affine.java | 130 ++++++----
.../referencing/provider/AxisOrderReversal.java | 23 +-
.../referencing/provider/AxisOrderReversal3D.java | 2 +-
.../provider/CoordinateFrameRotation.java | 2 +-
.../provider/CoordinateFrameRotation2D.java | 23 +-
.../provider/CoordinateFrameRotation3D.java | 38 ++-
.../referencing/provider/Equirectangular.java | 4 +-
.../provider/FranceGeocentricInterpolation.java | 62 +++--
.../referencing/provider/GeocentricAffine.java | 42 ++--
.../GeocentricAffineBetweenGeographic.java | 31 ++-
.../provider/GeocentricToGeographic.java | 39 ++-
.../provider/GeocentricToTopocentric.java | 24 +-
.../provider/GeocentricTranslation.java | 2 +-
.../provider/GeocentricTranslation2D.java | 23 +-
.../provider/GeocentricTranslation3D.java | 38 ++-
.../referencing/provider/GeodeticOperation.java | 122 +++++++---
.../referencing/provider/Geographic2Dto3D.java | 25 +-
.../referencing/provider/Geographic3Dto2D.java | 50 ++--
.../provider/GeographicAndVerticalOffsets.java | 32 ++-
.../referencing/provider/GeographicOffsets.java | 64 ++++-
.../referencing/provider/GeographicOffsets2D.java | 19 +-
.../provider/GeographicRedimension.java | 35 ++-
.../provider/GeographicToGeocentric.java | 39 ++-
.../provider/GeographicToTopocentric.java | 24 +-
.../referencing/provider/Interpolation1D.java | 24 +-
.../referencing/provider/LongitudeRotation.java | 36 ++-
.../referencing/provider/MapProjection.java | 34 ++-
.../referencing/provider/MapProjection3D.java | 38 +--
.../internal/referencing/provider/Molodensky.java | 38 ++-
.../provider/MolodenskyInterpolation.java | 45 ++--
.../sis/internal/referencing/provider/NADCON.java | 4 +-
.../sis/internal/referencing/provider/NTv1.java | 4 +-
.../sis/internal/referencing/provider/NTv2.java | 4 +-
.../referencing/provider/NorthPoleRotation.java | 4 +-
.../referencing/provider/PositionVector7Param.java | 2 +-
.../provider/PositionVector7Param2D.java | 23 +-
.../provider/PositionVector7Param3D.java | 38 ++-
.../internal/referencing/provider/Providers.java | 72 ------
.../referencing/provider/PseudoPlateCarree.java | 4 +-
.../referencing/provider/SouthPoleRotation.java | 4 +-
.../referencing/provider/VerticalOffset.java | 6 +-
.../internal/referencing/provider/Wraparound.java | 4 +-
.../provider/ZonedTransverseMercator.java | 4 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../org/apache/sis/parameter/TensorParameters.java | 14 +-
.../org/apache/sis/parameter/TensorValues.java | 3 +-
.../sis/referencing/AbstractIdentifiedObject.java | 9 +-
.../apache/sis/referencing/AuthorityFactories.java | 16 +-
.../java/org/apache/sis/referencing/Builder.java | 6 +-
.../main/java/org/apache/sis/referencing/CRS.java | 18 +-
.../sis/referencing/EPSGFactoryFallback.java | 7 +-
.../referencing/EllipsoidalHeightSeparator.java | 4 +-
.../apache/sis/referencing/GeodeticCalculator.java | 3 +-
.../apache/sis/referencing/NamedIdentifier.java | 6 +-
.../sis/referencing/StandardDefinitions.java | 6 +-
.../sis/referencing/datum/BursaWolfParameters.java | 2 +-
.../sis/referencing/datum/TimeDependentBWP.java | 2 +-
.../referencing/factory/GeodeticObjectFactory.java | 39 +--
.../factory/MultiAuthoritiesFactory.java | 10 +-
.../referencing/factory/sql/EPSGDataAccess.java | 119 +--------
.../sis/referencing/factory/sql/EPSGFactory.java | 26 +-
.../sis/referencing/factory/sql/EPSGInstaller.java | 5 +-
.../operation/AbstractSingleOperation.java | 5 +-
.../operation/CoordinateOperationFinder.java | 13 +-
.../operation/CoordinateOperationRegistry.java | 28 +--
.../operation/DefaultConcatenatedOperation.java | 4 +-
.../referencing/operation/DefaultConversion.java | 3 +-
.../DefaultCoordinateOperationFactory.java | 119 ++++-----
.../operation/DefaultOperationMethod.java | 255 +-------------------
.../operation/InverseOperationMethod.java | 2 +-
.../operation/builder/TransformBuilder.java | 5 +-
.../transform/AbstractLinearTransform.java | 2 +-
.../transform/CoordinateSystemTransform.java | 8 +-
.../transform/DefaultMathTransformFactory.java | 60 ++---
.../operation/transform/LinearTransform1D.java | 2 +-
.../referencing/EllipsoidalHeightCombinerTest.java | 6 +-
.../sis/internal/referencing/LazySetTest.java | 8 +-
.../internal/referencing/provider/AffineTest.java | 4 +-
.../provider/GeocentricTranslationTest.java | 10 +-
.../provider/GeographicOffsetsTest.java | 5 +-
.../provider/PositionVector7ParamTest.java | 7 +-
.../referencing/provider/ProviderMock.java | 15 +-
.../referencing/provider/ProvidersTest.java | 73 +++---
.../referencing/provider/SeismicBinGridMock.java | 4 +-
.../apache/sis/io/wkt/MathTransformParserTest.java | 6 +-
.../java/org/apache/sis/io/wkt/WKTParserTest.java | 6 +-
.../org/apache/sis/referencing/BuilderTest.java | 8 +-
.../sis/referencing/IdentifiedObjectsTest.java | 6 +-
.../sis/referencing/NamedIdentifierTest.java | 6 +-
.../factory/GeodeticObjectFactoryTest.java | 16 +-
.../sis/referencing/factory/TestFactorySource.java | 2 +-
.../geoapi/ParameterizedTransformTest.java | 7 +-
.../DefaultConcatenatedOperationTest.java | 8 +-
.../operation/DefaultConversionTest.java | 20 +-
.../operation/DefaultOperationMethodTest.java | 59 +----
.../operation/DefaultTransformationTest.java | 4 +-
.../operation/SingleOperationMarshallingTest.java | 6 +-
.../sis/referencing/operation/projection/NoOp.java | 3 +-
.../operation/projection/ObliqueMercatorTest.java | 7 +-
.../projection/ObliqueStereographicTest.java | 7 +-
.../transform/AbridgedMolodenskyTransformTest.java | 6 +-
.../operation/transform/CopyTransformTest.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 38 ++-
.../transform/EllipsoidToCentricTransformTest.java | 11 +-
.../InterpolatedGeocentricTransformTest.java | 6 +-
.../transform/InterpolatedTransformTest.java | 6 +-
.../transform/MolodenskyTransformTest.java | 11 +-
.../transform/OperationMethodSetTest.java | 4 +-
.../operation/transform/PolarToCartesianTest.java | 5 +-
.../transform/ProjectiveTransformTest.java | 2 +-
.../transform/SphericalToCartesianTest.java | 3 +-
.../operation/transform/TransferFunctionTest.java | 5 +-
.../transform/TransformSeparatorTest.java | 5 +-
.../report/CoordinateOperationMethods.java | 6 +-
.../test/integration/CoordinateOperationTest.java | 6 +-
.../org/apache/sis/referencing/crs/DerivedCRS.xml | 2 -
.../apache/sis/referencing/crs/ProjectedCRS.xml | 2 -
.../operation/ConcatenatedOperation.xml | 2 -
.../referencing/operation/PassThroughOperation.xml | 2 -
.../sis/internal/converter/SystemRegistry.java | 7 +-
.../sis/internal/system/DefaultFactories.java | 265 ---------------------
.../org/apache/sis/internal/system/Reflect.java | 106 +++++++++
.../internal/temporal/DefaultTemporalFactory.java | 9 +-
.../apache/sis/internal/temporal/package-info.java | 2 +-
.../org/apache/sis/internal/util/CloneAccess.java | 48 ++++
.../java/org/apache/sis/internal/util/Cloner.java | 155 ++++++------
.../org/apache/sis/internal/util/CodeLists.java | 9 +-
.../apache/sis/internal/util/FinalFieldSetter.java | 128 ----------
.../apache/sis/internal/util/MetadataServices.java | 7 +-
.../java/org/apache/sis/measure/FormatField.java | 4 +-
.../org/apache/sis/measure/QuantityFormat.java | 21 +-
.../java/org/apache/sis/measure/RangeFormat.java | 19 +-
.../java/org/apache/sis/measure/UnitFormat.java | 24 +-
.../apache/sis/setup/InstallationResources.java | 15 +-
.../sis/util/collection/DefaultTreeTable.java | 4 +-
.../java/org/apache/sis/util/resources/Errors.java | 35 ++-
.../org/apache/sis/util/resources/Errors_en.java} | 18 +-
.../org/apache/sis/util/resources/Errors_fr.java} | 18 +-
.../sis/util/resources/IndexedResourceBundle.java | 83 +++----
.../java/org/apache/sis/util/resources/Loader.java | 120 ----------
.../org/apache/sis/util/resources/Messages.java | 35 ++-
.../apache/sis/util/resources/Messages_en.java} | 18 +-
.../apache/sis/util/resources/Messages_fr.java} | 18 +-
.../org/apache/sis/util/resources/Vocabulary.java | 35 ++-
.../apache/sis/util/resources/Vocabulary_en.java} | 18 +-
.../apache/sis/util/resources/Vocabulary_fr.java} | 18 +-
.../util/resources/IndexedResourceBundleTest.java | 10 +-
.../org/apache/sis/util/resources/LoaderTest.java | 48 ----
.../sis/internal/profile/fra/ProfileTypes.java | 20 +-
.../apache/sis/storage/landsat/LandsatStore.java | 4 +-
.../org/apache/sis/internal/geotiff/Resources.java | 35 ++-
.../apache/sis/internal/geotiff/Resources_en.java | 18 +-
.../apache/sis/internal/geotiff/Resources_fr.java | 18 +-
.../sis/storage/geotiff/GridGeometryBuilder.java | 4 +-
.../sis/storage/geotiff/ImageMetadataBuilder.java | 2 +-
.../org/apache/sis/storage/geotiff/Reader.java | 6 +-
.../apache/sis/storage/geotiff/XMLMetadata.java | 2 +-
.../apache/sis/storage/geotiff/GeoCodesTest.java | 6 +-
.../apache/sis/storage/geotiff/GeoKeysTest.java | 8 +-
.../org/apache/sis/internal/netcdf/CRSBuilder.java | 6 +-
.../org/apache/sis/internal/netcdf/Convention.java | 8 +-
.../org/apache/sis/internal/netcdf/Decoder.java | 4 +-
.../org/apache/sis/internal/netcdf/Resources.java | 35 ++-
.../apache/sis/internal/netcdf/Resources_en.java | 18 +-
.../apache/sis/internal/netcdf/Resources_fr.java | 18 +-
.../apache/sis/internal/sql/feature/Analyzer.java | 6 +-
.../apache/sis/internal/sql/feature/Resources.java | 35 ++-
.../sis/internal/sql/feature/Resources_en.java | 18 +-
.../sis/internal/sql/feature/Resources_fr.java | 18 +-
.../apache/sis/storage/sql/ResourceDefinition.java | 10 +-
.../org/apache/sis/internal/storage/Resources.java | 35 ++-
.../apache/sis/internal/storage/Resources_en.java | 18 +-
.../apache/sis/internal/storage/Resources_fr.java | 18 +-
.../apache/sis/internal/storage/folder/Store.java | 6 +-
.../org/apache/sis/storage/DataStoreRegistry.java | 64 ++---
.../java/org/apache/sis/storage/DataStores.java | 54 +----
.../org/apache/sis/storage/DataStoresTest.java | 6 +-
.../org/apache/sis/internal/storage/gpx/Store.java | 6 +-
.../org/apache/sis/internal/storage/gpx/Types.java | 3 +-
268 files changed, 2858 insertions(+), 2943 deletions(-)
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
index 31b9fcbdc6,1fbd5a9baf..63a2380359
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
@@@ -42,10 -44,8 +43,11 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.Workaround;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.system.Loggers;
+ import org.apache.sis.internal.referencing.Resources;
+// Branch-dependent imports
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Base class for all providers defined in this package.
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
index ea97db1923,87e0a98fcf..801c0bac9d
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
@@@ -32,11 -32,10 +32,11 @@@ import org.opengis.util.InternationalSt
import org.apache.sis.util.resources.Errors;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.Identifier;
+import org.opengis.referencing.ReferenceIdentifier;
import org.opengis.parameter.InvalidParameterValueException;
import org.apache.sis.internal.metadata.NameToIdentifier;
- import org.apache.sis.internal.system.DefaultFactories;
import org.apache.sis.metadata.iso.citation.Citations;
+ import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.ArgumentChecks;
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index da4baa918b,91f499bde5..b6d8da1e7f
---
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
@@@ -927,11 -928,10 +928,10 @@@ class CoordinateOperationRegistry
ReferencingUtilities.getInterface(CoordinateOperation.class,
operation));
/*
* Reuse the same operation method, but we may need to change its
number of dimension.
- * The capability to resize an OperationMethod is specific to Apache
SIS, so we must
- * 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.
+ * For example the "Affine" set of parameters depend on the number of
dimensions.
+ * The capability to resize an operation method is specific to Apache
SIS.
*/
- if (operation instanceof SingleOperation) {
+ if (SubTypes.isSingleOperation(operation)) {
final SingleOperation single = (SingleOperation) operation;
properties.put(CoordinateOperations.PARAMETERS_KEY,
single.getParameterValues());
if (method == null) {
