Added unit "metre" to buffer and distance function. Fixed buffer function.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f889f4ac Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f889f4ac Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f889f4ac Branch: refs/heads/MARMOTTA-584 Commit: f889f4ac6cff00d56b9246acc490b4c6388e589f Parents: f621a84 Author: cuent <[email protected]> Authored: Fri Aug 14 22:42:28 2015 -0500 Committer: cuent <[email protected]> Committed: Fri Aug 14 22:42:28 2015 -0500 ---------------------------------------------------------------------- .../marmotta/kiwi/sparql/function/geosparql/BufferFunction.java | 4 ++-- .../kiwi/sparql/function/geosparql/DistanceFunction.java | 2 +- .../java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f889f4ac/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 23e46a2..021b128 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,8 +85,8 @@ public class BufferFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 3) { - if (args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.meter.toString() + "'")) { - return String.format("ST_AsText(ST_Buffer( ST_Transform( %s ,26986), %s))", args[0], args[1]); + if (args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.meter.toString() + "'") || args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.metre.toString() + "'")) { + return String.format("ST_AsText(ST_Transform(ST_Buffer( ST_Transform( %s ,26986), %s),4326))", args[0], args[1]); } } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/f889f4ac/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DistanceFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DistanceFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DistanceFunction.java index a725710..22de6c2 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DistanceFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/DistanceFunction.java @@ -85,7 +85,7 @@ public class DistanceFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { if (args.length == 3) { - if (args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.meter.toString() + "'")) { + if (args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.meter.toString() + "'") || args[2].equalsIgnoreCase("'" + FN_GEOSPARQL.metre.toString() + "'")) { return String.format("ST_Distance( ST_Transform( %s ,26986), ST_Transform( %s ,26986))", args[0], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/f889f4ac/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java index a1bf14f..e64ae7e 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java @@ -103,6 +103,7 @@ public class FN_GEOSPARQL { public static final String unitsNAMESPACE = "http://www.opengis.net/def/uom/OGC/1.0/";; public static final String unitsPREFIX = "units"; public static final URI meter; + public static final URI metre; // Default CRS public static final String sridNamespace = "http://www.opengis.net/def/crs/";; @@ -152,6 +153,7 @@ public class FN_GEOSPARQL { RELATE = f.createURI(NAMESPACE, "relate"); meter = f.createURI(unitsNAMESPACE, "meter"); + metre = f.createURI(unitsNAMESPACE, "metre"); POINT = "POINT"; MULTIPOLYGON = "MULTIPOLYGON";
