This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit f64017ade8d577f5acf52151f17b6a952788ea78 Merge: 41cf5d3399 108cf319d1 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Fri Aug 4 11:38:28 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. .../org/apache/sis/internal/gui/Resources.java | 2 +- .../apache/sis/cloud/aws/internal/Resources.java | 2 +- .../apache/sis/feature/ExpressionOperation.java | 5 +- .../java/org/apache/sis/filter/Capabilities.java | 25 +- .../apache/sis/filter/DefaultFilterFactory.java | 130 ++++++-- .../java/org/apache/sis/image/ImageProcessor.java | 7 +- .../internal/coverage/j2d/ColorModelBuilder.java | 4 +- .../sis/internal/coverage/j2d/FillValues.java | 1 + .../sis/internal/coverage/j2d/TilePlaceholder.java | 6 +- .../sis/internal/coverage/j2d/TiledImage.java | 2 +- .../apache/sis/internal/feature/Geometries.java | 4 +- .../apache/sis/internal/feature/GeometryType.java | 113 +++++-- .../sis/internal/feature/GeometryWrapper.java | 2 +- .../org/apache/sis/internal/feature/Resources.java | 2 +- .../apache/sis/internal/feature/esri/Factory.java | 8 +- .../sis/internal/feature/esri/package-info.java | 5 +- .../sis/internal/feature/j2d/package-info.java | 5 +- .../apache/sis/internal/feature/jts/Factory.java | 20 +- .../org/apache/sis/internal/feature/jts/JTS.java | 5 +- .../apache/sis/internal/feature/jts/Wrapper.java | 22 +- .../apache/sis/internal/filter/EditVisitor.java | 2 + .../sis/internal/filter/FunctionRegister.java | 14 +- .../java/org/apache/sis/internal/filter/Node.java | 2 +- .../org/apache/sis/internal/filter/Visitor.java | 4 +- .../java/org/apache/sis/internal/filter/XPath.java | 2 +- .../internal/filter/sqlmm/FunctionDescription.java | 349 +++++++++++++++++++++ .../apache/sis/internal/filter/sqlmm/Registry.java | 13 + .../apache/sis/internal/filter/sqlmm/SQLMM.java | 71 +++-- .../sis/internal/filter/sqlmm/SpatialFunction.java | 3 +- .../org/apache/sis/filter/CapabilitiesTest.java | 22 +- .../sis/internal/feature/GeometryTypeTest.java | 36 ++- .../internal/filter/sqlmm/RegistryTestCase.java | 18 ++ .../jaxb/metadata/replace/ServiceParameter.java | 4 +- .../apache/sis/internal/metadata/Resources.java | 2 +- .../internal/simple/SimpleIdentifiedObject.java | 15 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 5 + .../java/org/apache/sis/util/iso/TypeNames.java | 6 +- .../META-INF/services/org.opengis.util.NameFactory | 0 .../apache/sis/test/xml/DocumentComparator.java | 2 +- .../org/apache/sis/util/iso/TypeNamesTest.java | 17 +- .../sis/internal/map/coverage/RenderingData.java | 2 +- .../java/org/apache/sis/style/package-info.java | 2 +- .../main/java/org/apache/sis/style/se1/Fill.java | 2 +- .../org/apache/sis/style/se1/LinePlacement.java | 2 +- .../main/java/org/apache/sis/style/se1/Stroke.java | 2 +- .../org/apache/sis/style/se1/package-info.java | 2 +- .../apache/sis/internal/gazetteer/Resources.java | 2 +- .../referencing/CC_GeneralOperationParameter.java | 2 +- .../referencing/CC_OperationParameterGroup.java | 2 +- .../internal/jaxb/referencing/RS_Identifier.java | 2 +- .../sis/internal/referencing/Arithmetic.java | 9 +- .../internal/referencing/DefinitionVerifier.java | 4 +- .../apache/sis/internal/referencing/LazySet.java | 3 +- .../apache/sis/internal/referencing/Resources.java | 2 +- .../internal/referencing/j2d/AbstractShape.java | 2 +- .../sis/internal/referencing/j2d/package-info.java | 5 +- .../referencing/provider/DatumShiftGridFile.java | 12 +- .../referencing/provider/DatumShiftGridGroup.java | 6 +- .../referencing/provider/GeocentricAffine.java | 1 + .../DefaultCoordinateOperationFactory.java | 2 +- .../operation/DefaultOperationMethod.java | 2 +- .../operation/projection/AlbersEqualArea.java | 2 +- .../operation/transform/ScaleTransform.java | 2 +- .../operation/transform/SphericalToCartesian.java | 2 +- .../operation/DefaultOperationMethodTest.java | 3 +- .../sis/internal/converter/ArrayConverter.java | 6 +- .../internal/converter/CharSequenceConverter.java | 5 +- .../internal/converter/CollectionConverter.java | 5 +- .../sis/internal/converter/DateConverter.java | 5 +- .../sis/internal/converter/PathConverter.java | 6 +- .../sis/internal/converter/StringConverter.java | 5 +- .../apache/sis/internal/util/CollectionsExt.java | 2 - .../sis/util/ResourceInternationalString.java | 4 +- .../java/org/apache/sis/util/collection/Cache.java | 2 - pom.xml | 57 +++- .../apache/sis/internal/earth/netcdf/GCOM_C.java | 2 +- .../apache/sis/internal/earth/netcdf/GCOM_W.java | 2 +- .../apache/sis/internal/geotiff/Compression.java | 2 +- .../org/apache/sis/internal/geotiff/Predictor.java | 2 +- .../org/apache/sis/internal/geotiff/Resources.java | 2 +- .../apache/sis/storage/geotiff/GeoIdentifiers.java | 2 +- .../apache/sis/storage/geotiff/GeoKeysTest.java | 14 +- .../org/apache/sis/internal/netcdf/Resources.java | 2 +- .../org/apache/sis/internal/netcdf/Variable.java | 2 +- .../apache/sis/internal/sql/feature/Database.java | 20 +- .../apache/sis/internal/sql/feature/Resources.java | 7 +- .../sis/internal/sql/feature/Resources.properties | 1 + .../internal/sql/feature/Resources_fr.properties | 1 + .../apache/sis/internal/sql/postgis/Postgres.java | 2 +- .../internal/storage/FeatureCatalogBuilder.java | 2 +- .../sis/internal/storage/GridResourceWrapper.java | 4 +- .../sis/internal/storage/MemoryFeatureSet.java | 2 +- .../sis/internal/storage/MemoryGridResource.java | 2 +- .../org/apache/sis/internal/storage/Resources.java | 2 +- .../sis/internal/storage/wkt/FirstKeywordPeek.java | 6 +- .../sis/internal/storage/wkt/StoreFormat.java | 1 + .../sis/internal/storage/xml/package-info.java | 2 +- .../java/org/apache/sis/storage/FeatureQuery.java | 2 +- .../sis/test/storage/CoverageReadConsistency.java | 8 +- .../sis/internal/storage/gpx/WritableStore.java | 2 +- .../internal/storage/xml/stream/StaxStreamIO.java | 2 +- 101 files changed, 986 insertions(+), 241 deletions(-)