Strabon
changeset 801:491074f01e5d
* Removed the strdf:anyInteract extension function (end of an era).
* Fixed the strdf:mbbIntersects extension function
* Fixed the strdf:mbbIntersects extension function
line diff
1.1 --- a/ChangeLog Tue Dec 11 16:55:46 2012 +0200 1.2 +++ b/ChangeLog Tue Dec 11 19:28:43 2012 +0200 1.3 @@ -1,9 +1,14 @@ 1.4 Day Month Date Hour:Min:Sec Year Pyravlos Team 1.5 1.6 + * Version 3.2.7 released. 1.7 + 1.8 + * Modified the names of the stSPARQL extension functions that 1.9 + utilize the minimum bounding boxes of the involved geometries. 1.10 + 1.11 * Version 3.2.6 released. 1.12 1.13 * Modified the names of the stSPARQL extension functions to comply 1.14 - with the OGC Simple Features Access standard 1.15 + with the OGC Simple Features Access standard. 1.16 1.17 * Version 3.2.5 released. 1.18
2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Tue Dec 11 16:55:46 2012 +0200 2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Tue Dec 11 19:28:43 2012 +0200 2.3 @@ -73,7 +73,6 @@ 2.4 * stSPARQL * 2.5 * */ 2.6 // Spatial Relationships 2.7 - public static final String anyInteract = stRDF + "anyInteract"; 2.8 public static final String equals = stRDF + "equals"; 2.9 public static final String disjoint = stRDF + "disjoint"; 2.10 public static final String intersects = stRDF + "intersects"; 2.11 @@ -87,7 +86,7 @@ 2.12 public static final String relate = stRDF + "relate"; 2.13 2.14 // Topological Relationships utilizing mbb 2.15 - public static final String mbbOverlaps = stRDF + "mbbOverlaps"; 2.16 + public static final String mbbIntersects = stRDF + "mbbIntersects"; 2.17 public static final String mbbContains = stRDF + "mbbContains"; 2.18 public static final String mbbEquals = stRDF + "mbbEquals"; 2.19 public static final String mbbWithin = stRDF + "mbbWithin";
3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java Tue Dec 11 16:55:46 2012 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,85 +0,0 @@ 3.4 -/** 3.5 - * This Source Code Form is subject to the terms of the Mozilla Public 3.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 3.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 3.8 - * 3.9 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team 3.10 - * 3.11 - * http://www.strabon.di.uoa.gr/ 3.12 - */ 3.13 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 3.14 - 3.15 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 3.16 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 3.17 - 3.18 -/** 3.19 - * 3.20 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 3.21 - */ 3.22 -public class AnyInteractFunc extends SpatialRelationshipFunc { 3.23 - 3.24 - @Override 3.25 - public String getURI() { 3.26 - return GeoConstants.anyInteract; 3.27 - } 3.28 - 3.29 -// public Literal evaluate(ValueFactory valueFactory, Value... args) 3.30 -// throws ValueExprEvaluationException 3.31 -// { 3.32 -// if (args.length != 1) { 3.33 -// throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got " 3.34 -// + args.length); 3.35 -// } 3.36 -// 3.37 -// if (args[0] instanceof Literal) { 3.38 -// Literal literal = (Literal)args[0]; 3.39 -// URI datatype = literal.getDatatype(); 3.40 -// 3.41 -// if (QueryEvaluationUtil.isStringLiteral(literal)) { 3.42 -// String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel()); 3.43 -// if (XMLDatatypeUtil.isValidBoolean(booleanValue)) { 3.44 -// return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN); 3.45 -// } 3.46 -// } 3.47 -// else if (datatype != null) { 3.48 -// if (datatype.equals(XMLSchema.BOOLEAN)) { 3.49 -// return literal; 3.50 -// } 3.51 -// else { 3.52 -// Boolean booleanValue = null; 3.53 -// 3.54 -// try { 3.55 -// if (datatype.equals(XMLSchema.FLOAT)) { 3.56 -// float floatValue = literal.floatValue(); 3.57 -// booleanValue = floatValue != 0.0f && Float.isNaN(floatValue); 3.58 -// } 3.59 -// else if (datatype.equals(XMLSchema.DOUBLE)) { 3.60 -// double doubleValue = literal.doubleValue(); 3.61 -// booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue); 3.62 -// } 3.63 -// else if (datatype.equals(XMLSchema.DECIMAL)) { 3.64 -// BigDecimal decimalValue = literal.decimalValue(); 3.65 -// booleanValue = !decimalValue.equals(BigDecimal.ZERO); 3.66 -// } 3.67 -// else if (datatype.equals(XMLSchema.INTEGER)) { 3.68 -// BigInteger integerValue = literal.integerValue(); 3.69 -// booleanValue = !integerValue.equals(BigInteger.ZERO); 3.70 -// } 3.71 -// else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) { 3.72 -// booleanValue = literal.longValue() != 0L; 3.73 -// } 3.74 -// } 3.75 -// catch (NumberFormatException e) { 3.76 -// throw new ValueExprEvaluationException(e.getMessage(), e); 3.77 -// } 3.78 -// 3.79 -// if (booleanValue != null) { 3.80 -// return valueFactory.createLiteral(booleanValue); 3.81 -// } 3.82 -// } 3.83 -// } 3.84 -// } 3.85 -// 3.86 -// throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]); 3.87 -// } 3.88 -}
4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/ContainsMBBFunc.java Tue Dec 11 16:55:46 2012 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,26 +0,0 @@ 4.4 -/** 4.5 - * This Source Code Form is subject to the terms of the Mozilla Public 4.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 4.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 4.8 - * 4.9 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team 4.10 - * 4.11 - * http://www.strabon.di.uoa.gr/ 4.12 - */ 4.13 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 4.14 - 4.15 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 4.16 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 4.17 - 4.18 -/** 4.19 - * 4.20 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 4.21 - */ 4.22 -public class ContainsMBBFunc extends SpatialRelationshipFunc { 4.23 - 4.24 - @Override 4.25 - public String getURI() { 4.26 - return GeoConstants.mbbContains; 4.27 - } 4.28 - 4.29 -}
5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Tue Dec 11 16:55:46 2012 +0200 5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Tue Dec 11 19:28:43 2012 +0200 5.3 @@ -20,7 +20,7 @@ 5.4 5.5 @Override 5.6 public String getURI() { 5.7 - return GeoConstants.mbbOverlaps; 5.8 + return GeoConstants.mbbIntersects; 5.9 } 5.10 5.11 }
6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/WithinFunc.java Tue Dec 11 16:55:46 2012 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,26 +0,0 @@ 6.4 -/** 6.5 - * This Source Code Form is subject to the terms of the Mozilla Public 6.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 6.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 6.8 - * 6.9 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team 6.10 - * 6.11 - * http://www.strabon.di.uoa.gr/ 6.12 - */ 6.13 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 6.14 - 6.15 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 6.16 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 6.17 - 6.18 -/** 6.19 - * 6.20 - * @author Manos Karpathiotakis <mk@di.uoa.gr> 6.21 - */ 6.22 -public class WithinFunc extends SpatialRelationshipFunc { 6.23 - 6.24 - @Override 6.25 - public String getURI() { 6.26 - return GeoConstants.within; 6.27 - } 6.28 - 6.29 -}
7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/FunctionCallsOptimizer.java Tue Dec 11 16:55:46 2012 +0200 7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/impl/FunctionCallsOptimizer.java Tue Dec 11 19:28:43 2012 +0200 7.3 @@ -20,7 +20,7 @@ 7.4 //import org.openrdf.query.algebra.TupleExpr; 7.5 //import org.openrdf.query.algebra.ValueExpr; 7.6 //import org.openrdf.query.algebra.evaluation.QueryOptimizer; 7.7 -//import org.openrdf.query.algebra.evaluation.function.spatial.AnyInteractFunc; 7.8 +//import org.openrdf.query.algebra.evaluation.function.spatial.mbbIntersectsFunc; 7.9 //import org.openrdf.query.algebra.evaluation.function.spatial.ContainsFunc; 7.10 //import org.openrdf.query.algebra.evaluation.function.spatial.CoveredByFunc; 7.11 //import org.openrdf.query.algebra.evaluation.function.spatial.CoversFunc; 7.12 @@ -71,17 +71,17 @@ 7.13 // 7.14 // List<ValueExpr> args = functionCall.getArgs(); 7.15 // 7.16 -// if(function instanceof AnyInteractFunc) 7.17 +// if(function instanceof mbbIntersectsFunc) 7.18 // { 7.19 // ValueExpr left = args.get(0); 7.20 // ValueExpr right = args.get(1); 7.21 // 7.22 -// //PgSqlExprSupport.anyInteract(left,right); 7.23 +// //PgSqlExprSupport.mbbIntersects(left,right); 7.24 // } 7.25 ////FIXME this must be fixed 7.26 //// SpatialTopoOperator operator; 7.27 -//// if(function instanceof AnyInteractFunc) 7.28 -//// operator = new AnyInteract(args.get(0),args.get(1)); 7.29 +//// if(function instanceof mbbIntersectsFunc) 7.30 +//// operator = new mbbIntersects(args.get(0),args.get(1)); 7.31 //// else if(function instanceof ContainsFunc) 7.32 //// operator = new Contains(args.get(0),args.get(1)); 7.33 //// else if(function instanceof CoveredByFunc)
8.1 --- a/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function Tue Dec 11 16:55:46 2012 +0200 8.2 +++ b/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function Tue Dec 11 19:28:43 2012 +0200 8.3 @@ -11,7 +11,6 @@ 8.4 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbContainsFunc 8.5 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbWithinFunc 8.6 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc 8.7 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc 8.8 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc 8.9 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.DisjointFunc 8.10 org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.IntersectsFunc
9.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAnyInteract.java Tue Dec 11 16:55:46 2012 +0200 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,19 +0,0 @@ 9.4 -/* 9.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 9.6 - * 9.7 - * Licensed under the Aduna BSD-style license. 9.8 - */ 9.9 -package org.openrdf.sail.generaldb.algebra; 9.10 - 9.11 - 9.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 9.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 9.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 9.15 - 9.16 -public class GeneralDBSqlAnyInteract extends GeneralDBSqlGeoSpatial{ 9.17 - 9.18 - public GeneralDBSqlAnyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 9.19 - super(left, right); 9.20 - } 9.21 - 9.22 -} 9.23 \ No newline at end of file
10.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlContainsMBB.java Tue Dec 11 16:55:46 2012 +0200 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,19 +0,0 @@ 10.4 -/* 10.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 10.6 - * 10.7 - * Licensed under the Aduna BSD-style license. 10.8 - */ 10.9 -package org.openrdf.sail.generaldb.algebra; 10.10 - 10.11 - 10.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 10.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 10.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 10.15 - 10.16 -public class GeneralDBSqlContainsMBB extends GeneralDBSqlGeoSpatial{ 10.17 - 10.18 - public GeneralDBSqlContainsMBB(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 10.19 - super(left, right); 10.20 - } 10.21 - 10.22 -} 10.23 \ No newline at end of file
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlMbbContains.java Tue Dec 11 19:28:43 2012 +0200 11.3 @@ -0,0 +1,19 @@ 11.4 +/* 11.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008. 11.6 + * 11.7 + * Licensed under the Aduna BSD-style license. 11.8 + */ 11.9 +package org.openrdf.sail.generaldb.algebra; 11.10 + 11.11 + 11.12 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 11.13 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase; 11.14 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 11.15 + 11.16 +public class GeneralDBSqlMbbContains extends GeneralDBSqlGeoSpatial{ 11.17 + 11.18 + public GeneralDBSqlMbbContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 11.19 + super(left, right); 11.20 + } 11.21 + 11.22 +} 11.23 \ No newline at end of file
12.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java Tue Dec 11 16:55:46 2012 +0200 12.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java Tue Dec 11 19:28:43 2012 +0200 12.3 @@ -16,14 +16,13 @@ 12.4 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbove; 12.5 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbs; 12.6 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnd; 12.7 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 12.8 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlBelow; 12.9 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 12.10 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCast; 12.11 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCompare; 12.12 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlConcat; 12.13 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContains; 12.14 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContainsMBB; 12.15 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlMbbContains; 12.16 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCrosses; 12.17 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlDisjoint; 12.18 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEq; 12.19 @@ -274,11 +273,7 @@ 12.20 * 12.21 */ 12.22 12.23 - //XXX Spatial Relationship Functions - all 10 of them - stSPARQL++ 12.24 - public static GeneralDBSqlExpr anyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 12.25 - return new GeneralDBSqlAnyInteract(left, right); 12.26 - } 12.27 - 12.28 + //XXX Spatial Relationship Functions - all 9 of them - stSPARQL++ 12.29 public static GeneralDBSqlExpr equalsGeo(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 12.30 return new GeneralDBSqlEqualsSpatial(left, right); 12.31 } 12.32 @@ -328,8 +323,8 @@ 12.33 return new GeneralDBSqlMbbEquals(left, right); 12.34 } 12.35 12.36 - public static GeneralDBSqlExpr ContainsMBB(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 12.37 - return new GeneralDBSqlContainsMBB(left, right); 12.38 + public static GeneralDBSqlExpr mbbContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) { 12.39 + return new GeneralDBSqlMbbContains(left, right); 12.40 } 12.41 12.42 // directional
13.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBQueryModelVisitorBase.java Tue Dec 11 16:55:46 2012 +0200 13.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBQueryModelVisitorBase.java Tue Dec 11 19:28:43 2012 +0200 13.3 @@ -364,7 +364,7 @@ 13.4 meetNode(node); 13.5 } 13.6 13.7 - // public void meet(GeneralDBSqlAnyInteract node) throws X 13.8 + // public void meet(GeneralDBSqlmbbIntersects node) throws X 13.9 // { 13.10 // meetBinarySqlOperator(node); 13.11 // }
14.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Dec 11 16:55:46 2012 +0200 14.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Dec 11 19:28:43 2012 +0200 14.3 @@ -867,12 +867,7 @@ 14.4 GeneralDBSqlExpr spatialRelationshipPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg, 14.5 GeneralDBSqlExpr thirdArg) 14.6 { 14.7 - //XXX stSPARQL 14.8 - if(function.getURI().equals(GeoConstants.anyInteract)) 14.9 - { 14.10 - return anyInteract(leftArg,rightArg); 14.11 - } 14.12 - 14.13 + //XXX stSPARQL 14.14 if(function.getURI().equals(GeoConstants.equals)) 14.15 { 14.16 return equalsGeo(leftArg,rightArg); 14.17 @@ -927,7 +922,7 @@ 14.18 return below(leftArg,rightArg); 14.19 } 14.20 // mbb 14.21 - else if(function.getURI().equals(GeoConstants.mbbOverlaps)) 14.22 + else if(function.getURI().equals(GeoConstants.mbbIntersects)) 14.23 { 14.24 return mbbIntersects(leftArg,rightArg); 14.25 } 14.26 @@ -937,7 +932,7 @@ 14.27 } 14.28 else if(function.getURI().equals(GeoConstants.mbbContains)) 14.29 { 14.30 - return ContainsMBB(leftArg,rightArg); 14.31 + return mbbContains(leftArg,rightArg); 14.32 } 14.33 else if(function.getURI().equals(GeoConstants.mbbEquals)) 14.34 {
15.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Dec 11 16:55:46 2012 +0200 15.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Dec 11 19:28:43 2012 +0200 15.3 @@ -43,7 +43,6 @@ 15.4 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 15.5 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 15.6 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AboveFunc; 15.7 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc; 15.8 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.BelowFunc; 15.9 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.ContainsFunc; 15.10 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CrossesFunc; 15.11 @@ -356,13 +355,6 @@ 15.12 Geometry rightConverted = JTSWrapper.getInstance().transform(rightGeom, sourceSRID, targetSRID); 15.13 funcResult = leftGeom.getEnvelopeInternal().getMinY() > rightConverted.getEnvelopeInternal().getMaxY(); 15.14 } 15.15 - else if(function instanceof AnyInteractFunc) 15.16 - { 15.17 - int targetSRID = leftGeom.getSRID(); 15.18 - int sourceSRID = rightGeom.getSRID(); 15.19 - Geometry rightConverted = JTSWrapper.getInstance().transform(rightGeom, sourceSRID, targetSRID); 15.20 - funcResult = leftGeom.intersects(rightConverted); 15.21 - } 15.22 else if(function instanceof IntersectsFunc) 15.23 { 15.24 int targetSRID = leftGeom.getSRID(); 15.25 @@ -438,7 +430,6 @@ 15.26 int targetSRID = leftGeom.getSRID(); 15.27 int sourceSRID = rightGeom.getSRID(); 15.28 Geometry rightConverted = JTSWrapper.getInstance().transform(rightGeom, sourceSRID, targetSRID); 15.29 - System.out.println("FUNCTION TOUCHFUNC CALLED AND JTS WILL BE USED!!!"); 15.30 funcResult = leftGeom.touches(rightConverted); 15.31 } 15.32 else if(function instanceof MbbIntersectsFunc) 15.33 @@ -448,7 +439,7 @@ 15.34 Geometry rightConverted = JTSWrapper.getInstance().transform(rightGeom, sourceSRID, targetSRID); 15.35 funcResult = leftGeom.getEnvelope().intersects(rightConverted.getEnvelope()); 15.36 } 15.37 - else if(function instanceof MbbWithinFunc)//within function will do the job!!! 15.38 + else if(function instanceof MbbWithinFunc) 15.39 { 15.40 int targetSRID = leftGeom.getSRID(); 15.41 int sourceSRID = rightGeom.getSRID();
16.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBQueryBuilder.java Tue Dec 11 16:55:46 2012 +0200 16.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBQueryBuilder.java Tue Dec 11 19:28:43 2012 +0200 16.3 @@ -29,14 +29,13 @@ 16.4 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbove; 16.5 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbs; 16.6 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnd; 16.7 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 16.8 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlBelow; 16.9 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 16.10 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCast; 16.11 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCompare; 16.12 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlConcat; 16.13 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContains; 16.14 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContainsMBB; 16.15 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlMbbContains; 16.16 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCrosses; 16.17 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlDisjoint; 16.18 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEq; 16.19 @@ -533,9 +532,6 @@ 16.20 * FIXME 16.21 */ 16.22 //Relationships - boolean - stSPARQL 16.23 - else if (expr instanceof GeneralDBSqlAnyInteract) { 16.24 - append((GeneralDBSqlAnyInteract)expr, filter); 16.25 - } 16.26 else if (expr instanceof GeneralDBSqlCrosses) { 16.27 append((GeneralDBSqlCrosses)expr, filter); 16.28 } 16.29 @@ -578,8 +574,8 @@ 16.30 else if (expr instanceof GeneralDBSqlMbbWithin) { 16.31 append((GeneralDBSqlMbbWithin)expr, filter); 16.32 } 16.33 - else if (expr instanceof GeneralDBSqlContainsMBB) { 16.34 - append((GeneralDBSqlContainsMBB)expr, filter); 16.35 + else if (expr instanceof GeneralDBSqlMbbContains) { 16.36 + append((GeneralDBSqlMbbContains)expr, filter); 16.37 } 16.38 else if (expr instanceof GeneralDBSqlMbbEquals) { 16.39 append((GeneralDBSqlMbbEquals)expr, filter); 16.40 @@ -945,9 +941,6 @@ 16.41 throws UnsupportedRdbmsOperatorException; 16.42 16.43 //Spatial Relationship Functions 16.44 - protected abstract void append(GeneralDBSqlAnyInteract expr, GeneralDBSqlExprBuilder filter) 16.45 - throws UnsupportedRdbmsOperatorException; 16.46 - 16.47 protected abstract void append(GeneralDBSqlIntersects expr, GeneralDBSqlExprBuilder filter) 16.48 throws UnsupportedRdbmsOperatorException; 16.49 16.50 @@ -990,7 +983,7 @@ 16.51 throws UnsupportedRdbmsOperatorException; 16.52 protected abstract void append(GeneralDBSqlMbbWithin expr, GeneralDBSqlExprBuilder filter) 16.53 throws UnsupportedRdbmsOperatorException; 16.54 - protected abstract void append(GeneralDBSqlContainsMBB expr, GeneralDBSqlExprBuilder filter) 16.55 + protected abstract void append(GeneralDBSqlMbbContains expr, GeneralDBSqlExprBuilder filter) 16.56 throws UnsupportedRdbmsOperatorException; 16.57 protected abstract void append(GeneralDBSqlMbbEquals expr, GeneralDBSqlExprBuilder filter) 16.58 throws UnsupportedRdbmsOperatorException;
17.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBSqlExprBuilder.java Tue Dec 11 16:55:46 2012 +0200 17.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBSqlExprBuilder.java Tue Dec 11 19:28:43 2012 +0200 17.3 @@ -270,7 +270,7 @@ 17.4 public void intersectsMBB() { 17.5 17.6 //XXX 17.7 - //edw prepei na ginei allou eidous douleia!! oxi na mpei to anyinteract, 17.8 + //edw prepei na ginei allou eidous douleia!! oxi na mpei to mbbIntersects, 17.9 //alla na prostethei kati pou tha mou pei o kwstis 17.10 where.append(" && "); 17.11 }
18.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBQueryBuilder.java Tue Dec 11 16:55:46 2012 +0200 18.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/evaluation/MonetDBQueryBuilder.java Tue Dec 11 19:28:43 2012 +0200 18.3 @@ -16,11 +16,10 @@ 18.4 import org.openrdf.sail.generaldb.algebra.GeneralDBNumericColumn; 18.5 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbove; 18.6 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnd; 18.7 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 18.8 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlBelow; 18.9 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 18.10 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContains; 18.11 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContainsMBB; 18.12 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlMbbContains; 18.13 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCrosses; 18.14 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlDisjoint; 18.15 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEqualsSpatial; 18.16 @@ -128,7 +127,7 @@ 18.17 ST_Relate, 18.18 18.19 // These Spatial Relations are implemented in MonetDB as operands and they apply in MBB of a geometry 18.20 - anyInteract, 18.21 + mbbIntersects, 18.22 equals, 18.23 contains, 18.24 inside, 18.25 @@ -379,20 +378,11 @@ 18.26 return this; 18.27 } 18.28 18.29 - //Spatial Relationship Functions 18.30 - @Override 18.31 - protected void append(GeneralDBSqlAnyInteract expr, GeneralDBSqlExprBuilder filter) 18.32 - throws UnsupportedRdbmsOperatorException 18.33 - { 18.34 - appendMonetDBSpatialFunctionBinary(expr, filter, SpatialFunctionsMonetDB.anyInteract); 18.35 - // appendMonetDBSpatialOperand(expr, filter, SpatialOperandsMonetDB.anyInteract); 18.36 - } 18.37 - 18.38 - 18.39 + 18.40 @Override 18.41 protected void append(GeneralDBSqlIntersects expr, GeneralDBSqlExprBuilder filter) 18.42 throws UnsupportedRdbmsOperatorException { 18.43 - appendMonetDBSpatialFunctionBinary(expr, filter, SpatialFunctionsMonetDB.anyInteract); 18.44 + appendMonetDBSpatialFunctionBinary(expr, filter, SpatialFunctionsMonetDB.mbbIntersects); 18.45 18.46 } 18.47 18.48 @@ -488,7 +478,7 @@ 18.49 protected void append(GeneralDBSqlMbbIntersects expr, 18.50 GeneralDBSqlExprBuilder filter) 18.51 throws UnsupportedRdbmsOperatorException { 18.52 - appendMonetDBSpatialFunctionBinary(expr, filter, SpatialFunctionsMonetDB.anyInteract); 18.53 + appendMonetDBSpatialFunctionBinary(expr, filter, SpatialFunctionsMonetDB.mbbIntersects); 18.54 18.55 } 18.56 18.57 @@ -1178,7 +1168,7 @@ 18.58 case ST_Crosses: filter.appendFunction("Crosses"); break; 18.59 case ST_Overlaps: filter.appendFunction("Overlaps"); break; 18.60 case ST_Within: filter.appendFunction("Within"); break; 18.61 - case anyInteract: filter.appendFunction("NOT Disjoint"); break; 18.62 + case mbbIntersects: filter.appendFunction("NOT Disjoint"); break; 18.63 case equals: filter.appendFunction("Equals"); break; 18.64 case contains: filter.appendFunction("Contains"); break; 18.65 case inside: filter.appendFunction("Within"); break; 18.66 @@ -2015,7 +2005,7 @@ 18.67 } 18.68 18.69 @Override 18.70 - protected void append(GeneralDBSqlContainsMBB expr, 18.71 + protected void append(GeneralDBSqlMbbContains expr, 18.72 GeneralDBSqlExprBuilder filter) 18.73 throws UnsupportedRdbmsOperatorException { 18.74 // TODO Auto-generated method stub 18.75 @@ -2030,4 +2020,4 @@ 18.76 18.77 } 18.78 18.79 -} 18.80 \ No newline at end of file 18.81 +}
19.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Tue Dec 11 16:55:46 2012 +0200 19.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Tue Dec 11 19:28:43 2012 +0200 19.3 @@ -15,11 +15,10 @@ 19.4 import org.openrdf.sail.generaldb.algebra.GeneralDBNumericColumn; 19.5 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbove; 19.6 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnd; 19.7 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 19.8 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlBelow; 19.9 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 19.10 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContains; 19.11 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlContainsMBB; 19.12 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlMbbContains; 19.13 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCrosses; 19.14 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlDisjoint; 19.15 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEqualsSpatial; 19.16 @@ -118,7 +117,7 @@ 19.17 */ 19.18 boolean nullLabel = false; 19.19 19.20 - public enum SpatialOperandsPostGIS { anyInteract, equals, contains, inside, left, right, above, below; } 19.21 + public enum SpatialOperandsPostGIS { intersects, equals, contains, inside, left, right, above, below; } 19.22 public enum SpatialFunctionsPostGIS 19.23 { //stSPARQL++ 19.24 //Spatial Relationships 19.25 @@ -131,8 +130,6 @@ 19.26 ST_Contains, 19.27 ST_Overlaps, 19.28 ST_Relate, 19.29 - //ST_Covers, 19.30 - //ST_CoveredBy, 19.31 19.32 //Spatial Constructs - Binary 19.33 ST_Union, 19.34 @@ -348,14 +345,7 @@ 19.35 return this; 19.36 } 19.37 19.38 - //Spatial Relationship Functions 19.39 - @Override 19.40 - protected void append(GeneralDBSqlAnyInteract expr, GeneralDBSqlExprBuilder filter) 19.41 - throws UnsupportedRdbmsOperatorException { 19.42 - //dummy 19.43 - appendGeneralDBSpatialFunctionBinary(expr, filter, SpatialFunctionsPostGIS.ST_Intersects); 19.44 - } 19.45 - 19.46 + //Spatial Relationship Functions 19.47 @Override 19.48 protected void append(GeneralDBSqlEqualsSpatial expr, GeneralDBSqlExprBuilder filter) 19.49 throws UnsupportedRdbmsOperatorException { 19.50 @@ -468,7 +458,7 @@ 19.51 @Override 19.52 protected void append(GeneralDBSqlMbbIntersects expr, GeneralDBSqlExprBuilder filter) 19.53 throws UnsupportedRdbmsOperatorException { 19.54 - appendStSPARQLSpatialOperand(expr, filter, SpatialOperandsPostGIS.anyInteract); 19.55 + appendStSPARQLSpatialOperand(expr, filter, SpatialOperandsPostGIS.intersects); 19.56 } 19.57 19.58 @Override 19.59 @@ -479,7 +469,7 @@ 19.60 19.61 19.62 @Override 19.63 - protected void append(GeneralDBSqlContainsMBB expr, GeneralDBSqlExprBuilder filter) 19.64 + protected void append(GeneralDBSqlMbbContains expr, GeneralDBSqlExprBuilder filter) 19.65 throws UnsupportedRdbmsOperatorException { 19.66 appendStSPARQLSpatialOperand(expr, filter, SpatialOperandsPostGIS.contains); 19.67 } 19.68 @@ -982,7 +972,7 @@ 19.69 // 19.70 // switch(operand) 19.71 // { 19.72 - // case anyInteract: filter.anyInteract(); break; 19.73 + // case mbbIntersects: filter.mbbIntersects(); break; 19.74 // case equals: filter.equals(); break; 19.75 // case contains: filter.contains(); break; 19.76 // case inside: filter.inside(); break; 19.77 @@ -1069,7 +1059,7 @@ 19.78 19.79 switch(operand) 19.80 { 19.81 - case anyInteract: filter.intersectsMBB(); break; 19.82 + case intersects: filter.intersectsMBB(); break; 19.83 case equals: filter.equalsMBB(); break; 19.84 case contains: filter.containsMBB(); break; 19.85 case inside: filter.insideMBB(); break;
20.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/AggregateTests.java Tue Dec 11 16:55:46 2012 +0200 20.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/AggregateTests.java Tue Dec 11 19:28:43 2012 +0200 20.3 @@ -46,7 +46,7 @@ 20.4 "rdfs:label ?placename ; "+ 20.5 "geo:geometry ?placegeo ; "+ 20.6 "a ?type. "+ 20.7 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 20.8 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 20.9 "} "+ 20.10 "GROUP BY ?placegeo (STR(?place) AS ?str) strdf:union(?placegeo,?placegeo) "+ 20.11 "HAVING (AVG(?str) < 1) "+ 20.12 @@ -62,7 +62,7 @@ 20.13 "geo:geometry ?placegeo ; "+ 20.14 "geo:geometry ?placegeo2 ; "+ 20.15 "a ?type. "+ 20.16 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 20.17 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 20.18 "} "+ 20.19 "GROUP BY ?placegeo ?placegeo2"; 20.20 20.21 @@ -75,7 +75,7 @@ 20.22 "geo:geometry ?placegeo ; "+ 20.23 "geo:geometry ?placegeo2 ; "+ 20.24 "a ?type. "+ 20.25 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 20.26 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 20.27 "} "+ 20.28 "GROUP BY ?placegeo ?placegeo2"; 20.29 20.30 @@ -88,7 +88,7 @@ 20.31 "rdfs:label ?placename ; "+ 20.32 "geo:geometry ?placegeo ; "+ 20.33 "a ?type. "+ 20.34 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 20.35 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 20.36 "} "+ 20.37 "ORDER BY strdf:union(?placegeo,?placegeo) ?placegeo ?place"; 20.38 20.39 @@ -101,7 +101,7 @@ 20.40 "rdfs:label ?placename ; "+ 20.41 "geo:geometry ?placegeo ; "+ 20.42 "a ?type. "+ 20.43 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 20.44 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 20.45 "} "+ 20.46 "ORDER BY ?placegeo "; 20.47
21.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/GeneralTests.java Tue Dec 11 16:55:46 2012 +0200 21.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/GeneralTests.java Tue Dec 11 19:28:43 2012 +0200 21.3 @@ -55,7 +55,7 @@ 21.4 "rdfs:label ?placename ; "+ 21.5 "geo:geometry ?placegeo ; "+ 21.6 "a ?type. "+ 21.7 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.8 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.9 "}"; 21.10 21.11 protected String query2 = 21.12 @@ -66,7 +66,7 @@ 21.13 " a ?type ; "+ 21.14 " geo:geometry ?placegeo ; "+ 21.15 " rdfs:label ?placename . "+ 21.16 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.17 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.18 "}"; 21.19 21.20 protected String query3 = 21.21 @@ -77,7 +77,7 @@ 21.22 " a ?type ; "+ 21.23 " geo:geometry ?placegeo ; "+ 21.24 " rdfs:label ?placename . "+ 21.25 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.26 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.27 "}"; 21.28 21.29 protected String query4 = 21.30 @@ -88,8 +88,8 @@ 21.31 " a ?type ; "+ 21.32 " geo:geometry ?placegeo ; "+ 21.33 " rdfs:label ?placename . "+ 21.34 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo) " + 21.35 - "&& strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.36 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo) " + 21.37 + "&& strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.38 "}"; 21.39 21.40 protected String query5 = 21.41 @@ -100,8 +100,8 @@ 21.42 " a ?type ; "+ 21.43 " geo:geometry ?placegeo ; "+ 21.44 " rdfs:label ?placename . "+ 21.45 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)). "+ 21.46 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)). "+ 21.47 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)). "+ 21.48 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)). "+ 21.49 "}"; 21.50 21.51 protected String query6 = 21.52 @@ -113,7 +113,7 @@ 21.53 " a ?type ; "+ 21.54 " geo:geometry ?placegeo ; "+ 21.55 " rdfs:label ?placename . "+ 21.56 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.57 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo)) "+ 21.58 "}"; 21.59 21.60 protected String query7 = 21.61 @@ -134,7 +134,7 @@ 21.62 " a ?type ; "+ 21.63 " geo:geometry ?placegeo ; "+ 21.64 " rdfs:label ?placename . "+ 21.65 - "FILTER(strdf:anyInteract(?placegeo,?placegeo)) "+ 21.66 + "FILTER(strdf:mbbIntersects(?placegeo,?placegeo)) "+ 21.67 "}"; 21.68 21.69 protected String queryBufferVar = 21.70 @@ -145,7 +145,7 @@ 21.71 " a ?type ; "+ 21.72 " geo:geometry ?placegeo ; "+ 21.73 " rdfs:label ?placename . "+ 21.74 - "FILTER(strdf:anyInteract(strdf:buffer(?placegeo,?ext),?placegeo)) "+ 21.75 + "FILTER(strdf:mbbIntersects(strdf:buffer(?placegeo,?ext),?placegeo)) "+ 21.76 "}"; 21.77 21.78 protected String queryBufferConst = 21.79 @@ -156,7 +156,7 @@ 21.80 " a ?type ; "+ 21.81 " geo:geometry ?placegeo ; "+ 21.82 " rdfs:label ?placename . "+ 21.83 - "FILTER(strdf:anyInteract(strdf:buffer(?placegeo,2),?placegeo)) "+ 21.84 + "FILTER(strdf:mbbIntersects(strdf:buffer(?placegeo,2),?placegeo)) "+ 21.85 "}"; 21.86 21.87 protected String queryBufferConst2 = 21.88 @@ -167,7 +167,7 @@ 21.89 " a ?type ; "+ 21.90 " geo:geometry ?placegeo ; "+ 21.91 " rdfs:label ?placename . "+ 21.92 - "FILTER(strdf:anyInteract(strdf:buffer(\"POINT(23.72873 37.97205)\"^^<http://strdf.di.uoa.gr/ontology#WKT>,0.0572),?placegeo)) "+ 21.93 + "FILTER(strdf:mbbIntersects(strdf:buffer(\"POINT(23.72873 37.97205)\"^^<http://strdf.di.uoa.gr/ontology#WKT>,0.0572),?placegeo)) "+ 21.94 "}"; 21.95 21.96 protected String queryBufferConstInSelect = 21.97 @@ -178,7 +178,7 @@ 21.98 " a ?type ; "+ 21.99 " geo:geometry ?placegeo ; "+ 21.100 " rdfs:label ?placename . "+ 21.101 - "FILTER(strdf:anyInteract(strdf:buffer(?placegeo,2.5),?placegeo)) "+ 21.102 + "FILTER(strdf:mbbIntersects(strdf:buffer(?placegeo,2.5),?placegeo)) "+ 21.103 "}"; 21.104 21.105 21.106 @@ -190,7 +190,7 @@ 21.107 " a ?type ; "+ 21.108 " geo:geometry ?placegeo ; "+ 21.109 " rdfs:label ?placename . "+ 21.110 - "FILTER(strdf:anyInteract(strdf:buffer(?placegeo,2),?placegeo)) "+ 21.111 + "FILTER(strdf:mbbIntersects(strdf:buffer(?placegeo,2),?placegeo)) "+ 21.112 "}"; 21.113 21.114 protected String queryBufferSelectFilterB = 21.115 @@ -201,7 +201,7 @@ 21.116 " a ?type ; "+ 21.117 " geo:geometry ?placegeo ; "+ 21.118 " rdfs:label ?placename . "+ 21.119 - "FILTER(strdf:anyInteract(strdf:buffer(?placegeo,?ext),?placegeo)) "+ 21.120 + "FILTER(strdf:mbbIntersects(strdf:buffer(?placegeo,?ext),?placegeo)) "+ 21.121 "}"; 21.122 21.123 protected String queryEnvelopeConvexHull = 21.124 @@ -212,7 +212,7 @@ 21.125 " a ?type ; "+ 21.126 " geo:geometry ?placegeo ; "+ 21.127 " rdfs:label ?placename . "+ 21.128 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,strdf:envelope(?placegeo)),?placegeo) && strdf:anyInteract(strdf:convexHull(?placegeo),?placegeo)) "+ 21.129 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,strdf:envelope(?placegeo)),?placegeo) && strdf:mbbIntersects(strdf:convexHull(?placegeo),?placegeo)) "+ 21.130 "}"; 21.131 21.132 protected String queryMetrics1 = 21.133 @@ -271,7 +271,7 @@ 21.134 " rdfs:label ?placename ; "+ 21.135 " geo:geometry ?placegeo ; "+ 21.136 " a ?type. "+ 21.137 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.138 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.139 // "&& strdf:dimension(?placegeo) - 1 < 3" + 21.140 ") "+ 21.141 "}"; 21.142 @@ -284,7 +284,7 @@ 21.143 " rdfs:label ?placename ; "+ 21.144 " geo:geometry ?placegeo ; "+ 21.145 " a ?type. "+ 21.146 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.147 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.148 "&& strdf:dimension(?placegeo) - 1 < 3) "+ 21.149 "}"; 21.150 21.151 @@ -296,7 +296,7 @@ 21.152 " rdfs:label ?placename ; "+ 21.153 " geo:geometry ?placegeo ; "+ 21.154 " a ?type. "+ 21.155 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.156 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.157 // "&& strdf:dimension(\"POINT(0 0)\") - 1 < 3" + 21.158 ") "+ 21.159 "}"; 21.160 @@ -309,7 +309,7 @@ 21.161 " rdfs:label ?placename ; "+ 21.162 " geo:geometry ?placegeo ; "+ 21.163 " a ?type. "+ 21.164 - "FILTER(strdf:anyInteract(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.165 + "FILTER(strdf:mbbIntersects(strdf:union(?placegeo,?placegeo),?placegeo) && strdf:isSimple(?placegeo) "+ 21.166 "&& strdf:dimension(\"POINT(0 0)\") - 1 < 3) "+ 21.167 "}"; 21.168
22.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/HavingTests.java Tue Dec 11 16:55:46 2012 +0200 22.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/HavingTests.java Tue Dec 11 19:28:43 2012 +0200 22.3 @@ -51,7 +51,7 @@ 22.4 "strdf:hasGeometry ?baGeo. "+ 22.5 "?urbanArea a noa:UrbanArea; "+ 22.6 "strdf:hasGeometry ?uaGeo; "+ 22.7 - "FILTER(strdf:anyInteract(?baGeo,?uaGeo)). "+ 22.8 + "FILTER(strdf:mbbIntersects(?baGeo,?uaGeo)). "+ 22.9 "} "+ 22.10 "GROUP BY ?burntArea ?baGeo "+ 22.11 "HAVING (strdf:area(strdf:union(?uaGeo)) > 8) "; 22.12 @@ -63,7 +63,7 @@ 22.13 "strdf:hasGeometry ?baGeo. "+ 22.14 "?urbanArea a noa:UrbanArea; "+ 22.15 "strdf:hasGeometry ?uaGeo; "+ 22.16 - "FILTER(strdf:anyInteract(?baGeo,?uaGeo)). "+ 22.17 + "FILTER(strdf:mbbIntersects(?baGeo,?uaGeo)). "+ 22.18 "} "+ 22.19 "GROUP BY ?burntArea ?baGeo "+ 22.20 "HAVING (strdf:area(strdf:extent(?uaGeo)) > 8) "; 22.21 @@ -75,7 +75,7 @@ 22.22 "strdf:hasGeometry ?baGeo. "+ 22.23 "?urbanArea a noa:UrbanArea; "+ 22.24 "strdf:hasGeometry ?uaGeo; "+ 22.25 - "FILTER(strdf:anyInteract(?baGeo,?uaGeo)). "+ 22.26 + "FILTER(strdf:mbbIntersects(?baGeo,?uaGeo)). "+ 22.27 "} "+ 22.28 "GROUP BY ?burntArea ?baGeo "+ 22.29 "HAVING (strdf:area(strdf:extent(?uaGeo)) > 8) "; 22.30 @@ -87,7 +87,7 @@ 22.31 "strdf:hasGeometry ?baGeo. "+ 22.32 "?urbanArea a noa:UrbanArea; "+ 22.33 "strdf:hasGeometry ?uaGeo; "+ 22.34 - "FILTER(strdf:anyInteract(?baGeo,?uaGeo)). "+ 22.35 + "FILTER(strdf:mbbIntersects(?baGeo,?uaGeo)). "+ 22.36 "} "+ 22.37 "GROUP BY ?burntArea "+ 22.38 "HAVING (strdf:area(strdf:extent(?uaGeo)) < 8) ";
23.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/JoinTests.java Tue Dec 11 16:55:46 2012 +0200 23.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/JoinTests.java Tue Dec 11 19:28:43 2012 +0200 23.3 @@ -51,7 +51,7 @@ 23.4 "?sensorsDeployment <http://purl.oclc.org/NET/ssnx/ssn#deployedOnPlatform> ?sensorPlatform . "+ 23.5 "?sensorPlatform <http://www.loa-cnr.it/ontologies/DUL.owl#hasLocation> ?spaceRegion . "+ 23.6 "?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.7 - "FILTER(strdf:anyInteract(?sensorsGeo,?areaGeo) && strdf:anyInteract(?sensorsGeo,?placeGeo)) . "+ 23.8 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?areaGeo) && strdf:mbbIntersects(?sensorsGeo,?placeGeo)) . "+ 23.9 "}"; 23.10 23.11 String query5b = 23.12 @@ -67,8 +67,8 @@ 23.13 "?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.14 "?areaOfInterest <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeography> ?areaGeo . "+ 23.15 "?areaOfInterest <http://www.geonames.org/ontology#name> \"London\". "+ 23.16 - "FILTER(strdf:anyInteract(?sensorsGeo,?areaGeo)) . "+ 23.17 - "FILTER(strdf:anyInteract(?sensorsGeo,?placeGeo)). }"; 23.18 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?areaGeo)) . "+ 23.19 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?placeGeo)). }"; 23.20 23.21 String query5c = 23.22 "PREFIX strdf:<http://strdf.di.uoa.gr/ontology#> "+ 23.23 @@ -83,8 +83,8 @@ 23.24 "?sensorsDeployment <http://purl.oclc.org/NET/ssnx/ssn#deployedOnPlatform> ?sensorPlatform . "+ 23.25 "?sensorPlatform <http://www.loa-cnr.it/ontologies/DUL.owl#hasLocation> ?spaceRegion . "+ 23.26 "?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.27 - "FILTER(strdf:anyInteract(?sensorsGeo,?areaGeo)) . "+ 23.28 - "FILTER(strdf:anyInteract(?sensorsGeo,?placeGeo)). }"; 23.29 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?areaGeo)) . "+ 23.30 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?placeGeo)). }"; 23.31 23.32 String query9a = 23.33 "PREFIX strdf:<http://strdf.di.uoa.gr/ontology#> " + 23.34 @@ -102,8 +102,8 @@ 23.35 " ?populatedArea <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://dbpedia.org/ontology/PopulatedPlace> . " + 23.36 " ?populatedAreaGeoNames <http://www.w3.org/2002/07/owl#sameAs> ?populatedArea . " + 23.37 " ?populatedAreaGeoNames <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeography> ?areaGeo . " + 23.38 - " FILTER( strdf:anyInteract(?areaGeo,?sensorsGeo) ) . " + 23.39 - " FILTER( strdf:anyInteract(?seaGeo,?sensorsGeo) ) . " + 23.40 + " FILTER( strdf:mbbIntersects(?areaGeo,?sensorsGeo) ) . " + 23.41 + " FILTER( strdf:mbbIntersects(?seaGeo,?sensorsGeo) ) . " + 23.42 "}"; 23.43 23.44 String query3way = 23.45 @@ -119,8 +119,8 @@ 23.46 "?sensorsDeployment <http://purl.oclc.org/NET/ssnx/ssn#deployedOnPlatform> ?sensorPlatform . "+ 23.47 "?sensorPlatform <http://www.loa-cnr.it/ontologies/DUL.owl#hasLocation> ?spaceRegion . "+ 23.48 "?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.49 - "FILTER(strdf:anyInteract(?sensorsGeo,strdf:union(?areaGeo,?placeGeo)) " + 23.50 - "&& strdf:anyInteract(?sensorsGeo,?placeGeo) && ?place = ?spaceRegion) . "+ 23.51 + "FILTER(strdf:mbbIntersects(?sensorsGeo,strdf:union(?areaGeo,?placeGeo)) " + 23.52 + "&& strdf:mbbIntersects(?sensorsGeo,?placeGeo) && ?place = ?spaceRegion) . "+ 23.53 "}"; 23.54 23.55 String query5_3filters = 23.56 @@ -136,9 +136,9 @@ 23.57 " ?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.58 "?areaOfInterest <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeography> ?areaGeo . "+ 23.59 "?areaOfInterest <http://www.geonames.org/ontology#name> \"London\". "+ 23.60 - " FILTER(strdf:anyInteract(?sensorsGeo,?areaGeo)) . "+ 23.61 - "FILTER(strdf:anyInteract(?sensorsGeo,?placeGeo)). "+ 23.62 - " FILTER(strdf:anyInteract(?areaGeo,?placeGeo)).}"; 23.63 + " FILTER(strdf:mbbIntersects(?sensorsGeo,?areaGeo)) . "+ 23.64 + "FILTER(strdf:mbbIntersects(?sensorsGeo,?placeGeo)). "+ 23.65 + " FILTER(strdf:mbbIntersects(?areaGeo,?placeGeo)).}"; 23.66 23.67 String query5_properties = 23.68 "PREFIX strdf:<http://strdf.di.uoa.gr/ontology#> "+ 23.69 @@ -153,7 +153,7 @@ 23.70 " ?spaceRegion <http://dbpedia.org/property/hasGeometry> ?sensorsGeo . "+ 23.71 "?areaOfInterest <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeography> ?areaGeo . "+ 23.72 "?areaOfInterest <http://www.geonames.org/ontology#name> \"London\". "+ 23.73 - " FILTER(strdf:anyInteract(?sensorsGeo,?areaGeo)) . "+ 23.74 + " FILTER(strdf:mbbIntersects(?sensorsGeo,?areaGeo)) . "+ 23.75 "FILTER(strdf:dimension(?sensorsGeo) = strdf:dimension(?placeGeo)). }"; 23.76 23.77 @Test
24.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/MeaningfulAggregateTests.java Tue Dec 11 16:55:46 2012 +0200 24.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/MeaningfulAggregateTests.java Tue Dec 11 19:28:43 2012 +0200 24.3 @@ -83,7 +83,7 @@ 24.4 " strdf:hasGeometry ?baGeo. " + 24.5 " ?urbanArea a noa:UrbanArea; " + 24.6 " strdf:hasGeometry ?uaGeo. " + 24.7 - " FILTER(strdf:anyInteract(?baGeo,?uaGeo))" + 24.8 + " FILTER(strdf:mbbIntersects(?baGeo,?uaGeo))" + 24.9 " } " + 24.10 " GROUP BY ?burntArea ?baGeo "+ 24.11 " "; 24.12 @@ -97,7 +97,7 @@ 24.13 " strdf:hasGeometry ?baGeo. " + 24.14 " ?urbanArea a noa:UrbanArea; " + 24.15 " strdf:hasGeometry ?uaGeo. " + 24.16 - " FILTER(strdf:anyInteract(?baGeo,?uaGeo))" + 24.17 + " FILTER(strdf:mbbIntersects(?baGeo,?uaGeo))" + 24.18 " } " + 24.19 " GROUP BY ?burntArea" + 24.20 // " ?baGeo "+ 24.21 @@ -111,7 +111,7 @@ 24.22 " strdf:hasGeometry ?baGeo. " + 24.23 " ?urbanArea a noa:UrbanArea; " + 24.24 " strdf:hasGeometry ?uaGeo. " + 24.25 - " FILTER(strdf:anyInteract(?baGeo,?uaGeo))" + 24.26 + " FILTER(strdf:mbbIntersects(?baGeo,?uaGeo))" + 24.27 " } " + 24.28 " GROUP BY ?burntArea ?baGeo "+ 24.29 " "; 24.30 @@ -124,7 +124,7 @@ 24.31 " strdf:hasGeometry ?baGeo. " + 24.32 " ?urbanArea a noa:UrbanArea; " + 24.33 " strdf:hasGeometry ?uaGeo. " + 24.34 - " FILTER(strdf:anyInteract(?baGeo,?uaGeo))" + 24.35 + " FILTER(strdf:mbbIntersects(?baGeo,?uaGeo))" + 24.36 " } " + 24.37 " GROUP BY ?burntArea ?baGeo "+ 24.38 " "; 24.39 @@ -140,7 +140,7 @@ 24.40 " strdf:hasGeometry ?baGeo. " + 24.41 " ?urbanArea a noa:UrbanArea; " + 24.42 " strdf:hasGeometry ?uaGeo. " + 24.43 - " FILTER(strdf:anyInteract(?baGeo,?uaGeo))" + 24.44 + " FILTER(strdf:mbbIntersects(?baGeo,?uaGeo))" + 24.45 " } " + 24.46 " GROUP BY ?burntArea ?baGeo "+ 24.47 " HAVING (COUNT(?uaGeo) > 1 )"+
25.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/NOATests.java Tue Dec 11 16:55:46 2012 +0200 25.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/NOATests.java Tue Dec 11 19:28:43 2012 +0200 25.3 @@ -102,7 +102,7 @@ 25.4 "OPTIONAL { "+ 25.5 "?C rdf:type noa:Coastline . "+ 25.6 "?C noa:hasGeometry ?CGEO . "+ 25.7 - "filter ( strdf:anyInteract(?HGEO , ?CGEO) ) . "+ 25.8 + "filter ( strdf:mbbIntersects(?HGEO , ?CGEO) ) . "+ 25.9 "} FILTER( !bound(?C) ) "+ 25.10 "}"; 25.11
26.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java Tue Dec 11 16:55:46 2012 +0200 26.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java Tue Dec 11 19:28:43 2012 +0200 26.3 @@ -215,7 +215,7 @@ 26.4 } 26.5 26.6 @Test 26.7 - public void testStrdfAnyInteract() throws MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException 26.8 + public void testStrdfmbbIntersects() throws MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException 26.9 { 26.10 String query = 26.11 prefixes+ 26.12 @@ -226,7 +226,7 @@ 26.13 " FILTER( str(?id1) < str(?id2) ) . \n"+ 26.14 " ?s2 ex:geometry ?g2 . \n" + 26.15 " ?s1 ex:geometry ?g1 . \n"+ 26.16 - " FILTER( strdf:anyInteract(?g1, ?g2 ) ) . \n"+ 26.17 + " FILTER( strdf:mbbIntersects(?g1, ?g2 ) ) . \n"+ 26.18 "}"; 26.19 26.20 @SuppressWarnings("unchecked")
27.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/TransformTests.java Tue Dec 11 16:55:46 2012 +0200 27.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/TransformTests.java Tue Dec 11 19:28:43 2012 +0200 27.3 @@ -41,7 +41,7 @@ 27.4 "?H1 noa:hasConfidence ?HCONF1 . \n"+ 27.5 "?H1 noa:hasGeometry ?HGEO1 . \n"+ 27.6 "?H1 noa:hasAcquisitionTime ?HAT1 . \n"+ 27.7 -// " FILTER(strdf:anyInteract(?HGEO1,?HGEO1)) "+ 27.8 +// " FILTER(strdf:mbbIntersects(?HGEO1,?HGEO1)) "+ 27.9 "}" + 27.10 " LIMIT 5 \n"; 27.11 27.12 @@ -54,7 +54,7 @@ 27.13 // "?H2 noa:hasGeometry ?HGEO2 . \n"+ 27.14 //// "?H1 noa:producedFromProcessingChain ?PC1 . \n"+ 27.15 //// "?H2 noa:producedFromProcessingChain ?PC2 . \n"+ 27.16 -//// " FILTER(strdf:anyInteract(?HGEO1,?HGEO2)) "+ 27.17 +//// " FILTER(strdf:mbbIntersects(?HGEO1,?HGEO2)) "+ 27.18 // " FILTER(?H1 != ?H2) "+ 27.19 // "}" + 27.20 // " LIMIT 5 \n"; 27.21 @@ -73,7 +73,7 @@ 27.22 " FILTER(str(?HAT) = \"2007-08-24T14:45:00\") . \n"+ 27.23 " ?C rdf:type noa:Coastline ; \n"+ 27.24 " noa:hasGeometry ?CGEO . \n"+ 27.25 - " FILTER( strdf:anyInteract(?HGEO, ?CGEO) ) . \n"+ 27.26 + " FILTER( strdf:mbbIntersects(?HGEO, ?CGEO) ) . \n"+ 27.27 "} \n"+ 27.28 "GROUP BY ?H ?HAT ?HGEO\n"+ 27.29 "HAVING strdf:overlap(strdf:union(?CGEO), ?HGEO) " +
28.1 --- a/scripts/archive/v2.1/DeleteInSea.sparql Tue Dec 11 16:55:46 2012 +0200 28.2 +++ b/scripts/archive/v2.1/DeleteInSea.sparql Tue Dec 11 19:28:43 2012 +0200 28.3 @@ -12,7 +12,7 @@ 28.4 OPTIONAL { 28.5 ?c rdf:type noa:Coastline; 28.6 noa:hasGeometry ?cGeo . 28.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 28.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 28.9 } 28.10 FILTER(!bound(?c)) . 28.11 }
29.1 --- a/scripts/archive/v2.1/Refine.sparql Tue Dec 11 16:55:46 2012 +0200 29.2 +++ b/scripts/archive/v2.1/Refine.sparql Tue Dec 11 19:28:43 2012 +0200 29.3 @@ -24,7 +24,7 @@ 29.4 noa:hasConfidence ?conf . 29.5 ?c rdf:type noa:Coastline ; 29.6 noa:hasGeometry ?cGeo . 29.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 29.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 29.9 } 29.10 GROUP BY ?h ?hGeo ?conf 29.11 HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
30.1 --- a/scripts/archive/v2.1/discover.sparql Tue Dec 11 16:55:46 2012 +0200 30.2 +++ b/scripts/archive/v2.1/discover.sparql Tue Dec 11 19:28:43 2012 +0200 30.3 @@ -19,6 +19,6 @@ 30.4 ?d rdf:type gag:Dhmos; 30.5 strdf:hasGeometry ?dGeo; 30.6 rdfs:label ?dLabel. 30.7 - FILTER(strdf:anyInteract(?dGeo, ?hGeo)). 30.8 + FILTER(strdf:mbbIntersects(?dGeo, ?hGeo)). 30.9 } 30.10 GROUP BY ?h (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) AS ?geo) ?conf
31.1 --- a/scripts/archive/v2/DeleteInSea.sparql Tue Dec 11 16:55:46 2012 +0200 31.2 +++ b/scripts/archive/v2/DeleteInSea.sparql Tue Dec 11 19:28:43 2012 +0200 31.3 @@ -14,7 +14,7 @@ 31.4 OPTIONAL { 31.5 ?c rdf:type noa:Coastline; 31.6 noa:hasGeometry ?cGeo . 31.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 31.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 31.9 } 31.10 FILTER(!bound(?c)) . 31.11 }
32.1 --- a/scripts/archive/v2/Refine.sparql Tue Dec 11 16:55:46 2012 +0200 32.2 +++ b/scripts/archive/v2/Refine.sparql Tue Dec 11 19:28:43 2012 +0200 32.3 @@ -28,7 +28,7 @@ 32.4 FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 32.5 ?c rdf:type noa:Coastline ; 32.6 noa:hasGeometry ?cGeo . 32.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 32.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 32.9 } 32.10 GROUP BY ?h ?hGeo ?conf ?sat 32.11 HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
33.1 --- a/scripts/archive/v2/discover.sparql Tue Dec 11 16:55:46 2012 +0200 33.2 +++ b/scripts/archive/v2/discover.sparql Tue Dec 11 19:28:43 2012 +0200 33.3 @@ -20,6 +20,6 @@ 33.4 ?d rdf:type gag:Dhmos; 33.5 strdf:hasGeometry ?dGeo; 33.6 rdfs:label ?dLabel. 33.7 - FILTER(strdf:anyInteract(?dGeo, ?hGeo)). 33.8 + FILTER(strdf:mbbIntersects(?dGeo, ?hGeo)). 33.9 } 33.10 GROUP BY ?h (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) AS ?geo) ?conf
34.1 --- a/scripts/archive/v3/DeleteInSea.sparql Tue Dec 11 16:55:46 2012 +0200 34.2 +++ b/scripts/archive/v3/DeleteInSea.sparql Tue Dec 11 19:28:43 2012 +0200 34.3 @@ -14,7 +14,7 @@ 34.4 OPTIONAL { 34.5 ?c rdf:type noa:Coastline; 34.6 noa:hasGeometry ?cGeo . 34.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 34.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 34.9 } 34.10 FILTER(!bound(?c)) . 34.11 }
35.1 --- a/scripts/archive/v3/DeleteInSea.sparql~ Tue Dec 11 16:55:46 2012 +0200 35.2 +++ b/scripts/archive/v3/DeleteInSea.sparql~ Tue Dec 11 19:28:43 2012 +0200 35.3 @@ -14,7 +14,7 @@ 35.4 OPTIONAL { 35.5 ?c rdf:type noa:Coastline; 35.6 noa:hasGeometry ?cGeo . 35.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 35.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 35.9 } 35.10 FILTER(!bound(?c)) . 35.11 }
36.1 --- a/scripts/archive/v3/Refine.sparql Tue Dec 11 16:55:46 2012 +0200 36.2 +++ b/scripts/archive/v3/Refine.sparql Tue Dec 11 19:28:43 2012 +0200 36.3 @@ -29,7 +29,7 @@ 36.4 FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 36.5 ?c rdf:type noa:Coastline ; 36.6 noa:hasGeometry ?cGeo . 36.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 36.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 36.9 } 36.10 GROUP BY ?h ?hGeo ?conf ?sat 36.11 HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
37.1 --- a/scripts/archive/v3/ValidateInLand.sparql Tue Dec 11 16:55:46 2012 +0200 37.2 +++ b/scripts/archive/v3/ValidateInLand.sparql Tue Dec 11 19:28:43 2012 +0200 37.3 @@ -15,7 +15,7 @@ 37.4 FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 37.5 ?c rdf:type noa:Coastline ; 37.6 noa:hasGeometry ?cGeo . 37.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 37.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 37.9 } 37.10 GROUP BY ?h ?hGeo 37.11 HAVING strdf:contains(strdf:union(?cGeo), ?hGeo )
38.1 --- a/scripts/archive/v3/ValidateInLand.sparql~ Tue Dec 11 16:55:46 2012 +0200 38.2 +++ b/scripts/archive/v3/ValidateInLand.sparql~ Tue Dec 11 19:28:43 2012 +0200 38.3 @@ -15,7 +15,7 @@ 38.4 FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) . 38.5 ?c rdf:type noa:Coastline ; 38.6 noa:hasGeometry ?cGeo . 38.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 38.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 38.9 } 38.10 GROUP BY ?h ?hGeo 38.11 HAVING strdf:contains(strdf:union(?cGeo), ?hGeo )
39.1 --- a/scripts/runNoaRefinement.sh Tue Dec 11 16:55:46 2012 +0200 39.2 +++ b/scripts/runNoaRefinement.sh Tue Dec 11 19:28:43 2012 +0200 39.3 @@ -36,7 +36,7 @@ 39.4 OPTIONAL { 39.5 ?c rdf:type noa:Coastline; 39.6 noa:hasGeometry ?cGeo . 39.7 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 39.8 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 39.9 } 39.10 FILTER(!bound(?c)) . 39.11 }" 39.12 @@ -59,7 +59,7 @@ 39.13 FILTER(\"TIMESTAMP\"^^xsd:dateTime = ?hAcqTime) . 39.14 ?c rdf:type noa:Coastline; 39.15 noa:hasGeometry ?cGeo . 39.16 - FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 39.17 + FILTER(strdf:mbbIntersects(?hGeo, ?cGeo)) . 39.18 } 39.19 GROUP BY ?h ?hGeo 39.20 HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))