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 11d079adf9eace937007ea9505a9c33d360c3a42 Merge: fac1549bcd e242306664 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Oct 1 13:50:19 2026 +0200 Merge of automatic reorganization of imports order. .../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +- .../org/apache/sis/xml/ReferenceResolverTest.java | 2 +- .../transform/InterpolatedTransformTest.java | 2 +- .../sis/geometries/AttributeInterpolation.java | 1 + .../sis/geometries/AttributeTransformation.java | 1 + .../main/org/apache/sis/geometries/BBox.java | 6 ++-- .../main/org/apache/sis/geometries/Curve.java | 6 ++-- .../main/org/apache/sis/geometries/DataPoints.java | 4 +-- .../main/org/apache/sis/geometries/Empty.java | 2 +- .../main/org/apache/sis/geometries/Geometries.java | 28 +++++++++---------- .../main/org/apache/sis/geometries/Geometry.java | 12 ++++---- .../apache/sis/geometries/GeometryCollection.java | 6 ++-- .../org/apache/sis/geometries/GeometryFactory.java | 8 +++--- .../org/apache/sis/geometries/GeometryVisitor.java | 1 + .../main/org/apache/sis/geometries/HyperPlane.java | 2 +- .../main/org/apache/sis/geometries/OBBox.java | 4 +-- .../apache/sis/geometries/OrientedGeometry.java | 2 +- .../main/org/apache/sis/geometries/Plane.java | 2 +- .../main/org/apache/sis/geometries/Point.java | 10 +++---- .../main/org/apache/sis/geometries/Prism.java | 2 +- .../main/org/apache/sis/geometries/Ray.java | 2 +- .../main/org/apache/sis/geometries/Solid.java | 4 +-- .../main/org/apache/sis/geometries/Surface.java | 6 ++-- .../main/org/apache/sis/geometries/Wrapper.java | 16 +++++------ .../apache/sis/geometries/adapter/JTSAdapter.java | 10 +++---- .../sis/geometries/adapter/ShapeAdapter.java | 4 +-- .../org/apache/sis/geometries/adapter/Srid.java | 8 +++--- .../sis/geometries/adapter/WellKnownBinary.java | 32 +++++++++++----------- .../geometries/adapter/WellKnownBinaryParser.java | 4 +-- .../sis/geometries/adapter/WellKnownText.java | 4 +-- .../geometries/adapter/WellKnownTextParser.java | 4 +-- .../main/org/apache/sis/geometries/cs/Bearing.java | 4 +-- .../geometries/csg/ConstructiveSolidGeometry.java | 4 +-- .../main/org/apache/sis/geometries/curve/Arc.java | 4 +-- .../apache/sis/geometries/curve/ArcByBulge.java | 4 +-- .../sis/geometries/curve/ArcByCenterPoint.java | 5 ++-- .../apache/sis/geometries/curve/BSplineCurve.java | 5 ++-- .../org/apache/sis/geometries/curve/Bezier.java | 5 ++-- .../org/apache/sis/geometries/curve/Circle.java | 4 +-- .../sis/geometries/curve/CircularString.java | 4 +-- .../org/apache/sis/geometries/curve/Clothoid.java | 4 +-- .../apache/sis/geometries/curve/CompoundCurve.java | 1 + .../org/apache/sis/geometries/curve/Conic.java | 4 +-- .../apache/sis/geometries/curve/CubicSpline.java | 4 +-- .../apache/sis/geometries/curve/EllipticArc.java | 4 +-- .../apache/sis/geometries/curve/FunctionArc.java | 4 +-- .../apache/sis/geometries/curve/FunctionCurve.java | 2 +- .../org/apache/sis/geometries/curve/Geodesic.java | 8 +++--- .../apache/sis/geometries/curve/LineString.java | 10 +++---- .../org/apache/sis/geometries/curve/NurbCurve.java | 6 ++-- .../apache/sis/geometries/curve/OffsetCurve.java | 6 ++-- .../sis/geometries/curve/PolynomialSpline.java | 4 +-- .../apache/sis/geometries/curve/ProductCurve.java | 4 +-- .../apache/sis/geometries/curve/RealFunction.java | 2 +- .../sis/geometries/curve/RealPolynomial.java | 2 +- .../org/apache/sis/geometries/curve/Rhumb.java | 10 +++---- .../org/apache/sis/geometries/curve/Spiral.java | 4 +-- .../internal/shared/AbstractGeometry.java | 2 +- .../internal/shared/AbstractOrientedGeometry.java | 2 +- .../internal/shared/ArrayDataPoints.java | 4 +-- .../internal/shared/DefaultArcByBulge.java | 2 +- .../internal/shared/DefaultArcByCenterPoint.java | 2 +- .../internal/shared/DefaultBSplineCurve.java | 6 ++-- .../internal/shared/DefaultBSplineSolid.java | 8 +++--- .../internal/shared/DefaultBSplineSurface.java | 4 +-- .../geometries/internal/shared/DefaultBearing.java | 6 ++-- .../internal/shared/DefaultBilinearGrid.java | 8 +++--- .../internal/shared/DefaultCircularString.java | 3 +- .../internal/shared/DefaultCompoundCurve.java | 6 ++-- .../geometries/internal/shared/DefaultConic.java | 6 ++-- .../internal/shared/DefaultCurvePolygon.java | 4 +-- .../internal/shared/DefaultDataPoints.java | 4 +-- .../geometries/internal/shared/DefaultEmpty.java | 5 ++-- .../internal/shared/DefaultGeodesic.java | 2 +- .../internal/shared/DefaultGeometryCollection.java | 2 +- .../internal/shared/DefaultLineString.java | 1 + .../internal/shared/DefaultLinearRing.java | 1 + .../internal/shared/DefaultMultiCurve.java | 2 +- .../internal/shared/DefaultMultiLineString.java | 2 +- .../internal/shared/DefaultMultiPoint.java | 6 ++-- .../internal/shared/DefaultMultiPolygon.java | 2 +- .../internal/shared/DefaultMultiPolyhedron.java | 2 +- .../internal/shared/DefaultMultiSurface.java | 2 +- .../internal/shared/DefaultNurbCurve.java | 4 +-- .../internal/shared/DefaultNurbSurface.java | 3 +- .../internal/shared/DefaultOffsetCurve.java | 8 +++--- .../geometries/internal/shared/DefaultPoint.java | 4 +-- .../geometries/internal/shared/DefaultPolygon.java | 6 ++-- .../internal/shared/DefaultPolyhedralSurface.java | 4 +-- .../internal/shared/DefaultPolyhedron.java | 6 ++-- .../internal/shared/DefaultPolynomialSpline.java | 6 ++-- .../geometries/internal/shared/DefaultPrism.java | 6 ++-- .../internal/shared/DefaultRawMultiPoint.java | 2 +- .../internal/shared/DefaultReversedCurve.java | 6 ++-- .../internal/shared/DefaultReversedSurface.java | 4 +-- .../geometries/internal/shared/DefaultRhumb.java | 4 +-- .../geometries/internal/shared/DefaultSpiral.java | 6 ++-- .../shared/DefaultTriangulatedSurface.java | 2 +- .../geometries/internal/shared/IndexedPoint.java | 6 ++-- .../apache/sis/geometries/mesh/MeshPrimitive.java | 6 ++-- .../sis/geometries/mesh/MultiMeshPrimitive.java | 4 +-- .../apache/sis/geometries/operation/Contains.java | 2 +- .../sis/geometries/operation/DeBoorAlgorithm.java | 1 + .../geometries/operation/GeometryProcessor.java | 11 ++++---- .../sis/geometries/operation/Intersection.java | 8 +++--- .../sis/geometries/operation/ProcessorUtils.java | 4 +-- .../geometries/operation/ShewchukPredicates.java | 1 + .../org/apache/sis/geometries/operation/To3D.java | 6 ++-- .../sis/geometries/operation/ToPrimitive.java | 2 +- .../apache/sis/geometries/operation/Transform.java | 8 +++--- .../simplify/greedyinsert/TINBuilder.java | 2 +- .../operation/simplify/greedyinsert/WTriangle.java | 4 +-- .../operation/spatialanalysis2d/ISOBand.java | 16 +++++------ .../operation/spatialanalysis2d/ISOLine.java | 6 ++-- .../operation/triangulate/EarClipping.java | 2 +- .../operation/triangulate/delaunay/Delaunay.java | 2 +- .../triangulate/delaunay/OrientedEdge.java | 6 ++-- .../triangulate/delaunay/OrientedTriangle.java | 6 ++-- .../apache/sis/geometries/point/MultiPoint.java | 6 ++-- .../apache/sis/geometries/point/PointCloud.java | 2 +- .../apache/sis/geometries/solid/BSplineSolid.java | 4 +-- .../org/apache/sis/geometries/solid/Capsule.java | 4 +-- .../org/apache/sis/geometries/solid/Cylinder.java | 4 +-- .../org/apache/sis/geometries/solid/Frustrum.java | 6 ++-- .../sis/geometries/solid/ParametricCurveSolid.java | 6 ++-- .../apache/sis/geometries/solid/Polyhedron.java | 2 +- .../org/apache/sis/geometries/solid/Sphere.java | 12 ++++---- .../solid/polyhedron/AbstractPolyhedron.java | 4 +-- .../sis/geometries/surface/BSplineSurface.java | 8 +++--- .../sis/geometries/surface/BilinearGrid.java | 4 +-- .../sis/geometries/surface/CurvePolygon.java | 8 +++--- .../apache/sis/geometries/surface/NurbSurface.java | 1 + .../geometries/surface/ParametricCurveSurface.java | 8 +++--- .../org/apache/sis/geometries/surface/Polygon.java | 6 ++-- .../sis/geometries/surface/PolyhedralSurface.java | 4 +-- .../apache/sis/geometries/surface/PreparedTIN.java | 16 +++++------ .../apache/sis/geometries/surface/Triangle.java | 10 +++---- .../geometries/surface/TriangulatedSurface.java | 2 +- .../main/org/apache/sis/gml/AbstractGMLReader.java | 2 +- .../main/org/apache/sis/gml/AbstractGMLWriter.java | 2 +- .../org/apache/sis/gml/DOMXMLStreamReader.java | 1 + .../main/org/apache/sis/gml/GML2Reader.java | 2 +- .../main/org/apache/sis/gml/GML3Reader.java | 6 ++-- .../main/org/apache/sis/gml/GML3Writer.java | 2 +- .../main/org/apache/sis/gml/GMLCRS.java | 8 +++--- .../main/org/apache/sis/gml/GMLGeometryWriter.java | 2 +- .../main/org/apache/sis/gml/GMLWriter.java | 2 +- .../org/apache/sis/gml/JAXBGeometryAdapter.java | 5 ++-- .../org/apache/sis/gml/PositionListBuilder.java | 2 +- .../main/org/apache/sis/maths/Maths.java | 2 +- .../test/org/apache/sis/geometries/EmptyTest.java | 6 ++-- .../test/org/apache/sis/geometries/PointTest.java | 6 ++-- .../sis/geometries/adapter/ShapeConverterTest.java | 10 +++---- .../geometries/adapter/WellKnownBinaryTest.java | 10 +++---- .../sis/geometries/adapter/WellKnownTextTest.java | 4 +-- .../org/apache/sis/geometries/cs/BearingTest.java | 2 +- .../apache/sis/geometries/curve/ConicArcTest.java | 1 + .../apache/sis/geometries/curve/EllipseTest.java | 1 + .../internal/shared/ArraySequenceTest.java | 2 +- .../internal/shared/DefaultEmptyTest.java | 4 +-- .../internal/shared/DefaultPointTest.java | 2 +- .../internal/shared/IndexedPointTest.java | 2 +- .../sis/geometries/mesh/PrimitiveVisitorTest.java | 2 +- .../sis/geometries/operation/BufferTest.java | 4 +-- .../sis/geometries/operation/ContainsTest.java | 4 +-- .../sis/geometries/operation/ConvexHullTest.java | 4 +-- .../sis/geometries/operation/CrossesTest.java | 4 +-- .../sis/geometries/operation/DifferenceTest.java | 4 +-- .../sis/geometries/operation/DisjointTest.java | 4 +-- .../sis/geometries/operation/DistanceTest.java | 3 ++ .../apache/sis/geometries/operation/EqualTest.java | 4 +-- .../sis/geometries/operation/IntersectionTest.java | 3 ++ .../sis/geometries/operation/IntersectsTest.java | 4 +-- .../sis/geometries/operation/LocateAlongTest.java | 4 +-- .../geometries/operation/LocateBetweenTest.java | 4 +-- .../sis/geometries/operation/OverlapsTest.java | 4 +-- .../sis/geometries/operation/RelateTest.java | 4 +-- .../operation/ShewchukPredicatesTest.java | 5 +++- .../geometries/operation/SymDifferenceTest.java | 4 +-- .../apache/sis/geometries/operation/TestData.java | 2 +- .../sis/geometries/operation/ToPrimitiveTest.java | 6 ++-- .../sis/geometries/operation/TouchesTest.java | 4 +-- .../apache/sis/geometries/operation/UnionTest.java | 4 +-- .../geometries/operation/WithinDistanceTest.java | 4 +-- .../sis/geometries/operation/WithinTest.java | 4 +-- .../operation/simplify/TextureAtlasTest.java | 2 +- .../sis/geometries/surface/PreparedTINTest.java | 6 ++-- .../test/org/apache/sis/gml/GML2ReaderTest.java | 9 ++---- .../test/org/apache/sis/gml/GML2WriterTest.java | 9 ++---- .../test/org/apache/sis/gml/GML3ReaderTest.java | 29 +++++++++----------- .../test/org/apache/sis/gml/GML3WriterTest.java | 9 ++---- .../test/org/apache/sis/gml/GMLReaderTest.java | 2 -- .../test/org/apache/sis/gml/GMLWriterTest.java | 5 +--- .../test/org/apache/sis/gml/GeometryAssert.java | 10 +++---- .../apache/sis/gml/JAXBGeometryAdapterTest.java | 24 +++++++--------- .../test/org/apache/sis/gml/TestCase.java | 2 ++ .../storage/dggs/DiscreteGlobalGridSystems.java | 2 +- .../sis/referencing/dggs/AbstractDggrsTest.java | 2 +- .../storage/internal/shared/AggregationEvent.java | 1 + .../sis/storage/internal/shared/ContentEvent.java | 1 + .../internal/shared/FeatureSetContentEvent.java | 3 ++ .../internal/shared/FeatureSetModelEvent.java | 3 ++ .../sis/storage/internal/shared/ModelEvent.java | 1 + .../sis/storage/internal/shared/StorageEvent.java | 3 +- .../internal/shared/TilingContentEvent.java | 1 + .../storage/internal/shared/TilingModelEvent.java | 3 +- 206 files changed, 511 insertions(+), 491 deletions(-) diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBSplineSurface.java index a53ca31542,19c00db5d5..d922b75a18 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBSplineSurface.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBSplineSurface.java @@@ -24,11 -26,9 +26,9 @@@ import org.apache.sis.geometries.DataPo import org.apache.sis.geometries.curve.KnotType; import org.apache.sis.geometries.surface.BSplineSurface; import org.apache.sis.geometries.surface.BSplineSurfaceForm; - import org.opengis.geometry.DirectPosition; - import org.opengis.geometry.Envelope; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the geoapi-3.1 branch: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBilinearGrid.java index 92bf6a8759,8b9e7f9e88..e67dd7deda --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBilinearGrid.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultBilinearGrid.java @@@ -22,14 -22,14 +22,14 @@@ import javax.measure.Quantity import org.opengis.geometry.DirectPosition; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; + import org.apache.sis.geometries.Curve; + import org.apache.sis.geometries.DataPoints; + import org.apache.sis.geometries.GeometryType; import org.apache.sis.geometries.DataPointsType; + import org.apache.sis.geometries.surface.BilinearGrid; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the geoapi-3.1 branch: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java index 49076462ef,2059078106..07e100d1d4 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java @@@ -29,11 -30,11 +30,11 @@@ import org.apache.sis.geometries.surfac import org.apache.sis.maths.NDArrays; import org.apache.sis.maths.Vector; import org.apache.sis.maths.Vectors; - import org.opengis.geometry.DirectPosition; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; +// Specific to the geoapi-3.1 branch: +import org.opengis.referencing.ReferenceIdentifier; + /** * NURBS surface: tensor product of two directions (u, v), each one with its own degree and its own knot vector. * The control points form a grid controlPoints[i][j] (i = u direction, j = v direction). diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java index 8cb60846c8,b76d1b0819..1878706f22 --- 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 @@@ -24,21 -29,16 +29,16 @@@ import org.apache.sis.geometries.DataPo import org.apache.sis.geometries.Geometries; 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.maths.Tuple; import org.apache.sis.maths.Vector; import org.apache.sis.maths.Vectors; - import static org.opengis.annotation.Specification.ISO_19107; - import org.opengis.annotation.UML; +import org.apache.sis.geometries.internal.shared.AbstractGeometry; 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; - import org.opengis.geometry.DirectPosition; - import org.opengis.geometry.Envelope; - import org.opengis.referencing.crs.CoordinateReferenceSystem; - import org.apache.sis.geometries.DataPointsType; /**
