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 132cb96402eef8559b95ea84e75def2c4529aca6 Author: jsorel <[email protected]> AuthorDate: Mon Sep 7 09:17:31 2026 +0200 refactor(Geometry): regroup curve interfaces in a single package --- incubator/src/org.apache.sis.geometry/main/module-info.java | 1 + .../main/org/apache/sis/geometries/Curve.java | 1 + .../main/org/apache/sis/geometries/GeometryFactory.java | 8 +++++--- .../main/org/apache/sis/geometries/GeometryVisitor.java | 3 +++ .../main/org/apache/sis/geometries/MultiLineString.java | 1 + .../main/org/apache/sis/geometries/Polygon.java | 1 + .../main/org/apache/sis/geometries/Triangle.java | 1 + .../main/org/apache/sis/geometries/Wrapper.java | 2 ++ .../main/org/apache/sis/geometries/adapter/JTSAdapter.java | 2 ++ .../org/apache/sis/geometries/adapter/PathIteratorAdapter.java | 2 +- .../main/org/apache/sis/geometries/adapter/ShapeAdapter.java | 2 +- .../main/org/apache/sis/geometries/adapter/ShapeConverter.java | 2 +- .../main/org/apache/sis/geometries/{conics => curve}/Arc.java | 2 +- .../org/apache/sis/geometries/{conics => curve}/Circle.java | 2 +- .../sis/geometries/{conics => curve}/CircularString.java | 2 +- .../org/apache/sis/geometries/{spirals => curve}/Clothoid.java | 2 +- .../org/apache/sis/geometries/{conics => curve}/Conic.java | 2 +- .../org/apache/sis/geometries/{conics => curve}/ConicArc.java | 2 +- .../org/apache/sis/geometries/{conics => curve}/Ellipse.java | 2 +- .../apache/sis/geometries/{conics => curve}/EllipticArc.java | 2 +- .../main/org/apache/sis/geometries/{ => curve}/LineString.java | 7 ++++++- .../main/org/apache/sis/geometries/{ => curve}/LinearRing.java | 3 ++- .../org/apache/sis/geometries/{ => curve}/OffsetCurve.java | 4 +++- .../main/org/apache/sis/geometries/{ => curve}/Rhumb.java | 5 ++++- .../org/apache/sis/geometries/{spirals => curve}/Spiral.java | 2 +- .../{conics/ConicArc.java => curve/package-info.java} | 10 ++++------ .../sis/geometries/internal/shared/DefaultCircularString.java | 2 +- .../sis/geometries/internal/shared/DefaultLineString.java | 2 +- .../sis/geometries/internal/shared/DefaultLinearRing.java | 2 +- .../sis/geometries/internal/shared/DefaultMultiLineString.java | 2 +- .../apache/sis/geometries/internal/shared/DefaultPolygon.java | 2 +- .../apache/sis/geometries/internal/shared/DefaultTriangle.java | 2 +- .../main/org/apache/sis/geometries/mesh/MeshPrimitive.java | 2 +- .../apache/sis/geometries/mesh/MeshPrimitiveComparator.java | 2 +- .../org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java | 2 +- .../main/org/apache/sis/geometries/operation/Contains.java | 2 +- .../org/apache/sis/geometries/operation/GeometryProcessor.java | 4 ++-- .../main/org/apache/sis/geometries/operation/Intersection.java | 2 +- .../main/org/apache/sis/geometries/operation/To3D.java | 2 +- .../main/org/apache/sis/geometries/operation/ToPrimitive.java | 4 ++-- .../main/org/apache/sis/geometries/operation/Transform.java | 4 ++-- .../geometries/operation/simplify/greedyinsert/TINBuilder.java | 2 +- .../geometries/operation/simplify/greedyinsert/WTriangle.java | 2 +- .../sis/geometries/operation/triangulate/EarClipping.java | 2 +- .../operation/triangulate/delaunay/OrientedEdge.java | 2 +- .../operation/triangulate/delaunay/OrientedTriangle.java | 2 +- .../apache/sis/geometries/polyhedron/AbstractPolyhedron.java | 2 +- .../{conics/ConicArc.java => surface/package-info.java} | 10 ++++------ .../main/org/apache/sis/gml/AbstractGMLWriter.java | 4 ++-- .../main/org/apache/sis/gml/GML2Reader.java | 4 ++-- .../main/org/apache/sis/gml/GML2Writer.java | 4 ++-- .../main/org/apache/sis/gml/GML3Reader.java | 4 ++-- .../main/org/apache/sis/gml/GML3Writer.java | 6 +++--- .../test/org/apache/sis/geometries/TriangleTest.java | 1 + .../org/apache/sis/geometries/adapter/ShapeAdapterTest.java | 4 ++-- .../org/apache/sis/geometries/adapter/ShapeConverterTest.java | 4 ++-- .../org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java | 2 +- .../org/apache/sis/geometries/operation/ToPrimitiveTest.java | 4 ++-- .../test/org/apache/sis/gml/GML2ReaderTest.java | 4 ++-- .../test/org/apache/sis/gml/GML2WriterTest.java | 2 +- .../test/org/apache/sis/gml/GML3ReaderTest.java | 6 +++--- .../test/org/apache/sis/gml/GML3WriterTest.java | 2 +- .../test/org/apache/sis/gml/GeometryAssert.java | 2 +- .../test/org/apache/sis/gml/JAXBGeometryAdapterTest.java | 2 +- .../org/apache/sis/storage/dggs/DiscreteGlobalGridSystems.java | 2 +- .../org/apache/sis/referencing/dggs/AbstractDggrsTest.java | 2 +- 66 files changed, 106 insertions(+), 84 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 67c3a04af2..4c7ce455f6 100644 --- a/incubator/src/org.apache.sis.geometry/main/module-info.java +++ b/incubator/src/org.apache.sis.geometry/main/module-info.java @@ -31,6 +31,7 @@ module org.apache.sis.geometry { exports org.apache.sis.images; 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.scene; 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 fe135f738b..d8886341a1 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 @@ -16,6 +16,7 @@ */ 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; 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 84471d90dd..e76715e924 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 @@ -16,6 +16,8 @@ */ package org.apache.sis.geometries; +import org.apache.sis.geometries.curve.LinearRing; +import org.apache.sis.geometries.curve.LineString; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; import java.util.Collections; @@ -25,8 +27,8 @@ import javax.measure.Unit; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.curve.ArcByBulge; import org.apache.sis.geometries.curve.ArcByCenterPoint; -import org.apache.sis.geometries.conics.Circle; -import org.apache.sis.geometries.conics.CircularString; +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; @@ -59,7 +61,7 @@ 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.geometries.spirals.Clothoid; +import org.apache.sis.geometries.curve.Clothoid; import org.apache.sis.geometry.wrapper.Capability; import org.apache.sis.geometry.wrapper.Dimensions; import org.apache.sis.geometry.wrapper.GeometryType; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java index fb59c93d19..004dc428f3 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java @@ -16,6 +16,9 @@ */ package org.apache.sis.geometries; +import org.apache.sis.geometries.curve.LinearRing; +import org.apache.sis.geometries.curve.LineString; + /** * 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 addf68ed1c..0e09ef781c 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 @@ -16,6 +16,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; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java index 530221cf5f..b4072fa34a 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java @@ -16,6 +16,7 @@ */ package org.apache.sis.geometries; +import org.apache.sis.geometries.curve.LinearRing; import java.util.List; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; 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 6bbaddb517..0e022e9033 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 @@ -16,6 +16,7 @@ */ package org.apache.sis.geometries; +import org.apache.sis.geometries.curve.LinearRing; import java.util.Collections; import java.util.List; import static org.opengis.annotation.Specification.ISO_19107; 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 3c866e2e87..b24a6fd90e 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 @@ -16,6 +16,8 @@ */ package org.apache.sis.geometries; +import org.apache.sis.geometries.curve.LinearRing; +import org.apache.sis.geometries.curve.LineString; import java.awt.Shape; import java.util.Iterator; import java.util.OptionalInt; 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 2ba71918ab..5ec536c552 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 @@ -16,6 +16,8 @@ */ package org.apache.sis.geometries.adapter; +import org.apache.sis.geometries.curve.LinearRing; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.*; import java.util.ArrayList; import java.util.List; 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 b0bdad4b9f..16381d6fb3 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 @@ -23,7 +23,7 @@ import java.awt.geom.PathIterator; import java.awt.geom.AffineTransform; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; +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; 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 f712e2871b..9aafdbf34e 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 @@ -26,7 +26,7 @@ import java.util.Objects; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; 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 a1eaf7622d..ecb7bd7e0c 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 @@ -25,7 +25,7 @@ import java.awt.geom.IllegalPathStateException; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; +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; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java similarity index 97% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java index 5a66f80ca3..51751b3818 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Arc.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; import java.util.List; import org.apache.sis.geometries.math.Array; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Circle.java similarity index 96% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Circle.java index 5d5326e84e..cfef2debee 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Circle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java similarity index 98% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java index 9d288ae7d2..a9816f5d98 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/CircularString.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.AttributesType; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Clothoid.java similarity index 96% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Clothoid.java index ecaeeb76c2..59ff0a2841 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Clothoid.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.spirals; +package org.apache.sis.geometries.curve; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java similarity index 97% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java index 0fd7603870..b64094afe4 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Conic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ConicArc.java similarity index 95% copy from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java copy to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ConicArc.java index 43c40d2250..87f2144e28 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/ConicArc.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ellipse.java similarity index 95% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ellipse.java index 8fb81f9e30..b455bef03d 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ellipse.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/EllipticArc.java similarity index 96% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/EllipticArc.java index 1e9136a066..e274bc024e 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/EllipticArc.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; +package org.apache.sis.geometries.curve; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java similarity index 93% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java index 4553a59472..245be71cb4 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LineString.java @@ -14,9 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries; +package org.apache.sis.geometries.curve; import javax.measure.quantity.Length; +import org.apache.sis.geometries.AttributesType; +import org.apache.sis.geometries.Curve; +import org.apache.sis.geometries.CurveInterpolation; +import org.apache.sis.geometries.DataPoints; +import org.apache.sis.geometries.Point; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; import org.opengis.geometry.Envelope; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java similarity index 95% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java index 6653e45315..2adb8486f9 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/LinearRing.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries; +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; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/OffsetCurve.java similarity index 92% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/OffsetCurve.java index 131ee86f69..0e591ea70c 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/OffsetCurve.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries; +package org.apache.sis.geometries.curve; import javax.measure.quantity.Length; +import org.apache.sis.geometries.Bearing; +import org.apache.sis.geometries.Curve; import static org.opengis.annotation.Specification.ISO_19107; import org.opengis.annotation.UML; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Rhumb.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Rhumb.java similarity index 89% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Rhumb.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Rhumb.java index f38cbb7a8f..52fab47881 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Rhumb.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Rhumb.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries; +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.CurveInterpolation; import org.apache.sis.geometries.Bearing; +import org.apache.sis.geometries.Bearing; +import org.apache.sis.geometries.Curve; +import org.apache.sis.geometries.CurveInterpolation; /** diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java similarity index 97% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java index e0d76689e7..ae391e59b7 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Spiral.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.spirals; +package org.apache.sis.geometries.curve; import java.util.List; import static org.opengis.annotation.Specification.ISO_19107; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/package-info.java similarity index 76% copy from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java copy to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/package-info.java index 43c40d2250..f6e1b8243b 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/package-info.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; - /** + * Package for all Curve subtypes. * - * @author Johann Sorel (Geomatys) + * ISO-19107 separate them in different packages which result in packages with one or two classes. + * Grouping all types in a single package simplify management and search. */ -public interface ConicArc { - -} +package org.apache.sis.geometries.curve; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCircularString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCircularString.java index 070e3587a5..d48ce638a2 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCircularString.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCircularString.java @@ -16,7 +16,7 @@ */ package org.apache.sis.geometries.internal.shared; -import org.apache.sis.geometries.conics.CircularString; +import org.apache.sis.geometries.curve.CircularString; 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/DefaultLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLineString.java index 4ba9337abc..de17d5ba39 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLineString.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLineString.java @@ -16,7 +16,7 @@ */ package org.apache.sis.geometries.internal.shared; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.DataPoints; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLinearRing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLinearRing.java index 139592ade9..d50e13f119 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLinearRing.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultLinearRing.java @@ -16,7 +16,7 @@ */ package org.apache.sis.geometries.internal.shared; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.DataPoints; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiLineString.java index bee4876af6..63db5cace6 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiLineString.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultMultiLineString.java @@ -17,7 +17,7 @@ package org.apache.sis.geometries.internal.shared; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.MultiLineString; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolygon.java index 9e7826fc0a..3b805092d2 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolygon.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolygon.java @@ -22,7 +22,7 @@ import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.Curve; import org.apache.sis.geometries.Geometries; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.Polygon; import org.locationtech.jts.geom.GeometryFactory; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultTriangle.java index c2d1a55e59..bb2a8e5b60 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultTriangle.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultTriangle.java @@ -17,7 +17,7 @@ package org.apache.sis.geometries.internal.shared; import java.util.Objects; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.Triangle; 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 5f66b7c1f0..7b6cf5abbd 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 @@ -37,7 +37,7 @@ import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.Point; 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 56713299af..63bac5fea6 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 @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.Objects; import org.apache.sis.geometries.Geometry; -import org.apache.sis.geometries.LineString; +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; 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 6cd423c814..cf858dc658 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 @@ -19,7 +19,7 @@ package org.apache.sis.geometries.mesh; import java.util.HashSet; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; +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; 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 68fe374410..75eb107a0f 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 @@ -17,7 +17,7 @@ package org.apache.sis.geometries.operation; import org.apache.sis.geometries.AttributesType; -import org.apache.sis.geometries.LineString; +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; 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 721d5c97c9..d870ec2997 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 @@ -28,8 +28,8 @@ import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.Point; 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 8573ae6f55..a1523cc035 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 @@ -25,7 +25,7 @@ import java.util.stream.Stream; import org.opengis.referencing.operation.TransformException; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometries; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.Point; import org.apache.sis.geometries.PreparedTIN; 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 b974153ad9..481c0f225a 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 @@ -23,7 +23,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.util.FactoryException; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; +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; 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 f42dd656af..1698f9dcb2 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 @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.Point; @@ -117,7 +117,7 @@ public final class ToPrimitive { } for (int i = 0, k = 0; i < numGeometries; i++, k += 2) { - final org.apache.sis.geometries.LineString line = geometry.getGeometryN(i); + final org.apache.sis.geometries.curve.LineString line = geometry.getGeometryN(i); final DataPoints points = line.getDataPoints(); for (String name : attributesType.getAttributeNames()) { Array att = primitive.getAttribute(name); 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 1a6d9834ac..b8b76b6af8 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 @@ -23,7 +23,7 @@ import java.util.Set; import org.opengis.referencing.operation.TransformException; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; @@ -95,7 +95,7 @@ public final class Transform { final LinearRing exterior = transform(p.getExteriorRing(), crs, transform); - final List<org.apache.sis.geometries.LinearRing> interiors = new ArrayList<>(p.getInteriorRings()); + final List<org.apache.sis.geometries.curve.LinearRing> interiors = new ArrayList<>(p.getInteriorRings()); for (int i = 0, n = interiors.size(); i < n; i++) { interiors.set(i, transform(interiors.get(i), crs, transform)); } 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 1d01b6fe55..c5db4f01f3 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 @@ -30,7 +30,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; 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 65acf3f355..cba0e3d6a5 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 @@ -21,7 +21,7 @@ import java.util.List; import java.util.function.BiFunction; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.AttributesType; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.Point; import org.apache.sis.geometries.Triangle; import org.apache.sis.geometries.GeometryFactory; 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 d99d816f23..6934174af7 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 @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometry; -import org.apache.sis.geometries.LineString; +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; 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 5aaeef6de1..e9b54e95c5 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 @@ -20,7 +20,7 @@ import java.util.Iterator; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.AttributesType; -import org.apache.sis.geometries.LineString; +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; 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 90bbc8cdaf..77fad3f9ea 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 @@ -20,7 +20,7 @@ import java.awt.geom.Point2D; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.AttributesType; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.Point; import org.apache.sis.geometries.Triangle; import org.apache.sis.geometries.GeometryFactory; 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 19dea2e4b8..ab9c280b51 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 @@ -20,7 +20,7 @@ import java.util.List; import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiPolygon; import org.apache.sis.geometries.Polygon; import org.apache.sis.geometries.Polyhedron; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/package-info.java similarity index 76% rename from incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java rename to incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/package-info.java index 43c40d2250..40d2a639bf 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/package-info.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.conics; - /** + * Package for all Surface subtypes. * - * @author Johann Sorel (Geomatys) + * ISO-19107 separate them in different packages which result in packages with one or two classes. + * Grouping all types in a single package simplify management and search. */ -public interface ConicArc { - -} +package org.apache.sis.geometries.surface; 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 81e2180154..c0a29bc777 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 @@ -23,8 +23,8 @@ import org.apache.sis.geometries.Curve; import org.apache.sis.geometries.Empty; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiCurve; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiSurface; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java index 244b1bd713..426f633ab6 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java @@ -25,8 +25,8 @@ import javax.xml.stream.XMLStreamReader; import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiPolygon; diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Writer.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Writer.java index 66bc194a62..02f6237114 100644 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Writer.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Writer.java @@ -23,8 +23,8 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Empty; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiCurve; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiSurface; 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 79ba348f7a..f2cec5ab79 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 @@ -30,8 +30,8 @@ import org.apache.sis.geometries.Curve; import org.apache.sis.geometries.CurvePolygon; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiPolygon; import org.apache.sis.geometries.MultiPolyhedron; 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 1988d81d12..06a440d4ec 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 @@ -29,8 +29,8 @@ import org.apache.sis.geometries.CurvePolygon; import org.apache.sis.geometries.Empty; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiCurve; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiPolygon; @@ -45,7 +45,7 @@ import org.apache.sis.geometries.Surface; 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.conics.CircularString; +import org.apache.sis.geometries.curve.CircularString; import org.apache.sis.geometries.math.Tuple; 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/geometries/TriangleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java index d74753ac37..d9bc139cc6 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 @@ -16,6 +16,7 @@ */ 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.referencing.CommonCRS; 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 c3cfc605d0..90c5dc1a1d 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 @@ -20,8 +20,8 @@ import java.awt.Shape; import java.awt.geom.PathIterator; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +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; 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 a2b9ae92ad..11ae8e65de 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 @@ -32,8 +32,8 @@ import java.util.List; import org.apache.sis.geometries.Empty; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +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; 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 d2aa667c8a..f69ae03c55 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 @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.Geometries; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.Point; import org.apache.sis.geometries.TIN; import org.apache.sis.geometries.Triangle; 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 3a502a1dd0..054b42a510 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 @@ -20,8 +20,8 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.apache.sis.geometries.AttributesType; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.Point; 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 1df8583a69..e348fbd611 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 @@ -25,8 +25,8 @@ import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiPolygon; 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 42e4dd119c..6e736ad0b5 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 @@ -24,7 +24,7 @@ import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; 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 1424477af7..1b3772cad4 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 @@ -29,8 +29,8 @@ import org.apache.sis.geometries.CurvePolygon; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LineString; -import org.apache.sis.geometries.LinearRing; +import org.apache.sis.geometries.curve.LineString; +import org.apache.sis.geometries.curve.LinearRing; import org.apache.sis.geometries.MultiLineString; import org.apache.sis.geometries.MultiPoint; import org.apache.sis.geometries.MultiPolygon; @@ -44,7 +44,7 @@ import org.apache.sis.geometries.Surface; 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.conics.CircularString; +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.measure.Units; 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 500ef0f136..903701a1c5 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 @@ -26,7 +26,7 @@ import org.apache.sis.geometries.Curve; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GeometryAssert.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GeometryAssert.java index add8bc35e6..915c3c96ba 100644 --- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GeometryAssert.java +++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/gml/GeometryAssert.java @@ -21,7 +21,7 @@ import org.apache.sis.geometries.BBox; import org.apache.sis.geometries.Geometries; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryCollection; -import org.apache.sis.geometries.LineString; +import org.apache.sis.geometries.curve.LineString; import org.apache.sis.geometries.Point; import org.apache.sis.geometries.Polygon; import org.apache.sis.referencing.CRS; 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 3ce55b610e..d7d80f1ccc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.apache.sis.geometries.Geometry; import org.apache.sis.geometries.GeometryFactory; -import org.apache.sis.geometries.LinearRing; +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; 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 ed5750363a..be952bc384 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 @@ -37,7 +37,7 @@ import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.datum.Ellipsoid; import org.opengis.referencing.operation.TransformException; import org.opengis.util.FactoryException; -import org.apache.sis.geometries.LinearRing; +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; 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 2d981134bc..f4f184ee68 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 @@ -32,7 +32,7 @@ import org.apache.sis.coverage.grid.GridCoverage; 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.geometries.LinearRing; +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;
