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 70ade1957417e56a595314e2d8ea15402316d3af Merge: de34d59139 1bf2017453 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Oct 17 22:43:29 2026 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: bug fixes and upgrate from Java 11 to 12. README.md | 2 +- endorsed/build.gradle.kts | 3 +- .../org/apache/sis/console/IdentifierCommand.java | 5 +- .../org.apache.sis.feature/main/module-info.java | 2 +- .../main/org/apache/sis/coverage/Category.java | 3 +- .../apache/sis/coverage/grid/GridCRSBuilder.java | 10 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 2 +- .../org/apache/sis/coverage/grid/GridGeometry.java | 45 +- .../sis/coverage/grid/ValuesAtPointIterator.java | 11 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../org/apache/sis/feature/EnvelopeOperation.java | 8 +- .../sis/feature/FeatureOperationException.java | 46 +- .../sis/feature/InvalidFeatureException.java | 38 +- .../main/org/apache/sis/feature/package-info.java | 2 +- .../main/org/apache/sis/image/OverviewImage.java | 13 +- .../org/apache/sis/image/SourceAlignedImage.java | 8 +- .../org.apache.sis.metadata/main/module-info.java | 2 +- .../org/apache/sis/metadata/AbstractMetadata.java | 11 - .../org/apache/sis/metadata/MetadataStandard.java | 22 - .../sis/metadata/MetadataVisitorException.java | 52 ++- .../iso/extent/NotSpatioTemporalException.java | 5 +- .../main/org/apache/sis/metadata/package-info.java | 2 +- .../sis/metadata/sql/internal/shared/Dialect.java | 22 + .../metadata/sql/internal/shared/SQLBuilder.java | 3 +- .../metadata/sql/internal/shared/ScriptRunner.java | 4 +- .../sis/metadata/sql/internal/shared/Supports.java | 8 +- .../main/org/apache/sis/openoffice/CalcAddins.java | 20 +- .../gazetteer/GeohashReferenceSystem.java | 7 +- .../gazetteer/MilitaryGridReferenceSystem.java | 18 +- .../main/module-info.java | 2 +- .../main/org/apache/sis/geometry/Envelope2D.java | 3 +- .../sis/io/wkt/UnparsableObjectException.java | 49 +- .../main/org/apache/sis/io/wkt/package-info.java | 2 +- .../sis/parameter/MapProjectionDescriptor.java | 5 +- .../sis/referencing/AbstractIdentifiedObject.java | 12 - .../sis/referencing/crs/DefaultProjectedCRS.java | 5 +- .../sis/referencing/cs/DefaultCompoundCS.java | 5 +- .../factory/ConcurrentAuthorityFactory.java | 2 +- .../factory/IdentifiedObjectFinder.java | 2 +- .../referencing/factory/sql/EPSGCodeFinder.java | 73 ++- .../sis/referencing/factory/sql/EPSGInstaller.java | 4 + .../sis/referencing/factory/sql/SQLTranslator.java | 16 +- .../sis/referencing/factory/sql/package-info.java | 2 +- .../operation/AbstractCoordinateOperation.java | 5 +- .../referencing/operation/DefaultConversion.java | 29 +- .../operation/DefaultOperationMethod.java | 5 +- .../operation/DefaultPassThroughOperation.java | 5 +- .../sis/referencing/operation/package-info.java | 2 +- .../operation/projection/AlbersEqualArea.java | 13 +- .../operation/projection/AzimuthalEquidistant.java | 5 +- .../operation/projection/CassiniSoldner.java | 5 +- .../operation/projection/CylindricalEqualArea.java | 13 +- .../projection/EquidistantCylindrical.java | 13 +- .../projection/LambertAzimuthalEqualArea.java | 13 +- .../projection/LambertConicConformal.java | 13 +- .../referencing/operation/projection/Mercator.java | 13 +- .../projection/ModifiedAzimuthalEquidistant.java | 12 +- .../operation/projection/Mollweide.java | 7 +- .../operation/projection/ObliqueMercator.java | 12 +- .../operation/projection/ObliqueStereographic.java | 12 +- .../operation/projection/Orthographic.java | 12 +- .../operation/projection/PolarStereographic.java | 12 +- .../operation/projection/Polyconic.java | 12 +- .../referencing/operation/projection/Robinson.java | 7 +- .../operation/projection/SatelliteTracking.java | 12 +- .../operation/projection/Sinusoidal.java | 12 +- .../operation/projection/TransverseMercator.java | 7 +- .../sis/referencing/operation/provider/Affine.java | 5 +- .../org/apache/sis/referencing/package-info.java | 2 +- .../referencing/factory/sql/EPSGFactoryTest.java | 35 ++ .../sis/referencing/operation/projection/NoOp.java | 15 +- .../transform/ProjectiveTransformTest.java | 5 +- .../apache/sis/storage/geoheif/ImageResource.java | 2 +- .../storage/isobmff/base/IdentifiedMediaData.java | 5 +- .../sis/storage/geoheif/SelfConsistencyTest.java | 5 +- .../sis/storage/geotiff/SelfConsistencyTest.java | 5 +- .../sis/storage/netcdf/SelfConsistencyTest.java | 7 +- .../org.apache.sis.storage/main/module-info.java | 2 +- .../main/org/apache/sis/storage/DataOptionKey.java | 42 -- .../org/apache/sis/storage/DataStoreException.java | 59 ++- .../apache/sis/storage/GridCoverageResource.java | 20 +- .../main/org/apache/sis/storage/OptionKey.java | 148 +++++- .../org/apache/sis/storage/StorageConnector.java | 8 +- .../sis/storage/UnsupportedStorageException.java | 5 +- .../sis/storage/internal/InputStreamAdapter.java | 2 +- .../main/org/apache/sis/storage/package-info.java | 2 +- .../test/org/apache/sis/storage/OptionKeyTest.java | 3 +- .../sis/storage/esri/BILConsistencyTest.java | 10 +- .../sis/storage/esri/BIPConsistencyTest.java | 10 +- .../sis/storage/esri/BSQConsistencyTest.java | 10 +- .../sis/storage/image/SelfConsistencyTest.java | 10 +- .../sis/storage/test/CoverageReadConsistency.java | 6 +- .../src/org.apache.sis.util/main/module-info.java | 3 +- .../main/org/apache/sis/pending/jdk/JDK13.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK15.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK16.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK17.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK18.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK19.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK20.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK21.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK22.java | 2 +- .../main/org/apache/sis/pending/jdk/JDK23.java | 2 +- .../sis/pending/jdk/{JDK12.java => JDK26.java} | 25 +- .../org/apache/sis/pending/jdk/package-info.java | 2 +- .../main/org/apache/sis/setup/OptionKey.java | 349 --------------- .../main/org/apache/sis/util/Classes.java | 21 +- .../main/org/apache/sis/util/Exceptions.java | 44 +- .../org/apache/sis/util/LocalizedException.java | 85 ---- .../internal/shared/LocalizedParseException.java | 54 ++- .../org/apache/sis/util/logging/Initializer.java | 8 +- .../main/org/apache/sis/util/logging/Logging.java | 4 +- .../main/org/apache/sis/util/package-info.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 8 +- .../test/org/apache/sis/test/Printer.java | 5 +- .../shared/LocalizedParseExceptionTest.java | 12 +- .../sis/geometries/AttributeInterpolation.java | 6 + .../main/org/apache/sis/geometries/BBox.java | 175 +++++++- .../main/org/apache/sis/geometries/Curve.java | 74 ++- .../main/org/apache/sis/geometries/DataPoints.java | 247 ++++++++++- .../org/apache/sis/geometries/DataPointsType.java | 17 +- .../main/org/apache/sis/geometries/Empty.java | 2 +- .../main/org/apache/sis/geometries/Geometries.java | 38 +- .../main/org/apache/sis/geometries/Geometry.java | 28 +- .../apache/sis/geometries/GeometryCollection.java | 176 +++++++- .../org/apache/sis/geometries/GeometryFactory.java | 252 +++++++---- .../org/apache/sis/geometries/GeometryType.java | 40 +- .../org/apache/sis/geometries/GeometryVisitor.java | 40 -- .../main/org/apache/sis/geometries/HyperPlane.java | 26 +- .../main/org/apache/sis/geometries/OBBox.java | 27 +- .../main/org/apache/sis/geometries/Orientable.java | 11 +- .../main/org/apache/sis/geometries/Plane.java | 26 +- .../main/org/apache/sis/geometries/Point.java | 55 ++- .../main/org/apache/sis/geometries/Primitive.java | 6 +- .../main/org/apache/sis/geometries/Prism.java | 12 +- .../main/org/apache/sis/geometries/Solid.java | 12 +- .../main/org/apache/sis/geometries/Surface.java | 55 ++- .../apache/sis/geometries/adapter/JTSAdapter.java | 55 +-- .../geometries/adapter/PathIteratorAdapter.java | 36 +- .../org/apache/sis/geometries/adapter/SIS.java | 44 +- .../sis/geometries/adapter/ShapeConverter.java | 8 +- .../org/apache/sis/geometries/adapter/Srid.java | 5 +- .../sis/geometries/adapter/WellKnownBinary.java | 41 +- .../geometries/adapter/WellKnownBinaryParser.java | 39 +- .../sis/geometries/adapter/WellKnownText.java | 47 +- .../geometries/adapter/WellKnownTextParser.java | 35 +- .../org/apache/sis/geometries/adapter/Wrapper.java | 9 +- .../geometries/csg/ConstructiveSolidGeometry.java | 8 +- .../sis/geometries/curve/ArcByCenterPoint.java | 7 + .../apache/sis/geometries/curve/CompoundCurve.java | 33 ++ .../main/org/apache/sis/geometries/curve/Line.java | 21 +- .../apache/sis/geometries/curve/LineString.java | 26 +- .../apache/sis/geometries/curve/MultiCurve.java | 108 ----- .../sis/geometries/curve/MultiLineString.java | 52 --- .../org/apache/sis/geometries/curve/NurbCurve.java | 16 +- .../apache/sis/geometries/curve/ProductCurve.java | 27 +- .../main/org/apache/sis/geometries/curve/Ray.java | 198 +++++++++ .../internal/shared/AbstractGeometry.java | 41 ++ .../internal/shared/ArrayDataPoints.java | 6 +- .../internal/shared/BSplineEvaluator.java | 449 +++++++++++++++++++ .../internal/shared/ConcatenatedDataPoints.java | 30 +- .../internal/shared/CurveLinearizer.java | 494 +++++++++++++++++++++ .../sis/geometries/internal/shared/Curves.java | 269 +++++++++++ .../sis/geometries/internal/shared/DefaultArc.java | 90 ++++ .../internal/shared/DefaultArcByBulge.java | 58 ++- .../internal/shared/DefaultArcByCenterPoint.java | 100 ++++- .../internal/shared/DefaultBSplineCurve.java | 95 +++- .../internal/shared/DefaultBSplineSolid.java | 22 +- .../internal/shared/DefaultBSplineSurface.java | 29 +- .../geometries/internal/shared/DefaultBezier.java | 48 ++ .../internal/shared/DefaultBilinearGrid.java | 30 +- .../geometries/internal/shared/DefaultCapsule.java | 147 ++++++ .../internal/shared/DefaultCircularString.java | 40 +- .../internal/shared/DefaultCompoundCurve.java | 50 ++- .../geometries/internal/shared/DefaultConic.java | 93 +++- .../internal/shared/DefaultConicArc.java | 374 ++++++++++++++++ .../internal/shared/DefaultCurvePolygon.java | 11 +- .../internal/shared/DefaultCylinder.java | 158 +++++++ .../shared/DefaultEllipsoid.java} | 202 ++------- .../internal/shared/DefaultEllipticArc.java | 16 + .../geometries/internal/shared/DefaultEmpty.java | 5 +- .../internal/shared/DefaultGeometryCollection.java | 12 +- .../geometries/internal/shared/DefaultLine.java | 10 - .../internal/shared/DefaultLineString.java | 10 - .../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/DefaultNurbCurve.java | 66 ++- .../internal/shared/DefaultNurbSurface.java | 82 ++-- .../internal/shared/DefaultOffsetCurve.java | 33 +- .../geometries/internal/shared/DefaultPolygon.java | 15 +- .../internal/shared/DefaultPolyhedralSurface.java | 10 +- .../internal/shared/DefaultPolyhedron.java | 40 +- .../geometries/internal/shared/DefaultPrism.java | 48 +- .../internal/shared/DefaultProductCurve.java | 10 + .../internal/shared/DefaultRawMultiPoint.java | 39 -- .../{Ray.java => internal/shared/DefaultRay.java} | 81 +--- .../internal/shared/DefaultReversedCurve.java | 49 ++ .../internal/shared/DefaultReversedSurface.java | 32 +- .../geometries/internal/shared/DefaultSolid.java | 18 +- .../geometries/internal/shared/DefaultSphere.java | 187 ++++++++ .../internal/shared/EllipsoidalSurfaces.java | 159 +++++++ .../internal/shared/EmptyDataPoints.java | 10 +- .../geometries/internal/shared/IndexedPoint.java | 2 +- .../internal/shared/SinglePositionDataPoints.java | 8 +- .../apache/sis/geometries/mesh/MeshPrimitive.java | 25 +- .../sis/geometries/mesh/MultiMeshPrimitive.java | 6 +- .../operation/GaussLegendreQuadrature.java | 196 ++++++++ .../geometries/operation/GeometryProcessor.java | 43 +- .../sis/geometries/operation/Intersection.java | 6 +- .../sis/geometries/operation/ProcessorUtils.java | 2 - .../sis/geometries/operation/ToPrimitive.java | 92 +++- .../operation/simplify/greedyinsert/WTriangle.java | 9 +- .../operation/triangulate/EarClipping.java | 147 ++++-- .../triangulate/delaunay/OrientedEdge.java | 3 +- .../triangulate/delaunay/OrientedTriangle.java | 9 +- .../apache/sis/geometries/point/MultiPoint.java | 119 ----- .../org/apache/sis/geometries/solid/Frustrum.java | 25 +- .../sis/geometries/solid/MultiPolyhedron.java | 43 -- .../sis/geometries/solid/ParametricCurveSolid.java | 14 +- .../apache/sis/geometries/solid/Polyhedron.java | 99 ++++- .../solid/polyhedron/AbstractPolyhedron.java | 82 +++- .../org/apache/sis/geometries/surface/Capsule.java | 189 +++----- .../apache/sis/geometries/surface/Cylinder.java | 301 ++++++++----- .../apache/sis/geometries/surface/Ellipsoid.java | 303 +++---------- .../sis/geometries/surface/MultiPolygon.java | 60 --- .../sis/geometries/surface/MultiSurface.java | 111 ----- .../geometries/surface/ParametricCurveSurface.java | 26 +- .../sis/geometries/surface/PolyhedralSurface.java | 3 +- .../org/apache/sis/geometries/surface/Sphere.java | 253 ++++------- .../apache/sis/geometries/surface/Triangle.java | 163 ++----- .../main/org/apache/sis/gml/AbstractGMLWriter.java | 29 +- .../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 | 24 +- .../main/org/apache/sis/gml/GMLCRS.java | 2 +- .../org/apache/sis/gml/PositionListBuilder.java | 8 +- .../main/org/apache/sis/maths/ArrayFactory.java | 2 +- .../main/org/apache/sis/maths/NDArrays.java | 10 +- .../main/org/apache/sis/maths/NDRange.java | 421 ++++++++++++++++++ .../main/org/apache/sis/maths/ReadOnly.java | 15 +- .../main/org/apache/sis/maths/Vector.java | 17 +- .../main/org/apache/sis/maths/Vectors.java | 40 -- .../MultiSurfaceTest.java => BBoxTest.java} | 41 +- .../org/apache/sis/geometries/DataPointsTest.java | 361 ++++++++++++++- .../test/org/apache/sis/geometries/EmptyTest.java | 6 +- .../sis/geometries/GeometryCollectionTest.java | 8 +- .../org/apache/sis/geometries/GeometryTest.java | 37 ++ .../test/org/apache/sis/geometries/PrismTest.java | 13 +- .../sis/geometries/adapter/ShapeConverterTest.java | 3 +- .../geometries/adapter/WellKnownBinaryTest.java | 88 ++-- .../sis/geometries/adapter/WellKnownTextTest.java | 86 ++-- .../sis/geometries/curve/ArcByBulgeTest.java | 68 ++- .../sis/geometries/curve/ArcByCenterPointTest.java | 58 ++- .../sis/geometries/curve/BSplineCurveTest.java | 87 +++- .../apache/sis/geometries/curve/BezierTest.java | 37 ++ .../sis/geometries/curve/CircularStringTest.java | 52 ++- .../sis/geometries/curve/CompoundCurveTest.java | 34 +- .../org/apache/sis/geometries/curve/ConicTest.java | 114 ++++- .../sis/geometries/curve/EllipticArcTest.java | 68 +++ .../apache/sis/geometries/curve/GeodesicTest.java | 7 +- .../sis/geometries/curve/LineStringTest.java | 91 +++- .../sis/geometries/curve/MultiCurveTest.java | 50 --- .../sis/geometries/curve/MultiLineStringTest.java | 5 +- .../apache/sis/geometries/curve/NurbCurveTest.java | 75 ++++ .../sis/geometries/curve/OffsetCurveTest.java | 10 +- .../sis/geometries/curve/PolynomialSplineTest.java | 8 +- .../sis/geometries/curve/ProductCurveTest.java | 13 +- .../org/apache/sis/geometries/curve/RhumbTest.java | 7 +- .../apache/sis/geometries/curve/SpiralTest.java | 17 +- .../internal/shared/CurveLinearizerTest.java | 266 +++++++++++ .../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 -- .../internal/shared/DefaultReversedCurveTest.java | 51 ++- .../shared/DefaultReversedSurfaceTest.java | 15 +- .../sis/geometries/operation/AbstractD9IMTest.java | 23 +- .../operation/GaussLegendreQuadratureTest.java | 194 ++++++++ .../geometries/operation/SymDifferenceTest.java | 9 +- .../sis/geometries/operation/ToPrimitiveTest.java | 326 +++++++++++++- .../apache/sis/geometries/operation/UnionTest.java | 9 +- .../sis/geometries/point/MultiPointTest.java | 3 +- .../sis/geometries/solid/BSplineSolidTest.java | 7 +- .../sis/geometries/solid/MultiPolyhedronTest.java | 35 -- .../sis/geometries/solid/PolyhedronTest.java | 13 +- .../geometries/spherical/GreatCircleArcTest.java | 16 +- .../spherical/SphericalConvexPolygonTest.java | 4 +- .../spherical/SphericalTriangleTest.java | 24 +- .../sis/geometries/surface/CurvePolygonTest.java | 9 +- .../sis/geometries/surface/EllipsoidTest.java | 122 +++++ .../sis/geometries/surface/MultiPolygonTest.java | 5 +- .../surface/ParametricCurveSurfaceTest.java | 5 +- .../apache/sis/geometries/surface/PolygonTest.java | 2 +- .../geometries/surface/PolyhedralSurfaceTest.java | 10 +- .../apache/sis/geometries/surface/SphereTest.java | 142 ++++++ .../test/org/apache/sis/gml/GML2ReaderTest.java | 15 +- .../test/org/apache/sis/gml/GML2WriterTest.java | 2 +- .../test/org/apache/sis/gml/GML3ReaderTest.java | 24 +- .../test/org/apache/sis/gml/GML3WriterTest.java | 2 +- .../test/org/apache/sis/gml/GMLReaderTest.java | 4 +- .../test/org/apache/sis/gml/GeometryAssert.java | 2 +- .../apache/sis/gml/JAXBGeometryAdapterTest.java | 2 +- .../org/apache/sis/maths/AbstractVectorTest.java | 40 ++ .../test/org/apache/sis/maths/NDRangeTest.java | 255 +++++++++++ .../apache/sis/storage/geopackage/GpkgStore.java | 5 +- .../apache/sis/storage/geopackage/Initializer.java | 5 +- optional/README.md | 2 +- optional/src/org.apache.sis.gui/bundle/README | 2 +- .../src/org.apache.sis.gui/main/module-info.java | 2 +- .../apache/sis/gui/controls/SyncWindowList.java | 250 ----------- .../apache/sis/gui/coverage/CoverageExplorer.java | 102 ----- .../org/apache/sis/gui/dataset/WindowHandler.java | 474 -------------------- .../org/apache/sis/gui/dataset/WindowManager.java | 141 ------ .../org/apache/sis/gui/dataset/package-info.java | 2 +- .../org/apache/sis/gui/internal/PrivateAccess.java | 52 --- .../org/apache/sis/gui/internal/ToolbarButton.java | 115 ----- .../main/org/apache/sis/gui/map/StatusBar.java | 16 +- .../main/org/apache/sis/gui/map/package-info.java | 2 +- .../org/apache/sis/gui/referencing/WKTPane.java | 7 +- parent/overview.html | 2 +- parent/pom.xml | 4 +- 329 files changed, 9884 insertions(+), 5476 deletions(-) diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java index 748f074385,4e59033ccd..abb7475f8f --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java @@@ -32,18 -26,10 +26,9 @@@ import org.apache.sis.geometries.Geomet import org.apache.sis.geometries.GeometryFactory; import org.apache.sis.geometries.GeometryType; import org.apache.sis.geometries.SurfaceInterpolation; - import org.apache.sis.geometries.DataPointsType; - import org.apache.sis.geometries.internal.shared.AbstractGeometry; - import org.apache.sis.geometries.surface.ParametricCurveSurface; - import org.apache.sis.maths.DataType; - import org.apache.sis.maths.NDArrays; + import org.apache.sis.geometries.internal.shared.DefaultEllipsoid; + import org.apache.sis.maths.NDRange; import org.apache.sis.maths.ReadOnly; - import org.apache.sis.maths.SampleSystem; --import org.apache.sis.maths.Vector; - import org.apache.sis.util.ArgumentChecks; - - // Specific to the geoapi-3.1 branch: - import org.opengis.referencing.ReferenceIdentifier; /** diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/ParametricCurveSurface.java index 035db3fd45,444c689a67..777e54e345 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/ParametricCurveSurface.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/ParametricCurveSurface.java @@@ -26,6 -27,11 +27,11 @@@ import org.apache.sis.geometries.DataPo import org.apache.sis.geometries.GeometryType; import org.apache.sis.geometries.Surface; import org.apache.sis.geometries.SurfaceInterpolation; + import org.apache.sis.maths.Array; + import org.apache.sis.maths.Vector; + -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; ++// Specific to the geoapi-3.1 branch: ++import org.opengis.referencing.ReferenceIdentifier; /** @@@ -227,7 -233,17 +233,17 @@@ public sealed interface ParametricCurve * @see ISO 19107:2019 - 8.3.2.11 */ @UML(identifier="surface", specification=ISO_19107) - DirectPosition getSurface(double u, double v); + Vector<?> getSurface(double u, double v); + /** + * Returns the name of this surface used as a reference system for its parameter space. + * The default implementation returns the name of the {@linkplain #getGeometryType() geometry type}. + * + * @return name of the parameter space of this surface. + */ + @Override - default Identifier getName() { ++ default ReferenceIdentifier getName() { + return new NamedIdentifier(null, getGeometryType().name()); + } } diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java index 4859468a16,5a2f8334f4..62c5d08b01 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java @@@ -31,18 -28,11 +28,10 @@@ import org.apache.sis.geometries.Geomet import org.apache.sis.geometries.GeometryFactory; import org.apache.sis.geometries.GeometryType; import org.apache.sis.geometries.SurfaceInterpolation; - import org.apache.sis.geometries.DataPointsType; - import org.apache.sis.geometries.surface.ParametricCurveSurface; - import org.apache.sis.geometries.internal.shared.AbstractGeometry; - import org.apache.sis.maths.DataType; - import org.apache.sis.maths.NDArrays; + import org.apache.sis.geometries.internal.shared.DefaultSphere; + import org.apache.sis.maths.NDRange; import org.apache.sis.maths.ReadOnly; - import org.apache.sis.maths.SampleSystem; --import org.apache.sis.maths.Vector; - import org.apache.sis.util.ArgumentChecks; - - // Specific to the geoapi-3.1 branch: - import org.opengis.referencing.ReferenceIdentifier; + import org.apache.sis.measure.Quantities; /**
