You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by js...@apache.org on 2026/09/07 08:52:02 UTC
(sis) 05/06: refactor(Math): move math package outside geometries
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ac5b602bae72b728d265b955c302af0c9ec25ba5
Author: jsorel <jo...@geomatys.com>
AuthorDate: Mon Sep 7 09:28:38 2026 +0200
refactor(Math): move math package outside geometries
---
.../org.apache.sis.geometry/main/module-info.java | 2 +-
.../org/apache/sis/geometries/AttributesType.java | 4 +--
.../main/org/apache/sis/geometries/BBox.java | 4 +--
.../main/org/apache/sis/geometries/Curve.java | 4 +--
.../main/org/apache/sis/geometries/DataPoints.java | 10 +++---
.../main/org/apache/sis/geometries/Geometries.java | 16 ++++-----
.../org/apache/sis/geometries/GeometryFactory.java | 10 +++---
.../org/apache/sis/geometries/MultiLineString.java | 2 +-
.../main/org/apache/sis/geometries/MultiPoint.java | 2 +-
.../main/org/apache/sis/geometries/OBBox.java | 6 ++--
.../apache/sis/geometries/OrientedGeometry.java | 2 +-
.../main/org/apache/sis/geometries/Point.java | 4 +--
.../org/apache/sis/geometries/PreparedTIN.java | 8 ++---
.../main/org/apache/sis/geometries/Ray.java | 6 ++--
.../main/org/apache/sis/geometries/Sphere.java | 6 ++--
.../main/org/apache/sis/geometries/Surface.java | 2 +-
.../main/org/apache/sis/geometries/TIN.java | 2 +-
.../main/org/apache/sis/geometries/Triangle.java | 12 +++----
.../main/org/apache/sis/geometries/Wrapper.java | 2 +-
.../apache/sis/geometries/adapter/JTSAdapter.java | 16 ++++-----
.../geometries/adapter/PathIteratorAdapter.java | 2 +-
.../sis/geometries/adapter/ShapeAdapter.java | 8 ++---
.../sis/geometries/adapter/ShapeConverter.java | 6 ++--
.../geometries/cs/GeometricCoordinateSystem.java | 2 +-
.../main/org/apache/sis/geometries/curve/Arc.java | 4 +--
.../apache/sis/geometries/curve/ArcByBulge.java | 4 +--
.../sis/geometries/curve/ArcByCenterPoint.java | 2 +-
.../sis/geometries/curve/CircularString.java | 2 +-
.../org/apache/sis/geometries/curve/Conic.java | 2 +-
.../org/apache/sis/geometries/curve/Geodesic.java | 2 +-
.../apache/sis/geometries/curve/LineString.java | 2 +-
.../apache/sis/geometries/curve/LinearRing.java | 2 +-
.../org/apache/sis/geometries/curve/Spiral.java | 2 +-
.../org/apache/sis/geometries/index/KdTree.java | 6 ++--
.../internal/shared/AbstractGeometry.java | 6 ++--
.../internal/shared/AbstractOrientedGeometry.java | 4 +--
.../internal/shared/ArrayDataPoints.java | 12 +++----
.../internal/shared/DefaultArcByBulge.java | 2 +-
.../internal/shared/DefaultCompoundCurve.java | 2 +-
.../internal/shared/DefaultDataPoints.java | 2 +-
.../geometries/internal/shared/DefaultPoint.java | 8 ++---
.../internal/shared/DefaultReversedCurve.java | 2 +-
.../apache/sis/geometries/mesh/MeshPrimitive.java | 22 ++++++------
.../geometries/mesh/MeshPrimitiveComparator.java | 4 +--
.../sis/geometries/mesh/MeshPrimitiveIndexes.java | 10 +++---
.../sis/geometries/mesh/MeshPrimitiveVisitor.java | 6 ++--
.../sis/geometries/operation/ComputeAttribute.java | 10 +++---
.../apache/sis/geometries/operation/Contains.java | 10 +++---
.../apache/sis/geometries/operation/Distance.java | 6 ++--
.../geometries/operation/GeometryProcessor.java | 10 +++---
.../sis/geometries/operation/Intersection.java | 8 ++---
.../geometries/operation/SutherlandHodgman.java | 8 ++---
.../org/apache/sis/geometries/operation/To3D.java | 10 +++---
.../sis/geometries/operation/ToPrimitive.java | 4 +--
.../apache/sis/geometries/operation/Transform.java | 10 +++---
.../operation/simplify/greedyinsert/Edge.java | 4 +--
.../simplify/greedyinsert/TINBuilder.java | 8 ++---
.../simplify/greedyinsert/TinDistance.java | 6 ++--
.../operation/simplify/greedyinsert/WTriangle.java | 4 +--
.../operation/spatialanalysis2d/ISOBand.java | 2 +-
.../operation/spatialanalysis2d/ISOLine.java | 12 +++----
.../operation/triangulate/EarClipping.java | 12 +++----
.../operation/triangulate/delaunay/Delaunay.java | 12 +++----
.../triangulate/delaunay/OrientedEdge.java | 4 +--
.../triangulate/delaunay/OrientedTriangle.java | 2 +-
.../geometries/polyhedron/AbstractPolyhedron.java | 8 ++---
.../sis/geometries/polyhedron/Dodecahedron.java | 8 ++---
.../sis/geometries/polyhedron/Hexahedron.java | 8 ++---
.../sis/geometries/polyhedron/Icosahedron.java | 8 ++---
.../sis/geometries/polyhedron/Octahedron.java | 8 ++---
.../polyhedron/RhombicTriacontahedron.java | 8 ++---
.../sis/geometries/polyhedron/Tetrahedron.java | 8 ++---
.../polyhedron/TruncatedIcosahedron.java | 8 ++---
.../sis/geometries/polynomials/FunctionArc.java | 2 +-
.../sis/geometries/spherical/GreatCircleArc.java | 4 +--
.../spherical/SphericalConvexPolygon.java | 6 ++--
.../geometries/spherical/SphericalTriangle.java | 4 +--
.../sis/geometries/splines/PolynomialSpline.java | 2 +-
.../main/org/apache/sis/gml/AbstractGMLWriter.java | 2 +-
.../main/org/apache/sis/gml/GML3Reader.java | 4 +--
.../main/org/apache/sis/gml/GML3Writer.java | 2 +-
.../org/apache/sis/gml/PositionListBuilder.java | 8 ++---
.../{geometries/math => maths}/AbstractAffine.java | 2 +-
.../{geometries/math => maths}/AbstractArray.java | 2 +-
.../{geometries/math => maths}/AbstractCursor.java | 2 +-
.../{geometries/math => maths}/AbstractMatrix.java | 2 +-
.../math => maths}/AbstractSimilarity.java | 2 +-
.../{geometries/math => maths}/AbstractTuple.java | 2 +-
.../sis/{geometries/math => maths}/Affine.java | 2 +-
.../sis/{geometries/math => maths}/Affine1D.java | 2 +-
.../sis/{geometries/math => maths}/Affine2D.java | 2 +-
.../sis/{geometries/math => maths}/Affine3D.java | 2 +-
.../sis/{geometries/math => maths}/Affine4D.java | 2 +-
.../sis/{geometries/math => maths}/AffineND.java | 2 +-
.../sis/{geometries/math => maths}/Affines.java | 2 +-
.../sis/{geometries/math => maths}/Array.java | 2 +-
.../math => maths}/ArrayConcatenated.java | 2 +-
.../{geometries/math => maths}/ArrayFactory.java | 2 +-
.../math => maths}/ArrayFactoryFFM.java | 20 +++++------
.../math => maths}/ArrayFactoryHAT.java | 2 +-
.../math => maths}/ArrayFactoryJava.java | 20 +++++------
.../math => maths}/ArraySpliterator.java | 2 +-
.../math => maths}/ArrayUnmodifiable.java | 2 +-
.../sis/{geometries/math => maths}/Cursor.java | 2 +-
.../math => maths}/CursorUnmodifiable.java | 2 +-
.../sis/{geometries/math => maths}/DataType.java | 2 +-
.../{geometries/math => maths}/EasingMethod.java | 2 +-
.../sis/{geometries/math => maths}/Maths.java | 4 +--
.../sis/{geometries/math => maths}/Matrices.java | 2 +-
.../sis/{geometries/math => maths}/Matrix.java | 2 +-
.../sis/{geometries/math => maths}/Matrix2D.java | 2 +-
.../sis/{geometries/math => maths}/Matrix3D.java | 2 +-
.../sis/{geometries/math => maths}/Matrix4D.java | 4 +--
.../sis/{geometries/math => maths}/MatrixND.java | 2 +-
.../sis/{geometries/math => maths}/NDArray.java | 2 +-
.../sis/{geometries/math => maths}/NDArrays.java | 2 +-
.../sis/{geometries/math => maths}/Quaternion.java | 4 +--
.../{geometries/math => maths}/Quaternions.java | 2 +-
.../sis/{geometries/math => maths}/ReadOnly.java | 42 +++++++++++-----------
.../{geometries/math => maths}/SampleSystem.java | 2 +-
.../sis/{geometries/math => maths}/Similarity.java | 2 +-
.../{geometries/math => maths}/Similarity3D.java | 2 +-
.../{geometries/math => maths}/SimilarityND.java | 2 +-
.../math => maths}/SimplifiedTransform.java | 2 +-
.../sis/{geometries/math => maths}/Transform.java | 4 +--
.../{geometries/math => maths}/Transform1D.java | 2 +-
.../sis/{geometries/math => maths}/Tuple.java | 2 +-
.../math => maths}/TupleUnmodifiable.java | 2 +-
.../sis/{geometries/math => maths}/Vector.java | 2 +-
.../sis/{geometries/math => maths}/Vector1D.java | 2 +-
.../sis/{geometries/math => maths}/Vector2D.java | 2 +-
.../sis/{geometries/math => maths}/Vector3D.java | 2 +-
.../sis/{geometries/math => maths}/Vector4D.java | 2 +-
.../sis/{geometries/math => maths}/VectorND.java | 2 +-
.../sis/{geometries/math => maths}/Vectors.java | 2 +-
.../{geometries/math => maths}/package-info.java | 2 +-
.../org/apache/sis/scene/AnimationSampler.java | 2 +-
.../main/org/apache/sis/scene/MorphTarget.java | 6 ++--
.../main/org/apache/sis/scene/SceneNode.java | 4 +--
.../main/org/apache/sis/scene/SceneUtilities.java | 4 +--
.../main/org/apache/sis/scene/Skin.java | 2 +-
.../main/org/apache/sis/scene/physics/Motion.java | 4 +--
.../org/apache/sis/geometries/PreparedTINTest.java | 2 +-
.../org/apache/sis/geometries/TriangleTest.java | 4 +--
.../sis/geometries/adapter/ShapeAdapterTest.java | 4 +--
.../sis/geometries/adapter/ShapeConverterTest.java | 4 +--
.../internal/shared/ArraySequenceTest.java | 10 +++---
.../sis/geometries/mesh/PrimitiveIndexesTest.java | 4 +--
.../apache/sis/geometries/mesh/PrimitiveTest.java | 2 +-
.../sis/geometries/mesh/PrimitiveVisitorTest.java | 6 ++--
.../sis/geometries/operation/DistanceTest.java | 2 +-
.../sis/geometries/operation/IntersectionTest.java | 6 ++--
.../operation/ShewchukPredicatesTest.java | 2 +-
.../geometries/operation/SutherlandHogmanTest.java | 8 ++---
.../apache/sis/geometries/operation/To3DTest.java | 4 +--
.../sis/geometries/operation/ToPrimitiveTest.java | 4 +--
.../sis/geometries/operation/TransformTest.java | 2 +-
.../operation/spatialanalysis2d/IsoBandTest.java | 4 +--
.../triangulate/delaunay/DelaunayTest.java | 4 +--
.../triangulate/delaunay/OrientedEdgeTest.java | 4 +--
.../geometries/spherical/GreatCircleArcTest.java | 4 +--
.../spherical/SphericalConvexPolygonTest.java | 8 ++---
.../spherical/SphericalTriangleTest.java | 4 +--
.../test/org/apache/sis/gml/GML2ReaderTest.java | 4 +--
.../test/org/apache/sis/gml/GML2WriterTest.java | 4 +--
.../test/org/apache/sis/gml/GML3ReaderTest.java | 4 +--
.../test/org/apache/sis/gml/GML3WriterTest.java | 8 ++---
.../test/org/apache/sis/gml/GMLWriterTest.java | 4 +--
.../apache/sis/gml/JAXBGeometryAdapterTest.java | 4 +--
.../math => maths}/AbstractArrayTest.java | 2 +-
.../math => maths}/AbstractTupleTest.java | 2 +-
.../math => maths}/AbstractVectorTest.java | 2 +-
.../math => maths}/ArrayConcatenatedTest.java | 2 +-
.../{geometries/math => maths}/ArrayNbTest.java | 2 +-
.../{geometries/math => maths}/ArrayNdTest.java | 2 +-
.../{geometries/math => maths}/ArrayNfTest.java | 2 +-
.../{geometries/math => maths}/ArrayNiTest.java | 2 +-
.../{geometries/math => maths}/ArrayNlTest.java | 2 +-
.../{geometries/math => maths}/ArrayNsTest.java | 2 +-
.../{geometries/math => maths}/ArrayNubTest.java | 2 +-
.../{geometries/math => maths}/ArrayNuiTest.java | 2 +-
.../{geometries/math => maths}/ArrayNusTest.java | 2 +-
.../math => maths}/EasingMethodTest.java | 2 +-
.../sis/{geometries/math => maths}/MathsTest.java | 2 +-
.../{geometries/math => maths}/NDArraysTest.java | 2 +-
.../{geometries/math => maths}/QuaternionTest.java | 2 +-
.../{geometries/math => maths}/Vector3DTest.java | 2 +-
.../{geometries/math => maths}/VectorXbTest.java | 2 +-
.../{geometries/math => maths}/VectorXdTest.java | 2 +-
.../{geometries/math => maths}/VectorXfTest.java | 2 +-
.../{geometries/math => maths}/VectorXiTest.java | 2 +-
.../{geometries/math => maths}/VectorXlTest.java | 2 +-
.../{geometries/math => maths}/VectorXsTest.java | 2 +-
.../{geometries/math => maths}/VectorXubTest.java | 2 +-
.../{geometries/math => maths}/VectorXuiTest.java | 2 +-
.../{geometries/math => maths}/VectorXusTest.java | 2 +-
.../{geometries/math => maths}/VectorsTest.java | 2 +-
.../org/apache/sis/scene/SceneUtilitiesTest.java | 4 +--
.../org/apache/sis/referencing/dggs/s2/S2Zone.java | 2 +-
.../dggs/DiscreteGlobalGridCoverageProcessor.java | 10 +++---
.../storage/dggs/DiscreteGlobalGridSystems.java | 4 +--
.../shared/ArrayDiscreteGlobalGridCoverage.java | 10 +++---
.../rs/internal/shared/ArrayCodedCoverage.java | 10 +++---
.../rs/internal/shared/GridAsCodedResource.java | 8 ++---
.../sis/referencing/dggs/AbstractDggrsTest.java | 8 ++---
205 files changed, 466 insertions(+), 466 deletions(-)
diff --git a/incubator/src/org.apache.sis.geometry/main/module-info.java b/incubator/src/org.apache.sis.geometry/main/module-info.java
index 4c7ce455f6..d83edffcb0 100644
--- a/incubator/src/org.apache.sis.geometry/main/module-info.java
+++ b/incubator/src/org.apache.sis.geometry/main/module-info.java
@@ -33,7 +33,7 @@ module org.apache.sis.geometry {
exports org.apache.sis.geometries;
exports org.apache.sis.geometries.curve;
exports org.apache.sis.geometries.operation;
- exports org.apache.sis.geometries.math;
+ exports org.apache.sis.maths;
exports org.apache.sis.scene;
exports org.apache.sis.scene.light;
exports org.apache.sis.scene.material;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
index 7cfc34e7e5..3cc50c33ba 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
@@ -21,8 +21,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.DataType;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
index 37e858d113..1c5dbe6bbc 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
@@ -21,8 +21,8 @@ import java.util.Map;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
index d8886341a1..91c614d76f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
@@ -19,11 +19,11 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.curve.LineString;
import java.util.List;
import javax.measure.quantity.Length;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/DataPoints.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/DataPoints.java
index f746b022d4..01969685e0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/DataPoints.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/DataPoints.java
@@ -18,11 +18,11 @@ package org.apache.sis.geometries;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
index 14b3b34c7f..6f271a1a1c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
@@ -47,14 +47,14 @@ import org.opengis.referencing.datum.EngineeringDatum;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.util.FactoryException;
import org.opengis.util.InternationalString;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vector3D;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.Matrix3D;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vector3D;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Matrix3D;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometry.wrapper.jts.JTS;
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 e76715e924..662e070b67 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
@@ -30,10 +30,10 @@ import org.apache.sis.geometries.curve.ArcByCenterPoint;
import org.apache.sis.geometries.curve.Circle;
import org.apache.sis.geometries.curve.CircularString;
import org.apache.sis.geometries.curve.Geodesic;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Vector;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometries.internal.shared.DefaultArcByBulge;
import org.apache.sis.geometries.internal.shared.DefaultArcByCenterPoint;
@@ -60,7 +60,7 @@ import org.apache.sis.geometries.internal.shared.DefaultReversedCurve;
import org.apache.sis.geometries.internal.shared.DefaultReversedSurface;
import org.apache.sis.geometries.internal.shared.DefaultTriangle;
import org.apache.sis.geometries.internal.shared.DefaultTriangulatedSurface;
-import org.apache.sis.geometries.math.DataType;
+import org.apache.sis.maths.DataType;
import org.apache.sis.geometries.curve.Clothoid;
import org.apache.sis.geometry.wrapper.Capability;
import org.apache.sis.geometry.wrapper.Dimensions;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
index 0e09ef781c..f786ab4013 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
index 13bf30c526..5459a53f4a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
index 222c4fbe3e..2325c42070 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
@@ -19,9 +19,9 @@ package org.apache.sis.geometries;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java
index 7cfa3cae0d..1515128428 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OrientedGeometry.java
@@ -17,7 +17,7 @@
package org.apache.sis.geometries;
import org.opengis.geometry.Envelope;
-import org.apache.sis.geometries.math.Similarity;
+import org.apache.sis.maths.Similarity;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
index 5e1c3d53d6..0acd43aa20 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
@@ -22,8 +22,8 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
index 856943ae5b..246c577dfc 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
@@ -31,10 +31,10 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CRS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java
index f57e14f7b8..7053cd2077 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java
@@ -20,9 +20,9 @@ import java.util.Objects;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
index 14f08876f7..fa6280b90f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
@@ -23,9 +23,9 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
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.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.util.ArgumentChecks;
// Specific to the geoapi-4.0 branch:
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
index aec63bdf93..58744465f0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
@@ -21,7 +21,7 @@ import javax.measure.quantity.Length;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
index 2ea5c5b47c..445e8b7d12 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
@@ -17,7 +17,7 @@
package org.apache.sis.geometries;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
index 0e022e9033..a1d24855cb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
@@ -24,12 +24,12 @@ import org.opengis.annotation.UML;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.Vector3D;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Vector3D;
+import org.apache.sis.maths.Vectors;
/**
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 b24a6fd90e..f8247dddff 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
@@ -33,7 +33,7 @@ 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.maths.Tuple;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
index 5ec536c552..3a9282399e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
@@ -24,14 +24,14 @@ import java.util.List;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.locationtech.jts.geom.CoordinateXY;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/PathIteratorAdapter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/PathIteratorAdapter.java
index 16381d6fb3..0b7a4d1eef 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/PathIteratorAdapter.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/PathIteratorAdapter.java
@@ -26,7 +26,7 @@ import org.apache.sis.geometries.GeometryCollection;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeAdapter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeAdapter.java
index 9aafdbf34e..9a3f7d0209 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeAdapter.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeAdapter.java
@@ -28,10 +28,10 @@ import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.geometry.wrapper.j2d.EmptyShape;
import org.apache.sis.referencing.internal.shared.AbstractShape;
import org.apache.sis.referencing.internal.shared.IntervalRectangle;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeConverter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeConverter.java
index ecb7bd7e0c..19af5f80a4 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeConverter.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/ShapeConverter.java
@@ -29,9 +29,9 @@ import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Surface;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.internal.shared.AbstractShape;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
index b3c821bff0..de477134a0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
@@ -21,7 +21,7 @@ import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
import org.apache.sis.geometries.Bearing;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java
index 51751b3818..bc91d8cb80 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.curve;
import java.util.List;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByBulge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByBulge.java
index 2c8f980769..c6e16f79f8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByBulge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByBulge.java
@@ -21,8 +21,8 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Vector;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByCenterPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByCenterPoint.java
index 1f37ad75af..7d95b40a68 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByCenterPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ArcByCenterPoint.java
@@ -22,7 +22,7 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java
index a9816f5d98..3f0cff9b13 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java
@@ -21,7 +21,7 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java
index b64094afe4..695e874a3d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java
@@ -19,7 +19,7 @@ package org.apache.sis.geometries.curve;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Geodesic.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Geodesic.java
index 4924208eba..f60d2151b6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Geodesic.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Geodesic.java
@@ -24,7 +24,7 @@ import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java
index 245be71cb4..643e752690 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java
@@ -27,7 +27,7 @@ import org.opengis.annotation.UML;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java
index 2adb8486f9..ac1f72cf71 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries.curve;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java
index ae391e59b7..9eef4c8fb3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java
@@ -21,7 +21,7 @@ import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.polynomials.RealFunction;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
index 41b5072882..9d9df579e3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
@@ -22,9 +22,9 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractGeometry.java
index 8ce0480fd7..fd4c828b03 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractGeometry.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractGeometry.java
@@ -19,9 +19,9 @@ package org.apache.sis.geometries.internal.shared;
import java.util.HashMap;
import java.util.Map;
import org.apache.sis.geometries.Geometry;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometry.GeneralEnvelope;
import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java
index 67c6b422d1..371e8062cd 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/AbstractOrientedGeometry.java
@@ -18,8 +18,8 @@ package org.apache.sis.geometries.internal.shared;
import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.OrientedGeometry;
-import org.apache.sis.geometries.math.Similarity;
-import org.apache.sis.geometries.math.Similarity3D;
+import org.apache.sis.maths.Similarity;
+import org.apache.sis.maths.Similarity3D;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
index 77cabddb79..d5c3759271 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
@@ -25,12 +25,12 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultArcByBulge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultArcByBulge.java
index 4a26fb49eb..7c6561c17b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultArcByBulge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultArcByBulge.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries.internal.shared;
import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.curve.ArcByBulge;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
index 1a743fe4ec..5ce7475978 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.CompoundCurve;
import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
index 1fe84eb74d..df6b6b5a85 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPoint.java
index 6e1d19b8ae..2964573057 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPoint.java
@@ -20,10 +20,10 @@ import java.util.Objects;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultReversedCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultReversedCurve.java
index bbce828cff..61f9be6797 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultReversedCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultReversedCurve.java
@@ -25,7 +25,7 @@ import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.Orientable;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Primitive;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
index 7b6cf5abbd..77b48bb4d2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
@@ -43,17 +43,17 @@ import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vector1D;
-import org.apache.sis.geometries.math.Vector3D;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vector1D;
+import org.apache.sis.maths.Vector3D;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.collection.Containers;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
index 63bac5fea6..87e60ec745 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
@@ -26,8 +26,8 @@ import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CRS;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
index 6fed1d240b..afac329553 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
@@ -25,11 +25,11 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector1D;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector1D;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
index cf858dc658..ada79d1044 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
@@ -22,9 +22,9 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ComputeAttribute.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ComputeAttribute.java
index 788767f6ba..5cd998981d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ComputeAttribute.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ComputeAttribute.java
@@ -22,11 +22,11 @@ import java.util.function.Function;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Contains.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Contains.java
index 75eb107a0f..b40c9e18d6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Contains.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Contains.java
@@ -20,11 +20,11 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Distance.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Distance.java
index 0a88d20f0f..295af4df76 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Distance.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Distance.java
@@ -18,9 +18,9 @@ package org.apache.sis.geometries.operation;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.operation.ProcessorUtils;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vectors;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
index d870ec2997..f1e70bdfda 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
@@ -35,11 +35,11 @@ import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Intersection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Intersection.java
index a1523cc035..fc3f64990d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Intersection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Intersection.java
@@ -35,10 +35,10 @@ import org.apache.sis.geometries.internal.shared.DefaultDataPoints;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
index 523465e8d2..b74e8f8c1a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
@@ -18,10 +18,10 @@ package org.apache.sis.geometries.operation;
import java.util.ArrayList;
import java.util.List;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
index 481c0f225a..8279f9f03a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
@@ -25,11 +25,11 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.referencing.CRS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ToPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ToPrimitive.java
index 1698f9dcb2..ae21088fbe 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ToPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/ToPrimitive.java
@@ -27,8 +27,8 @@ import org.apache.sis.geometries.MultiLineString;
import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Transform.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Transform.java
index b8b76b6af8..64e46921a0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Transform.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Transform.java
@@ -26,11 +26,11 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/Edge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/Edge.java
index b140dc7cea..7bed2e0b97 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/Edge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/Edge.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.geometries.operation.simplify.greedyinsert;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
index c5db4f01f3..5ba5f4fe77 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
@@ -32,10 +32,10 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
index 9593102321..e249a8a3ed 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
@@ -18,9 +18,9 @@ package org.apache.sis.geometries.operation.simplify.greedyinsert;
import java.util.function.BiFunction;
import org.apache.sis.geometries.Triangle;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
index cba0e3d6a5..cde8a6ca0a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
@@ -26,8 +26,8 @@ import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
index 8a97cf1701..f6bfe0d4b8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
@@ -32,7 +32,7 @@ import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import static org.apache.sis.geometries.operation.spatialanalysis2d.ISOLine.interpolateToArray;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
index ddc33a15b2..0a61b6bd0d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
@@ -25,12 +25,12 @@ import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector3D;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector3D;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
index 6934174af7..e37cc46cd9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
@@ -24,12 +24,12 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.Array;
-import static org.apache.sis.geometries.math.Vectors.*;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Array;
+import static org.apache.sis.maths.Vectors.*;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.util.ArraysExt;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
index 2cdc790c5f..1d4b1df675 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
@@ -27,12 +27,12 @@ import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.index.KdTree;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Array;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
index e9b54e95c5..4cf6696409 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
@@ -24,8 +24,8 @@ import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
index 77fad3f9ea..3c15a74cc0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
@@ -28,7 +28,7 @@ import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.operation.OperationException;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.referencing.internal.shared.ShapeUtilities;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/AbstractPolyhedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/AbstractPolyhedron.java
index ab9c280b51..59a4ac7509 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/AbstractPolyhedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/AbstractPolyhedron.java
@@ -26,10 +26,10 @@ import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.Polyhedron;
import org.apache.sis.geometries.Sphere;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.ReadOnly;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.ReadOnly;
+import org.apache.sis.maths.Vector3D;
import org.apache.sis.geometries.spherical.SphericalConvexPolygon;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Dodecahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Dodecahedron.java
index d52098382e..e66ab9c530 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Dodecahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Dodecahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Hexahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Hexahedron.java
index 016bec722c..1aa79d8af0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Hexahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Hexahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Icosahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Icosahedron.java
index db157477cf..8e95911023 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Icosahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Icosahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Octahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Octahedron.java
index 98e2eb394c..9ab1181a74 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Octahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Octahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/RhombicTriacontahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/RhombicTriacontahedron.java
index 56c4112f22..3425a17fe1 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/RhombicTriacontahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/RhombicTriacontahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Tetrahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Tetrahedron.java
index a8d5496aea..fd782c7b03 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Tetrahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/Tetrahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/TruncatedIcosahedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/TruncatedIcosahedron.java
index 23ec3c86ba..f6fa4b2aab 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/TruncatedIcosahedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polyhedron/TruncatedIcosahedron.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.polyhedron;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ArrayFactoryJava;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ArrayFactoryJava;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
index 50d1def263..d2fe25432e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries.polynomials;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Range;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/GreatCircleArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/GreatCircleArc.java
index d23ab74100..b6b61493a2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/GreatCircleArc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/GreatCircleArc.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries.spherical;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalConvexPolygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalConvexPolygon.java
index 68bdc71ee7..59327c55b3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalConvexPolygon.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalConvexPolygon.java
@@ -17,9 +17,9 @@
package org.apache.sis.geometries.spherical;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.ReadOnly;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.ReadOnly;
+import org.apache.sis.maths.Vector3D;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalTriangle.java
index b78ef921c6..2d9fce0b98 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalTriangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spherical/SphericalTriangle.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries.spherical;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.Maths;
-import org.apache.sis.geometries.math.ReadOnly;
+import org.apache.sis.maths.Maths;
+import org.apache.sis.maths.ReadOnly;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
index bb9f362d60..829abe9227 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
-import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.maths.Vector;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/AbstractGMLWriter.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/AbstractGMLWriter.java
index c0a29bc777..b815e25974 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/AbstractGMLWriter.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/AbstractGMLWriter.java
@@ -31,7 +31,7 @@ import org.apache.sis.geometries.MultiSurface;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.Surface;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Reader.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Reader.java
index f2cec5ab79..bee63993f8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Reader.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Reader.java
@@ -44,8 +44,8 @@ import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.curve.ArcByBulge;
import org.apache.sis.geometries.curve.ArcByCenterPoint;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.measure.Units;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
index 06a440d4ec..09f7e70c9e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
@@ -46,7 +46,7 @@ import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.curve.ArcByBulge;
import org.apache.sis.geometries.curve.ArcByCenterPoint;
import org.apache.sis.geometries.curve.CircularString;
-import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.maths.Tuple;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
import org.apache.sis.geometries.DataPoints;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/PositionListBuilder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/PositionListBuilder.java
index 89f5207269..0c20a59bbb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/PositionListBuilder.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/PositionListBuilder.java
@@ -18,9 +18,9 @@ package org.apache.sis.gml;
import java.util.Arrays;
import org.apache.sis.geometries.GeometryFactory;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
@@ -37,7 +37,7 @@ import org.apache.sis.geometries.DataPoints;
* ordinates, which is the layout that {@link NDArrays#of(SampleSystem, double...)} expects. The
* tuple width is <em>not</em> known in advance: it is fixed by the first tuple appended and then
* enforced for every subsequent one, because an Apache SIS
- * {@link org.apache.sis.geometries.math.Array} is strictly rectangular — there is no per-tuple
+ * {@link org.apache.sis.maths.Array} is strictly rectangular — there is no per-tuple
* width, and no convention by which a missing ordinate could be marked absent. A GML coordinate
* list mixing 2-D and 3-D tuples is therefore rejected rather than padded: padding with {@code 0}
* would invent coordinates, and padding with {@link Double#NaN} would silently poison every
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractAffine.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractAffine.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractAffine.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractAffine.java
index 3fe111de6c..0cd98ebd55 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractAffine.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractAffine.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractArray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractArray.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractArray.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractArray.java
index 88deb437b0..3bf1f8baaa 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractArray.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractArray.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractCursor.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractCursor.java
index 38212f482d..a705817bea 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractCursor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractMatrix.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractMatrix.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractMatrix.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractMatrix.java
index b3082ff6b3..43d4f0db1e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractMatrix.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractMatrix.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractSimilarity.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractSimilarity.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractSimilarity.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractSimilarity.java
index 2321d685fe..7bd34532c2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractSimilarity.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractSimilarity.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractTuple.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractTuple.java
index 79de6d45b9..cbec99a436 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AbstractTuple.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine.java
index e7e9ec2cdb..2be5801505 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine1D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine1D.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine1D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine1D.java
index 5f60e5c3ce..a85a40a6b7 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine1D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine1D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine2D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine2D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine2D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine2D.java
index a6f6297535..9c21c9446c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine2D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine2D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine3D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine3D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine3D.java
index 83b63d322d..39c414b8ea 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine3D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine4D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine4D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine4D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine4D.java
index 509226f8d7..7dbe8f8005 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affine4D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affine4D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AffineND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AffineND.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AffineND.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AffineND.java
index 921b9a469b..e1725f4c9e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AffineND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/AffineND.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affines.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affines.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affines.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affines.java
index 771447ae6c..3aba66a41f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Affines.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Affines.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Array.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Array.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Array.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Array.java
index 75a77dd290..add97bd378 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Array.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Array.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayConcatenated.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayConcatenated.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayConcatenated.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayConcatenated.java
index 24e4e20957..d6dd530451 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayConcatenated.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayConcatenated.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactory.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactory.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactory.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactory.java
index d1e54ae5f0..cee1b99a82 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactory.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.lang.foreign.SegmentAllocator;
import java.util.Collection;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryFFM.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryFFM.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryFFM.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryFFM.java
index a29e54c160..4943d0a1b9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryFFM.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryFFM.java
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.lang.foreign.MemorySegment;
import java.lang.foreign.SegmentAllocator;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import static org.apache.sis.geometries.math.DataType.BYTE;
-import static org.apache.sis.geometries.math.DataType.DOUBLE;
-import static org.apache.sis.geometries.math.DataType.FLOAT;
-import static org.apache.sis.geometries.math.DataType.INT;
-import static org.apache.sis.geometries.math.DataType.LONG;
-import static org.apache.sis.geometries.math.DataType.SHORT;
-import static org.apache.sis.geometries.math.DataType.UBYTE;
-import static org.apache.sis.geometries.math.DataType.UINT;
-import static org.apache.sis.geometries.math.DataType.USHORT;
+import static org.apache.sis.maths.DataType.BYTE;
+import static org.apache.sis.maths.DataType.DOUBLE;
+import static org.apache.sis.maths.DataType.FLOAT;
+import static org.apache.sis.maths.DataType.INT;
+import static org.apache.sis.maths.DataType.LONG;
+import static org.apache.sis.maths.DataType.SHORT;
+import static org.apache.sis.maths.DataType.UBYTE;
+import static org.apache.sis.maths.DataType.UINT;
+import static org.apache.sis.maths.DataType.USHORT;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryHAT.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryHAT.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryHAT.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryHAT.java
index 7c948a7e21..782ade3ff7 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryHAT.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryHAT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryJava.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryJava.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryJava.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryJava.java
index 812a2a683f..949a25a989 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayFactoryJava.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayFactoryJava.java
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
import java.util.List;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import static org.apache.sis.geometries.math.DataType.BYTE;
-import static org.apache.sis.geometries.math.DataType.DOUBLE;
-import static org.apache.sis.geometries.math.DataType.FLOAT;
-import static org.apache.sis.geometries.math.DataType.INT;
-import static org.apache.sis.geometries.math.DataType.LONG;
-import static org.apache.sis.geometries.math.DataType.SHORT;
-import static org.apache.sis.geometries.math.DataType.UBYTE;
-import static org.apache.sis.geometries.math.DataType.UINT;
-import static org.apache.sis.geometries.math.DataType.USHORT;
+import static org.apache.sis.maths.DataType.BYTE;
+import static org.apache.sis.maths.DataType.DOUBLE;
+import static org.apache.sis.maths.DataType.FLOAT;
+import static org.apache.sis.maths.DataType.INT;
+import static org.apache.sis.maths.DataType.LONG;
+import static org.apache.sis.maths.DataType.SHORT;
+import static org.apache.sis.maths.DataType.UBYTE;
+import static org.apache.sis.maths.DataType.UINT;
+import static org.apache.sis.maths.DataType.USHORT;
import org.apache.sis.util.ArgumentChecks;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArraySpliterator.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArraySpliterator.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArraySpliterator.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArraySpliterator.java
index e1a1aa3407..ccc79674a5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArraySpliterator.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArraySpliterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Spliterator;
import java.util.function.Consumer;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayUnmodifiable.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayUnmodifiable.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayUnmodifiable.java
index de6e8c5186..5983552c0a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ArrayUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ArrayUnmodifiable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Cursor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Cursor.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Cursor.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Cursor.java
index 81c24a1b32..e910c6d66a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Cursor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Cursor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/CursorUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/CursorUnmodifiable.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/CursorUnmodifiable.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/CursorUnmodifiable.java
index f4df8278e3..57420ccbb8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/CursorUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/CursorUnmodifiable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.apache.sis.util.ArgumentChecks;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/DataType.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/DataType.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/DataType.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/DataType.java
index ae3ebd0269..4fe373a198 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/DataType.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/DataType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.awt.image.RasterFormatException;
import static org.apache.sis.util.internal.shared.Numerics.MAX_INTEGER_CONVERTIBLE_TO_FLOAT;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/EasingMethod.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/EasingMethod.java
index 37b6c65027..0ed92a329b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/EasingMethod.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/EasingMethod.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.function.DoubleUnaryOperator;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Maths.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Maths.java
index 7ce5508c19..a52bab0d28 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Maths.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
-import static org.apache.sis.geometries.math.Vectors.*;
+import static org.apache.sis.maths.Vectors.*;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometries.operation.ShewchukPredicates;
import org.apache.sis.referencing.operation.matrix.Matrix4;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrices.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrices.java
index 0cde178a07..afe95f9bf0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrices.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrices.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix.java
index fb2ee70892..7ab8ea138d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix2D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix2D.java
index 45bb64e11a..d0454325ef 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix2D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix3D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix3D.java
index 4a748b210a..96aa3db985 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix3D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix4D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix4D.java
index 20c7155543..9d5ae31c3a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Matrix4D.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
-import static org.apache.sis.geometries.math.Matrix.ROW_ORDER;
+import static org.apache.sis.maths.Matrix.ROW_ORDER;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/MatrixND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/MatrixND.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/MatrixND.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/MatrixND.java
index a76b423d3b..47342c0cd0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/MatrixND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/MatrixND.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArray.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArray.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArray.java
index 665c3ff51f..37e8ef620f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArray.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArray.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.stream.Stream;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArrays.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArrays.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArrays.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArrays.java
index e0c488f628..da108e0303 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/NDArrays.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/NDArrays.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.AbstractList;
import java.util.ArrayList;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternion.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternion.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternion.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternion.java
index e1a6378e97..1e8c88398b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternion.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternion.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
-import static org.apache.sis.geometries.math.Matrix.ROW_ORDER;
+import static org.apache.sis.maths.Matrix.ROW_ORDER;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternions.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternions.java
index 21420ae1a9..8370c79134 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Quaternions.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Quaternions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ReadOnly.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ReadOnly.java
similarity index 90%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ReadOnly.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ReadOnly.java
index 35fcfe87a7..046720ad97 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/ReadOnly.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/ReadOnly.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CRS;
@@ -185,8 +185,8 @@ public final class ReadOnly {
*
* @return tuple copy.
*/
- default org.apache.sis.geometries.math.Tuple<?> copy() {
- org.apache.sis.geometries.math.Vector<?> tuple = Vectors.create(getSampleSystem(), getDataType());
+ default org.apache.sis.maths.Tuple<?> copy() {
+ org.apache.sis.maths.Vector<?> tuple = Vectors.create(getSampleSystem(), getDataType());
tuple.set(this);
return tuple;
}
@@ -286,12 +286,12 @@ public final class ReadOnly {
* @param other
* @return cross product result
*/
- default org.apache.sis.geometries.math.Vector<?> cross(ReadOnly.Tuple<?> other) {
+ default org.apache.sis.maths.Vector<?> cross(ReadOnly.Tuple<?> other) {
double[] v1 = toArrayDouble();
double[] v2 = other.toArrayDouble();
double[] buffer = new double[v1.length];
Vectors.cross(v1, v2, buffer);
- org.apache.sis.geometries.math.Vector<?> res = Vectors.createDouble(buffer.length);
+ org.apache.sis.maths.Vector<?> res = Vectors.createDouble(buffer.length);
res.set(buffer);
return res;
}
@@ -317,9 +317,9 @@ public final class ReadOnly {
* @param d last dimension value
* @return Vector
*/
- default org.apache.sis.geometries.math.Vector<?> extend(double d) {
+ default org.apache.sis.maths.Vector<?> extend(double d) {
final int dim = getDimension();
- final org.apache.sis.geometries.math.Vector<?> v = Vectors.create(dim+1, getDataType());
+ final org.apache.sis.maths.Vector<?> v = Vectors.create(dim+1, getDataType());
for (int i = 0; i < dim; i++) {
v.set(i, get(i));
}
@@ -334,8 +334,8 @@ public final class ReadOnly {
* @param size number of dimension to preserve
* @return Vector
*/
- default org.apache.sis.geometries.math.Vector<?> shrink(int size) {
- final org.apache.sis.geometries.math.Vector<?> v = Vectors.create(size, getDataType());
+ default org.apache.sis.maths.Vector<?> shrink(int size) {
+ final org.apache.sis.maths.Vector<?> v = Vectors.create(size, getDataType());
for (int i = 0; i < size; i++) {
v.set(i, get(i));
}
@@ -343,7 +343,7 @@ public final class ReadOnly {
}
@Override
- org.apache.sis.geometries.math.Vector<?> copy();
+ org.apache.sis.maths.Vector<?> copy();
}
@@ -383,14 +383,14 @@ public final class ReadOnly {
*
* @return matrix
*/
- org.apache.sis.geometries.math.Matrix<?> toMatrix();
+ org.apache.sis.maths.Matrix<?> toMatrix();
/**
* Create a copy of this Affine.
*
* @return copy
*/
- org.apache.sis.geometries.math.Affine<?> copy();
+ org.apache.sis.maths.Affine<?> copy();
}
@@ -425,7 +425,7 @@ public final class ReadOnly {
* @return A(i0:i1,j0:j1)
* @exception ArrayIndexOutOfBoundsException Submatrix indices
*/
- org.apache.sis.geometries.math.Matrix<?> getRange(int i0, int i1, int j0, int j1);
+ org.apache.sis.maths.Matrix<?> getRange(int i0, int i1, int j0, int j1);
/**
* Get a submatrix.
@@ -435,7 +435,7 @@ public final class ReadOnly {
* @return A(r(:),c(:))
* @exception ArrayIndexOutOfBoundsException Submatrix indices
*/
- org.apache.sis.geometries.math.Matrix<?> getRange(int[] r, int[] c);
+ org.apache.sis.maths.Matrix<?> getRange(int[] r, int[] c);
/**
* Get a submatrix.
@@ -446,7 +446,7 @@ public final class ReadOnly {
* @return A(i0:i1,c(:))
* @exception ArrayIndexOutOfBoundsException Submatrix indices
*/
- org.apache.sis.geometries.math.Matrix<?> getRange(int i0, int i1, int[] c);
+ org.apache.sis.maths.Matrix<?> getRange(int i0, int i1, int[] c);
/**
* Get a submatrix.
@@ -457,7 +457,7 @@ public final class ReadOnly {
* @return A(r(:),j0:j1)
* @exception ArrayIndexOutOfBoundsException Submatrix indices
*/
- org.apache.sis.geometries.math.Matrix<?> getRange(int[] r, int j0, int j1);
+ org.apache.sis.maths.Matrix<?> getRange(int[] r, int j0, int j1);
/**
* Matrix as 2D double array.
@@ -491,7 +491,7 @@ public final class ReadOnly {
*/
float[] toArrayFloat(boolean rowOrder);
- org.apache.sis.geometries.math.Matrix<?> copy();
+ org.apache.sis.maths.Matrix<?> copy();
/**
* Test if all cells in the matrix equals given value.
@@ -564,7 +564,7 @@ public final class ReadOnly {
* @param dest tuple, can be null.
* @return destination tuple.
*/
- org.apache.sis.geometries.math.Tuple<?> inverseTransform(ReadOnly.Tuple<?> source, org.apache.sis.geometries.math.Tuple<?> dest);
+ org.apache.sis.maths.Tuple<?> inverseTransform(ReadOnly.Tuple<?> source, org.apache.sis.maths.Tuple<?> dest);
/**
* Create a square matrix of size dimensions+1
@@ -572,21 +572,21 @@ public final class ReadOnly {
*
* @return matrix
*/
- org.apache.sis.geometries.math.Matrix<?> toMatrix();
+ org.apache.sis.maths.Matrix<?> toMatrix();
/**
* Create and affine transform.
*
* @return
*/
- org.apache.sis.geometries.math.Affine<?> toAffine();
+ org.apache.sis.maths.Affine<?> toAffine();
/**
* Create a copy of this Similarity.
*
* @return copy
*/
- org.apache.sis.geometries.math.Similarity<?> copy();
+ org.apache.sis.maths.Similarity<?> copy();
}
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SampleSystem.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SampleSystem.java
index fb89447d00..7c7ed0f87d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SampleSystem.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Arrays;
import java.util.List;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity.java
index b895c00810..6f4b7b1604 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity3D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity3D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity3D.java
index 70dfe57dbd..c60636b976 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Similarity3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Similarity3D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Objects;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimilarityND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimilarityND.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimilarityND.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimilarityND.java
index f9fb7afbe1..f83c82bb4d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimilarityND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimilarityND.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimplifiedTransform.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimplifiedTransform.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimplifiedTransform.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimplifiedTransform.java
index 99ce425c4e..ecbb453390 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SimplifiedTransform.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/SimplifiedTransform.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform.java
index 5ba1f3f39b..7350520324 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
-import static org.apache.sis.geometries.math.DataType.FLOAT;
+import static org.apache.sis.maths.DataType.FLOAT;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform1D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform1D.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform1D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform1D.java
index 624d3f0ce4..7e8392b6cf 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Transform1D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Transform1D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Tuple.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Tuple.java
index 6a9fd86562..71e76db1eb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Tuple.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.operation.MathTransform;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/TupleUnmodifiable.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/TupleUnmodifiable.java
index 5e7a3ba48b..3ecb8b8aa6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/TupleUnmodifiable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector.java
index af94998c85..db9b41f278 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
index 5b3d208842..e1f15e801d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector2D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector2D.java
index 6c7f1307a6..b8b5eeee6e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector2D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector3D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector3D.java
index 4e15b1f316..1f966c951b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector3D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector4D.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector4D.java
index 2a4ce05a28..97ee12a1a3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector4D.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorND.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorND.java
index 96438df6c5..1aeb659a87 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorND.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vectors.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vectors.java
index 673ba354c9..7edfdb8dfd 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vectors.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.geometry.DirectPosition;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/package-info.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/package-info.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/package-info.java
rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/package-info.java
index 1ad8ccbf24..16be9d22d9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/package-info.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/package-info.java
@@ -19,4 +19,4 @@
* Code from this package is inspired (and sometimes copied) from the public domain Unlicense-Lib project math package.
* With authors :Johann Sorel and Bertrand COTE
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/AnimationSampler.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/AnimationSampler.java
index 2fa5b8fd16..b347aa1fd1 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/AnimationSampler.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/AnimationSampler.java
@@ -17,7 +17,7 @@
package org.apache.sis.scene;
import java.util.Objects;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Array;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/MorphTarget.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/MorphTarget.java
index f4d742cac2..eee3a5dd66 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/MorphTarget.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/MorphTarget.java
@@ -20,9 +20,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Objects;
import org.apache.sis.geometries.AttributesType;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.SampleSystem;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneNode.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneNode.java
index 4dc67a51e5..7c9199b5e3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneNode.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneNode.java
@@ -30,8 +30,8 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.scene.light.Light;
import org.apache.sis.geometries.Geometries;
-import org.apache.sis.geometries.math.Similarity;
-import org.apache.sis.geometries.math.Similarity3D;
+import org.apache.sis.maths.Similarity;
+import org.apache.sis.maths.Similarity3D;
import org.apache.sis.scene.physics.Collider;
import org.apache.sis.scene.physics.Joint;
import org.apache.sis.scene.physics.Motion;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneUtilities.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneUtilities.java
index fbb9268ea6..415e0c37cb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneUtilities.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/SceneUtilities.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.scene;
-import org.apache.sis.geometries.math.Matrix;
-import org.apache.sis.geometries.math.Similarity3D;
+import org.apache.sis.maths.Matrix;
+import org.apache.sis.maths.Similarity3D;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/Skin.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/Skin.java
index def257bcc6..ea5bdf9e41 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/Skin.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/Skin.java
@@ -18,7 +18,7 @@ package org.apache.sis.scene;
import java.util.List;
import java.util.Objects;
-import org.apache.sis.geometries.math.Matrix4D;
+import org.apache.sis.maths.Matrix4D;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/physics/Motion.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/physics/Motion.java
index b28dacc82a..5e317cab86 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/physics/Motion.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/scene/physics/Motion.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.scene.physics;
-import org.apache.sis.geometries.math.Quaternion;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.Quaternion;
+import org.apache.sis.maths.Vector3D;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
index a17f1d91bf..23260f1d03 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.NDArrays;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
index d9bc139cc6..5a60b4dba0 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries;
import org.apache.sis.geometries.curve.LinearRing;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeAdapterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeAdapterTest.java
index 90c5dc1a1d..acfd4cf750 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeAdapterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeAdapterTest.java
@@ -24,8 +24,8 @@ import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.geometry.wrapper.j2d.DecimatedShape;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
index 11ae8e65de..b1280bc438 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
@@ -37,8 +37,8 @@ import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.MultiPolygon;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector2D;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector2D;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
index 516dac2c99..5c3b924de7 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
@@ -21,11 +21,11 @@ import java.util.Map;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.Vector3D;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Vector3D;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
index bf73abe666..121fc7ce39 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
@@ -21,8 +21,8 @@ import java.util.Arrays;
import java.util.List;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveIndexes;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
index aab87fa870..b1321da879 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.geometries.mesh;
import java.util.Arrays;
import java.util.List;
import org.apache.sis.geometries.Geometries;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.NDArrays;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
index f69ae03c55..e0dabd6f66 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
@@ -27,9 +27,9 @@ import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector3D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/DistanceTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/DistanceTest.java
index bbc849bda6..a077bcff77 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/DistanceTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/DistanceTest.java
@@ -18,7 +18,7 @@ package org.apache.sis.geometries.operation;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CommonCRS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/IntersectionTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/IntersectionTest.java
index 8e81449479..cc1502f1a3 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/IntersectionTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/IntersectionTest.java
@@ -17,9 +17,9 @@
package org.apache.sis.geometries.operation;
import org.apache.sis.geometries.Geometry;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.referencing.CommonCRS;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ShewchukPredicatesTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ShewchukPredicatesTest.java
index 33572fa95d..eecc0d90c9 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ShewchukPredicatesTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ShewchukPredicatesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.sis.geometries.operation;
-import org.apache.sis.geometries.math.Maths;
+import org.apache.sis.maths.Maths;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
index 3630bf791a..a7a121267d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
@@ -17,10 +17,10 @@
package org.apache.sis.geometries.operation;
import java.util.List;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Array;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
index af04670c15..f8558d72d5 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
@@ -20,8 +20,8 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.NDArrays;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ToPrimitiveTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ToPrimitiveTest.java
index 054b42a510..2a8f242ee5 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ToPrimitiveTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/ToPrimitiveTest.java
@@ -28,8 +28,8 @@ import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/TransformTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/TransformTest.java
index 991f6fbaeb..982cf4c47c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/TransformTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/TransformTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.NDArrays;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
index edd281cfbd..f380685673 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
@@ -26,8 +26,8 @@ import org.locationtech.jts.geom.Polygon;
import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.NDArrays;
import static org.apache.sis.geometries.operation.spatialanalysis2d.ISOLine.interpolateToCoord2D;
import org.apache.sis.measure.NumberRange;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/DelaunayTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/DelaunayTest.java
index 9119dbb54d..57a045d658 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/DelaunayTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/DelaunayTest.java
@@ -19,8 +19,8 @@ package org.apache.sis.geometries.operation.triangulate.delaunay;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveComparator;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
index d3ad9d46f1..af080cf24a 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
@@ -20,8 +20,8 @@ import java.util.Iterator;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Array;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/GreatCircleArcTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/GreatCircleArcTest.java
index 83396fbcbf..d42d5398ab 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/GreatCircleArcTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/GreatCircleArcTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries.spherical;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.ReadOnly;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.ReadOnly;
+import org.apache.sis.maths.Vector3D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalConvexPolygonTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalConvexPolygonTest.java
index 4aca3ef1f1..08225aeb88 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalConvexPolygonTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalConvexPolygonTest.java
@@ -18,10 +18,10 @@ package org.apache.sis.geometries.spherical;
import java.util.List;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector3D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalTriangleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalTriangleTest.java
index ee598cbb8a..8f21efc756 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalTriangleTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/spherical/SphericalTriangleTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries.spherical;
import org.apache.sis.geometries.Sphere;
-import org.apache.sis.geometries.math.ReadOnly;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.ReadOnly;
+import org.apache.sis.maths.Vector3D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2ReaderTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2ReaderTest.java
index e348fbd611..6b3bd4c805 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2ReaderTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2ReaderTest.java
@@ -32,8 +32,8 @@ import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.MultiPolygon;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2WriterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2WriterTest.java
index 6e736ad0b5..85da0277bf 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2WriterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML2WriterTest.java
@@ -26,8 +26,8 @@ import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3ReaderTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3ReaderTest.java
index 1b3772cad4..6da6a6023c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3ReaderTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3ReaderTest.java
@@ -45,8 +45,8 @@ import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.curve.ArcByBulge;
import org.apache.sis.geometries.curve.ArcByCenterPoint;
import org.apache.sis.geometries.curve.CircularString;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.CRS;
import org.apache.sis.storage.DataStoreContentException;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3WriterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3WriterTest.java
index 903701a1c5..616865c35b 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3WriterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GML3WriterTest.java
@@ -29,10 +29,10 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.curve.ArcByCenterPoint;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Vector;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.referencing.CRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GMLWriterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GMLWriterTest.java
index 857ca92d1b..7f2dab5652 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GMLWriterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GMLWriterTest.java
@@ -21,8 +21,8 @@ import java.nio.charset.StandardCharsets;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CRS;
// Test dependencies
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/JAXBGeometryAdapterTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/JAXBGeometryAdapterTest.java
index d7d80f1ccc..579a996d9d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/JAXBGeometryAdapterTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/JAXBGeometryAdapterTest.java
@@ -25,8 +25,8 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CRS;
import jakarta.xml.bind.JAXBContext;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractArrayTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractArrayTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractArrayTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractArrayTest.java
index 6e1a97720b..5fd5d742e7 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractArrayTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractArrayTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.matrix.Matrices;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractTupleTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractTupleTest.java
index 7153f06a55..ecefc98889 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractTupleTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractVectorTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractVectorTest.java
index a917dd3c31..4da8e7e576 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/AbstractVectorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayConcatenatedTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayConcatenatedTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayConcatenatedTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayConcatenatedTest.java
index 06b26fe288..e679ff52b1 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayConcatenatedTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayConcatenatedTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNbTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNbTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNbTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNbTest.java
index 19f683b67e..bce1ff3354 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNbTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNbTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNdTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNdTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNdTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNdTest.java
index 5f55532899..c989ae4b1c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNdTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNdTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNfTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNfTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNfTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNfTest.java
index 01d2f4e3d9..c2fbd10d78 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNfTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNfTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNiTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNiTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNiTest.java
index 8d6fb8c418..1aa88ca212 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNiTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNlTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNlTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNlTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNlTest.java
index 4eff336bbe..607df155e2 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNlTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNsTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNsTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNsTest.java
index cc3eabee37..0e3bd3eda0 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNubTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNubTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNubTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNubTest.java
index 74fcea1190..67b116fd40 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNubTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNubTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNuiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNuiTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNuiTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNuiTest.java
index a23253e2f9..a9eca54f3c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNuiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNuiTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNusTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNusTest.java
similarity index 96%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNusTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNusTest.java
index 5ed96df658..341a491a92 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/ArrayNusTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/ArrayNusTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/EasingMethodTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/EasingMethodTest.java
index dd7b5de970..09ae93f9b6 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/EasingMethodTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/EasingMethodTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/MathsTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/MathsTest.java
index 551cbef9a4..ec2b77efe3 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/MathsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/NDArraysTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/NDArraysTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/NDArraysTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/NDArraysTest.java
index 87b24328ce..4414b7f266 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/NDArraysTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/NDArraysTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import java.util.Collections;
import java.util.HashSet;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/QuaternionTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/QuaternionTest.java
index 1634d74662..d08467d530 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/QuaternionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/Vector3DTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/Vector3DTest.java
similarity index 98%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/Vector3DTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/Vector3DTest.java
index 710858392b..04a0aba2fc 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/Vector3DTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/Vector3DTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXbTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXbTest.java
index afdc96e276..6b239d6a17 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXbTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXdTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXdTest.java
index 076499fb75..095b04bb21 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXdTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXfTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXfTest.java
index 5e32254bab..3d35cd18eb 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXfTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXiTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXiTest.java
index 9787f29bb6..e2b8951918 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXiTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXlTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXlTest.java
index fe88d6bf5b..c0560d7729 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXlTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXsTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXsTest.java
index 9467043c53..25acfd0eae 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXubTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXubTest.java
index b0fe4ac412..fb284aa6e6 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXubTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXuiTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXuiTest.java
index ad2fd8a488..a5b0918dd7 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXuiTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXusTest.java
similarity index 97%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXusTest.java
index 6906c7d97d..8dccaac31d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorXusTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorsTest.java
similarity index 99%
rename from incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java
rename to incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorsTest.java
index 93ae447847..e94d32d8b6 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/maths/VectorsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.geometries.math;
+package org.apache.sis.maths;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.referencing.operation.MathTransform;
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/scene/SceneUtilitiesTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/scene/SceneUtilitiesTest.java
index 672849a0be..e679ea6c42 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/scene/SceneUtilitiesTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/scene/SceneUtilitiesTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.scene;
-import org.apache.sis.geometries.math.Similarity3D;
-import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.maths.Similarity3D;
+import org.apache.sis.maths.Vector3D;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/dggs/s2/S2Zone.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/dggs/s2/S2Zone.java
index 1e42ee27f8..d663bcae11 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/dggs/s2/S2Zone.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/dggs/s2/S2Zone.java
@@ -27,7 +27,7 @@ import com.google.common.geometry.S2Point;
import com.google.common.geometry.S2Polygon;
import org.opengis.geometry.DirectPosition;
import org.opengis.metadata.extent.BoundingPolygon;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.dggs.RefinementLevel;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
index fe1b1ea895..9c25cc7841 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
@@ -59,11 +59,11 @@ import org.apache.sis.coverage.grid.GridOrientation;
import org.apache.sis.feature.Features;
import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.filter.DefaultFilterFactory;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.Vector1D;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Vector1D;
import org.apache.sis.geometry.DirectPosition1D;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridSystems.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridSystems.java
index be952bc384..e892d517d7 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridSystems.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridSystems.java
@@ -39,8 +39,8 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.NDArrays;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/internal/shared/ArrayDiscreteGlobalGridCoverage.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/internal/shared/ArrayDiscreteGlobalGridCoverage.java
index da33d18d84..9c02add0bc 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/internal/shared/ArrayDiscreteGlobalGridCoverage.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/internal/shared/ArrayDiscreteGlobalGridCoverage.java
@@ -21,11 +21,11 @@ import java.util.Arrays;
import java.util.List;
import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.dggs.DiscreteGlobalGridGeometry;
import org.apache.sis.storage.rs.CodeIterator;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/ArrayCodedCoverage.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/ArrayCodedCoverage.java
index 3387c31d44..7ae093dde4 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/ArrayCodedCoverage.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/ArrayCodedCoverage.java
@@ -23,11 +23,11 @@ import java.util.Objects;
import org.opengis.util.FactoryException;
import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Cursor;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.rs.CodeIterator;
import org.apache.sis.storage.rs.CodedGeometry;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/GridAsCodedResource.java b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/GridAsCodedResource.java
index 8874a66862..901aa138df 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/GridAsCodedResource.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/GridAsCodedResource.java
@@ -39,10 +39,10 @@ import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridOrientation;
import org.apache.sis.coverage.grid.GridRoundingMode;
-import org.apache.sis.geometries.math.Array;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.maths.Array;
+import org.apache.sis.maths.DataType;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.SampleSystem;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.dggs.DiscreteGlobalGridReferenceSystem;
import org.apache.sis.referencing.rs.Code;
diff --git a/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java b/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
index f4f184ee68..4981760616 100644
--- a/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
+++ b/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
@@ -34,10 +34,10 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridOrientation;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector2D;
-import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.maths.Tuple;
+import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vectors;
import org.apache.sis.referencing.GeodeticCalculator;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.util.iso.Names;