Strabon
changeset 623:e47be5e2bc98
Operator "&&" checks overlapping MBBs, not intersecting. This is why mbbIntersects function is replaced (syntactically) by mbbOverlaps
author | Konstantina Bereta <Konstantina.Bereta@di.uoa.gr> |
---|---|
date | Fri Oct 05 14:09:22 2012 +0300 (2012-10-05) |
parents | 4bb0fad95027 |
children | c1c2701395be 1a1fb0a4981a |
files | evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java |
line diff
1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Thu Oct 04 21:35:22 2012 +0300 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Fri Oct 05 14:09:22 2012 +0300 1.3 @@ -90,7 +90,7 @@ 1.4 public static final String below = stRDF + "below"; 1.5 1.6 // Spatial Relationships utilizing mbb 1.7 - public static final String mbbIntersects = stRDF + "mbbIntersects"; 1.8 + public static final String mbbOverlaps = stRDF + "mbbOverlaps"; 1.9 public static final String mbbContains = stRDF + "mbbContains"; 1.10 public static final String mbbEquals = stRDF + "mbbEquals"; 1.11 public static final String mbbInside = stRDF + "mbbInside";
2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Thu Oct 04 21:35:22 2012 +0300 2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Fri Oct 05 14:09:22 2012 +0300 2.3 @@ -20,7 +20,7 @@ 2.4 2.5 @Override 2.6 public String getURI() { 2.7 - return GeoConstants.mbbIntersects; 2.8 + return GeoConstants.mbbOverlaps; 2.9 } 2.10 2.11 }
3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Thu Oct 04 21:35:22 2012 +0300 3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Fri Oct 05 14:09:22 2012 +0300 3.3 @@ -922,7 +922,7 @@ 3.4 { 3.5 return touch(leftArg,rightArg); 3.6 } 3.7 - else if(function.getURI().equals(GeoConstants.mbbIntersects)) 3.8 + else if(function.getURI().equals(GeoConstants.mbbOverlaps)) 3.9 { 3.10 return mbbIntersects(leftArg,rightArg); 3.11 }