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 236ded5a92ac7beb8e413b7a0fd2210c3366d23d Merge: 3bb55654d2 b0b0ae6e7f Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Aug 15 22:40:55 2025 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains an upgrade of the EPSG database installer for installing EPSG version 12 or later. Contains also miscellaneous bug fixes or improvements in EPSG access and in grid coverages. .../coverage/grid/BandAggregateGridCoverage.java | 2 +- .../sis/coverage/grid/ClippedGridCoverage.java | 193 ++++++ .../apache/sis/coverage/grid/DefaultEvaluator.java | 3 +- .../sis/coverage/grid/DerivedGridCoverage.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 4 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 34 +- .../org/apache/sis/coverage/grid/GridExtent.java | 6 +- .../apache/sis/coverage/grid/ImageRenderer.java | 50 +- .../sis/coverage/grid/ResampledGridCoverage.java | 4 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 9 +- .../main/org/apache/sis/image/BandSelectImage.java | 22 +- .../main/org/apache/sis/image/ImageOverlay.java | 2 + .../main/org/apache/sis/image/PlanarImage.java | 25 +- .../sis/image/PositionalConsistencyImage.java | 6 +- .../org/apache/sis/image/SourceAlignedImage.java | 7 +- .../sis/coverage/grid/ClippedGridCoverageTest.java | 202 +++++++ .../coverage/grid/ConvertedGridCoverageTest.java | 9 +- .../sis/coverage/grid/GridCoverage2DTest.java | 4 +- .../coverage/grid/TranslatedGridCoverageTest.java | 4 +- .../org/apache/sis/metadata/sql/Installer.java | 2 +- .../org/apache/sis/metadata/sql/privy/Dialect.java | 78 ++- .../sis/metadata/sql/privy/ScriptRunner.java | 274 +++------ .../apache/sis/metadata/sql/privy/Supports.java | 41 +- .../main/org/apache/sis/temporal/TemporalDate.java | 2 +- .../org/apache/sis/metadata/sql/TestDatabase.java | 2 +- .../sis/metadata/sql/privy/ScriptRunnerTest.java | 9 +- .../sis/metadata/sql/privy/SupportsTest.java} | 34 +- .../org/apache/sis/map/coverage/RenderingData.java | 22 +- .../main/org/apache/sis/portrayal/Canvas.java | 2 +- .../sis/referencing/crs/AbstractSingleCRS.java | 32 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 2 +- .../sis/referencing/datum/AbstractDatum.java | 2 +- .../referencing/factory/sql/AuthorityCodes.java | 6 +- .../referencing/factory/sql/EPSGCodeFinder.java | 18 +- .../referencing/factory/sql/EPSGDataAccess.java | 26 +- .../sis/referencing/factory/sql/EPSGFactory.java | 54 +- .../sis/referencing/factory/sql/EPSGInstaller.java | 190 ++---- .../sis/referencing/factory/sql/EPSG_Finish.sql | 117 ++-- .../sis/referencing/factory/sql/EPSG_Prepare.sql | 32 +- .../factory/sql/InstallationScriptProvider.java | 31 +- .../sis/referencing/factory/sql/SQLTranslator.java | 224 +++---- .../sis/referencing/factory/sql/TableInfo.java | 32 +- .../referencing/internal/VerticalDatumTypes.java | 4 +- .../operation/AbstractCoordinateOperation.java | 2 +- .../referencing/factory/sql/EPSGInstallerTest.java | 40 +- .../sis/storage/base/MemoryGridResource.java | 143 +++-- .../main/org/apache/sis/pending/jdk/JDK22.java | 11 + .../main/org/apache/sis/util/ComparisonMode.java | 62 +- .../main/org/apache/sis/util/StringBuilders.java | 23 +- .../org/apache/sis/util/StringBuildersTest.java | 27 +- .../org/apache/sis/geometries/math/TupleArray.java | 7 + .../coveragejson/CoverageJsonStoreProvider.java | 5 +- .../sis/storage/coveragejson/CoverageResource.java | 8 +- .../apache/sis/storage/geopackage/GpkgStore.java | 2 +- netbeans-project/nbproject/project.xml | 1 + optional/build.gradle.kts | 2 + .../sis/referencing/factory/sql/epsg/Clear.sql | 43 ++ .../factory/sql/epsg/DataScriptFormatter.java | 655 ++++++++++----------- .../factory/sql/epsg/DataScriptUpdater.java | 93 +++ .../referencing/factory/sql/epsg/DebugTools.sql | 17 +- .../sis/referencing/factory/sql/epsg/README.md | 40 +- .../factory/sql/epsg/TableScriptUpdater.java | 174 ++++++ .../referencing/factory/sql/epsg/TableValues.java | 364 ++++++++++++ 64 files changed, 2342 insertions(+), 1205 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java index 4ffdbd4f7a,55c0a8653b..49c0195828 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java @@@ -272,24 -273,24 +265,25 @@@ final class TableInfo /** * Appends a {@code WHERE} clause together with a condition for searching the specified object. - * This method delegates to {@link #where(Class, StringBuilder)} with the type of the given object, - * except that some object properties may be inspected for resolving ambiguities. + * This method delegates to {@link #where(EPSGDataAccess, Class, StringBuilder)} with the type + * of the given object, except that some object properties may be inspected for resolving ambiguities. * - * @param object the object to search in the database. - * @param buffer where to append the {@code WHERE} clause. + * @param factory the factory which is writing a <abbr>SQL</abbr> statement. + * @param object the object to search in the database. + * @param buffer where to append the {@code WHERE} clause. */ + @SuppressWarnings("deprecation") - final void where(final IdentifiedObject object, final StringBuilder buffer) { + final void where(final EPSGDataAccess factory, final IdentifiedObject object, final StringBuilder buffer) { Class<?> userType = object.getClass(); if (object instanceof GeodeticCRS) { final CoordinateSystem cs = ((GeodeticCRS) object).getCoordinateSystem(); if (cs instanceof EllipsoidalCS) { userType = GeographicCRS.class; } else if (cs instanceof CartesianCS || cs instanceof SphericalCS) { - userType = DefaultGeocentricCRS.class; + userType = GeocentricCRS.class; } } - where(userType, buffer); + where(factory, userType, buffer); } /**
