[sis] branch geoapi-4.0 updated: Add missing call to `unwrap(…)` for geometry arguments in filter expressions having a non-geometric arguments in addition of geometric ones.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new e4a750173c Add missing call to `unwrap(…)` for geometry arguments in 
filter expressions having a non-geometric arguments in addition of geometric 
ones.
e4a750173c is described below

commit e4a750173ce1e7d8ba4f99d837c53f6636a3f5eb
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Jun 7 12:12:31 2022 +0200

    Add missing call to `unwrap(…)` for geometry arguments in filter 
expressions having a non-geometric arguments in addition of geometric ones.
---
 .../main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java   | 4 ++--
 .../main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java | 4 ++--
 .../main/java/org/apache/sis/internal/filter/sqlmm/package-info.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
index 48b7625881..d219252ed3 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/OneGeometry.java
@@ -33,7 +33,7 @@ import org.opengis.filter.Expression;
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.1
+ * @version 1.3
  *
  * @param  <R>  the type of resources (e.g. {@link 
org.opengis.feature.Feature}) used as inputs.
  * @param  <G>  the implementation type of geometry objects.
@@ -133,7 +133,7 @@ class OneGeometry<R,G> extends SpatialFunction<R> {
          */
         @Override
         public List<Expression<? super R, ?>> getParameters() {
-            return Arrays.asList(geometry, argument);               // TODO: 
use List.of(…) with JDK9.
+            return Arrays.asList(unwrap(geometry), argument);       // TODO: 
use List.of(…) with JDK9.
         }
 
         /**
diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
index 69efa59bc8..b4575408b3 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/TwoGeometries.java
@@ -38,7 +38,7 @@ import org.opengis.filter.ValueReference;
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.1
+ * @version 1.3
  *
  * @param  <R>  the type of resources (e.g. {@link 
org.opengis.feature.Feature}) used as inputs.
  * @param  <G>  the implementation type of geometry objects.
@@ -177,7 +177,7 @@ class TwoGeometries<R,G> extends SpatialFunction<R> {
          */
         @Override
         public List<Expression<? super R, ?>> getParameters() {
-            return Arrays.asList(geometry1, geometry2, argument);              
 // TODO: use List.of(…) with JDK9.
+            return Arrays.asList(unwrap(geometry1), unwrap(geometry2), 
argument);   // TODO: use List.of(…) with JDK9.
         }
 
         /**
diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
index e25ed2f294..573e57912c 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/package-info.java
@@ -31,7 +31,7 @@
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 1.2
+ * @version 1.3
  * @since   1.1
  * @module
  */