Strabon

changeset 777:31ad48021033

Replace strdf:inside with strdf:within in SpatialTests.java
author George Garbis <ggarbis@di.uoa.gr>
date Mon Dec 10 11:15:42 2012 +0200 (2012-12-10)
parents 6b6f0afbc89e
children 8df99e93a35d 4ac0390b1220
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Dec 07 18:23:15 2012 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Mon Dec 10 11:15:42 2012 +0200
     1.3 @@ -75,7 +75,7 @@
     1.4  	public static final String anyInteract 		= stRDF + "anyInteract";
     1.5  	public static final String intersects 		= stRDF + "intersects";
     1.6  	public static final String contains 		= stRDF + "contains";
     1.7 -	public static final String within 		= stRDF + "within";
     1.8 +	public static final String within 			= stRDF + "within";
     1.9  	public static final String coveredBy 		= stRDF + "coveredBy";
    1.10  	public static final String covers 			= stRDF + "covers";
    1.11  	public static final String disjoint 		= stRDF + "disjoint";
     2.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java	Fri Dec 07 18:23:15 2012 +0200
     2.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java	Mon Dec 10 11:15:42 2012 +0200
     2.3 @@ -187,7 +187,7 @@
     2.4  		}
     2.5  
     2.6  	@Test
     2.7 -	public void testStrdfInside() throws MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException
     2.8 +	public void testStrdfWithin() throws MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException
     2.9  	{
    2.10  		String query = 
    2.11  			prefixes+
    2.12 @@ -198,7 +198,7 @@
    2.13  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    2.14  			" ?s2 ex:geometry ?g2 . \n" +
    2.15  			" ?s1 ex:geometry ?g1 . \n"+
    2.16 -			" FILTER( strdf:inside(?g1, ?g2 )) . \n"+
    2.17 +			" FILTER( strdf:within(?g1, ?g2)) . \n"+
    2.18  			"}";
    2.19  		
    2.20  		@SuppressWarnings("unchecked")