This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit a559ab6251b438da25afe506626a6546054037f5 Merge: 9f647391e7 b6b21e6d9f Author: Martin Desruisseaux <[email protected]> AuthorDate: Sun Jul 12 20:01:53 2026 +0200 Merge branch 'geoapi-3.1' .../sis/coverage/grid/BufferedGridCoverage.java | 5 +- .../apache/sis/coverage/grid/DefaultEvaluator.java | 26 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 5 +- .../org/apache/sis/map/coverage/RenderingData.java | 5 +- .../sis/storage/geotiff/ImageFileDirectory.java | 8 +- .../apache/sis/storage/base/StoreUtilities.java | 55 +++- .../apache/sis/storage/tiling/ImageTileMatrix.java | 6 +- .../apache/sis/storage/tiling/TileReadEvent.java | 16 +- .../storage/tiling/TiledGridCoverageResource.java | 71 ++++- .../sis/util/resources/IndexedResourceBundle.java | 16 +- .../org/apache/sis/util/resources/Vocabulary.java | 15 + .../sis/util/resources/Vocabulary.properties | 3 + .../sis/util/resources/Vocabulary_fr.properties | 3 + .../apache/sis/storage/geoheif/FromImageIO.java | 10 +- .../apache/sis/storage/geoheif/GeoHeifStore.java | 15 +- .../main/org/apache/sis/storage/geoheif/Image.java | 7 +- .../org/apache/sis/storage/geoheif/ImageModel.java | 15 +- .../apache/sis/storage/geoheif/ImageResource.java | 23 +- ...erageBuilder.java => ImageResourceBuilder.java} | 81 +++--- .../{Pyramid.java => PyramidedImageResource.java} | 10 +- .../sis/storage/geoheif/ResourceBuilder.java | 94 ++++--- .../org/apache/sis/storage/geoheif/TiledImage.java | 2 +- .../sis/storage/geoheif/UncompressedImage.java | 13 +- .../sis/storage/geoheif/internal/Resources.java | 301 +++++++++++++++++++++ .../storage/geoheif/internal/Resources.properties | 50 ++++ .../sis/storage/geoheif/internal/Resources_en.java | 30 ++ .../sis/storage/geoheif/internal/Resources_fr.java | 30 ++ .../geoheif/internal/Resources_fr.properties | 55 ++++ .../sis/storage/geoheif/internal/package-info.java | 28 ++ .../main/org/apache/sis/storage/isobmff/Box.java | 3 +- .../org/apache/sis/storage/isobmff/Reader.java | 60 ++-- .../org/apache/sis/storage/isobmff/TreeNode.java | 40 +-- .../isobmff/UnsupportedVersionException.java | 3 +- .../apache/sis/storage/isobmff/base/Copyright.java | 3 +- .../apache/sis/storage/isobmff/base/ItemData.java | 3 +- .../sis/storage/isobmff/base/ItemInfoEntry.java | 10 - .../sis/storage/isobmff/base/ItemLocation.java | 5 +- .../sis/storage/isobmff/base/ItemProperties.java | 3 +- .../apache/sis/storage/isobmff/geo/ModelCRS.java | 6 +- .../sis/storage/isobmff/mpeg/ComponentPalette.java | 3 +- .../sis/storage/isobmff/mpeg/ComponentType.java | 3 +- .../sis/storage/isobmff/mpeg/InterleavingMode.java | 3 +- .../isobmff/mpeg/UncompressedFrameConfig.java | 4 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 9 +- .../apache/sis/gui/coverage/CoverageExplorer.java | 3 +- .../main/org/apache/sis/gui/coverage/GridView.java | 3 +- .../org/apache/sis/gui/coverage/ImageRequest.java | 43 --- .../sis/gui/coverage/StyledRenderingData.java | 3 +- .../org/apache/sis/gui/map/ValuesFormatter.java | 5 - .../org/apache/sis/gui/map/ValuesUnderCursor.java | 21 +- .../gui/referencing/RecentReferenceSystems.java | 1 - .../main/org/apache/sis/gui/referencing/Utils.java | 11 - .../org/apache/sis/storage/gdal/TiledCoverage.java | 9 +- .../org/apache/sis/storage/gdal/TiledResource.java | 11 +- 54 files changed, 932 insertions(+), 334 deletions(-) diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java index 54fcc1b898,7dd7880725..13cc902197 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java @@@ -43,12 -45,19 +45,19 @@@ import org.apache.sis.coverage.grid.Gri import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.metadata.internal.shared.Identifiers; import org.apache.sis.metadata.iso.extent.Extents; + import org.apache.sis.referencing.CommonCRS; + import org.apache.sis.referencing.ImmutableIdentifier; import org.apache.sis.system.Configuration; import org.apache.sis.system.Modules; + import org.apache.sis.util.ArraysExt; + import org.apache.sis.util.CharSequences; + import org.apache.sis.util.Classes; + import org.apache.sis.util.Localized; import org.apache.sis.util.resources.Errors; + import org.apache.sis.util.resources.Vocabulary; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; /**
