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 5dab0950ead118f6ea2ebdd046db0da3cc8dc58d
Merge: 715d2bf6ff 24d7b6901d
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon May 20 14:05:19 2024 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../org/apache/sis/coverage/CoverageCombiner.java | 2 +-
.../org/apache/sis/coverage/RegionOfInterest.java | 2 +-
.../coverage/grid/CoordinateOperationFinder.java | 1 -
.../apache/sis/coverage/grid/DefaultEvaluator.java | 1 -
.../sis/coverage/grid/DimensionalityReduction.java | 11 +-
.../apache/sis/coverage/grid/DomainLinearizer.java | 1 -
.../coverage/grid/FractionalGridCoordinates.java | 1 -
.../apache/sis/coverage/grid/GridCoverage2D.java | 1 -
.../sis/coverage/grid/GridCoverageProcessor.java | 1 -
.../apache/sis/coverage/grid/GridDerivation.java | 1 -
.../org/apache/sis/coverage/grid/GridExtent.java | 3 +-
.../apache/sis/coverage/grid/GridExtentCRS.java | 1 -
.../org/apache/sis/coverage/grid/GridGeometry.java | 11 +-
.../apache/sis/coverage/grid/GridOrientation.java | 1 -
.../org/apache/sis/coverage/grid/PixelInCell.java | 129 +++++++++++++++++++++
.../apache/sis/coverage/grid/PixelTranslation.java | 29 +----
.../sis/coverage/grid/ResampledGridCoverage.java | 1 -
.../apache/sis/coverage/grid/SliceGeometry.java | 1 -
.../sis/coverage/privy/CommonDomainFinder.java | 2 +-
.../sis/coverage/privy/MultiSourceArgument.java | 2 +-
.../main/org/apache/sis/image/ImageCombiner.java | 2 +-
.../main/org/apache/sis/image/ImageProcessor.java | 2 +-
.../main/org/apache/sis/image/ResampledImage.java | 4 +-
.../grid/BandAggregateGridCoverageTest.java | 1 -
.../coverage/grid/BufferedGridCoverageTest.java | 1 -
.../coverage/grid/ConvertedGridCoverageTest.java | 1 -
.../sis/coverage/grid/DimensionAppenderTest.java | 1 -
.../coverage/grid/DimensionalityReductionTest.java | 1 -
.../sis/coverage/grid/GridCoverage2DTest.java | 1 -
.../sis/coverage/grid/GridCoverageBuilderTest.java | 1 -
.../sis/coverage/grid/GridDerivationTest.java | 1 -
.../apache/sis/coverage/grid/GridGeometryTest.java | 1 -
.../sis/coverage/grid/PixelTranslationTest.java | 1 -
.../coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../coverage/grid/TranslatedGridCoverageTest.java | 1 -
.../test/org/apache/sis/util/iso/TypesTest.java | 10 +-
.../org/apache/sis/xml/RenameListGenerator.java | 2 +-
.../org/apache/sis/xml/test/PackageVerifier.java | 8 +-
.../org/apache/sis/xml/test/SchemaCompliance.java | 8 +-
.../coverage/MultiResolutionCoverageLoader.java | 2 +-
.../org/apache/sis/map/coverage/RenderingData.java | 2 +-
.../main/org/apache/sis/portrayal/Canvas.java | 2 +-
.../org/apache/sis/portrayal/CanvasExtent.java | 2 +-
.../MultiResolutionCoverageLoaderTest.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 4 +-
.../apache/sis/referencing/cs/DefaultAffineCS.java | 3 -
.../sis/referencing/cs/DefaultCartesianCS.java | 3 -
.../sis/referencing/datum/DatumShiftGrid.java | 2 +-
.../referencing/datum/DefaultVerticalDatum.java | 4 +-
.../referencing/factory/GeodeticObjectFactory.java | 2 +-
.../referencing/operation/SubOperationInfo.java | 2 +-
.../operation/builder/LinearTransformBuilder.java | 2 +-
.../operation/builder/LocalizationGridBuilder.java | 4 +-
.../sis/referencing/operation/gridded/Tile.java | 13 +--
.../referencing/operation/provider/Robinson.java | 12 +-
.../referencing/operation/provider/Sinusoidal.java | 13 ++-
.../transform/DefaultMathTransformFactory.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRS.java | 2 +-
.../sis/storage/geotiff/MultiResolutionImage.java | 2 +-
.../geotiff/reader/GridGeometryBuilder.java | 2 +-
.../sis/storage/geotiff/writer/GeoEncoder.java | 2 +-
.../org/apache/sis/storage/netcdf/base/Grid.java | 2 +-
.../sis/storage/netcdf/base/GridAdjustment.java | 2 +-
.../sis/storage/netcdf/base/GridMapping.java | 2 +-
.../sis/storage/sql/postgis/RasterFormat.java | 2 +-
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../sis/storage/aggregate/DimensionAppender.java | 2 +-
.../apache/sis/storage/aggregate/GridSlice.java | 2 +-
.../sis/storage/base/MemoryGridResource.java | 2 +-
.../apache/sis/storage/base/TiledGridCoverage.java | 2 +-
.../apache/sis/storage/esri/AsciiGridStore.java | 2 +-
.../apache/sis/storage/esri/RawRasterStore.java | 2 +-
.../org/apache/sis/storage/esri/WritableStore.java | 2 +-
.../apache/sis/storage/image/WorldFileStore.java | 2 +-
.../org/apache/sis/storage/tiling/TileMatrix.java | 2 +-
.../org/apache/sis/storage/CoverageQueryTest.java | 2 +-
.../aggregate/BandAggregateGridResourceTest.java | 2 +-
.../sis/storage/base/MemoryGridResourceTest.java | 2 +-
geoapi/snapshot | 2 +-
.../main/org/apache/sis/map/SEPortrayer.java | 2 +-
.../apache/sis/map/service/se1/LineToScene2D.java | 2 +-
.../sis/storage/coveragejson/CoverageResource.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../apache/sis/gui/coverage/GridSliceSelector.java | 2 +-
.../sis/gui/coverage/StyledRenderingData.java | 2 +-
.../main/org/apache/sis/gui/map/MapCanvas.java | 2 +-
.../org/apache/sis/gui/map/OperationFinder.java | 2 +-
.../main/org/apache/sis/gui/map/StatusBar.java | 2 +-
.../gui/referencing/RecentReferenceSystems.java | 2 +-
.../apache/sis/gui/coverage/CoverageCanvasApp.java | 2 +-
90 files changed, 241 insertions(+), 152 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index 1853941e2b,2dc350279f..3a8ea951db
---
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
@@@ -1563,8 -1565,8 +1563,8 @@@ class GeodeticObjectParser extends Math
* @return the {@code "ImageDatum"} element.
* @throws ParseException if the {@code "ImageDatum"} element cannot be
parsed.
*/
- @SuppressWarnings("deprecation")
+ @SuppressWarnings("removal")
- private DefaultImageDatum parseImageDatum(final int mode, final Element
parent) throws ParseException {
+ private ImageDatum parseImageDatum(final int mode, final Element parent)
throws ParseException {
final Element element = parent.pullElement(mode,
WKTKeywords.ImageDatum, WKTKeywords.IDatum);
if (element == null) {
return null;
@@@ -1670,8 -1666,8 +1670,8 @@@
* @return the {@code "ImageCRS"} element as an {@link ImageCRS} object.
* @throws ParseException if the {@code "ImageCRS"} element cannot be
parsed.
*/
- @SuppressWarnings("deprecation")
+ @SuppressWarnings("removal")
- private DefaultImageCRS parseImageCRS(final int mode, final Element
parent) throws ParseException {
+ private ImageCRS parseImageCRS(final int mode, final Element parent)
throws ParseException {
final Element element = parent.pullElement(mode,
WKTKeywords.ImageCRS);
if (element == null) {
return null;
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index 7644bf76bc,6f5d81257b..3a7a54c66a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@@ -320,8 -319,8 +320,8 @@@ public final class HardCodedCRS
* By default, this CRS has no transformation path to any other CRS (i.e.
a map using
* this CS cannot be reprojected to a geographic coordinate reference
system for example).
*
- * <p>The {@code PixelInCell} attribute of the associated {@code
ImageDatum}
+ * <p>The {@code pixelInCell} attribute of the associated {@code
ImageDatum}
- * is set to {@link
org.apache.sis.coverage.grid.PixelInCell#CELL_CENTER}.</p>
+ * is set to {@link PixelInCell#CELL_CENTER}.</p>
*/
@SuppressWarnings("removal")
public static final DefaultImageCRS IMAGE = new DefaultImageCRS(
diff --cc geoapi/snapshot
index 1fe645ba50,580f2a9f70..80d7264486
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 1fe645ba50f15bb3ab97f93892fc4fdb236d3720
-Subproject commit 580f2a9f7038f65c0759083ca55fcd43f4c56446
++Subproject commit 80d72644860facda496cef21b132d13fec65c029
