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 9b56572ba1cd4704b236cfcf02e741a8da410b75
Merge: ad3d4f6c2f ebe3bf8253
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Apr 7 18:32:32 2025 +0200
Merge branch 'geoapi-3.1'
.../main/org/apache/sis/console/AboutCommand.java | 4 +-
.../main/org/apache/sis/console/CommandRunner.java | 9 +-
.../org/apache/sis/console/CommandRunnerTest.java | 11 +-
.../main/org/apache/sis/filter/TemporalFilter.java | 6 +-
.../org.apache.sis.metadata/main/module-info.java | 1 +
.../main/org/apache/sis/temporal/TimeMethods.java | 162 +++++++--
.../main/org/apache/sis/xml/MarshalContext.java | 21 +-
.../main/org/apache/sis/xml/Pooled.java | 21 +-
.../main/org/apache/sis/xml/XML.java | 5 +-
.../main/org/apache/sis/xml/bind/Context.java | 8 +-
.../org/apache/sis/temporal/TimeMethodsTest.java | 56 +++
.../org/apache/sis/xml/privy/XmlUtilitiesTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 16 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 3 +-
.../main/org/apache/sis/storage/landsat/Band.java | 9 +-
.../main/module-info.java | 3 -
.../org/apache/sis/storage/geotiff/DataCube.java | 3 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 41 ++-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 32 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 50 +--
.../sis/storage/geotiff/spi/SchemaModifier.java | 306 ----------------
.../sis/storage/netcdf/base/GridMapping.java | 3 +-
.../sis/storage/xml/stream/StaxDataStore.java | 4 +-
.../org.apache.sis.storage/main/module-info.java | 1 +
.../main/org/apache/sis/storage/DataOptionKey.java | 9 +
.../org/apache/sis/storage/base/URIDataStore.java | 4 +-
.../main/org/apache/sis/storage/folder/Store.java | 8 +-
.../apache/sis/storage/folder/StoreProvider.java | 6 +-
.../sis/storage/image/WorldFileResource.java | 16 +-
.../apache/sis/storage/image/WorldFileStore.java | 31 +-
.../sis/storage/modifier/CoverageModifier.java | 385 +++++++++++++++++++++
.../apache/sis/storage/modifier}/package-info.java | 6 +-
.../org/apache/sis/storage/wkt/StoreFormat.java | 4 +-
.../main/org/apache/sis/setup/OptionKey.java | 11 +-
.../sis/storage/geoheif/CoverageBuilder.java | 38 +-
.../apache/sis/storage/geoheif/GeoHeifStore.java | 9 +-
.../main/org/apache/sis/storage/geoheif/Image.java | 8 +
.../apache/sis/storage/geoheif/ImageResource.java | 5 +-
.../sis/storage/geoheif/ResourceBuilder.java | 8 +-
.../sis/storage/geoheif/UncompressedImage.java | 2 +-
.../sis/storage/shapefile/ShapefileStore.java | 48 ++-
.../apache/sis/storage/shapefile/dbf/DBFField.java | 31 +-
.../sis/storage/shapefile/dbf/DBFHeader.java | 5 +-
.../sis/storage/shapefile/dbf/DBFReader.java | 5 +-
.../sis/storage/shapefile/dbf/DBFIOTest.java | 6 +-
.../apache/sis/storage/shapefile/dbf/Snippets.java | 8 +-
.../org/apache/sis/gui/referencing/WKTPane.java | 3 +-
.../org/apache/sis/storage/gdal/GDALStore.java | 2 +-
49 files changed, 921 insertions(+), 518 deletions(-)
diff --cc
endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
index cd6b1b2e26,6413abcadc..0f3f84be2a
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
@@@ -196,8 -200,8 +196,8 @@@ class TemporalFilter<R,T> extends Binar
return operation.evaluate(left, right);
}
} catch (DateTimeException e) {
- throw new InvalidFilterValueException(Errors.format(
+ throw new IllegalArgumentException(Errors.format(
- Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()));
+ Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()), e);
}
}
return false;
@@@ -235,8 -239,8 +235,8 @@@
if (right != null) try {
return operation.evaluate(left, right);
} catch (DateTimeException e) {
- throw new InvalidFilterValueException(Errors.format(
+ throw new IllegalArgumentException(Errors.format(
- Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()));
+ Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()), e);
}
}
return false;
@@@ -275,8 -279,8 +275,8 @@@
if (right != null) try {
return operation.evaluate(left, right);
} catch (DateTimeException e) {
- throw new InvalidFilterValueException(Errors.format(
+ throw new IllegalArgumentException(Errors.format(
- Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()));
+ Errors.Keys.CannotCompareInstanceOf_2,
left.getClass(), right.getClass()), e);
}
}
return false;
diff --cc
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java
index f616f36907,0bbcd6bbd7..02c19a540b
---
a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java
+++
b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java
@@@ -247,9 -254,9 +254,9 @@@ public class GeoHeifStore extends DataS
builder.setISOStandards(true);
builder.setPredefinedFormat(GeoHeifStoreProvider.NAME, listeners,
true);
builder.addFormatReaderSIS(GeoHeifStoreProvider.NAME);
- builder.addResourceScope(ScopeCode.COVERAGE, null);
+ builder.addResourceScope(ScopeCode.valueOf("COVERAGE"), null);
getIdentifier().ifPresent((id) -> builder.addIdentifier(id,
MetadataBuilder.Scope.ALL));
- metadata = builder.buildAndFreeze();
+ metadata = customizer.customize(new
CoverageModifier.Source(this), builder.build());
}
return metadata;
}
