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 0a72e06db91f4d8b115f1a5f2d1e76fc32136242
Merge: e0f5cfa3ec 3afc7a15bf
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Oct 29 18:42:14 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
.../sis/buildtools/coding/ReorganizeImports.java | 31 +-
endorsed/build.gradle.kts | 2 +-
.../main/org/apache/sis/console/CommandRunner.java | 2 +-
.../org.apache.sis.feature/main/module-info.java | 2 +-
.../main/org/apache/sis/coverage/Category.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 7 +-
.../org/apache/sis/coverage/grid/package-info.java | 2 +-
.../org/apache/sis/feature/AbstractAttribute.java | 2 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 8 +-
.../apache/sis/feature/DefaultAssociationRole.java | 2 +-
.../apache/sis/feature/DefaultAttributeType.java | 4 +-
.../sis/feature/builder/AttributeTypeBuilder.java | 4 +-
.../apache/sis/feature/builder/TypeBuilder.java | 13 +-
.../apache/sis/feature/builder/package-info.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 5 +-
.../main/org/apache/sis/image/Colorizer.java | 4 +-
.../main/org/apache/sis/image/ImageProcessor.java | 151 +------
.../main/org/apache/sis/image/Visualization.java | 12 -
.../main/org/apache/sis/image/package-info.java | 2 +-
.../org.apache.sis.metadata/main/module-info.java | 4 +-
.../apache/sis/metadata/internal/AxisNames.java | 48 +-
.../apache/sis/metadata/internal/NameMeaning.java | 2 +-
.../sis/metadata/internal/ReferencingServices.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 88 +---
.../sis/metadata/iso/citation/Citations.java | 12 +-
.../iso/constraint/DefaultConstraints.java | 6 +-
.../metadata/iso/distribution/DefaultFormat.java | 2 +-
.../iso/extent/DefaultGeographicBoundingBox.java | 4 +-
.../iso/extent/DefaultGeographicDescription.java | 6 +-
.../apache/sis/metadata/iso/extent/Extents.java | 4 +-
.../org/apache/sis/metadata/iso/package-info.java | 2 +-
.../apache/sis/util/iso/DefaultRecordSchema.java | 5 +-
.../org/apache/sis/util/iso/DefaultRecordType.java | 57 +--
.../main/org/apache/sis/util/iso/Types.java | 2 +-
.../main/org/apache/sis/util/iso/package-info.java | 2 +-
.../main/org/apache/sis/xml/bind/Context.java | 2 +-
.../test/org/apache/sis/metadata/TreeNodeTest.java | 6 +-
.../sis/openoffice/ReferencingFunctions.java | 4 +-
.../org/apache/sis/openoffice/XReferencing.java | 4 +-
.../referencing/gazetteer/FinalLocationType.java | 12 +-
.../gazetteer/ModifiableLocationType.java | 12 +-
.../main/module-info.java | 2 +-
.../main/org/apache/sis/io/wkt/Convention.java | 2 +-
.../main/org/apache/sis/io/wkt/Formatter.java | 4 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 4 +-
.../main/org/apache/sis/io/wkt/StoredTree.java | 4 +-
.../main/org/apache/sis/io/wkt/Transliterator.java | 30 +-
.../main/org/apache/sis/io/wkt/package-info.java | 4 +-
.../parameter/DefaultParameterDescriptorGroup.java | 4 +-
.../sis/parameter/DefaultParameterValue.java | 4 +-
.../org/apache/sis/parameter/ParameterBuilder.java | 10 +-
.../org/apache/sis/parameter/TensorParameters.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 12 +-
.../main/org/apache/sis/referencing/Builder.java | 10 +-
.../main/org/apache/sis/referencing/CRS.java | 6 +-
.../main/org/apache/sis/referencing/CommonCRS.java | 6 +-
.../apache/sis/referencing/IdentifiedObjects.java | 4 +-
.../apache/sis/referencing/NamedIdentifier.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRS.java | 2 +-
.../apache/sis/referencing/cs/AxesConvention.java | 2 +-
.../org/apache/sis/referencing/cs/AxisFilter.java | 4 +-
.../sis/referencing/cs/CoordinateSystems.java | 12 +-
.../cs/DefaultCoordinateSystemAxis.java | 16 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 8 +-
.../sis/referencing/datum/DatumShiftGrid.java | 2 +-
.../referencing/datum/DefaultGeodeticDatum.java | 4 +-
.../factory/CommonAuthorityFactory.java | 4 +-
.../factory/IdentifiedObjectFinder.java | 2 +-
.../referencing/factory/IdentifiedObjectSet.java | 2 +-
.../referencing/factory/sql/EPSGDataAccess.java | 6 +-
.../sis/referencing/factory/sql/package-info.java | 4 +-
.../sis/referencing/internal/DeprecatedCode.java | 2 +-
.../sis/referencing/internal/DeprecatedName.java | 2 +-
.../operation/CoordinateOperationContext.java | 6 +-
.../operation/CoordinateOperationRegistry.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 9 +-
.../operation/LooselyDefinedMethod.java | 12 +-
.../builder/LocalizationGridException.java | 4 +-
.../operation/builder/ProjectedTransformTry.java | 2 +-
.../sis/referencing/operation/matrix/Matrices.java | 2 +-
.../referencing/operation/matrix/MatrixSIS.java | 23 +-
.../referencing/operation/matrix/package-info.java | 2 +-
.../sis/referencing/operation/package-info.java | 2 +-
.../operation/projection/AzimuthalEquidistant.java | 2 +-
.../operation/projection/CassiniSoldner.java | 8 +-
.../operation/projection/ConformalProjection.java | 4 +-
.../projection/LambertConicConformal.java | 20 +-
.../referencing/operation/projection/Mercator.java | 26 +-
.../projection/ModifiedAzimuthalEquidistant.java | 2 +-
.../operation/projection/Mollweide.java | 4 +-
.../operation/projection/NormalizedProjection.java | 6 +-
.../operation/projection/ObliqueMercator.java | 10 +-
.../operation/projection/ObliqueStereographic.java | 8 +-
.../operation/projection/Orthographic.java | 2 +-
.../operation/projection/PolarStereographic.java | 26 +-
.../operation/projection/Polyconic.java | 2 +-
.../operation/projection/Sinusoidal.java | 6 +-
.../operation/projection/TransverseMercator.java | 4 +-
.../operation/projection/ZonedGridSystem.java | 2 +-
.../operation/projection/package-info.java | 6 +-
.../operation/provider/AbridgedMolodensky.java | 6 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/AbstractStereographic.java | 2 +-
.../sis/referencing/operation/provider/Affine.java | 2 +-
.../operation/provider/AlbersEqualArea.java | 2 +-
.../operation/provider/AxisOrderReversal.java | 2 +-
.../operation/provider/AxisOrderReversal3D.java | 2 +-
.../provider/AzimuthalEquidistantSpherical.java | 2 +-
.../operation/provider/CassiniSoldner.java | 2 +-
.../provider/CoordinateFrameRotation.java | 2 +-
.../provider/CoordinateFrameRotation2D.java | 2 +-
.../provider/CoordinateFrameRotation3D.java | 2 +-
.../operation/provider/Equirectangular.java | 4 +-
.../provider/FranceGeocentricInterpolation.java | 42 +-
.../operation/provider/GeocentricToGeographic.java | 2 +-
.../provider/GeocentricToTopocentric.java | 2 +-
.../operation/provider/GeocentricTranslation.java | 2 +-
.../provider/GeocentricTranslation2D.java | 2 +-
.../provider/GeocentricTranslation3D.java | 2 +-
.../operation/provider/Geographic2Dto3D.java | 2 +-
.../operation/provider/Geographic3Dto2D.java | 2 +-
.../provider/GeographicAndVerticalOffsets.java | 6 +-
.../operation/provider/GeographicOffsets.java | 8 +-
.../operation/provider/GeographicOffsets2D.java | 2 +-
.../operation/provider/GeographicToGeocentric.java | 4 +-
.../provider/GeographicToTopocentric.java | 2 +-
.../provider/HyperbolicCassiniSoldner.java | 2 +-
.../operation/provider/Interpolation1D.java | 4 +-
.../provider/LambertAzimuthalEqualArea.java | 2 +-
.../LambertAzimuthalEqualAreaSpherical.java | 2 +-
.../operation/provider/LambertConformal1SP.java | 2 +-
.../operation/provider/LambertConformal2SP.java | 2 +-
.../provider/LambertConformalBelgium.java | 2 +-
.../provider/LambertConformalMichigan.java | 2 +-
.../operation/provider/LambertConformalWest.java | 6 +-
.../provider/LambertCylindricalEqualArea.java | 2 +-
.../LambertCylindricalEqualAreaSpherical.java | 2 +-
.../operation/provider/LongitudeRotation.java | 2 +-
.../operation/provider/Mercator1SP.java | 2 +-
.../operation/provider/Mercator2SP.java | 2 +-
.../provider/MercatorAuxiliarySphere.java | 2 +-
.../operation/provider/MercatorSpherical.java | 2 +-
.../operation/provider/MillerCylindrical.java | 2 +-
.../provider/ModifiedAzimuthalEquidistant.java | 2 +-
.../referencing/operation/provider/Mollweide.java | 2 +-
.../referencing/operation/provider/Molodensky.java | 6 +-
.../provider/MolodenskyInterpolation.java | 105 -----
.../sis/referencing/operation/provider/NADCON.java | 6 +-
.../sis/referencing/operation/provider/NTv1.java | 2 +-
.../sis/referencing/operation/provider/NTv2.java | 4 +-
.../operation/provider/ObliqueMercator.java | 4 +-
.../operation/provider/ObliqueMercatorCenter.java | 4 +-
.../provider/ObliqueMercatorTwoPoints.java | 2 +-
.../provider/ObliqueMercatorTwoPointsCenter.java | 2 +-
.../operation/provider/ObliqueStereographic.java | 2 +-
.../operation/provider/Orthographic.java | 2 +-
.../operation/provider/PolarStereographicA.java | 4 +-
.../operation/provider/PolarStereographicB.java | 4 +-
.../operation/provider/PolarStereographicC.java | 2 +-
.../provider/PolarStereographicNorth.java | 2 +-
.../provider/PolarStereographicSouth.java | 2 +-
.../referencing/operation/provider/Polyconic.java | 2 +-
.../operation/provider/PositionVector7Param.java | 2 +-
.../operation/provider/PositionVector7Param2D.java | 2 +-
.../operation/provider/PositionVector7Param3D.java | 2 +-
.../operation/provider/PseudoMercator.java | 2 +-
.../operation/provider/PseudoPlateCarree.java | 2 +-
.../operation/provider/PseudoSinusoidal.java | 2 +-
.../operation/provider/RegionalMercator.java | 2 +-
.../operation/provider/SatelliteTracking.java | 2 +-
.../referencing/operation/provider/Sinusoidal.java | 2 +-
.../operation/provider/TransverseMercator.java | 4 +-
.../provider/TransverseMercatorSouth.java | 2 +-
.../operation/provider/VerticalOffset.java | 4 +-
.../provider/ZonedTransverseMercator.java | 2 +-
.../transform/AbridgedMolodenskyTransform2D.java | 2 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../operation/transform/DatumShiftTransform.java | 32 +-
.../transform/DefaultMathTransformFactory.java | 14 +-
.../transform/InterpolatedGeocentricTransform.java | 38 +-
.../transform/InterpolatedMolodenskyTransform.java | 458 -------------------
.../InterpolatedMolodenskyTransform2D.java | 139 ------
.../operation/transform/InterpolatedTransform.java | 2 +-
.../operation/transform/MathTransforms.java | 18 -
.../operation/transform/MolodenskyFormula.java | 490 ---------------------
.../operation/transform/MolodenskyTransform.java | 420 +++++++++++++++++-
.../operation/transform/package-info.java | 2 +-
.../sis/referencing/util/AxisDirections.java | 4 +-
.../sis/referencing/util/CoordinateOperations.java | 2 +-
.../sis/referencing/util/DefinitionVerifier.java | 8 +-
.../org/apache/sis/referencing/util/Formulas.java | 4 +-
.../referencing/util/GeodeticObjectBuilder.java | 8 +-
.../sis/referencing/util/ReferencingUtilities.java | 10 +-
.../org/apache/sis/referencing/util/j2d/Tile.java | 12 +-
.../referencing/CC_GeneralOperationParameter.java | 4 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 +-
.../sis/io/wkt/GeodeticObjectParserTest.java | 4 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 2 +-
.../apache/sis/parameter/ParameterBuilderTest.java | 2 +-
.../org/apache/sis/referencing/BuilderTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 4 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../apache/sis/referencing/cs/HardCodedAxes.java | 54 +--
.../operation/CoordinateOperationFinderTest.java | 4 +-
.../operation/CoordinateOperationRegistryTest.java | 20 +-
.../DefaultCoordinateOperationFactoryTest.java | 2 +-
.../operation/projection/CassiniSoldnerTest.java | 4 +-
.../projection/LambertConicConformalTest.java | 12 +-
.../operation/projection/MercatorTest.java | 22 +-
.../ModifiedAzimuthalEquidistantTest.java | 2 +-
.../operation/projection/ObliqueMercatorTest.java | 2 +-
.../operation/projection/OrthographicTest.java | 2 +-
.../projection/PolarStereographicTest.java | 2 +-
.../provider/CoordinateFrameRotationTest.java | 4 +-
.../FranceGeocentricInterpolationTest.java | 2 +-
.../provider/GeocentricTranslationTest.java | 6 +-
.../operation/provider/GeographicOffsetsTest.java | 4 +-
.../provider/PositionVector7ParamTest.java | 4 +-
.../operation/provider/ProvidersTest.java | 1 -
.../operation/provider/SeismicBinGridMock.java | 4 +-
.../operation/transform/CopyTransformTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 4 +-
.../InterpolatedGeocentricTransformTest.java | 2 +-
.../InterpolatedMolodenskyTransformTest.java | 130 ------
.../transform/InterpolatedTransformTest.java | 4 +-
.../transform/MolodenskyTransformTest.java | 4 +-
.../operation/transform/ScaleTransformTest.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Axis.java | 4 +-
.../apache/sis/storage/netcdf/base/CRSBuilder.java | 12 +-
.../apache/sis/storage/netcdf/base/Convention.java | 6 +-
.../apache/sis/storage/netcdf/base/Decoder.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Grid.java | 4 +-
.../apache/sis/storage/netcdf/base/Variable.java | 2 +-
.../sis/storage/netcdf/base/package-info.java | 10 +-
.../sis/storage/netcdf/classic/ChannelDecoder.java | 2 +-
.../sis/storage/netcdf/classic/GridInfo.java | 2 +-
.../sis/storage/netcdf/classic/VariableInfo.java | 4 +-
.../apache/sis/storage/netcdf/package-info.java | 10 +-
.../sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +-
.../sis/storage/netcdf/ucar/GridWrapper.java | 2 +-
.../apache/sis/io/stream/OutputStreamAdapter.java | 2 +-
.../org/apache/sis/storage/DataStoreProvider.java | 4 +-
.../main/org/apache/sis/storage/Resource.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 2 +-
.../org/apache/sis/storage/image/FormatFinder.java | 2 +-
.../main/org/apache/sis/storage/xml/Store.java | 2 +-
.../src/org.apache.sis.util/main/module-info.java | 14 +-
.../main/org/apache/sis/io/AppendableWriter.java | 2 +-
.../main/org/apache/sis/io/Appender.java | 2 +-
.../main/org/apache/sis/io/IO.java | 2 +-
.../main/org/apache/sis/io/TableAppender.java | 2 +-
.../main/org/apache/sis/io/TabularFormat.java | 4 +-
.../main/org/apache/sis/measure/package-info.java | 6 +-
.../main/org/apache/sis/setup/About.java | 2 +-
.../sis/util/AbstractInternationalString.java | 2 +-
.../main/org/apache/sis/util/ArgumentChecks.java | 118 ++---
.../main/org/apache/sis/util/CharSequences.java | 42 +-
.../main/org/apache/sis/util/ComparisonMode.java | 4 +-
.../main/org/apache/sis/util/Debug.java | 2 +-
.../org/apache/sis/util/LenientComparable.java | 4 +-
.../org/apache/sis/util/NullArgumentException.java | 67 ---
.../main/org/apache/sis/util/Numbers.java | 4 +-
.../main/org/apache/sis/util/ObjectConverter.java | 2 +-
.../main/org/apache/sis/util/StringBuilders.java | 2 +-
.../apache/sis/util/collection/CodeListSet.java | 5 +-
.../org/apache/sis/util/collection/Containers.java | 2 +-
.../apache/sis/util/collection/TableColumn.java | 16 +-
.../sis/util/collection/TreeTableFormat.java | 4 +-
.../sis/util/collection/WeakValueHashMap.java | 11 +-
.../apache/sis/util/collection/package-info.java | 2 +-
.../apache/sis/util/internal/CheckedArrayList.java | 3 +-
.../apache/sis/util/internal/CheckedHashSet.java | 3 +-
.../org/apache/sis/util/internal/Constants.java | 2 +-
.../org/apache/sis/util/internal/DoubleDouble.java | 2 +-
.../sis/util/internal/LocalizedParseException.java | 4 +-
.../main/org/apache/sis/util/logging/Logging.java | 18 +-
.../org/apache/sis/util/logging/package-info.java | 2 +-
.../main/org/apache/sis/util/package-info.java | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 2 +-
.../org/apache/sis/util/ArgumentChecksTest.java | 4 +-
.../sis/util/internal/CheckedArrayListTest.java | 5 +-
.../src/org.apache.sis.cql/main/module-info.java | 2 -
.../storage/coveragejson/CoverageJsonStore.java | 9 +-
.../sis/storage/coveragejson/CoverageResource.java | 46 +-
.../storage/coveragejson/binding/Parameters.java | 2 +-
.../sis/storage/coveragejson/package-info.java | 2 +-
.../main/module-info.java | 2 -
.../storage/shapefile/DataStoreQueryException.java | 2 -
.../shapefile/DataStoreQueryResultException.java | 2 -
.../shapefile/DbaseFileNotFoundException.java | 2 -
.../sis/storage/shapefile/InputFeatureStream.java | 2 -
.../shapefile/InvalidDbaseFileFormatException.java | 2 -
.../shapefile/InvalidShapefileFormatException.java | 2 -
.../apache/sis/storage/shapefile/ShapeFile.java | 3 -
.../sis/storage/shapefile/ShapeTypeEnum.java | 3 -
.../shapefile/ShapefileNotFoundException.java | 2 -
.../apache/sis/storage/shapefile/cpg/CpgFiles.java | 2 -
.../apache/sis/storage/shapefile/package-info.java | 2 -
.../test/module-info.java | 2 -
.../org/apache/sis/services/OSGiActivator.java | 2 -
.../org/apache/sis/services/ServletListener.java | 2 -
optional/src/org.apache.sis.gui/bundle/README | 2 +-
.../org/apache/sis/gui/controls/TabularWidget.java | 2 +-
.../apache/sis/gui/coverage/BandRangeTable.java | 2 +-
.../apache/sis/gui/coverage/CoverageStyling.java | 2 +-
.../sis/gui/coverage/ImagePropertyExplorer.java | 4 +-
.../org/apache/sis/gui/dataset/FeatureTable.java | 2 +-
.../main/org/apache/sis/gui/dataset/LogViewer.java | 2 +-
.../sis/gui/internal/FixedHeaderColumnSize.java | 4 +-
.../apache/sis/gui/internal/ImageConverter.java | 2 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 2 +-
.../org/apache/sis/gui/referencing/CRSChooser.java | 2 +-
.../gui/referencing/RecentReferenceSystems.java | 4 +-
.../main/org/apache/sis/gui/setup/Wizard.java | 2 +-
315 files changed, 1188 insertions(+), 2639 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
index bf41a3889b,027013eb9b..d379aa7e6c
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/ObliqueMercatorCenter.java
@@@ -24,12 -24,9 +24,12 @@@ import org.apache.sis.metadata.iso.cita
import static org.apache.sis.referencing.IdentifiedObjects.getIdentifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
- * The provider for <cite>"Hotine Oblique Mercator (variant B)"</cite>
projection (EPSG:9815).
+ * The provider for <q>Hotine Oblique Mercator (variant B)</q> projection
(EPSG:9815).
*
* @author Rueben Schulz (UBC)
* @author Martin Desruisseaux (Geomatys)
