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 f58c7f7d563d5ea51d480e17a24a6f0f5c4520e4
Merge: cdfb5327b5 a2cb3742f8
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Jan 22 14:08:06 2024 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1:
    - Better handling of `AxesConvention`.
    - Better handling of special cases in transform concatenations.
    - Detech changes of coordinate system types in `ConcatenatedOperation`.

 .../apache/sis/buildtools/gradle/Dependency.java   |   1 +
 endorsed/build.gradle.kts                          |   3 -
 .../org/apache/sis/console/CommandRunnerTest.java  |   4 +-
 .../org.apache.sis.feature/main/module-info.java   |   3 +-
 .../apache/sis/coverage/grid/GridOrientation.java  |   2 +-
 .../apache/sis/coverage/grid/SliceGeometry.java    |  12 +-
 .../sis/coverage/internal/CompoundTransform.java   |  54 ++--
 .../apache/sis/coverage/grid/GridExtentTest.java   |  12 +-
 .../sis/metadata/iso/citation/Citations.java       |  64 +----
 .../test/org/apache/sis/xml/XLinkTest.java         |   6 +-
 .../org.apache.sis.portrayal/main/module-info.java |   7 +-
 .../main/org/apache/sis/portrayal/Observable.java  |  14 +-
 .../org/apache/sis/portrayal/package-info.java     |   2 +-
 .../main/org/apache/sis/style/Style.java           |   2 +
 .../main/org/apache/sis/style/package-info.java    |   2 +
 .../MultiResolutionCoverageLoaderTest.java         |   2 +-
 .../apache/sis/style/se1/ChannelSelectionTest.java |   2 +-
 .../sis/style/se1/ContrastEnhancementTest.java     |   2 +-
 .../apache/sis/style/se1/ExternalGraphicTest.java  |   2 +-
 .../apache/sis/style/se1/FeatureTypeStyleTest.java |   2 +-
 .../test/org/apache/sis/style/se1/FontTest.java    |   2 +-
 .../test/org/apache/sis/style/se1/GraphicTest.java |   2 +-
 .../test/org/apache/sis/style/se1/HaloTest.java    |   2 +-
 .../apache/sis/style/se1/LineSymbolizerTest.java   |   2 +-
 .../test/org/apache/sis/style/se1/MarkTest.java    |   2 +-
 .../apache/sis/style/se1/PointPlacementTest.java   |   2 +-
 .../apache/sis/style/se1/PointSymbolizerTest.java  |   2 +-
 .../sis/style/se1/PolygonSymbolizerTest.java       |   2 +-
 .../apache/sis/style/se1/RasterSymbolizerTest.java |   2 +-
 .../test/org/apache/sis/style/se1/RuleTest.java    |   2 +-
 .../apache/sis/style/se1/SelectedChannelTest.java  |   2 +-
 .../org/apache/sis/style/se1/ShadedReliefTest.java |   2 +-
 .../test/org/apache/sis/style/se1/StrokeTest.java  |   2 +-
 .../org/apache/sis/style/se1/StyleTestCase.java    |   5 +-
 .../org/apache/sis/style/se1/SymbolizerTest.java   |   5 +-
 .../org/apache/sis/style/se1/SymbologyTest.java    |   2 +-
 .../apache/sis/style/se1/TextSymbolizerTest.java   |   2 +-
 .../main/org/apache/sis/referencing/CommonCRS.java |  13 +-
 .../apache/sis/referencing/crs/AbstractCRS.java    | 149 ++++++-----
 .../sis/referencing/crs/AbstractDerivedCRS.java    |  28 +-
 .../sis/referencing/crs/DefaultCompoundCRS.java    | 129 ++++-----
 .../sis/referencing/crs/DefaultDerivedCRS.java     |  73 ++++--
 .../sis/referencing/crs/DefaultEngineeringCRS.java |  26 +-
 .../sis/referencing/crs/DefaultGeocentricCRS.java  |  33 +--
 .../sis/referencing/crs/DefaultGeodeticCRS.java    |  20 +-
 .../sis/referencing/crs/DefaultGeographicCRS.java  |  25 +-
 .../sis/referencing/crs/DefaultImageCRS.java       |  26 +-
 .../sis/referencing/crs/DefaultParametricCRS.java  |  27 +-
 .../sis/referencing/crs/DefaultProjectedCRS.java   |  19 +-
 .../sis/referencing/crs/DefaultTemporalCRS.java    |  26 +-
 .../sis/referencing/crs/DefaultVerticalCRS.java    |  21 +-
 .../apache/sis/referencing/crs/package-info.java   |   2 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  | 222 +++++++++++-----
 .../apache/sis/referencing/cs/AxesConvention.java  |  22 +-
 .../apache/sis/referencing/cs/DefaultAffineCS.java |  31 +--
 .../sis/referencing/cs/DefaultCartesianCS.java     |  69 +++--
 .../sis/referencing/cs/DefaultCompoundCS.java      |  57 +++-
 .../sis/referencing/cs/DefaultCylindricalCS.java   |  34 +--
 .../sis/referencing/cs/DefaultEllipsoidalCS.java   |  41 ++-
 .../apache/sis/referencing/cs/DefaultLinearCS.java |  32 +--
 .../sis/referencing/cs/DefaultParametricCS.java    |  32 +--
 .../apache/sis/referencing/cs/DefaultPolarCS.java  |  32 +--
 .../sis/referencing/cs/DefaultSphericalCS.java     |  39 +--
 .../apache/sis/referencing/cs/DefaultTimeCS.java   |  32 +--
 .../sis/referencing/cs/DefaultUserDefinedCS.java   |  32 +--
 .../sis/referencing/cs/DefaultVerticalCS.java      |  32 +--
 .../org/apache/sis/referencing/cs/Normalizer.java  |  11 +-
 .../org/apache/sis/referencing/cs/SubTypes.java    |  31 +++
 .../apache/sis/referencing/cs/package-info.java    |   2 +-
 .../factory/GeodeticAuthorityFactory.java          |   8 +-
 .../factory/MultiAuthoritiesFactory.java           |   2 +-
 .../sis/referencing/factory/package-info.java      |   2 +-
 .../operation/DefaultConcatenatedOperation.java    |  14 +-
 .../referencing/operation/matrix/MatrixSIS.java    |   2 +
 .../referencing/operation/projection/Mercator.java |  63 +++--
 .../operation/projection/NormalizedProjection.java | 116 +--------
 .../transform/AbstractLinearTransform.java         |  17 --
 .../operation/transform/AbstractMathTransform.java | 227 ++++++++++++++--
 .../operation/transform/CartesianToPolar.java      |   2 +-
 .../operation/transform/CartesianToSpherical.java  |   2 +-
 .../operation/transform/ConcatenatedTransform.java |  58 +++--
 .../transform/CoordinateSystemTransform.java       | 188 +++++++++++++-
 .../transform/DefaultMathTransformFactory.java     |   6 +-
 .../transform/EllipsoidToCentricTransform.java     |  81 +++---
 .../transform/ExponentialTransform1D.java          |  65 +++--
 .../transform/LogarithmicTransform1D.java          |  53 ++--
 .../operation/transform/PassThroughTransform.java  | 287 +++++++++++----------
 .../operation/transform/PolarToCartesian.java      |   2 +-
 .../operation/transform/PowerTransform1D.java      |  30 +--
 .../operation/transform/SphericalToCartesian.java  |   2 +-
 .../operation/transform/TransformSeparator.java    |  17 +-
 .../operation/transform/UnitConversion.java        |  26 +-
 .../operation/transform/WraparoundTransform.java   |  86 +++---
 .../sis/referencing/util/CoordinateOperations.java |   2 +-
 .../referencing/util/ExtendedPrecisionMatrix.java  |  27 ++
 .../referencing/util/MathTransformsOrFactory.java  | 138 ----------
 .../sis/referencing/util/ReferencingUtilities.java |  41 +++
 .../test/org/apache/sis/io/wkt/ColorsTest.java     |   3 +-
 .../test/org/apache/sis/io/wkt/ElementTest.java    |   6 +-
 .../sis/io/wkt/GeodeticObjectParserTest.java       |   3 +-
 .../org/apache/sis/io/wkt/WKTDictionaryTest.java   |   6 +-
 .../test/org/apache/sis/io/wkt/WKTFormatTest.java  |   3 +-
 .../test/org/apache/sis/referencing/CRSTest.java   | 149 +++++------
 .../sis/referencing/cs/DefaultPolarCSTest.java     |   4 +-
 .../operation/transform/CartesianToPolarTest.java  |  12 +-
 .../transform/CartesianToSphericalTest.java        |  49 +++-
 .../transform/EllipsoidToCentricTransformTest.java |  40 +--
 .../transform/PassThroughTransformTest.java        |  73 +++---
 .../operation/transform/PolarToCartesianTest.java  |  20 +-
 .../transform/SphericalToCartesianTest.java        |  64 ++++-
 .../transform/TransformSeparatorTest.java          | 179 ++++++-------
 .../transform/WraparoundTransformTest.java         |  11 +-
 .../sis/storage/geotiff/reader/CRSBuilder.java     |  10 +-
 .../sis/io/stream/ChannelDataOutputTest.java       |   2 +-
 .../org/apache/sis/storage/FeatureQueryTest.java   |   2 +-
 .../apache/sis/storage/StorageConnectorTest.java   |   4 +-
 .../storage/internal/RewindableLineReaderTest.java |   3 +-
 .../src/org.apache.sis.util/main/module-info.java  |   1 +
 .../main/org/apache/sis/util/CharSequences.java    |  66 +++++
 .../apache/sis/util/internal/DefinitionURI.java    |   3 +-
 incubator/build.gradle.kts                         |  44 ++++
 .../main/module-info.java                          |  13 +-
 .../org/apache/sis/map/ExceptionPresentation.java  |   2 -
 .../main/org/apache/sis/map/ListChangeEvent.java   |   1 -
 .../main/org/apache/sis/map}/MapItem.java          |   6 +-
 .../main/org/apache/sis/map}/MapLayer.java         |   3 +-
 .../main/org/apache/sis/map}/MapLayers.java        |   5 +-
 .../main/org/apache/sis/map/NotifiedList.java      |   4 +-
 .../main/org/apache/sis/map/Presentation.java      |   2 -
 .../org/apache/sis/map/PropertyNameCollector.java  |   1 -
 .../org/apache/sis/map/ResourceSymbolizer.java     |   1 -
 .../main/org/apache/sis/map/SEPortrayer.java       |   4 -
 .../main/org/apache/sis/map/SEPresentation.java    |   2 -
 .../main/org/apache/sis/map/SymbologyVisitor.java  |   1 -
 .../main/org/apache/sis/map/package-info.java      |   0
 .../test/org/apache/sis/map}/MapLayersTest.java    |   9 +-
 .../test/org/apache/sis/map/SEPortrayerTest.java   |   9 +-
 netbeans-project/nbproject/project.properties      |   4 +-
 138 files changed, 2339 insertions(+), 1655 deletions(-)


Reply via email to