This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from 8b22f4d62e Remove the deprecated `OptionKey` class.
new 70c15a524c feat(Geometry): move MultiCurve and MultiSurface methods on
GeometryCollection
new 7063c38d7b feat(Geometry): remove GeometryCollection subtypes, adopt
ISO 19107:2019 elementType instead
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sis/geometries/GeometryCollection.java | 136 +++++++++++++++++++--
.../org/apache/sis/geometries/GeometryFactory.java | 116 ++++++++----------
.../org/apache/sis/geometries/GeometryType.java | 39 +-----
.../org/apache/sis/geometries/GeometryVisitor.java | 40 ------
.../apache/sis/geometries/adapter/JTSAdapter.java | 48 +++-----
.../org/apache/sis/geometries/adapter/SIS.java | 30 ++---
.../sis/geometries/adapter/WellKnownBinary.java | 32 ++---
.../geometries/adapter/WellKnownBinaryParser.java | 31 ++---
.../sis/geometries/adapter/WellKnownText.java | 39 +++---
.../geometries/adapter/WellKnownTextParser.java | 29 ++---
.../org/apache/sis/geometries/adapter/Wrapper.java | 9 +-
.../apache/sis/geometries/curve/MultiCurve.java | 108 ----------------
.../sis/geometries/curve/MultiLineString.java | 52 --------
.../apache/sis/geometries/curve/ProductCurve.java | 17 ++-
.../internal/shared/DefaultGeometryCollection.java | 5 +-
.../internal/shared/DefaultMultiCurve.java | 39 ------
.../internal/shared/DefaultMultiLineString.java | 38 ------
.../internal/shared/DefaultMultiPoint.java | 11 +-
.../internal/shared/DefaultMultiPolygon.java | 38 ------
.../internal/shared/DefaultMultiPolyhedron.java | 41 -------
.../internal/shared/DefaultMultiSurface.java | 50 --------
.../internal/shared/DefaultPolyhedron.java | 16 +--
.../internal/shared/DefaultProductCurve.java | 10 ++
.../internal/shared/DefaultRawMultiPoint.java | 39 ------
.../apache/sis/geometries/mesh/MeshPrimitive.java | 21 +++-
.../sis/geometries/mesh/MultiMeshPrimitive.java | 5 +-
.../geometries/operation/GeometryProcessor.java | 24 ++--
.../sis/geometries/operation/Intersection.java | 4 +-
.../sis/geometries/operation/ToPrimitive.java | 6 +-
.../apache/sis/geometries/point/MultiPoint.java | 119 ------------------
.../sis/geometries/solid/MultiPolyhedron.java | 43 -------
.../apache/sis/geometries/solid/Polyhedron.java | 11 +-
.../solid/polyhedron/AbstractPolyhedron.java | 12 +-
.../sis/geometries/surface/MultiPolygon.java | 60 ---------
.../sis/geometries/surface/MultiSurface.java | 111 -----------------
.../sis/geometries/surface/PolyhedralSurface.java | 3 +-
.../main/org/apache/sis/gml/AbstractGMLWriter.java | 27 ++--
.../main/org/apache/sis/gml/GML2Reader.java | 12 +-
.../main/org/apache/sis/gml/GML2Writer.java | 9 +-
.../main/org/apache/sis/gml/GML3Reader.java | 18 ++-
.../main/org/apache/sis/gml/GML3Writer.java | 22 ++--
.../sis/geometries/adapter/ShapeConverterTest.java | 3 +-
.../geometries/adapter/WellKnownBinaryTest.java | 88 +++++++------
.../sis/geometries/adapter/WellKnownTextTest.java | 86 +++++++------
.../sis/geometries/curve/LineStringTest.java | 4 +-
.../sis/geometries/curve/MultiCurveTest.java | 50 --------
.../sis/geometries/curve/MultiLineStringTest.java | 5 +-
.../internal/shared/DefaultMultiCurveTest.java | 29 -----
.../shared/DefaultMultiLineStringTest.java | 7 +-
.../internal/shared/DefaultMultiPointTest.java | 5 +-
.../internal/shared/DefaultMultiPolygonTest.java | 7 +-
.../shared/DefaultMultiPolyhedronTest.java | 29 -----
.../internal/shared/DefaultMultiSurfaceTest.java | 29 -----
.../internal/shared/DefaultRawMultiPointTest.java | 46 -------
.../sis/geometries/operation/AbstractD9IMTest.java | 23 ++--
.../geometries/operation/SymDifferenceTest.java | 9 +-
.../sis/geometries/operation/ToPrimitiveTest.java | 9 +-
.../apache/sis/geometries/operation/UnionTest.java | 9 +-
.../sis/geometries/point/MultiPointTest.java | 3 +-
.../sis/geometries/solid/MultiPolyhedronTest.java | 35 ------
.../sis/geometries/surface/MultiPolygonTest.java | 5 +-
.../sis/geometries/surface/MultiSurfaceTest.java | 55 ---------
.../test/org/apache/sis/gml/GML2ReaderTest.java | 13 +-
.../test/org/apache/sis/gml/GML3ReaderTest.java | 22 ++--
.../test/org/apache/sis/gml/GMLReaderTest.java | 4 +-
65 files changed, 551 insertions(+), 1544 deletions(-)
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/MultiCurve.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/MultiLineString.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiCurve.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiLineString.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiPolygon.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiPolyhedron.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiSurface.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultRawMultiPoint.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/point/MultiPoint.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/MultiPolyhedron.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/MultiPolygon.java
delete mode 100644
incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/MultiSurface.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/MultiCurveTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/DefaultMultiCurveTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/DefaultMultiPolyhedronTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/DefaultMultiSurfaceTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/DefaultRawMultiPointTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/solid/MultiPolyhedronTest.java
delete mode 100644
incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/MultiSurfaceTest.java
