Updated max and min args for functions. Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4b69a291 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4b69a291 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4b69a291
Branch: refs/heads/MARMOTTA-584 Commit: 4b69a29179c2af974f842c99a4b96f4d0d059893 Parents: 73cf2a7 Author: cuent <cuent@mbp-de-xavier> Authored: Thu Aug 13 17:34:26 2015 -0500 Committer: cuent <cuent@mbp-de-xavier> Committed: Thu Aug 13 17:34:26 2015 -0500 ---------------------------------------------------------------------- .../kiwi/sparql/function/geosparql/BoundaryFunction.java | 3 --- .../kiwi/sparql/function/geosparql/BufferFunction.java | 8 ++------ .../sparql/function/geosparql/ConvexHullFunction.java | 6 +----- .../sparql/function/geosparql/DifferenceFunction.java | 4 ---- .../kiwi/sparql/function/geosparql/RelateFunction.java | 4 ---- .../sparql/function/geosparql/SfContainsFunction.java | 11 +++-------- .../sparql/function/geosparql/SfCrossesFunction.java | 8 ++------ .../sparql/function/geosparql/SfDisjointFunction.java | 8 ++------ .../kiwi/sparql/function/geosparql/SfEqualsFunction.java | 8 ++------ .../sparql/function/geosparql/SfIntersectsFunction.java | 2 +- .../sparql/function/geosparql/SfOverlapsFunction.java | 7 ++----- .../sparql/function/geosparql/SfTouchesFunction.java | 10 +--------- .../kiwi/sparql/function/geosparql/SfWithinFunction.java | 10 +--------- 13 files changed, 17 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BoundaryFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BoundaryFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BoundaryFunction.java index 68c8c75..e7fafb6 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BoundaryFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BoundaryFunction.java @@ -85,9 +85,6 @@ public class BoundaryFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("ST_AsText(ST_Boundary(%s))", args[0]); - } return String.format("ST_AsText(ST_Boundary(%s)) ", args[0]); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BufferFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BufferFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BufferFunction.java index 1214d58..ff5d758 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BufferFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/BufferFunction.java @@ -85,14 +85,10 @@ public class BufferFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("ST_AsText(st_Buffer(%s , %s ))", args[0], args[1]); - } return String.format("ST_AsText(st_Buffer(%s , %s )) ", args[0], args[1]); } - } - throw new UnsupportedOperationException("buffer function not supported by dialect " + dialect); + throw new UnsupportedOperationException("Buffer function not supported by dialect " + dialect); } /** @@ -125,7 +121,7 @@ public class BufferFunction implements NativeFunction { */ @Override public int getMinArgs() { - return 2; + return 3; } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/ConvexHullFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/ConvexHullFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/ConvexHullFunction.java index 63ae16f..b21db80 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/ConvexHullFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/ConvexHullFunction.java @@ -85,14 +85,10 @@ public class ConvexHullFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 1) { - if (args[0].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[0].contains(FN_GEOSPARQL.MULTILINESTRING) || args[0].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("ST_AsText(st_convexHull( %s ))", args[0]); - } return String.format("ST_AsText(st_convexHull(%s))", args[0]); } - } - throw new UnsupportedOperationException("convexHull function not supported by dialect " + dialect); + throw new UnsupportedOperationException("ConvexHull function not supported by dialect " + dialect); } /** http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DifferenceFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DifferenceFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DifferenceFunction.java index 111cff9..c44facf 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DifferenceFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DifferenceFunction.java @@ -85,12 +85,8 @@ public class DifferenceFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("ST_AsText(ST_Difference(%s , %s ))", args[0], args[1]); - } return String.format("ST_AsText(ST_Difference(%s , %s )) ", args[0], args[1]); } - } throw new UnsupportedOperationException("Difference function not supported by dialect " + dialect); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/RelateFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/RelateFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/RelateFunction.java index db63d2b..5a395c9 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/RelateFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/RelateFunction.java @@ -85,12 +85,8 @@ public class RelateFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 3) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("ST_Relate(%s, %s, %s )", args[0], args[1], args[2]); - } return String.format("ST_Relate(%s, %s , %s)", args[0], args[1], args[2]); } - } throw new UnsupportedOperationException("Relate function not supported by dialect " + dialect); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java index 95dd9a7..8a6ac31 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java @@ -82,16 +82,11 @@ public class SfContainsFunction implements NativeFunction { @Override public String getNative(KiWiDialect dialect, String... args) { if(dialect instanceof PostgreSQLDialect) { - if(args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) - { //If users insert Direct the WKT Geometry - return String.format("st_Contains(%s , %s )",args[0],args[1]); - } + if(args.length == 2) { return String.format("st_Contains(%s , %s )",args[0],args[1]); } - } - throw new UnsupportedOperationException("sfContains function not supported by dialect "+dialect); + throw new UnsupportedOperationException("Contains function not supported by dialect "+dialect); } /** @@ -133,6 +128,6 @@ public class SfContainsFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java index 48708ea..affb94e 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java @@ -85,14 +85,10 @@ public class SfCrossesFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("st_Crosses(%s , %s )", args[0], args[1]); - } return String.format("st_Crosses(%s , %s )", args[0], args[1]); } - } - throw new UnsupportedOperationException("sfCrosses function not supported by dialect " + dialect); + throw new UnsupportedOperationException("Crosses function not supported by dialect " + dialect); } /** @@ -135,6 +131,6 @@ public class SfCrossesFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java index 79f430f..ce8d90e 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java @@ -85,14 +85,10 @@ public class SfDisjointFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("st_Disjoint(%s , %s )", args[0], args[1]); - } return String.format("st_Disjoint(%s , %s )", args[0], args[1]); } - } - throw new UnsupportedOperationException("sfDisjoint function not supported by dialect " + dialect); + throw new UnsupportedOperationException("Disjoint function not supported by dialect " + dialect); } /** @@ -135,6 +131,6 @@ public class SfDisjointFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java index 5384af6..dd41175 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java @@ -85,14 +85,10 @@ public class SfEqualsFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("st_Equals(%s , %s )", args[0], args[1]); - } return String.format("st_Equals(%s , %s )", args[0], args[1]); } - } - throw new UnsupportedOperationException("sfEquals function not supported by dialect " + dialect); + throw new UnsupportedOperationException("Equals function not supported by dialect " + dialect); } /** @@ -135,6 +131,6 @@ public class SfEqualsFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java index 6cccc1d..afe4e81 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java @@ -29,7 +29,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; /** * A SPARQL function for doing a intersection between two geometries. Should be * implemented directly in the database, as the in-memory implementation is - * non-functional. Only support by postgres - POSTGIS + * non-functional. Only support by postgres - POSTGIS. * <p/> * The function can be called either as: * <ul> http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java index 29e50c6..227993a 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java @@ -85,13 +85,10 @@ public class SfOverlapsFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON) || args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return String.format("st_Overlaps(%s , %s )", args[0], args[1]); - } return String.format("st_Overlaps(%s , %s )", args[0], args[1]); } } - throw new UnsupportedOperationException("sfOverlaps function not supported by dialect " + dialect); + throw new UnsupportedOperationException("Overlaps function not supported by dialect " + dialect); } /** @@ -134,6 +131,6 @@ public class SfOverlapsFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java index de46e26..85c1018 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java @@ -85,16 +85,8 @@ public class SfTouchesFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 2) { - // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTIPOLYGON.toString())) - // { return String.format("st_Touches(%s , %s )", args[0], args[1]); - // } - // else - // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTILINESTRING.toString())) - // { return "st_Intersects(substring( " + args[0] + " from position('" + FN_GEOSPARQL.POINT.toString() + "' in " + args[0] + " ) for 60 ), substring( " + args[1] + " from position('"+FN_GEOSPARQL.MULTILINESTRING.toString()+"' in " + args[1] + " ) for char_length( " + args[1] + " ) ) ) "; - // } } - } throw new UnsupportedOperationException("Touches function not supported by dialect " + dialect); } @@ -139,6 +131,6 @@ public class SfTouchesFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4b69a291/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java index 69f57b5..13ddbc9 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java @@ -83,16 +83,8 @@ public class SfWithinFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if(dialect instanceof PostgreSQLDialect) { if(args.length == 2) { - // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTIPOLYGON.toString())) - // { return "st_Within("+args[0]+","+args[1]+")"; - // } - // else - // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTILINESTRING.toString())) - // { return "st_Intersects(substring( " + args[0] + " from position('" + FN_GEOSPARQL.POINT.toString() + "' in " + args[0] + " ) for 60 ), substring( " + args[1] + " from position('"+FN_GEOSPARQL.MULTILINESTRING.toString()+"' in " + args[1] + " ) for char_length( " + args[1] + " ) ) ) "; - // } } - } throw new UnsupportedOperationException("Within function not supported by dialect "+dialect); } @@ -136,6 +128,6 @@ public class SfWithinFunction implements NativeFunction { */ @Override public int getMaxArgs() { - return 3; + return 2; } }
