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 4fdadd9721c43e7032a75bece618e4d59a2d86c1 Merge: 2fae730759 c96495643a Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Oct 9 14:47:12 2026 +0200 Merge of automatic reorganization of imports order. .../org/apache/sis/util/internal/shared/TableRowList.java | 2 +- .../main/org/apache/sis/geometries/Curve.java | 2 +- .../main/org/apache/sis/geometries/Geometries.java | 2 +- .../main/org/apache/sis/geometries/GeometryFactory.java | 2 +- .../main/org/apache/sis/geometries/adapter/SIS.java | 2 +- .../main/org/apache/sis/geometries/adapter/Wrapper.java | 2 +- .../sis/geometries/internal/shared/ArrayDataPoints.java | 2 +- .../sis/geometries/internal/shared/DefaultDataPoints.java | 2 +- .../sis/geometries/mesh/MeshPrimitiveComparator.java | 2 +- .../apache/sis/geometries/operation/GeometryProcessor.java | 2 +- .../apache/sis/geometries/operation/SutherlandHodgman.java | 1 - .../main/org/apache/sis/geometries/operation/To3D.java | 2 +- .../operation/simplify/greedyinsert/TINBuilder.java | 2 +- .../operation/simplify/greedyinsert/TinDistance.java | 1 - .../sis/geometries/operation/triangulate/EarClipping.java | 2 +- .../operation/triangulate/delaunay/Delaunay.java | 1 - .../operation/triangulate/delaunay/OrientedTriangle.java | 2 +- .../main/org/apache/sis/geometries/solid/Cylinder.java | 1 - .../main/org/apache/sis/geometries/solid/Ellipsoid.java | 4 +--- .../main/org/apache/sis/geometries/solid/Sphere.java | 8 +++----- .../org/apache/sis/geometries/surface/PreparedTIN.java | 1 - .../test/org/apache/sis/geometries/GeometryTest.java | 2 +- .../test/org/apache/sis/geometries/PointTest.java | 2 +- .../apache/sis/geometries/adapter/ShapeConverterTest.java | 2 +- .../org/apache/sis/geometries/curve/LineStringTest.java | 2 +- .../org/apache/sis/geometries/curve/LinearRingTest.java | 2 +- .../apache/sis/geometries/curve/MultiLineStringTest.java | 4 ++-- .../test/org/apache/sis/geometries/mesh/PrimitiveTest.java | 2 +- .../apache/sis/geometries/operation/AbstractD9IMTest.java | 2 +- .../sis/geometries/operation/SutherlandHogmanTest.java | 2 +- .../test/org/apache/sis/geometries/operation/To3DTest.java | 2 +- .../sis/geometries/operation/WithinDistanceTest.java | 3 +-- .../org/apache/sis/geometries/point/MultiPointTest.java | 2 +- .../apache/sis/geometries/surface/MultiPolygonTest.java | 2 +- .../org/apache/sis/geometries/surface/PolygonTest.java | 2 +- .../org/apache/sis/geometries/surface/PreparedTINTest.java | 2 +- .../org/apache/sis/geometries/surface/TriangleTest.java | 2 +- .../org/apache/sis/referencing/dggs/AbstractDggrsTest.java | 2 +- .../org/apache/sis/storage/geopose/LocalTangentPlane.java | 14 +++++++------- .../apache/sis/resources/embedded/EmbeddedResources.java | 2 +- 40 files changed, 44 insertions(+), 54 deletions(-) diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java index 6b2fb7e853,679bcdb8e1..84458f9a6c --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java @@@ -39,14 -39,12 +39,12 @@@ import org.apache.sis.maths.DataType import org.apache.sis.maths.NDArrays; import org.apache.sis.maths.ReadOnly; import org.apache.sis.maths.SampleSystem; + import org.apache.sis.maths.Vector; import org.apache.sis.util.ArgumentChecks; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the geoapi-3.1 branch: +import org.opengis.referencing.ReferenceIdentifier; - // Specific to the geoapi-4.0 branch: - import org.apache.sis.maths.Vector; - /** * An ellipsoid geometry defined by a center and one semi-axis length per axis of the coordinate diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java index c8228bc3f6,af09fd9b2a..7cf059129c --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java @@@ -32,19 -32,17 +32,17 @@@ import org.apache.sis.geometries.Geomet import org.apache.sis.geometries.GeometryType; import org.apache.sis.geometries.SurfaceInterpolation; import org.apache.sis.geometries.DataPointsType; -import org.apache.sis.geometries.internal.shared.AbstractGeometry; import org.apache.sis.geometries.surface.ParametricCurveSurface; +import org.apache.sis.geometries.internal.shared.AbstractGeometry; - - // Specific to the geoapi-3.1 branch: - import org.opengis.referencing.ReferenceIdentifier; import org.apache.sis.maths.DataType; import org.apache.sis.maths.NDArrays; import org.apache.sis.maths.ReadOnly; import org.apache.sis.maths.SampleSystem; + import org.apache.sis.maths.Vector; import org.apache.sis.util.ArgumentChecks; --// Specific to the geoapi-4.0 branch: - import org.apache.sis.maths.Vector; -import org.opengis.metadata.Identifier; ++// Specific to the geoapi-3.1 branch: ++import org.opengis.referencing.ReferenceIdentifier; /**
