This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 8783e66c1f5f995a5cb2c75cebf1598f81d2cad5
Merge: 9686f9d864 e0f5cfa3ec
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Oct 28 17:08:29 2023 +0200
Merge branch 'geoapi-3.1'
.../apache/sis/geometry/wrapper/jts/Wrapper.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../org/apache/sis/storage/geotiff/Writer.java | 4 ++--
.../sis/storage/geotiff/writer/GeoEncoder.java | 9 +++++----
.../storage/geotiff/writer/ReformattedImage.java | 3 ++-
.../org/apache/sis/storage/geotiff/WriterTest.java | 7 ++++---
.../apache/sis/storage/base/MetadataFetcher.java | 3 ++-
.../sis/io/stream/HyperRectangleWriterTest.java | 6 ++++--
.../apache/sis/io/stream/UpdatableWriteTest.java | 6 ++++--
.../storage/coveragejson/CoverageJsonStore.java | 22 +++++++++++-----------
.../coveragejson/CoverageJsonStoreProvider.java | 8 ++++----
.../sis/storage/coveragejson/CoverageResource.java | 21 +++++++++++----------
.../sis/storage/coveragejson/binding/Axe.java | 4 ++--
.../sis/storage/coveragejson/binding/Axes.java | 2 +-
.../sis/storage/coveragejson/binding/Category.java | 2 +-
.../coveragejson/binding/CategoryEncoding.java | 4 ++--
.../sis/storage/coveragejson/binding/Coverage.java | 6 +++---
.../coveragejson/binding/CoverageCollection.java | 4 ++--
.../storage/coveragejson/binding/Dictionary.java | 4 ++--
.../sis/storage/coveragejson/binding/Domain.java | 4 ++--
.../coveragejson/binding/GeographicCRS.java | 2 +-
.../sis/storage/coveragejson/binding/I18N.java | 8 ++++----
.../storage/coveragejson/binding/IdentifierRS.java | 2 +-
.../sis/storage/coveragejson/binding/NdArray.java | 4 ++--
.../coveragejson/binding/ObservedProperty.java | 4 ++--
.../storage/coveragejson/binding/Parameter.java | 2 +-
.../coveragejson/binding/ParameterGroup.java | 4 ++--
.../storage/coveragejson/binding/Parameters.java | 4 ++--
.../storage/coveragejson/binding/ProjectedCRS.java | 2 +-
.../sis/storage/coveragejson/binding/Ranges.java | 4 ++--
.../binding/ReferenceSystemConnection.java | 4 ++--
.../sis/storage/coveragejson/binding/Symbol.java | 2 +-
.../coveragejson/binding/TargetConcept.java | 2 +-
.../storage/coveragejson/binding/TemporalRS.java | 2 +-
.../sis/storage/coveragejson/binding/TileSet.java | 6 +++---
.../storage/coveragejson/binding/TiledNdArray.java | 4 ++--
.../sis/storage/coveragejson/binding/Unit.java | 2 +-
.../storage/coveragejson/binding/VerticalCRS.java | 2 +-
.../coveragejson/CoverageJsonStoreTest.java | 13 ++++++++-----
.../storage/coveragejson/binding/BindingTest.java | 13 ++++++++-----
41 files changed, 113 insertions(+), 98 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 531f71f93b,9fa86d38b4..7460f4a0ef
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@@ -31,10 -31,13 +31,10 @@@ import org.apache.sis.metadata.internal
// Test dependencies
import org.junit.Test;
- import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
+ import org.apache.sis.test.TestUtilities;
import org.apache.sis.xml.test.AnnotationConsistencyCheck;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
-
/**
* Base class for tests done on metadata objects using reflection. This base
class tests JAXB annotations
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
index 8e0f417ddb,7a60ecb1f7..f987d86fd6
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java
@@@ -41,9 -40,11 +40,11 @@@ import org.opengis.metadata.spatial.Cel
import org.opengis.metadata.spatial.Georectified;
import org.opengis.metadata.spatial.SpatialRepresentation;
import org.opengis.metadata.spatial.GridSpatialRepresentation;
+ import org.apache.sis.util.collection.CodeListSet;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
++// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.apache.sis.metadata.iso.DefaultMetadata;
/**
diff --cc
incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
index 2891698e2e,db4aeaf0ce..6f205569e0
---
a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
+++
b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageResource.java
@@@ -71,18 -81,9 +81,9 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransforms;
- import org.apache.sis.storage.AbstractGridCoverageResource;
- import org.apache.sis.storage.DataStoreException;
- import org.apache.sis.storage.NoSuchDataException;
- import org.opengis.metadata.spatial.DimensionNameType;
- import org.opengis.referencing.crs.CoordinateReferenceSystem;
- import org.opengis.referencing.datum.PixelInCell;
- import org.opengis.referencing.operation.MathTransform;
- import org.opengis.referencing.operation.MathTransform1D;
- import org.opengis.referencing.operation.Matrix;
- import org.opengis.util.FactoryException;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
++// Specific to the main branch:
+import org.apache.sis.image.SequenceType;
/**
