This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit f70b0f2ffd3d83666b982f7a4c7426bb3b270c00 Merge: 96e4ba9bde 5acd0c2351 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Apr 17 15:50:16 2026 +0200 Merge branch 'geoapi-3.1'. .../sis/coverage/grid/GridCoverageBuilder.java | 384 +++++++++++++++------ .../org/apache/sis/coverage/grid/GridExtent.java | 147 ++++++++ .../main/org/apache/sis/image/BandedIterator.java | 27 +- .../apache/sis/image/WritablePixelIterator.java | 38 +- .../sis/image/internal/shared/ObservableImage.java | 2 +- .../sis/image/internal/shared/TiledImage.java | 2 +- .../image/internal/shared/WritableTiledImage.java | 5 +- .../sis/coverage/grid/GridCoverageBuilderTest.java | 25 +- .../apache/sis/coverage/grid/GridExtentTest.java | 40 +++ .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../apache/sis/image/BandAggregateImageTest.java | 1 + .../org/apache/sis/image/BandSelectImageTest.java | 1 + .../sis/image/BandedSampleConverterTest.java | 2 +- .../org/apache/sis/image/ImageCombinerTest.java | 5 +- .../org/apache/sis/image/PixelIteratorTest.java | 5 +- .../test/org/apache/sis/image/PlanarImageTest.java | 3 +- .../org/apache/sis/image/ResampledImageTest.java | 3 +- .../apache/sis/image/StatisticsCalculatorTest.java | 3 +- .../test/org/apache/sis/image/TiledImageMock.java | 2 + .../metadata/sql/internal/shared/ScriptRunner.java | 39 ++- .../sis/storage/geotiff/ImageFileDirectory.java | 7 +- .../org/apache/sis/storage/geotiff/Writer.java | 5 +- .../sis/storage/geotiff/writer/TileMatrix.java | 2 +- .../sis/storage/geotiff/GeoTiffStoreTest.java | 46 ++- .../org/apache/sis/storage/geotiff/ReaderTest.java | 43 ++- .../org/apache/sis/storage/geotiff/WriterTest.java | 2 +- .../test/org/apache/sis/storage/geotiff/tiled.tiff | Bin 0 -> 3564 bytes .../apache/sis/storage/sql/postgis/TestRaster.java | 2 +- .../main/org/apache/sis/io/stream/ChannelData.java | 16 + .../apache/sis/io/stream/ChannelDataOutput.java | 29 +- .../org/apache/sis/io/stream/ChannelFactory.java | 14 +- .../sis/io/stream/ChannelImageOutputStream.java | 2 +- .../main/org/apache/sis/io/stream/IOUtilities.java | 4 +- .../org/apache/sis/storage/StorageConnector.java | 95 ++++- .../storage/base/WritableGridCoverageSupport.java | 2 +- .../storage/tiling/TiledGridCoverageResource.java | 52 ++- .../apache/sis/storage/tiling/TiledResource.java | 2 + .../sis/io/stream/ChannelDataOutputTest.java | 4 +- .../sis/io/stream/HyperRectangleWriterTest.java | 4 +- .../io/stream/SubsampledRectangleWriterTest.java | 2 +- .../apache/sis/io/stream/UpdatableWriteTest.java | 2 +- .../main/org/apache/sis/util/resources/Errors.java | 5 + .../apache/sis/util/resources/Errors.properties | 1 + .../apache/sis/util/resources/Errors_fr.properties | 1 + .../sis/storage/shapefile/ShapefileProvider.java | 17 + .../sis/storage/shapefile/ShapefileStore.java | 8 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 93 ++--- .../main/org/apache/sis/gui/internal/FontGIS.java | 2 +- .../org/apache/sis/gui/internal/GUIUtilities.java | 22 ++ .../apache/sis/gui/internal/io/FileAccessView.java | 6 +- .../org/apache/sis/gui/map/EvanescentPane.java | 51 ++- .../main/org/apache/sis/gui/map/MapCanvas.java | 197 ++++++++--- .../apache/sis/gui/internal/GUIUtilitiesTest.java | 15 + 53 files changed, 1150 insertions(+), 339 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedIterator.java index 87476c8069,975d8132e3..f18f15917e --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedIterator.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedIterator.java @@@ -29,7 -29,11 +29,8 @@@ import java.awt.image.RenderedImage import java.awt.image.WritableRaster; import java.awt.image.WritableRenderedImage; import java.util.function.IntBinaryOperator; + import java.util.function.DoubleBinaryOperator; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coverage.grid.SequenceType; - /** * A pixel iterator reading values directly from a {@link DataBuffer} instead of using {@link Raster} API. diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index acddb348a7,d82477a5da..90c6249d4e --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@@ -91,6 -91,6 +91,7 @@@ import org.apache.sis.setup.OptionKey import org.apache.sis.storage.AbstractFeatureSet; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; ++import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.FeatureQuery; import org.apache.sis.storage.FeatureSet; import org.apache.sis.storage.Query;
