This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit de34d591393ad65442000b8f2cac3f107dbd8cde Merge: 4fdadd9721 e4457e3a05 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Oct 9 18:59:10 2026 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 NOTICE | 2 +- .../apache/sis/setup/OptionalInstallations.java | 4 +- .../main/org/apache/sis/geometries/Curve.java | 2 + .../apache/sis/geometries/GeometryCollection.java | 5 +- .../org/apache/sis/geometries/GeometryFactory.java | 17 +- .../org/apache/sis/geometries/GeometryType.java | 184 ++++++++++++++------- .../main/org/apache/sis/geometries/Solid.java | 6 +- .../main/org/apache/sis/geometries/curve/Line.java | 161 ++++++++++++++++++ .../internal/shared/DefaultBSplineSolid.java | 4 +- .../internal/shared/DefaultGeometryCollection.java | 15 +- ...ultGeometryCollection.java => DefaultLine.java} | 64 ++----- .../internal/shared/DefaultMultiCurve.java | 3 +- .../internal/shared/DefaultMultiPolyhedron.java | 3 +- .../internal/shared/DefaultMultiSurface.java | 3 +- .../internal/shared/DefaultPolyhedron.java | 5 +- .../internal/shared/DefaultProductCurve.java | 3 +- .../internal/shared/DefaultRawMultiPoint.java | 3 +- .../{DefaultPolyhedron.java => DefaultSolid.java} | 80 +++++---- .../sis/geometries/mesh/MultiMeshPrimitive.java | 7 + .../solid/polyhedron/AbstractPolyhedron.java | 6 +- .../sis/geometries/spherical/GreatCircleArc.java | 2 +- .../spherical/SphericalConvexPolygon.java | 2 +- .../geometries/spherical/SphericalTriangle.java | 2 +- .../sis/geometries/{solid => surface}/Capsule.java | 2 +- .../geometries/{solid => surface}/Cylinder.java | 4 +- .../geometries/{solid => surface}/Ellipsoid.java | 2 +- .../geometries/surface/ParametricCurveSurface.java | 2 - .../sis/geometries/{solid => surface}/Sphere.java | 2 +- .../geometries/spherical/GreatCircleArcTest.java | 2 +- .../spherical/SphericalConvexPolygonTest.java | 2 +- .../spherical/SphericalTriangleTest.java | 2 +- optional/src/org.apache.sis.gui/bundle/README | 10 +- 32 files changed, 426 insertions(+), 185 deletions(-)
