This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit efcc2b768f55c0c37f28b8faf8805b585467534d Merge: 4589e86bfb b87ed440db Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Jul 9 00:45:33 2026 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../apache/sis/coverage/grid/DefaultEvaluator.java | 27 +++- .../apache/sis/coverage/grid/GridCRSBuilder.java | 43 ++++-- .../apache/sis/coverage/grid/GridDerivation.java | 88 ++++++++--- .../org/apache/sis/coverage/grid/GridExtent.java | 33 +++- .../org/apache/sis/coverage/grid/GridGeometry.java | 79 +++++++--- .../grid/IncompleteGridGeometryException.java | 8 +- .../sis/coverage/grid/ResampledGridCoverage.java | 2 +- .../sis/coverage/grid/TranslatedTransform.java | 3 +- .../main/org/apache/sis/image/ComputedImage.java | 1 + .../image/internal/shared/BatchComputedImage.java | 5 +- .../image/internal/shared/SampleModelBuilder.java | 5 +- .../sis/coverage/grid/GridDerivationTest.java | 36 ++++- .../org/apache/sis/map/coverage/RenderingData.java | 14 +- .../org/apache/sis/geometry/CoordinateFormat.java | 6 +- .../main/org/apache/sis/geometry/package-info.java | 2 +- .../apache/sis/referencing/NamedIdentifier.java | 6 +- .../sis/storage/geotiff/ImageFileDirectory.java | 10 +- .../apache/sis/storage/geotiff/reader/Type.java | 3 +- .../sis/storage/geotiff/inflater/CCITTRLETest.java | 1 + .../apache/sis/io/stream/HyperRectangleWriter.java | 14 +- .../main/org/apache/sis/io/stream/Region.java | 171 ++++++++++++++++++++- .../org/apache/sis/storage/internal/Resources.java | 5 + .../sis/storage/internal/Resources.properties | 1 + .../sis/storage/internal/Resources_fr.properties | 1 + .../apache/sis/storage/tiling/TileReadEvent.java | 21 ++- .../sis/storage/tiling/TiledGridCoverage.java | 42 ++++- .../main/org/apache/sis/util/ArraysExt.java | 20 ++- .../main/org/apache/sis/storage/geoheif/Image.java | 2 +- .../apache/sis/storage/geoheif/ImageResource.java | 38 ++++- .../org/apache/sis/storage/geoheif/Pyramid.java | 25 +-- .../sis/storage/geoheif/UncompressedImage.java | 53 +++---- .../isobmff/mpeg/UncompressedFrameConfig.java | 7 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 9 +- .../apache/sis/gui/coverage/StyleController.java | 2 +- .../org/apache/sis/gui/map/OperationFinder.java | 2 +- .../org/apache/sis/gui/map/ValuesFormatter.java | 4 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 23 ++- .../org/apache/sis/gui/referencing/MenuSync.java | 7 +- .../gui/referencing/RecentReferenceSystems.java | 10 +- .../main/org/apache/sis/gui/referencing/Utils.java | 2 + 40 files changed, 655 insertions(+), 176 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java index de463c2b1f,8979a5a1f4..0fb39227d6 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NamedIdentifier.java @@@ -37,12 -37,9 +37,12 @@@ import org.apache.sis.metadata.internal import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.util.iso.DefaultNameFactory; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + /** - * An identification of a CRS object which is both a {@link Identifier} and a {@link GenericName}. + * An identification of a <abbr>CRS</abbr> object which is both an {@link Identifier} and a {@link GenericName}. * This class implements both interfaces in order to allow usage of the same instance either as an object * {@linkplain AbstractIdentifiedObject#getName() name} or {@linkplain AbstractIdentifiedObject#getAlias() alias}. * This flexibility make easier to uses object's names in two different models:
