Merge pull request #1664 from lat-lon/fix/isGeomTypeOptionalGeometries-XPLANBOX-2615

Return false is geometry property does not exists (3.6)

Author: stephanr

deegree-core/deegree-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.");

deegree-core/deegree-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.");

deegree-core/deegree-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.");