Merge pull request deegree#1664 from lat-lon/fix/isGeomTypeOptionalGe…

…ometries-XPLANBOX-2615 Return false is geometry property does not exists (3.6)
tfr42 · Mar 27, 2024 · c8e7d52 · c8e7d52
2 parents 6390ff6 + 9fa02f4
commit c8e7d52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...gree-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsCurve.java b/...gree-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsCurve.java
@@ -59,6 +59,9 @@ public <T> TypedObjectNode[] evaluate(T obj, XPathEvaluator<T> xpathEvaluator)
 					throws FilterEvaluationException {
 				TypedObjectNode[] vals = getParams()[0].evaluate(obj, xpathEvaluator);
 
+				if (vals.length == 0) {
+					return new TypedObjectNode[] { new PrimitiveValue(Boolean.toString(false)) };
+				}
 				if (vals.length != 1) {
 					throw new FilterEvaluationException(
 							"The " + NAME + " function's first argument must evaluate" + " to exactly one value.");

diff --git a/...gree-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsPoint.java b/...gree-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsPoint.java
@@ -56,6 +56,9 @@ public <T> TypedObjectNode[] evaluate(T obj, XPathEvaluator<T> xpathEvaluator)
 					throws FilterEvaluationException {
 				TypedObjectNode[] vals = getParams()[0].evaluate(obj, xpathEvaluator);
 
+				if (vals.length == 0) {
+					return new TypedObjectNode[] { new PrimitiveValue(Boolean.toString(false)) };
+				}
 				if (vals.length != 1) {
 					throw new FilterEvaluationException(
 							"The " + NAME + " function's first argument must evaluate" + " to exactly one value.");

diff --git a/...ee-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsSurface.java b/...ee-core-filterfunctions/src/main/java/org/deegree/filter/function/geometry/IsSurface.java
@@ -57,6 +57,9 @@ public <T> TypedObjectNode[] evaluate(T obj, XPathEvaluator<T> xpathEvaluator)
 					throws FilterEvaluationException {
 				TypedObjectNode[] vals = getParams()[0].evaluate(obj, xpathEvaluator);
 
+				if (vals.length == 0) {
+					return new TypedObjectNode[] { new PrimitiveValue(Boolean.toString(false)) };
+				}
 				if (vals.length != 1) {
 					throw new FilterEvaluationException(
 							"The " + NAME + " function's first argument must evaluate" + " to exactly one value.");