This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new be1d8a0caf Post-merge automatic reorganization of imports order.
Contains also opportunistic cleanup.
be1d8a0caf is described below
commit be1d8a0caf90030dbd1458a151db54839f19829a
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Mon Sep 1 12:32:20 2025 +0200
Post-merge automatic reorganization of imports order.
Contains also opportunistic cleanup.
---
.../apache/sis/geometry/wrapper/GeometryWrapper.java | 2 +-
.../org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 --
.../org/apache/sis/referencing/AuthorityFactories.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 8 ++++----
.../referencing/factory/IdentifiedObjectFinder.java | 4 +++-
.../referencing/factory/MultiAuthoritiesFactory.java | 4 +++-
.../sis/referencing/factory/sql/EPSGInstaller.java | 2 +-
.../sis/referencing/internal/VerticalDatumTypes.java | 4 +++-
.../apache/sis/test/integration/ConsistencyTest.java | 4 +---
.../main/org/apache/sis/util/ComparisonMode.java | 2 +-
.../org/apache/sis/geometries/GeometryFactory.java | 3 ++-
.../main/org/apache/sis/geometries/Wrapper.java | 18 ++++++++----------
12 files changed, 28 insertions(+), 27 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
index 401258b6a3..18044b7fe4 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
@@ -24,7 +24,6 @@ import javax.measure.Unit;
import javax.measure.Quantity;
import javax.measure.IncommensurableException;
import javax.measure.quantity.Length;
-import org.opengis.geometry.Geometry;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
@@ -45,6 +44,7 @@ import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Set;
+import org.opengis.geometry.Geometry;
import org.opengis.geometry.Boundary;
import org.opengis.geometry.TransfiniteSet;
import org.opengis.geometry.complex.Complex;
diff --git
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
index da10560a59..272daf4cea 100644
---
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
@@ -1446,7 +1446,6 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator<Coo
return null;
}
final String name = element.pullString("name");
- @SuppressWarnings("deprecation")
RealizationMethod method = null;
if (isWKT1) {
method =
VerticalDatumTypes.fromLegacyCode(element.pullInteger("datum"));
@@ -1882,7 +1881,6 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator<Coo
* @return the {@code "VerticalCRS"} element as a {@link VerticalCRS}
object.
* @throws ParseException if the {@code "VerticalCRS"} element cannot be
parsed.
*/
- @SuppressWarnings("deprecation")
private SingleCRS parseVerticalCRS(final int mode, final Element parent,
final boolean isBaseCRS)
throws ParseException
{
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
index 83fd38a632..40b0671ca0 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
@@ -31,6 +31,7 @@ import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.datum.DatumAuthorityFactory;
import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
import org.apache.sis.referencing.privy.LazySet;
+import org.apache.sis.referencing.privy.FilteredIterator;
import org.apache.sis.system.Reflect;
import org.apache.sis.system.Loggers;
import org.apache.sis.system.Modules;
@@ -42,7 +43,6 @@ import
org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
import org.apache.sis.referencing.factory.UnavailableFactoryException;
import org.apache.sis.referencing.factory.sql.EPSGFactory;
-import org.apache.sis.referencing.privy.FilteredIterator;
import org.apache.sis.util.logging.Logging;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index ce0953116f..c093240378 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@ -27,6 +27,7 @@ import java.util.logging.LogRecord;
import java.time.temporal.Temporal;
import org.opengis.util.FactoryException;
import org.opengis.geometry.Envelope;
+import org.opengis.geometry.Geometry;
import org.opengis.referencing.NoSuchAuthorityCodeException;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.cs.CartesianCS;
@@ -51,6 +52,8 @@ import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.TransformException;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.extent.Extent;
+import org.opengis.metadata.extent.BoundingPolygon;
+import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.measure.Units;
import org.apache.sis.geometry.Envelopes;
@@ -65,6 +68,7 @@ import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.privy.DefinitionVerifier;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
+import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.referencing.cs.AxisFilter;
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.cs.DefaultVerticalCS;
@@ -81,7 +85,6 @@ import
org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import org.apache.sis.referencing.factory.UnavailableFactoryException;
-import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.util.ArgumentChecks;
@@ -95,12 +98,9 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.logging.Logging;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.geometry.Geometry;
import org.opengis.referencing.ObjectDomain;
import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.referencing.datum.DynamicReferenceFrame;
-import org.opengis.metadata.extent.BoundingPolygon;
-import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.coordinate.CoordinateMetadata;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
index 6284d56dae..fdb044803a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
@@ -24,7 +24,6 @@ import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import org.opengis.util.FactoryException;
-import org.opengis.metadata.Identifier;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.AuthorityFactory;
import org.opengis.referencing.NoSuchAuthorityCodeException;
@@ -45,6 +44,9 @@ import org.apache.sis.system.Semaphores;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
+// Specific to the geoapi-4.0 branch:
+import org.opengis.metadata.Identifier;
+
/**
* Searches in an authority factory for objects approximately equal to a given
object.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
index 1c049568bb..7a86244ee2 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
@@ -42,7 +42,6 @@ import org.opengis.referencing.cs.*;
import org.opengis.referencing.crs.*;
import org.opengis.referencing.datum.*;
import org.opengis.referencing.operation.*;
-import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.extent.Extent;
import org.opengis.parameter.ParameterDescriptor;
@@ -69,6 +68,9 @@ import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.BackingStoreException;
+// Specific to the geoapi-4.0 branch:
+import org.opengis.metadata.Identifier;
+
/**
* A factory that delegates the object creation to another factory determined
from the <var>authority</var> part
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
index 82828676ab..d9f64c9333 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
@@ -17,12 +17,12 @@
package org.apache.sis.referencing.factory.sql;
import java.util.Locale;
+import java.util.Map;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.io.BufferedReader;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import org.apache.sis.util.privy.Constants;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index 88a6330dfa..7bca9602f1 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@ -148,9 +148,11 @@ public final class VerticalDatumTypes {
case ORTHOMETRIC: return 2001; // CS_VD_Orthometric
case ELLIPSOIDAL: return 2002; // CS_VD_Ellipsoidal
case BAROMETRIC: return 2003; // CS_VD_AltitudeBarometric
+ case "GEOIDAL":
case "GEOID": return 2005; // CS_VD_GeoidModelDerived
case "LEVELLING": // From ISO: "adjustment of a levelling
network fixed to one or more tide gauges".
- case "TIDAL": return 2006; // CS_VD_Depth
+ case "TIDAL":
+ case "DEPTH": return 2006; // CS_VD_Depth
}
}
return 2000;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
index 33fdd7fa1a..e111d7bd47 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
@@ -26,6 +26,7 @@ import org.opengis.util.CodeList;
import org.opengis.util.FactoryException;
import org.opengis.util.NoSuchIdentifierException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.crs.VerticalCRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.FactoryDataException;
@@ -41,9 +42,6 @@ import org.apache.sis.io.wkt.Warnings;
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.UnformattableObjectException;
-// Specific to the geoapi-3.1 and 4.0 branches:
-import org.opengis.referencing.crs.VerticalCRS;
-
// Test dependencies
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
index 88c1a98f29..90f79f248a 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ComparisonMode.java
@@ -32,7 +32,7 @@ import org.opengis.referencing.operation.MathTransform;
* <li>{@link #STRICT} – All attributes of the compared objects
shall be strictly equal.</li>
* <li>{@link #BY_CONTRACT} – Only the attributes published in the
interface contract need to be compared.</li>
* <li>{@link #IGNORE_METADATA} – Only the attributes relevant to the object
functionality are compared.</li>
- * <li>{@link #COMPATIBILITY} – Like {@code IGNORE_METADATA}, but
ignore also some structural changes for historical reasons.</li>
+ * <li>{@link #COMPATIBILITY} – Like {@code IGNORE_METADATA}, but ignore
also some structural changes for historical reasons.</li>
* <li>{@link #APPROXIMATE} – Like {@code COMPATIBILITY}, with some
tolerance threshold on numerical values.</li>
* <li>{@link #ALLOW_VARIANT} – Objects not really equal but related
(e.g., <abbr>CRS</abbr> using different axis order).</li>
* <li>{@link #DEBUG} – Special mode for figuring out why two
objects expected to be equal are not.</li>
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
index 628413d177..0a7417920b 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
@@ -21,6 +21,7 @@ import java.nio.DoubleBuffer;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.conics.Circle;
import org.apache.sis.geometries.conics.CircularString;
import org.apache.sis.geometries.math.SampleSystem;
@@ -43,7 +44,7 @@ import org.apache.sis.geometry.wrapper.Dimensions;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.setup.GeometryLibrary;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Wrapper.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Wrapper.java
index e902842bad..fdb45aa56e 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Wrapper.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Wrapper.java
@@ -19,27 +19,25 @@ package org.apache.sis.geometries;
import java.awt.Shape;
import java.util.Iterator;
import java.util.OptionalInt;
-import org.apache.sis.filter.sqlmm.SQLMM;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.privy.ArraySequence;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.Envelope;
import org.opengis.util.FactoryException;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import org.opengis.filter.SpatialOperatorName;
+import org.opengis.filter.DistanceOperatorName;
+import org.apache.sis.filter.sqlmm.SQLMM;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.privy.ArraySequence;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.util.Debug;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.CoordinateSequence;
-import org.locationtech.jts.geom.Envelope;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.SpatialOperatorName;
-import org.opengis.filter.DistanceOperatorName;
/**
