Strabon

changeset 905:ba5c6c56ac94

changed names of geosparql functions to follow OGC Standard
author Kallirroi Dogani <kallirroi@di.uoa.gr>
date Fri Mar 22 17:07:20 2013 +0200 (2013-03-22)
parents e0e85317a1c4
children b0c4b76da2f0
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java runtime/src/main/java/eu/earthobservatory/runtime/postgis/testCRS.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 Mar 22 16:44:16 2013 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Mar 22 17:07:20 2013 +0200
     1.3 @@ -166,34 +166,34 @@
     1.4  	public static final String geoSparqlBoundary 				= geof + "boundary";
     1.5  
     1.6  	// Simple Features - 8 functions - all with 2 arguments + boolean
     1.7 -	public static final String sfEquals 						= geof + "sf-equals";
     1.8 -	public static final String sfDisjoint 						= geof + "sf-disjoint";
     1.9 -	public static final String sfIntersects 					= geof + "sf-intersects";
    1.10 -	public static final String sfTouches 						= geof + "sf-touches";
    1.11 -	public static final String sfCrosses 						= geof + "sf-crosses";
    1.12 -	public static final String sfWithin 						= geof + "sf-within";
    1.13 -	public static final String sfContains 						= geof + "sf-contains";
    1.14 -	public static final String sfOverlaps 						= geof + "sf-overlaps";
    1.15 +	public static final String sfEquals 						= geof + "sfEquals";
    1.16 +	public static final String sfDisjoint 						= geof + "sfDisjoint";
    1.17 +	public static final String sfIntersects 					= geof + "sfIntersects";
    1.18 +	public static final String sfTouches 						= geof + "sfTouches";
    1.19 +	public static final String sfCrosses 						= geof + "sfCrosses";
    1.20 +	public static final String sfWithin 						= geof + "sfWithin";
    1.21 +	public static final String sfContains 						= geof + "sfContains";
    1.22 +	public static final String sfOverlaps 						= geof + "sfOverlaps";
    1.23  
    1.24  	// Egenhofer - 8 functions - all with 2 arguments + boolean
    1.25 -	public static final String ehEquals 						= geof + "eh-equals";
    1.26 -	public static final String ehDisjoint 						= geof + "eh-disjoint";
    1.27 -	public static final String ehMeet 							= geof + "eh-meet";
    1.28 -	public static final String ehOverlap 						= geof + "eh-overlap";
    1.29 -	public static final String ehCovers 						= geof + "eh-covers";
    1.30 -	public static final String ehCoveredBy 						= geof + "eh-coveredBy";
    1.31 -	public static final String ehInside 						= geof + "eh-inside";
    1.32 -	public static final String ehContains 						= geof + "eh-contains";
    1.33 +	public static final String ehEquals 						= geof + "ehEquals";
    1.34 +	public static final String ehDisjoint 						= geof + "ehDisjoint";
    1.35 +	public static final String ehMeet 							= geof + "ehMeet";
    1.36 +	public static final String ehOverlap 						= geof + "ehOverlap";
    1.37 +	public static final String ehCovers 						= geof + "ehCovers";
    1.38 +	public static final String ehCoveredBy 						= geof + "ehCoveredBy";
    1.39 +	public static final String ehInside 						= geof + "ehInside";
    1.40 +	public static final String ehContains 						= geof + "ehContains";
    1.41  
    1.42  	// RCC8 - 8 functions - all with 2 arguments + boolean
    1.43 -	public static final String rccEquals 						 = geof + "rcc8-eq";
    1.44 -	public static final String rccDisconnected 					 = geof + "rcc8-dc";
    1.45 -	public static final String rccExternallyConnected 			 = geof + "rcc8-ec";
    1.46 -	public static final String rccPartiallyOverlapping 			 = geof + "rcc8-po";
    1.47 -	public static final String rccTangentialProperPartInverse 	 = geof + "rcc8-tppi";
    1.48 -	public static final String rccTangentialProperPart 			 = geof + "rcc8-tpp";
    1.49 -	public static final String rccNonTangentialProperPart 		 = geof + "rcc8-ntpp";
    1.50 -	public static final String rccNonTangentialProperPartInverse = geof + "rcc8-ntppi";
    1.51 +	public static final String rccEquals 						 = geof + "rcc8eq";
    1.52 +	public static final String rccDisconnected 					 = geof + "rcc8dc";
    1.53 +	public static final String rccExternallyConnected 			 = geof + "rcc8ec";
    1.54 +	public static final String rccPartiallyOverlapping 			 = geof + "rcc8po";
    1.55 +	public static final String rccTangentialProperPartInverse 	 = geof + "rcc8tppi";
    1.56 +	public static final String rccTangentialProperPart 			 = geof + "rcc8tpp";
    1.57 +	public static final String rccNonTangentialProperPart 		 = geof + "rcc8ntpp";
    1.58 +	public static final String rccNonTangentialProperPartInverse = geof + "rcc8ntppi";
    1.59  	
    1.60  	// The generic relate function
    1.61  	public static final String geoSparqlRelate 					 = geof + "relate";
     2.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java	Fri Mar 22 16:44:16 2013 +0200
     2.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/GeosparqlRDFHandlerBase.java	Fri Mar 22 17:07:20 2013 +0200
     2.3 @@ -19,7 +19,7 @@
     2.4  
     2.5  public class GeosparqlRDFHandlerBase extends RDFHandlerBase {
     2.6  	
     2.7 -	public static String geonamespace = "http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/";
     2.8 +	public static String geonamespace = "http://www.opengis.net/def/function/geosparql/";
     2.9  	public static String gml="http://www.opengis.net/def/geometryType/OGC-GML/3.2/";
    2.10  	public static String sf="http://www.opengis.net/def/geometryType/OGC-SF/1.0/";
    2.11  	public static String type = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
    2.12 @@ -44,8 +44,8 @@
    2.13  	public static List <String> geometryDomainList = Arrays.asList(dimension, coordinateDimension, spatialdimension,isEmpty, isSimple, is3D,asWKT, asGML);
    2.14  	public static String WKTLiteral=   geonamespace + "WKTLiteral";
    2.15  	public static String GMLLiteral=   geonamespace + "GMLLiteral";
    2.16 -	public static List <String> rcc8 = Arrays.asList(geonamespace+"rcc8-eq",geonamespace+"rcc8-dc",geonamespace+"rcc8-ec",geonamespace+"rcc8-po",
    2.17 -			geonamespace+"rcc8-tppi", geonamespace+"rcc8-tpp",geonamespace+ "rcc8-ntpp", geonamespace+"rcc8-ntpp");
    2.18 +	public static List <String> rcc8 = Arrays.asList(geonamespace+"rcc8eq",geonamespace+"rcc8dc",geonamespace+"rcc8ec",geonamespace+"rcc8po",
    2.19 +			geonamespace+"rcc8tppi", geonamespace+"rcc8tpp",geonamespace+ "rcc8ntpp", geonamespace+"rcc8ntpp");
    2.20  	
    2.21  	//loose check: tha elegxw an arxizei apo eh- i apo sf- i apo rcc8- (den einai ola tou rcc8)
    2.22  	
    2.23 @@ -85,7 +85,7 @@
    2.24  		String predicate = st.getPredicate().toString();
    2.25  		String object = st.getObject().toString();
    2.26  		
    2.27 -		if(predicate.startsWith("http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/sf-")||predicate.startsWith(geonamespace+"eh-")|| 
    2.28 +		if(predicate.startsWith("http://www.opengis.net/def/function/geosparql/sf")||predicate.startsWith(geonamespace+"eh")|| 
    2.29  				rcc8.contains(predicate))
    2.30  		{
    2.31  			String triple = "<"+subject+ "> <"+ type +"> <"+ SpatialObject+ "> .\n" +
    2.32 @@ -315,10 +315,10 @@
    2.33  		parser.setVerifyData(true);
    2.34  
    2.35  		String text = 
    2.36 -				"<http://example.org/rcc8Obj1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/rcc8-eq> <http://example.org/rcc8Obj2> . " +
    2.37 -				"<http://example.org/simpleGeometry1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/isEmpty> _:nai . \n"+
    2.38 -		"<http://example.org/ForestArea1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/defaultGeometry> _:b2 . \n"+
    2.39 -		"<http://example.org/SpatialObject1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/eh-intersects> <http://example.org/SpatialObject2> . \n";
    2.40 +				"<http://example.org/rcc8Obj1> <http://www.opengis.net/def/function/geosparql/rcc8eq> <http://example.org/rcc8Obj2> . " +
    2.41 +				"<http://example.org/simpleGeometry1> <http://www.opengis.net/def/function/geosparql/isEmpty> _:nai . \n"+
    2.42 +		"<http://example.org/ForestArea1> <http://www.opengis.net/def/function/geosparql/defaultGeometry> _:b2 . \n"+
    2.43 +		"<http://example.org/SpatialObject1> <http://www.opengis.net/def/function/geosparql/ehIntersects> <http://example.org/SpatialObject2> . \n";
    2.44          
    2.45  		String gmltext= "<http://example.org/GM_MultiSolid> <"+type+"> <"+gml+"GM_Object> .\n"; 
    2.46  		String sftext= "<http://example.org/Line> <"+type+"> <"+sf+"Geometry> .\n"; 
     3.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/postgis/testCRS.java	Fri Mar 22 16:44:16 2013 +0200
     3.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/postgis/testCRS.java	Fri Mar 22 17:07:20 2013 +0200
     3.3 @@ -38,10 +38,10 @@
     3.4  		}
     3.5  		
     3.6  		String text = 
     3.7 -				"<http://example.org/rcc8Obj1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/rcc8-eq> <http://example.org/rcc8Obj2> . \n" +
     3.8 -				"<http://example.org/simpleGeometry1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/isEmpty> <http://example.org/nai> . \n"+
     3.9 -		"<http://example.org/ForestArea1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/defaultGeometry> <http://example.org/defaultgeom> . \n"+
    3.10 -		"<http://example.org/SpatialObject1> <http://www.opengis.net/ont/OGC-GeoSPARQL/1.0/eh-intersects> <http://example.org/SpatialObject2> . \n";
    3.11 +				"<http://example.org/rcc8Obj1> <http://www.opengis.net/def/function/geosparql/rcc8eq> <http://example.org/rcc8Obj2> . \n" +
    3.12 +				"<http://example.org/simpleGeometry1> <http://www.opengis.net/def/function/geosparql/isEmpty> <http://example.org/nai> . \n"+
    3.13 +		"<http://example.org/ForestArea1> <http://www.opengis.net/def/function/geosparql/defaultGeometry> <http://example.org/defaultgeom> . \n"+
    3.14 +		"<http://example.org/SpatialObject1> <http://www.opengis.net/def/function/geosparql/ehIntersects> <http://example.org/SpatialObject2> . \n";
    3.15  
    3.16  		String statement1= "<http://example.org/CoastLine4> <http://www.earthobservatory.eu/ontologies/noaOntology.owl#hasGeometry> " +
    3.17  				"\"POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/4326" +
     4.1 --- a/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java	Fri Mar 22 16:44:16 2013 +0200
     4.2 +++ b/runtime/src/test/java/eu/earthobservatory/runtime/generaldb/SpatialTests.java	Fri Mar 22 17:07:20 2013 +0200
     4.3 @@ -780,7 +780,7 @@
     4.4  			" ?s1 ex:geometry ?g1 . \n"+
     4.5  			" ?s2 ex:geometry ?g2 . \n" +
     4.6  			" FILTER( str(?s1) < str(?s2) ) . \n"+
     4.7 -			" FILTER( geof:sf-equals(?g1, ?g2 )) . \n"+
     4.8 +			" FILTER( geof:sfEquals(?g1, ?g2 )) . \n"+
     4.9  			"}";
    4.10  		
    4.11  		@SuppressWarnings("unchecked")
    4.12 @@ -799,7 +799,7 @@
    4.13  			" ?s1 ex:geometry ?g1 . \n"+
    4.14  			" ?s2 ex:geometry ?g2 . \n" +
    4.15  			" FILTER( str(?s1) < str(?s2) ) . \n"+
    4.16 -			" FILTER( geof:sf-disjoint(?g1, ?g2 )) . \n"+
    4.17 +			" FILTER( geof:sfDisjoint(?g1, ?g2 )) . \n"+
    4.18  			"}";
    4.19  		
    4.20  		@SuppressWarnings("unchecked")
    4.21 @@ -821,7 +821,7 @@
    4.22  			" FILTER( str(?id1) < str(?id2) ) . \n"+
    4.23  			" ?s2 ex:geometry ?g2 . \n" +
    4.24  			" ?s1 ex:geometry ?g1 . \n"+
    4.25 -			" FILTER( geof:sf-intersects(?g1, ?g2 )) . \n"+
    4.26 +			" FILTER( geof:sfIntersects(?g1, ?g2 )) . \n"+
    4.27  			"}";
    4.28  		
    4.29  		@SuppressWarnings("unchecked")
    4.30 @@ -846,7 +846,7 @@
    4.31  			" FILTER( str(?id1) < str(?id2) ) . \n"+
    4.32  			" ?s2 ex:geometry ?g2 . \n" +
    4.33  			" ?s1 ex:geometry ?g1 . \n"+
    4.34 -			" FILTER( geof:sf-touches(?g1, ?g2 )) . \n"+
    4.35 +			" FILTER( geof:sfTouches(?g1, ?g2 )) . \n"+
    4.36  			"}";
    4.37  		
    4.38  		@SuppressWarnings("unchecked")
    4.39 @@ -867,7 +867,7 @@
    4.40  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    4.41  			" ?s2 ex:geometry ?g2 . \n" +
    4.42  			" ?s1 ex:geometry ?g1 . \n"+
    4.43 -			" FILTER( geof:sf-crosses(?g1, ?g2 )) . \n"+
    4.44 +			" FILTER( geof:sfCrosses(?g1, ?g2 )) . \n"+
    4.45  			"}";
    4.46  		
    4.47  		@SuppressWarnings("unchecked")
    4.48 @@ -889,7 +889,7 @@
    4.49  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    4.50  			" ?s2 ex:geometry ?g2 . \n" +
    4.51  			" ?s1 ex:geometry ?g1 . \n"+
    4.52 -			" FILTER( geof:sf-within(?g1, ?g2 )) . \n"+
    4.53 +			" FILTER( geof:sfWithin(?g1, ?g2 )) . \n"+
    4.54  			"}";
    4.55  		
    4.56  		@SuppressWarnings("unchecked")
    4.57 @@ -911,7 +911,7 @@
    4.58  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    4.59  			" ?s2 ex:geometry ?g2 . \n" +
    4.60  			" ?s1 ex:geometry ?g1 . \n"+
    4.61 -			" FILTER( geof:sf-contains(?g1, ?g2 )) . \n"+
    4.62 +			" FILTER( geof:sfContains(?g1, ?g2 )) . \n"+
    4.63  			"}";
    4.64  		
    4.65  		@SuppressWarnings("unchecked")
    4.66 @@ -933,7 +933,7 @@
    4.67  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    4.68  			" ?s2 ex:geometry ?g2 . \n" +
    4.69  			" ?s1 ex:geometry ?g1 . \n"+
    4.70 -			" FILTER( geof:sf-overlaps(?g1, ?g2 )) . \n"+
    4.71 +			" FILTER( geof:sfOverlaps(?g1, ?g2 )) . \n"+
    4.72  			"}";
    4.73  		
    4.74  		@SuppressWarnings("unchecked")
    4.75 @@ -955,7 +955,7 @@
    4.76  			" ?s1 ex:geometry ?g1 . \n"+
    4.77  			" ?s2 ex:geometry ?g2 . \n" +
    4.78  			" FILTER( str(?s1) < str(?s2) ) . \n"+
    4.79 -			" FILTER( geof:eh-equals(?g1, ?g2 )) . \n"+
    4.80 +			" FILTER( geof:ehEquals(?g1, ?g2 )) . \n"+
    4.81  			"}";
    4.82  		
    4.83  		@SuppressWarnings("unchecked")
    4.84 @@ -974,7 +974,7 @@
    4.85  			" ?s1 ex:geometry ?g1 . \n"+
    4.86  			" ?s2 ex:geometry ?g2 . \n" +
    4.87  			" FILTER( str(?s1) < str(?s2) ) . \n"+
    4.88 -			" FILTER( geof:eh-disjoint(?g1, ?g2 )) . \n"+
    4.89 +			" FILTER( geof:ehDisjoint(?g1, ?g2 )) . \n"+
    4.90  			"}";
    4.91  		
    4.92  		@SuppressWarnings("unchecked")
    4.93 @@ -996,7 +996,7 @@
    4.94  			" FILTER( str(?id1) != str(?id2) ) . \n"+
    4.95  			" ?s2 ex:geometry ?g2 . \n" +
    4.96  			" ?s1 ex:geometry ?g1 . \n"+
    4.97 -			" FILTER( geof:eh-meet(?g1, ?g2 )) . \n"+
    4.98 +			" FILTER( geof:ehMeet(?g1, ?g2 )) . \n"+
    4.99  			"}";
   4.100  		
   4.101  		@SuppressWarnings("unchecked")
   4.102 @@ -1018,7 +1018,7 @@
   4.103  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.104  			" ?s2 ex:geometry ?g2 . \n" +
   4.105  			" ?s1 ex:geometry ?g1 . \n"+
   4.106 -			" FILTER( geof:eh-overlap(?g1, ?g2 )) . \n"+
   4.107 +			" FILTER( geof:ehOverlap(?g1, ?g2 )) . \n"+
   4.108  			"}";
   4.109  		
   4.110  		@SuppressWarnings("unchecked")
   4.111 @@ -1040,7 +1040,7 @@
   4.112  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.113  			" ?s2 ex:geometry ?g2 . \n" +
   4.114  			" ?s1 ex:geometry ?g1 . \n"+
   4.115 -			" FILTER( geof:eh-covers(?g1, ?g2 )) . \n"+
   4.116 +			" FILTER( geof:ehCovers(?g1, ?g2 )) . \n"+
   4.117  			"}";
   4.118  		
   4.119  		@SuppressWarnings("unchecked")
   4.120 @@ -1061,7 +1061,7 @@
   4.121  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.122  			" ?s2 ex:geometry ?g2 . \n" +
   4.123  			" ?s1 ex:geometry ?g1 . \n"+
   4.124 -			" FILTER( geof:eh-coveredBy(?g1, ?g2 )) . \n"+
   4.125 +			" FILTER( geof:ehCoveredBy(?g1, ?g2 )) . \n"+
   4.126  			"}";
   4.127  		
   4.128  		@SuppressWarnings("unchecked")
   4.129 @@ -1082,7 +1082,7 @@
   4.130  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.131  			" ?s2 ex:geometry ?g2 . \n" +
   4.132  			" ?s1 ex:geometry ?g1 . \n"+
   4.133 -			" FILTER( geof:eh-inside(?g1, ?g2 )) . \n"+
   4.134 +			" FILTER( geof:ehInside(?g1, ?g2 )) . \n"+
   4.135  			"}";
   4.136  		
   4.137  		@SuppressWarnings("unchecked")
   4.138 @@ -1103,7 +1103,7 @@
   4.139  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.140  			" ?s2 ex:geometry ?g2 . \n" +
   4.141  			" ?s1 ex:geometry ?g1 . \n"+
   4.142 -			" FILTER( geof:eh-contains(?g1, ?g2 )) . \n"+
   4.143 +			" FILTER( geof:ehContains(?g1, ?g2 )) . \n"+
   4.144  			"}";
   4.145  		
   4.146  		@SuppressWarnings("unchecked")
   4.147 @@ -1124,7 +1124,7 @@
   4.148  			" ?s1 ex:geometry ?g1 . \n"+
   4.149  			" ?s2 ex:geometry ?g2 . \n" +
   4.150  			" FILTER( str(?s1) < str(?s2) ) . \n"+
   4.151 -			" FILTER( geof:rcc8-dc(?g1, ?g2 )) . \n"+
   4.152 +			" FILTER( geof:rcc8dc(?g1, ?g2 )) . \n"+
   4.153  			"}";
   4.154  		
   4.155  		@SuppressWarnings("unchecked")
   4.156 @@ -1146,7 +1146,7 @@
   4.157  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.158  			" ?s2 ex:geometry ?g2 . \n" +
   4.159  			" ?s1 ex:geometry ?g1 . \n"+
   4.160 -			" FILTER( geof:rcc8-po(?g1, ?g2 )) . \n"+
   4.161 +			" FILTER( geof:rcc8po(?g1, ?g2 )) . \n"+
   4.162  			"}";
   4.163  		
   4.164  		@SuppressWarnings("unchecked")
   4.165 @@ -1168,7 +1168,7 @@
   4.166  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.167  			" ?s2 ex:geometry ?g2 . \n" +
   4.168  			" ?s1 ex:geometry ?g1 . \n"+
   4.169 -			" FILTER( geof:rcc8-tppi(?g1, ?g2 )) . \n"+
   4.170 +			" FILTER( geof:rcc8tppi(?g1, ?g2 )) . \n"+
   4.171  			"}";
   4.172  		
   4.173  		@SuppressWarnings("unchecked")
   4.174 @@ -1189,7 +1189,7 @@
   4.175  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.176  			" ?s2 ex:geometry ?g2 . \n" +
   4.177  			" ?s1 ex:geometry ?g1 . \n"+
   4.178 -			" FILTER( geof:rcc8-tpp(?g1, ?g2 )) . \n"+
   4.179 +			" FILTER( geof:rcc8tpp(?g1, ?g2 )) . \n"+
   4.180  			"}";
   4.181  		
   4.182  		@SuppressWarnings("unchecked")
   4.183 @@ -1211,7 +1211,7 @@
   4.184  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.185  			" ?s2 ex:geometry ?g2 . \n" +
   4.186  			" ?s1 ex:geometry ?g1 . \n"+
   4.187 -			" FILTER( geof:rcc8-ntpp(?g1, ?g2 )) . \n"+
   4.188 +			" FILTER( geof:rcc8ntpp(?g1, ?g2 )) . \n"+
   4.189  			"}";
   4.190  		
   4.191  		@SuppressWarnings("unchecked")
   4.192 @@ -1231,7 +1231,7 @@
   4.193  			" FILTER( str(?id1) != str(?id2) ) . \n"+
   4.194  			" ?s2 ex:geometry ?g2 . \n" +
   4.195  			" ?s1 ex:geometry ?g1 . \n"+
   4.196 -			" FILTER( geof:rcc8-ntpp(?g1, ?g2 )) . \n"+
   4.197 +			" FILTER( geof:rcc8ntpp(?g1, ?g2 )) . \n"+
   4.198  			"}";
   4.199  		
   4.200  		@SuppressWarnings("unchecked")