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 d8e3bc5a7f6fd7f8f92e71a8afc2e96f529fe58f Merge: 343f672ec6 2225f00d04 Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jul 21 17:00:05 2025 +0200 Merge of automatic reorganization of imports order. .../apache/sis/feature/StringJoinOperation.java | 2 +- .../apache/sis/filter/DefaultFilterFactory.java | 2 +- .../apache/sis/geometry/wrapper/Geometries.java | 6 +-- .../sis/geometry/wrapper/GeometryWrapper.java | 2 - .../sis/geometry/wrapper/jts/ConverterTo2D.java | 2 +- .../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +- .../org/apache/sis/metadata/MetadataStandard.java | 2 +- .../referencing/datum/DefaultDatumEnsemble.java | 4 +- .../operation/provider/AbstractProvider.java | 2 +- .../operation/provider/Geographic2Dto3D.java | 2 +- .../transform/EllipsoidToCentricTransform.java | 2 +- .../operation/transform/LinearTransform1D.java | 2 + .../operation/transform/OnewayLinearTransform.java | 6 ++- .../referencing/privy/ReferencingUtilities.java | 2 - .../sis/storage/sql/feature/InfoStatements.java | 2 +- .../org/apache/sis/storage/sql/feature/Table.java | 2 +- .../org/apache/sis/geometries/AttributesType.java | 5 ++- .../main/org/apache/sis/geometries/BBox.java | 7 ++-- .../main/org/apache/sis/geometries/Bearing.java | 1 + .../org/apache/sis/geometries/BoundaryType.java | 1 + .../org/apache/sis/geometries/CompoundCurve.java | 1 + .../main/org/apache/sis/geometries/Curve.java | 3 +- .../apache/sis/geometries/CurveInterpolation.java | 1 + .../main/org/apache/sis/geometries/Empty.java | 1 + .../main/org/apache/sis/geometries/Geometries.java | 31 +++++++------- .../main/org/apache/sis/geometries/Geometry.java | 1 + .../apache/sis/geometries/GeometryCollection.java | 3 +- .../org/apache/sis/geometries/GeometryFactory.java | 3 +- .../org/apache/sis/geometries/GeometryType.java | 1 + .../org/apache/sis/geometries/GeometryVisitor.java | 1 + .../main/org/apache/sis/geometries/Knot.java | 1 + .../main/org/apache/sis/geometries/LineString.java | 7 ++-- .../main/org/apache/sis/geometries/LinearRing.java | 1 + .../main/org/apache/sis/geometries/MultiCurve.java | 1 + .../org/apache/sis/geometries/MultiLineString.java | 1 + .../main/org/apache/sis/geometries/MultiPoint.java | 3 +- .../org/apache/sis/geometries/MultiPolygon.java | 1 + .../org/apache/sis/geometries/MultiPolyhedron.java | 1 + .../org/apache/sis/geometries/MultiSurface.java | 1 + .../main/org/apache/sis/geometries/OBBox.java | 5 ++- .../org/apache/sis/geometries/OffsetCurve.java | 1 + .../main/org/apache/sis/geometries/Orientable.java | 1 + .../main/org/apache/sis/geometries/Point.java | 8 ++-- .../org/apache/sis/geometries/PointSequence.java | 5 ++- .../main/org/apache/sis/geometries/Polygon.java | 3 +- .../apache/sis/geometries/PolyhedralSurface.java | 1 + .../main/org/apache/sis/geometries/Polyhedron.java | 1 + .../org/apache/sis/geometries/PreparedTIN.java | 17 ++++---- .../main/org/apache/sis/geometries/Primitive.java | 1 + .../main/org/apache/sis/geometries/Prism.java | 3 +- .../org/apache/sis/geometries/ProductCurve.java | 5 ++- .../main/org/apache/sis/geometries/Solid.java | 1 + .../apache/sis/geometries/SolidInterpolation.java | 1 + .../main/org/apache/sis/geometries/Sphere.java | 5 ++- .../main/org/apache/sis/geometries/Surface.java | 3 +- .../sis/geometries/SurfaceInterpolation.java | 1 + .../main/org/apache/sis/geometries/TIN.java | 1 + .../main/org/apache/sis/geometries/Triangle.java | 10 ++--- .../apache/sis/geometries/TriangulatedSurface.java | 1 + .../main/org/apache/sis/geometries/conics/Arc.java | 3 +- .../org/apache/sis/geometries/conics/Circle.java | 1 + .../sis/geometries/conics/CircularString.java | 1 + .../org/apache/sis/geometries/conics/Conic.java | 3 +- .../org/apache/sis/geometries/conics/ConicArc.java | 1 + .../org/apache/sis/geometries/conics/Ellipse.java | 1 + .../apache/sis/geometries/conics/EllipticArc.java | 1 + .../apache/sis/geometries/conicsurfaces/Cone.java | 1 + .../sis/geometries/conicsurfaces/Cylinder.java | 1 + .../sis/geometries/conicsurfaces/Sphere.java | 1 + .../sis/geometries/cs/CurveRelativeDirection.java | 1 + .../apache/sis/geometries/cs/FixedDirection.java | 1 + .../geometries/cs/GeometricCoordinateSystem.java | 5 ++- .../org/apache/sis/geometries/cs/Projection.java | 1 + .../sis/geometries/cs/ReferenceDirection.java | 1 + .../sis/geometries/cs/RelativeDirection.java | 1 + .../org/apache/sis/geometries/cs/Rotation.java | 1 + .../apache/sis/geometries/geodesics/Geodesic.java | 5 ++- .../sis/geometries/griddedsolid/BSolidSpline.java | 1 + .../griddedsolid/ParametricCurveSolid.java | 7 ++-- .../org/apache/sis/geometries/index/KdTree.java | 1 + .../sis/geometries/index/MortonIterator.java | 1 + .../apache/sis/geometries/math/AbstractCursor.java | 1 + .../apache/sis/geometries/math/AbstractTuple.java | 3 +- .../sis/geometries/math/AbstractTupleArray.java | 1 + .../main/org/apache/sis/geometries/math/Maths.java | 1 + .../org/apache/sis/geometries/math/Matrix.java | 1 + .../org/apache/sis/geometries/math/Matrix2D.java | 1 + .../org/apache/sis/geometries/math/Matrix3D.java | 1 + .../org/apache/sis/geometries/math/Matrix4D.java | 1 + .../apache/sis/geometries/math/SampleSystem.java | 5 ++- .../main/org/apache/sis/geometries/math/Tuple.java | 3 +- .../org/apache/sis/geometries/math/TupleArray.java | 5 ++- .../geometries/math/TupleArrayConcatenated.java | 3 +- .../math/TupleArrayCursorUnmodifiable.java | 1 + .../apache/sis/geometries/math/TupleArrayND.java | 3 +- .../sis/geometries/math/TupleArraySpliterator.java | 1 + .../geometries/math/TupleArrayUnmodifiable.java | 3 +- .../apache/sis/geometries/math/TupleArrays.java | 5 ++- .../sis/geometries/math/TupleUnmodifiable.java | 3 +- .../org/apache/sis/geometries/math/Vector.java | 1 + .../org/apache/sis/geometries/math/Vector1D.java | 1 + .../org/apache/sis/geometries/math/Vector2D.java | 1 + .../org/apache/sis/geometries/math/Vector3D.java | 1 + .../org/apache/sis/geometries/math/Vector4D.java | 1 + .../org/apache/sis/geometries/math/VectorND.java | 1 + .../org/apache/sis/geometries/math/Vectors.java | 10 ++--- .../apache/sis/geometries/mesh/MeshPrimitive.java | 5 ++- .../geometries/mesh/MeshPrimitiveComparator.java | 7 ++-- .../sis/geometries/mesh/MeshPrimitiveIndexes.java | 1 + .../sis/geometries/mesh/MeshPrimitiveVisitor.java | 6 +-- .../sis/geometries/mesh/MultiMeshPrimitive.java | 7 ++-- .../geometries/operation/GeometryOperations.java | 49 +++++++++++----------- .../apache/sis/geometries/operation/Operation.java | 1 + .../geometries/operation/OperationException.java | 1 + .../geometries/operation/SutherlandHodgman.java | 5 ++- .../operation/spatialanalysis2d/Buffer.java | 1 + .../operation/spatialanalysis2d/ConvexHull.java | 1 + .../operation/spatialanalysis2d/Difference.java | 1 + .../operation/spatialanalysis2d/Distance.java | 1 + .../operation/spatialanalysis2d/ISOBand.java | 19 +++++---- .../operation/spatialanalysis2d/ISOLine.java | 11 ++--- .../operation/spatialanalysis2d/Intersection.java | 1 + .../operation/spatialanalysis2d/IsoInclusion.java | 1 + .../operation/spatialanalysis2d/SymDifference.java | 1 + .../operation/spatialanalysis2d/Union.java | 1 + .../operation/spatialedition/ComputeAttribute.java | 7 ++-- .../geometries/operation/spatialedition/To3D.java | 5 ++- .../operation/spatialedition/ToPrimitive.java | 1 + .../operation/spatialedition/Transform.java | 7 ++-- .../operation/spatialrelations2d/Contains.java | 1 + .../operation/spatialrelations2d/Crosses.java | 1 + .../operation/spatialrelations2d/Disjoint.java | 1 + .../operation/spatialrelations2d/Equals.java | 1 + .../operation/spatialrelations2d/Intersects.java | 1 + .../operation/spatialrelations2d/LocateAlong.java | 1 + .../spatialrelations2d/LocateBetween.java | 1 + .../operation/spatialrelations2d/Overlaps.java | 1 + .../operation/spatialrelations2d/Relate.java | 1 + .../operation/spatialrelations2d/Touches.java | 1 + .../operation/spatialrelations2d/Within.java | 1 + .../parametriccurvesurfaces/BilinearGrid.java | 1 + .../geometries/parametriccurvesurfaces/Cone.java | 1 + .../parametriccurvesurfaces/Cylinder.java | 1 + .../ParametricCurveSurface.java | 9 ++-- .../geometries/parametriccurvesurfaces/Sphere.java | 1 + .../sis/geometries/polynomials/FunctionArc.java | 5 ++- .../sis/geometries/polynomials/FunctionCurve.java | 3 +- .../geometries/polynomials/PolynomialCurve.java | 1 + .../sis/geometries/polynomials/RealFunction.java | 3 +- .../sis/geometries/polynomials/RealPolynomial.java | 3 +- .../sis/geometries/privy/AbstractGeometry.java | 7 ++-- .../apache/sis/geometries/privy/ArraySequence.java | 15 +++---- .../privy/DefaultGeometryCollection.java | 3 +- .../sis/geometries/privy/DefaultLineString.java | 1 + .../sis/geometries/privy/DefaultLinearRing.java | 1 + .../sis/geometries/privy/DefaultMultiCurve.java | 3 +- .../geometries/privy/DefaultMultiLineString.java | 1 + .../sis/geometries/privy/DefaultMultiPoint.java | 5 ++- .../sis/geometries/privy/DefaultMultiPolygon.java | 1 + .../sis/geometries/privy/DefaultMultiSurface.java | 3 +- .../apache/sis/geometries/privy/DefaultPoint.java | 11 ++--- .../sis/geometries/privy/DefaultPointSequence.java | 5 ++- .../sis/geometries/privy/DefaultPolygon.java | 7 ++-- .../apache/sis/geometries/processor/Processor.java | 1 + .../sis/geometries/processor/ProcessorUtils.java | 7 ++-- .../processor/spatialanalysis2d/Distance.java | 1 + .../processor/spatialanalysis2d/Intersection.java | 25 +++++------ .../processor/spatialedition/ComputeAttribute.java | 5 ++- .../geometries/processor/spatialedition/To3D.java | 5 ++- .../processor/spatialedition/ToPrimitive.java | 1 + .../processor/spatialedition/Transform.java | 3 +- .../processor/spatialrelations2d/Contains.java | 1 + .../org/apache/sis/geometries/rhumb/Rhumb.java | 5 ++- .../sis/geometries/simplify/TextureAtlas.java | 1 + .../sis/geometries/simplify/greedyinsert/Edge.java | 1 + .../simplify/greedyinsert/TINBuilder.java | 3 +- .../simplify/greedyinsert/TinDistance.java | 1 + .../simplify/greedyinsert/WTriangle.java | 13 +++--- .../apache/sis/geometries/spirals/Clothoid.java | 1 + .../org/apache/sis/geometries/spirals/Spiral.java | 7 ++-- .../sis/geometries/splines/BSplineCurve.java | 1 + .../org/apache/sis/geometries/splines/Bezier.java | 1 + .../apache/sis/geometries/splines/CubicSpline.java | 1 + .../apache/sis/geometries/splines/KnotType.java | 1 + .../org/apache/sis/geometries/splines/NURB.java | 1 + .../sis/geometries/splines/PolynomialSpline.java | 3 +- .../apache/sis/geometries/splines/SplineCurve.java | 5 ++- .../sis/geometries/splines/SplineCurveForm.java | 1 + .../geometries/splinesurfaces/BSplineSurface.java | 9 ++-- .../splinesurfaces/BSplineSurfaceForm.java | 1 + .../sis/geometries/triangulate/EarClipping.java | 7 ++-- .../geometries/triangulate/delaunay/Delaunay.java | 3 +- .../triangulate/delaunay/OrientedEdge.java | 11 ++--- .../triangulate/delaunay/OrientedTriangle.java | 15 +++---- .../org/apache/sis/geometries/GeometriesTest.java | 8 ++-- .../org/apache/sis/geometries/PreparedTINTest.java | 9 ++-- .../org/apache/sis/geometries/TriangleTest.java | 3 ++ .../sis/geometries/index/MortonIteratorTest.java | 2 + .../geometries/math/AbstractTupleArrayTest.java | 5 ++- .../sis/geometries/math/AbstractTupleTest.java | 2 + .../sis/geometries/math/AbstractVectorTest.java | 2 + .../org/apache/sis/geometries/math/MathsTest.java | 2 + .../apache/sis/geometries/math/QuaternionTest.java | 3 ++ .../math/TupleArrayConcatenatedTest.java | 2 + .../sis/geometries/math/TupleArrayNbTest.java | 1 + .../sis/geometries/math/TupleArrayNfTest.java | 1 + .../sis/geometries/math/TupleArrayNiTest.java | 1 + .../sis/geometries/math/TupleArrayNlTest.java | 1 + .../sis/geometries/math/TupleArrayNsTest.java | 1 + .../sis/geometries/math/TupleArrayNubTest.java | 1 + .../sis/geometries/math/TupleArrayNuiTest.java | 1 + .../sis/geometries/math/TupleArrayNusTest.java | 1 + .../sis/geometries/math/TupleArraysTest.java | 5 ++- .../apache/sis/geometries/math/VectorXbTest.java | 1 + .../apache/sis/geometries/math/VectorXdTest.java | 1 + .../apache/sis/geometries/math/VectorXfTest.java | 1 + .../apache/sis/geometries/math/VectorXiTest.java | 1 + .../apache/sis/geometries/math/VectorXlTest.java | 1 + .../apache/sis/geometries/math/VectorXsTest.java | 1 + .../apache/sis/geometries/math/VectorXubTest.java | 1 + .../apache/sis/geometries/math/VectorXuiTest.java | 1 + .../apache/sis/geometries/math/VectorXusTest.java | 1 + .../apache/sis/geometries/math/VectorsTest.java | 9 ++-- .../sis/geometries/mesh/PrimitiveIndexesTest.java | 7 +++- .../apache/sis/geometries/mesh/PrimitiveTest.java | 3 ++ .../sis/geometries/mesh/PrimitiveVisitorTest.java | 9 ++-- .../geometries/operation/SutherlandHogmanTest.java | 3 ++ .../operation/spatialanalysis2d/IsoBandTest.java | 9 ++-- .../sis/geometries/privy/ArraySequenceTest.java | 5 ++- .../processor/spatialanalysis2d/DistanceTest.java | 3 ++ .../spatialanalysis2d/IntersectionTest.java | 6 ++- .../processor/spatialedition/To3DTest.java | 7 +++- .../processor/spatialedition/ToPrimitiveTest.java | 9 ++-- .../processor/spatialedition/TransformTest.java | 11 +++-- .../sis/geometries/simplify/TextureAtlasTest.java | 3 ++ .../triangulate/delaunay/DelaunayTest.java | 5 ++- .../triangulate/delaunay/OrientedEdgeTest.java | 5 ++- .../sis/storage/shapefile/ShapefileStore.java | 4 +- .../sis/storage/shapefile/ShapefileStoreTest.java | 2 +- 239 files changed, 548 insertions(+), 286 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java index d65ca53799,03e50c87b4..ff220d6585 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java @@@ -41,12 -41,12 +41,12 @@@ import org.apache.sis.setup.GeometryLib import org.apache.sis.util.resources.Errors; import org.apache.sis.util.collection.BackingStoreException; - // Specific to the geoapi-3.1 and 4.0 branches: - import org.opengis.feature.Feature; - +// Specific to the main and geoapi-3.1 branches: +import org.opengis.geometry.MismatchedDimensionException; + + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import org.opengis.feature.Feature; + -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; - /** * Utility methods on geometric objects defined in libraries outside Apache <abbr>SIS</abbr>. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java index 182baae5e0,3345849257..04b35f035e --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java @@@ -51,11 -49,9 +49,13 @@@ import org.apache.sis.util.ComparisonMo import org.apache.sis.util.Utilities; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: +import java.util.Date; +import org.opengis.referencing.datum.VerticalDatumType; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import java.util.Optional; + import java.time.temporal.Temporal; import org.opengis.referencing.crs.ParametricCRS; import org.opengis.referencing.datum.DatumEnsemble; import org.opengis.referencing.datum.ParametricDatum;
