This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit cac15f3608398b9ebb3c1769ea55799c8ef698bd Merge: 87f745fce9 297ea99ae9 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Nov 4 15:04:35 2026 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains a move of `org.apache.sis.web` in endorsed modules as a fix for https://issues.apache.org/jira/browse/SIS-640 .../apache/sis/buildtools/gradle/Dependency.java | 2 +- endorsed/build.gradle.kts | 15 + .../apache/sis/geometry/wrapper/Geometries.java | 5 - .../sis/geometry/wrapper/GeometryFactories.java | 32 +- .../referencing/factory/sql/EPSGFactoryTest.java | 2 +- .../src/org.apache.sis.util/main/module-info.java | 2 +- .../main/org/apache/sis/setup/GeometryLibrary.java | 78 ++--- .../main/org/apache/sis/setup/package-info.java | 2 +- .../main/org/apache/sis/system/Shutdown.java | 3 +- .../main/org/apache/sis/system/SystemListener.java | 2 +- .../jakarta.servlet.ServletContainerInitializer | 1 + .../javax.servlet.ServletContainerInitializer | 1 + .../src/org.apache.sis.web/main/module-info.java | 48 +++ .../apache/sis/web/jakarta}/ServletListener.java | 20 +- .../org/apache/sis/web/jakarta/package-info.java | 14 +- .../apache/sis/web/javaee}/ServletListener.java | 30 +- .../org/apache/sis/web/javaee/package-info.java | 12 +- .../org/apache/sis/web/osgi}/OSGiActivator.java | 2 +- .../org/apache/sis/web/osgi}/package-info.java | 6 +- .../src/org.apache.sis.web}/webapp/WEB-INF/web.xml | 0 incubator/build.gradle.kts | 14 - .../org.apache.sis.geometry/main/module-info.java | 2 + .../main/org/apache/sis/geometries/Geometries.java | 42 ++- .../apache/sis/geometries/GeometryCollection.java | 89 +++++- .../apache/sis/geometries/adapter/JTSAdapter.java | 25 +- .../sis/geometries/adapter/ShapeAdapter.java | 23 +- .../internal/shared/ArrayDataPoints.java | 11 +- .../internal/shared/DefaultGeometryCollection.java | 11 +- .../shared/GeometryCollectionSpliterator.java | 115 ++++++++ .../apache/sis/geometries/mesh/MeshPrimitive.java | 16 + .../geometries/mesh/MeshPrimitiveComparator.java | 9 +- .../sis/geometries/mesh/MeshPrimitiveVisitor.java | 15 +- .../sis/geometries/mesh/MultiMeshPrimitive.java | 96 ------ .../sis/geometries/operation/ComputeAttribute.java | 30 +- .../geometries/operation/GeometryProcessor.java | 44 ++- .../sis/geometries/operation/Intersection.java | 5 +- .../sis/geometries/operation/ToPrimitive.java | 41 +-- .../apache/sis/geometries/operation/Transform.java | 54 +++- .../operation/extrude/TerrainExtruder.java | 13 +- .../main/org/apache/sis/geometries/summary.adoc | 323 ++++++++++++++------- .../SIS.java => geometry/wrapper/sis/Factory.java} | 10 +- .../adapter => geometry/wrapper/sis}/Wrapper.java | 7 +- .../main/org/apache/sis/maths/Vector1D.java | 36 +++ .../main/org/apache/sis/maths/Vector2D.java | 45 +++ .../main/org/apache/sis/maths/Vector3D.java | 54 ++++ .../main/org/apache/sis/maths/Vector4D.java | 63 ++++ .../sis/geometries/GeometryCollectionTest.java | 34 +++ .../sis/geometries/adapter/JTSAdapterTest.java | 68 +++++ .../sis/geometries/adapter/ShapeAdapterTest.java | 32 ++ .../sis/geometries/operation/ToPrimitiveTest.java | 15 +- .../sis/geometries/operation/TransformTest.java | 56 +++- .../operation/extrude/TerrainExtruderTest.java | 8 +- .../sis/geometry/wrapper/sis/FactoryTest.java} | 29 +- .../main/module-info.java | 1 + .../shared => geometry/wrapper}/s2/Factory.java | 5 +- .../shared => geometry/wrapper}/s2/S2.java | 2 +- .../shared => geometry/wrapper}/s2/Wrapper.java | 2 +- .../sis/referencing/dggs/DiscreteGlobalGrid.java | 2 +- .../org/apache/sis/referencing/dggs/s2/S2Zone.java | 2 +- .../storage/dggs/DiscreteGlobalGridGeometry.java | 2 +- .../storage/dggs/DiscreteGlobalGridSystems.java | 4 +- .../org/apache/sis/storage/rs/CodedDerivation.java | 2 +- .../webapp/META-INF/context.xml | 26 -- netbeans-project/ivy.xml | 1 + 64 files changed, 1266 insertions(+), 495 deletions(-)
