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 3ed0c5f895bd95464995ba8f90b50642e89d6cee Merge: b7f39770a2 b967e38433 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Aug 15 20:04:14 2026 +0200 Merge of automatic reorganization of imports order. .../apache/sis/coverage/grid/GridCRSBuilder.java | 2 +- .../sis/coverage/grid/GridDerivationTest.java | 2 +- .../test/org/apache/sis/feature/Assertions.java | 2 +- .../apache/sis/map/coverage/RenderingDataTest.java | 2 +- .../sis/storage/geotiff/reader/CRSBuilder.java | 6 +-- .../sis/storage/netcdf/base/GridMapping.java | 2 +- .../apache/sis/storage/netcdf/NetcdfStoreTest.java | 4 +- .../org/apache/sis/storage/esri/RasterStore.java | 2 +- .../geometries/csg/ConstructiveSolidGeometry.java | 4 +- .../geometries/polyhedron/AbstractPolyhedron.java | 5 ++- .../sis/geometries/polyhedron/Dodecahedron.java | 1 + .../sis/geometries/polyhedron/Hexahedron.java | 1 + .../sis/geometries/polyhedron/Icosahedron.java | 1 + .../sis/geometries/polyhedron/Octahedron.java | 1 + .../polyhedron/RhombicTriacontahedron.java | 1 + .../sis/geometries/polyhedron/Tetrahedron.java | 1 + .../polyhedron/TruncatedIcosahedron.java | 1 + .../sis/geometries/spherical/GreatCircleArc.java | 1 + .../spherical/SphericalConvexPolygon.java | 1 + .../geometries/spherical/SphericalTriangle.java | 1 + .../main/org/apache/sis/scene/Model.java | 2 +- .../main/org/apache/sis/scene/SceneNode.java | 2 +- .../main/org/apache/sis/scene/SceneUtilities.java | 1 + .../main/org/apache/sis/scene/Surface.java | 4 +- .../org/apache/sis/scene/light/Directional.java | 1 + .../main/org/apache/sis/scene/light/HDRI.java | 1 + .../main/org/apache/sis/scene/light/Light.java | 1 + .../main/org/apache/sis/scene/light/Point.java | 1 + .../main/org/apache/sis/scene/light/Quad.java | 1 + .../main/org/apache/sis/scene/light/Ring.java | 1 + .../main/org/apache/sis/scene/light/Spot.java | 1 + .../org/apache/sis/scene/SceneUtilitiesTest.java | 1 + .../sis/referencing/dggs/DiscreteGlobalGrid.java | 11 +++--- .../dggs/DiscreteGlobalGridHierarchy.java | 1 + .../dggs/DiscreteGlobalGridReferenceSystem.java | 3 +- .../DiscreteGlobalGridReferenceSystemFactory.java | 1 + .../dggs/DiscreteGlobalGridReferenceSystems.java | 13 ++++--- .../referencing/dggs/DiscreteGlobalGridSystem.java | 1 + .../sis/referencing/dggs/GridConstraints.java | 1 + .../referencing/dggs/PolyhedronOrientation.java | 1 + .../sis/referencing/dggs/PolyhedronParameters.java | 1 + .../sis/referencing/dggs/RefinementLevel.java | 7 ++-- .../sis/referencing/dggs/RefinementStrategy.java | 1 + .../apache/sis/referencing/dggs/SubZoneOrder.java | 1 + .../sis/referencing/dggs/ZonalReferenceSystem.java | 1 + .../main/org/apache/sis/referencing/dggs/Zone.java | 9 +++-- .../shared/AbstractDiscreteGlobalGrid.java | 9 +++-- .../AbstractDiscreteGlobalGridHierarchy.java | 1 + .../shared/AbstractDiscreteGlobalGridSystem.java | 5 ++- .../dggs/internal/shared/AbstractZone.java | 5 ++- .../dggs/internal/shared/AuthalicSphere.java | 3 +- .../shared/DefaultZonalReferenceSystem.java | 1 + .../apache/sis/referencing/dggs/s2/S2Coder.java | 7 ++-- .../org/apache/sis/referencing/dggs/s2/S2Dgg.java | 19 +++++----- .../org/apache/sis/referencing/dggs/s2/S2Dggh.java | 1 + .../apache/sis/referencing/dggs/s2/S2Dggrs.java | 9 +++-- .../org/apache/sis/referencing/dggs/s2/S2Dggs.java | 1 + .../apache/sis/referencing/dggs/s2/S2Factory.java | 5 ++- .../org/apache/sis/referencing/dggs/s2/S2Zone.java | 11 +++--- .../main/org/apache/sis/referencing/rs/Code.java | 13 ++++--- .../org/apache/sis/referencing/rs/CompoundRS.java | 14 ++++--- .../sis/referencing/rs/ReferenceSystems.java | 13 ++++--- .../rs/internal/shared/CodeOperations.java | 19 ++++++---- .../sis/storage/coverage/BandedCoverageExt.java | 3 +- .../storage/coverage/BandedCoverageResource.java | 11 +++--- .../sis/storage/coverage/CoverageUtilities.java | 6 +-- .../apache/sis/storage/coverage/FeatureExt.java | 5 ++- .../dggs/DiscreteGlobalGridCoverageProcessor.java | 43 +++++++++++----------- .../storage/dggs/DiscreteGlobalGridGeometry.java | 13 ++++--- .../storage/dggs/DiscreteGlobalGridResource.java | 5 ++- .../storage/dggs/DiscreteGlobalGridSystems.java | 23 ++++++------ .../storage/dggs/DiscreteGlobalGridTransform.java | 3 +- .../shared/AbstractDiscreteGlobalGridCoverage.java | 13 ++++--- .../shared/ArrayDiscreteGlobalGridCoverage.java | 3 +- ...ingTiledDiscreteGlobalGridCoverageResource.java | 11 +++--- .../internal/shared/ComputedZoneIndexList.java | 1 + .../FeatureSetAsDiscreteGlobalGridResource.java | 19 +++++----- .../shared/GridAsDiscreteGlobalGridResource.java | 11 +++--- .../shared/IndexedDiscreteGlobalGridCoverage.java | 15 ++++---- .../shared/MemoryDiscreteGlobalGridResource.java | 1 + .../shared/RasterDiscreteGlobalGridCoverage.java | 5 ++- .../shared/TiledDiscreteGlobalGridCoverage.java | 9 +++-- .../TiledDiscreteGlobalGridCoverageResource.java | 3 +- ...bleTiledDiscreteGlobalGridCoverageResource.java | 1 + .../sis/storage/image/internal/ImageBuilder.java | 1 + .../sis/storage/image/internal/MergeOperator.java | 1 + .../org/apache/sis/storage/rs/CodeIterator.java | 1 + .../org/apache/sis/storage/rs/CodeTransform.java | 3 +- .../org/apache/sis/storage/rs/CodedCoverage.java | 5 ++- .../org/apache/sis/storage/rs/CodedCoverages.java | 9 +++-- .../org/apache/sis/storage/rs/CodedGeometry.java | 15 ++++---- .../org/apache/sis/storage/rs/CodedResource.java | 13 ++++--- .../sis/storage/rs/CompoundCodedGeometry.java | 5 ++- .../sis/storage/rs/WritableCodeIterator.java | 1 + .../rs/internal/shared/AbstractCodedCoverage.java | 21 ++++++----- .../rs/internal/shared/AddDimCodedCoverage.java | 11 +++--- .../rs/internal/shared/AddDimCodedResource.java | 9 +++-- .../rs/internal/shared/ArrayCodedCoverage.java | 5 ++- .../storage/rs/internal/shared/CodeTransforms.java | 15 ++++---- .../internal/shared/CodedCoverageAsFeatureSet.java | 19 +++++----- .../rs/internal/shared/CompoundCodedCoverage.java | 5 ++- .../rs/internal/shared/CompoundCodedResource.java | 15 ++++---- .../rs/internal/shared/GridAsCodedResource.java | 17 +++++---- .../rs/internal/shared/MemoryCodedResource.java | 3 +- .../rs/internal/shared/ResampledCodedCoverage.java | 7 ++-- .../storage/rs/internal/shared/SubTransform.java | 3 +- .../sis/storage/rs/internal/shared/s2/Factory.java | 13 ++++--- .../sis/storage/rs/internal/shared/s2/S2.java | 21 ++++++----- .../sis/storage/rs/internal/shared/s2/Wrapper.java | 7 ++-- .../sis/referencing/dggs/AbstractDggrsTest.java | 17 +++++---- .../org/apache/sis/referencing/dggs/s2/S2Test.java | 9 +++-- .../sis/referencing/rs/CodeOperationTest.java | 12 +++--- .../rs/ArrayReferencedGridCoverageTest.java | 14 ++++--- .../storage/coveragejson/CoverageJsonStore.java | 2 +- .../sis/storage/coveragejson/binding/Axe.java | 2 +- .../sis/storage/coveragejson/binding/Axes.java | 2 +- .../sis/storage/coveragejson/binding/Category.java | 3 +- .../sis/storage/coveragejson/binding/Coverage.java | 8 ++-- .../coveragejson/binding/CoverageCollection.java | 2 +- .../coveragejson/binding/CoverageJsonObject.java | 1 + .../sis/storage/coveragejson/binding/Domain.java | 2 +- .../coveragejson/binding/GeographicCRS.java | 2 +- .../storage/coveragejson/binding/IdentifierRS.java | 2 +- .../sis/storage/coveragejson/binding/NdArray.java | 2 +- .../coveragejson/binding/ObservedProperty.java | 2 +- .../storage/coveragejson/binding/Parameter.java | 2 +- .../coveragejson/binding/ParameterGroup.java | 2 +- .../storage/coveragejson/binding/ProjectedCRS.java | 2 +- .../binding/ReferenceSystemConnection.java | 2 +- .../sis/storage/coveragejson/binding/Symbol.java | 2 +- .../coveragejson/binding/TargetConcept.java | 2 +- .../storage/coveragejson/binding/TemporalRS.java | 2 +- .../sis/storage/coveragejson/binding/TileSet.java | 2 +- .../storage/coveragejson/binding/TiledNdArray.java | 2 +- .../sis/storage/coveragejson/binding/Unit.java | 2 +- .../storage/coveragejson/binding/VerticalCRS.java | 2 +- .../org/apache/sis/storage/geojson/GeoJSON.java | 21 ++++++----- .../apache/sis/storage/geojson/GeoJSONMapper.java | 25 +++++++------ .../storage/geojson/binding/GeoJSONFeature.java | 7 ++-- .../geojson/binding/GeoJSONFeatureCollection.java | 7 ++-- .../storage/geojson/binding/GeoJSONGeometry.java | 3 +- .../geojson/binding/GeoJSONGeometryCollection.java | 7 ++-- .../storage/geojson/binding/GeoJSONLineString.java | 7 ++-- .../geojson/binding/GeoJSONMultiLineString.java | 7 ++-- .../storage/geojson/binding/GeoJSONMultiPoint.java | 7 ++-- .../geojson/binding/GeoJSONMultiPolygon.java | 7 ++-- .../sis/storage/geojson/binding/GeoJSONObject.java | 7 ++-- .../sis/storage/geojson/binding/GeoJSONPoint.java | 7 ++-- .../storage/geojson/binding/GeoJSONPolygon.java | 7 ++-- .../geojson/binding/JSONFGCircularString.java | 7 ++-- .../geojson/binding/JSONFGCompoundCurve.java | 7 ++-- .../storage/geojson/binding/JSONFGCoordRefSys.java | 2 +- .../geojson/binding/JSONFGCurvePolygon.java | 7 ++-- .../storage/geojson/binding/JSONFGMeasures.java | 3 +- .../storage/geojson/binding/JSONFGMultiCurve.java | 7 ++-- .../geojson/binding/JSONFGMultiPolyhedron.java | 7 ++-- .../storage/geojson/binding/JSONFGMultiPrism.java | 7 ++-- .../geojson/binding/JSONFGMultiSurface.java | 7 ++-- .../storage/geojson/binding/JSONFGPolyhedron.java | 6 +-- .../sis/storage/geojson/binding/JSONFGPrism.java | 3 +- .../sis/storage/geojson/binding/JSONFGTime.java | 6 +-- .../sis/storage/json/DataTransferObject.java | 5 ++- .../movingfeature/binding/MFCoordRefSys.java | 3 +- .../movingfeature/binding/MFMovingFeature.java | 7 ++-- .../binding/MFMovingFeatureCollection.java | 7 ++-- .../binding/MFMovingGeometryBase.java | 3 +- .../binding/MFMovingGeometryCollection.java | 7 ++-- .../movingfeature/binding/MFMovingLineString.java | 7 ++-- .../movingfeature/binding/MFMovingPoint.java | 7 ++-- .../movingfeature/binding/MFMovingPointCloud.java | 7 ++-- .../movingfeature/binding/MFMovingPolygon.java | 7 ++-- .../movingfeature/binding/MFOrientation.java | 7 ++-- .../movingfeature/binding/MFTemporalGeometry.java | 3 +- .../binding/MFTemporalPrimitiveGeometry.java | 7 ++-- .../binding/MFTemporalPropertyGroup.java | 7 ++-- .../binding/MFTemporalPropertyValue.java | 7 ++-- .../main/org/apache/sis/storage/ogcjson/Link.java | 3 +- .../storage/coveragejson/binding/BindingTest.java | 2 +- .../sis/storage/geojson/binding/BindingTest.java | 3 +- .../sis/storage/json/AbstractBindingTest.java | 10 +++-- .../storage/movingfeature/binding/BindingTest.java | 3 +- 181 files changed, 616 insertions(+), 463 deletions(-) diff --cc incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/CompoundRS.java index c467a7e6f7,78ccdb77ca..4cb7994329 --- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/CompoundRS.java +++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/CompoundRS.java @@@ -32,6 -26,14 +26,14 @@@ import org.opengis.referencing.crs.Comp import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.SingleCRS; import org.opengis.util.FactoryException; + import org.apache.sis.referencing.CRS; + import org.apache.sis.referencing.CommonCRS; + import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers; + import org.apache.sis.referencing.dggs.DiscreteGlobalGridReferenceSystem; + -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; -import org.apache.sis.metadata.iso.DefaultIdentifier; ++// Specific to the geoapi-3.1 branch: ++import org.opengis.referencing.ReferenceIdentifier; ++import org.apache.sis.referencing.NamedIdentifier; /** diff --cc incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/internal/shared/CodeOperations.java index 24e502c6e7,1d0a73c184..33cacb5ef3 --- a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/internal/shared/CodeOperations.java +++ b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/referencing/rs/internal/shared/CodeOperations.java @@@ -34,6 -26,17 +26,17 @@@ import org.opengis.referencing.operatio import org.opengis.referencing.operation.NoninvertibleTransformException; import org.opengis.referencing.operation.TransformException; import org.opengis.util.FactoryException; + import org.apache.sis.referencing.CRS; + import org.apache.sis.referencing.NamedIdentifier; + import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers; + import org.apache.sis.referencing.rs.Code; + import org.apache.sis.referencing.rs.CodeOperation; + import org.apache.sis.referencing.rs.ReferenceSystems; + import org.apache.sis.util.iso.Names; + -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; ++// Specific to the geoapi-3.1 branch: ++import org.opengis.referencing.ReferenceIdentifier; + /** *
