1.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java	Tue Apr 02 11:44:35 2013 +0300
     1.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java	Tue Apr 02 12:01:30 2013 +0300
     1.3 @@ -98,7 +98,7 @@
     1.4  	 */
     1.5  	@Override
     1.6  	public List<String> getstSPARQLSpatialExtensionFunctions() {
     1.7 -		return GeoConstants.stSPARQLSpatialExtFunc;
     1.8 +		return GeoConstants.STSPARQLSpatialExtFunc;
     1.9  	}
    1.10  
    1.11  	/* (non-Javadoc)
    1.12 @@ -106,6 +106,6 @@
    1.13  	 */
    1.14  	@Override
    1.15  	public List<String> getGeoSPARQLSpatialExtensionFunctions() {
    1.16 -		return GeoConstants.stGeoSPARQLExtFunc;
    1.17 +		return GeoConstants.GEOSPARQLExtFunc;
    1.18  	}
    1.19  }

     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Tue Apr 02 11:44:35 2013 +0300
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Tue Apr 02 12:01:30 2013 +0300
     2.3 @@ -154,56 +154,56 @@
     2.4  	 *  							stSPARQL								*
     2.5  	 * 																		*/
     2.6  	// Spatial Relationships
     2.7 -	public static final String equals 			= stRDF + "equals";
     2.8 -	public static final String disjoint 		= stRDF + "disjoint";
     2.9 -	public static final String intersects 		= stRDF + "intersects";
    2.10 -	public static final String touches 			= stRDF + "touches";
    2.11 -	public static final String within 			= stRDF + "within";
    2.12 -	public static final String contains 		= stRDF + "contains";
    2.13 -	public static final String overlaps 		= stRDF + "overlaps";
    2.14 -	public static final String crosses 			= stRDF + "crosses";
    2.15 +	public static final String stSPARQLequals 		= stRDF + "equals";
    2.16 +	public static final String stSPARQLdisjoint 		= stRDF + "disjoint";
    2.17 +	public static final String stSPARQLintersects 	= stRDF + "intersects";
    2.18 +	public static final String stSPARQLtouches 		= stRDF + "touches";
    2.19 +	public static final String stSPARQLwithin 		= stRDF + "within";
    2.20 +	public static final String stSPARQLcontains 		= stRDF + "contains";
    2.21 +	public static final String stSPARQLoverlaps 		= stRDF + "overlaps";
    2.22 +	public static final String stSPARQLcrosses 		= stRDF + "crosses";
    2.23  	
    2.24  	// The generic relate function
    2.25 -	public static final String relate 			= stRDF + "relate";
    2.26 +	public static final String stSPARQLrelate			= stRDF + "relate";
    2.27  	
    2.28  	// Topological Relationships utilizing mbb
    2.29 -	public static final String mbbIntersects	= stRDF + "mbbIntersects";
    2.30 -	public static final String mbbContains 		= stRDF + "mbbContains";
    2.31 -	public static final String mbbEquals 		= stRDF + "mbbEquals";
    2.32 -	public static final String mbbWithin 		= stRDF + "mbbWithin";
    2.33 +	public static final String stSPARQLmbbIntersects	= stRDF + "mbbIntersects";
    2.34 +	public static final String stSPARQLmbbContains 	= stRDF + "mbbContains";
    2.35 +	public static final String stSPARQLmbbEquals 		= stRDF + "mbbEquals";
    2.36 +	public static final String stSPARQLmbbWithin 		= stRDF + "mbbWithin";
    2.37  	
    2.38  	// Directional functions
    2.39 -	public static final String left 			= stRDF + "left";
    2.40 -	public static final String right			= stRDF + "right";
    2.41 -	public static final String above 			= stRDF + "above";
    2.42 -	public static final String below			= stRDF + "below";
    2.43 +	public static final String stSPARQLleft 			= stRDF + "left";
    2.44 +	public static final String stSPARQLright			= stRDF + "right";
    2.45 +	public static final String stSPARQLabove 			= stRDF + "above";
    2.46 +	public static final String stSPARQLbelow			= stRDF + "below";
    2.47  
    2.48  	// Spatial Constructs
    2.49 -	public static final String union 			= stRDF + "union";
    2.50 -	public static final String buffer 			= stRDF + "buffer";
    2.51 -	public static final String envelope 		= stRDF + "envelope";
    2.52 -	public static final String convexHull		= stRDF + "convexHull";
    2.53 -	public static final String boundary 		= stRDF + "boundary";
    2.54 -	public static final String intersection 	= stRDF + "intersection";
    2.55 -	public static final String difference 		= stRDF + "difference";
    2.56 -	public static final String symDifference	= stRDF + "symDifference";
    2.57 -	public static final String transform 		= stRDF + "transform";
    2.58 +	public static final String stSPARQLunion 			= stRDF + "union";
    2.59 +	public static final String stSPARQLbuffer 		= stRDF + "buffer";
    2.60 +	public static final String stSPARQLenvelope 		= stRDF + "envelope";
    2.61 +	public static final String stSPARQLconvexHull		= stRDF + "convexHull";
    2.62 +	public static final String stSPARQLboundary 		= stRDF + "boundary";
    2.63 +	public static final String stSPARQLintersection 	= stRDF + "intersection";
    2.64 +	public static final String stSPARQLdifference 	= stRDF + "difference";
    2.65 +	public static final String stSPARQLsymDifference	= stRDF + "symDifference";
    2.66 +	public static final String stSPARQLtransform 		= stRDF + "transform";
    2.67  	
    2.68  	// Spatial Metric Functions
    2.69 -	public static final String distance 		= stRDF + "distance";
    2.70 -	public static final String area 			= stRDF + "area";
    2.71 +	public static final String stSPARQLdistance 		= stRDF + "distance";
    2.72 +	public static final String stSPARQLarea 			= stRDF + "area";
    2.73  
    2.74  	// Spatial Properties
    2.75 -	public static final String dimension 		= stRDF + "dimension";
    2.76 -	public static final String geometryType 	= stRDF + "geometryType";
    2.77 -	public static final String asText 			= stRDF + "asText";
    2.78 -	public static final String asGML 			= stRDF + "asGML";
    2.79 -	public static final String srid 			= stRDF + "srid";
    2.80 -	public static final String isEmpty 			= stRDF + "isEmpty";
    2.81 -	public static final String isSimple 		= stRDF + "isSimple";
    2.82 +	public static final String stSPARQLdimension 		= stRDF + "dimension";
    2.83 +	public static final String stSPARQLgeometryType 	= stRDF + "geometryType";
    2.84 +	public static final String stSPARQLasText 		= stRDF + "asText";
    2.85 +	public static final String stSPARQLasGML 			= stRDF + "asGML";
    2.86 +	public static final String stSPARQLsrid 			= stRDF + "srid";
    2.87 +	public static final String stSPARQLisEmpty 		= stRDF + "isEmpty";
    2.88 +	public static final String stSPARQLisSimple 		= stRDF + "isSimple";
    2.89  
    2.90  	// Spatial Aggregate Functions
    2.91 -	public static final String extent 			= stRDF + "extent";
    2.92 +	public static final String stSPARQLextent 		= stRDF + "extent";
    2.93  	
    2.94  	/**
    2.95  	 * WGS 84 latitude-longitude (EPSG:4326)
    2.96 @@ -238,47 +238,47 @@
    2.97  	 * 																		*/	
    2.98  	// Non-topological
    2.99  	public static final String geoSparqlDistance 				= GEOF + "distance"; //3 arguments
   2.100 -	public static final String geoSparqlBuffer 					= GEOF + "buffer"; //3 arguments
   2.101 -	public static final String geoSparqlConvexHull 				= GEOF + "convexHull";
   2.102 +	public static final String geoSparqlBuffer 				= GEOF + "buffer"; //3 arguments
   2.103 +	public static final String geoSparqlConvexHull 			= GEOF + "convexHull";
   2.104  	public static final String geoSparqlIntersection 			= GEOF + "intersection";
   2.105 -	public static final String geoSparqlUnion 					= GEOF + "union";
   2.106 -	public static final String geoSparqlDifference 				= GEOF + "difference";
   2.107 +	public static final String geoSparqlUnion 				= GEOF + "union";
   2.108 +	public static final String geoSparqlDifference 			= GEOF + "difference";
   2.109  	public static final String geoSparqlSymmetricDifference 	= GEOF + "symmetricDifference";
   2.110  	public static final String geoSparqlEnvelope 				= GEOF + "envelope";
   2.111  	public static final String geoSparqlBoundary 				= GEOF + "boundary";
   2.112  
   2.113  	// Simple Features - 8 functions - all with 2 arguments + boolean
   2.114  	public static final String sfEquals 						= GEOF + "sfEquals";
   2.115 -	public static final String sfDisjoint 						= GEOF + "sfDisjoint";
   2.116 +	public static final String sfDisjoint 					= GEOF + "sfDisjoint";
   2.117  	public static final String sfIntersects 					= GEOF + "sfIntersects";
   2.118  	public static final String sfTouches 						= GEOF + "sfTouches";
   2.119  	public static final String sfCrosses 						= GEOF + "sfCrosses";
   2.120  	public static final String sfWithin 						= GEOF + "sfWithin";
   2.121 -	public static final String sfContains 						= GEOF + "sfContains";
   2.122 -	public static final String sfOverlaps 						= GEOF + "sfOverlaps";
   2.123 +	public static final String sfContains 					= GEOF + "sfContains";
   2.124 +	public static final String sfOverlaps 					= GEOF + "sfOverlaps";
   2.125  
   2.126  	// Egenhofer - 8 functions - all with 2 arguments + boolean
   2.127  	public static final String ehEquals 						= GEOF + "ehEquals";
   2.128 -	public static final String ehDisjoint 						= GEOF + "ehDisjoint";
   2.129 -	public static final String ehMeet 							= GEOF + "ehMeet";
   2.130 +	public static final String ehDisjoint 					= GEOF + "ehDisjoint";
   2.131 +	public static final String ehMeet 						= GEOF + "ehMeet";
   2.132  	public static final String ehOverlap 						= GEOF + "ehOverlap";
   2.133  	public static final String ehCovers 						= GEOF + "ehCovers";
   2.134 -	public static final String ehCoveredBy 						= GEOF + "ehCoveredBy";
   2.135 +	public static final String ehCoveredBy 					= GEOF + "ehCoveredBy";
   2.136  	public static final String ehInside 						= GEOF + "ehInside";
   2.137 -	public static final String ehContains 						= GEOF + "ehContains";
   2.138 +	public static final String ehContains 					= GEOF + "ehContains";
   2.139  
   2.140  	// RCC8 - 8 functions - all with 2 arguments + boolean
   2.141 -	public static final String rccEquals 						 = GEOF + "rcc8eq";
   2.142 -	public static final String rccDisconnected 					 = GEOF + "rcc8dc";
   2.143 -	public static final String rccExternallyConnected 			 = GEOF + "rcc8ec";
   2.144 -	public static final String rccPartiallyOverlapping 			 = GEOF + "rcc8po";
   2.145 -	public static final String rccTangentialProperPartInverse 	 = GEOF + "rcc8tppi";
   2.146 -	public static final String rccTangentialProperPart 			 = GEOF + "rcc8tpp";
   2.147 -	public static final String rccNonTangentialProperPart 		 = GEOF + "rcc8ntpp";
   2.148 -	public static final String rccNonTangentialProperPartInverse = GEOF + "rcc8ntppi";
   2.149 +	public static final String rccEquals 						 		= GEOF + "rcc8eq";
   2.150 +	public static final String rccDisconnected 				 		= GEOF + "rcc8dc";
   2.151 +	public static final String rccExternallyConnected 		 		= GEOF + "rcc8ec";
   2.152 +	public static final String rccPartiallyOverlapping 		 		= GEOF + "rcc8po";
   2.153 +	public static final String rccTangentialProperPartInverse			= GEOF + "rcc8tppi";
   2.154 +	public static final String rccTangentialProperPart 		 		= GEOF + "rcc8tpp";
   2.155 +	public static final String rccNonTangentialProperPart 		 	= GEOF + "rcc8ntpp";
   2.156 +	public static final String rccNonTangentialProperPartInverse 		= GEOF + "rcc8ntppi";
   2.157  	
   2.158  	// The generic relate function
   2.159 -	public static final String geoSparqlRelate 					 = GEOF + "relate";
   2.160 +	public static final String geoSparqlRelate 					 	= GEOF + "relate";
   2.161  
   2.162  	/**
   2.163  	 * Addition for datetime metric functions
   2.164 @@ -304,7 +304,7 @@
   2.165  	/**
   2.166  	 * List of stSPARQL spatial extension functions 
   2.167  	 */
   2.168 -	public static final List<String> stSPARQLSpatialExtFunc = new ArrayList<String>();
   2.169 +	public static final List<String> STSPARQLSpatialExtFunc = new ArrayList<String>();
   2.170  	
   2.171  	/**
   2.172  	 * List of stSPARQL temporal extension functions
   2.173 @@ -314,69 +314,25 @@
   2.174  	/**
   2.175  	 * List of GeoSPARQL extension functions
   2.176  	 */
   2.177 -	public static final List<String> stGeoSPARQLExtFunc = new ArrayList<String>();
   2.178 +	public static final List<String> GEOSPARQLExtFunc = new ArrayList<String>();
   2.179  	
   2.180  	// declare spatial and temporal extension functions
   2.181  	static {
   2.182  		Class<GeoConstants> geoConstants = GeoConstants.class;	
   2.183  		
   2.184 -		stSPARQLSpatialExtFunc.add(equals);	
   2.185 -		stSPARQLSpatialExtFunc.add(disjoint);
   2.186 -		stSPARQLSpatialExtFunc.add(intersects);
   2.187 -		stSPARQLSpatialExtFunc.add(touches);	
   2.188 -		stSPARQLSpatialExtFunc.add(within);	
   2.189 -		stSPARQLSpatialExtFunc.add(contains);	
   2.190 -		stSPARQLSpatialExtFunc.add(overlaps);	
   2.191 -		stSPARQLSpatialExtFunc.add(crosses);
   2.192 -
   2.193 -		stSPARQLSpatialExtFunc.add(relate);
   2.194 -			     
   2.195 -		stSPARQLSpatialExtFunc.add(mbbIntersects);
   2.196 -		stSPARQLSpatialExtFunc.add(mbbContains); 	
   2.197 -		stSPARQLSpatialExtFunc.add(mbbEquals);	
   2.198 -		stSPARQLSpatialExtFunc.add(mbbWithin);
   2.199 -			     
   2.200 -		stSPARQLSpatialExtFunc.add(left);	
   2.201 -		stSPARQLSpatialExtFunc.add(right);	
   2.202 -		stSPARQLSpatialExtFunc.add(above);	
   2.203 -		stSPARQLSpatialExtFunc.add(below);	
   2.204 -			     
   2.205 -		stSPARQLSpatialExtFunc.add(union);	
   2.206 -		stSPARQLSpatialExtFunc.add(buffer);	
   2.207 -		stSPARQLSpatialExtFunc.add(envelope);	
   2.208 -		stSPARQLSpatialExtFunc.add(convexHull);	
   2.209 -		stSPARQLSpatialExtFunc.add(boundary);
   2.210 -		stSPARQLSpatialExtFunc.add(intersection);
   2.211 -		stSPARQLSpatialExtFunc.add(difference);
   2.212 -		stSPARQLSpatialExtFunc.add(symDifference);
   2.213 -		stSPARQLSpatialExtFunc.add(transform);
   2.214 -			     
   2.215 -		stSPARQLSpatialExtFunc.add(distance);
   2.216 -		stSPARQLSpatialExtFunc.add(area);	
   2.217 -			     
   2.218 -		stSPARQLSpatialExtFunc.add(dimension);
   2.219 -		stSPARQLSpatialExtFunc.add(geometryType);
   2.220 -		stSPARQLSpatialExtFunc.add(asText);	
   2.221 -		stSPARQLSpatialExtFunc.add(asGML);	
   2.222 -		stSPARQLSpatialExtFunc.add(srid);
   2.223 -		stSPARQLSpatialExtFunc.add(isEmpty);
   2.224 -		stSPARQLSpatialExtFunc.add(isSimple); 	
   2.225 -			     
   2.226 -		stSPARQLSpatialExtFunc.add(extent);
   2.227 -		
   2.228 -		
   2.229  		try {
   2.230  			Field[] field = geoConstants.getDeclaredFields();
   2.231  		
   2.232  			for (int i = 0; i < field.length; i++) {
   2.233  				// stSPARQL
   2.234 -				
   2.235 -				// GeoSPARQL
   2.236 -				if (field[i].getName().startsWith("geoSparql") ||
   2.237 +				if (field[i].getName().startsWith("stSPARQL")) {
   2.238 +					STSPARQLSpatialExtFunc.add((String) field[i].get(null));
   2.239 +					
   2.240 +				} else if (field[i].getName().startsWith("geoSparql") || 
   2.241  						field[i].getName().startsWith("sf") ||
   2.242  						field[i].getName().startsWith("eh") ||
   2.243 -						field[i].getName().startsWith("rcc")) {
   2.244 -					stGeoSPARQLExtFunc.add((String) field[i].get(null));
   2.245 +						field[i].getName().startsWith("rcc")) { // GeoSPARQL
   2.246 +					GEOSPARQLExtFunc.add((String) field[i].get(null));
   2.247  				}
   2.248  			}
   2.249  		} catch (SecurityException e) {

     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Tue Apr 02 11:44:35 2013 +0300
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Tue Apr 02 12:01:30 2013 +0300
     3.3 @@ -20,6 +20,6 @@
     3.4  
     3.5  	@Override
     3.6  	public String getURI() {
     3.7 -		return GeoConstants.extent;
     3.8 +		return GeoConstants.stSPARQLextent;
     3.9  	}
    3.10  }

     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Tue Apr 02 11:44:35 2013 +0300
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Tue Apr 02 12:01:30 2013 +0300
     4.3 @@ -20,6 +20,6 @@
     4.4  
     4.5  	@Override
     4.6  	public String getURI() {
     4.7 -		return GeoConstants.boundary;
     4.8 +		return GeoConstants.stSPARQLboundary;
     4.9  	}
    4.10  }

     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Tue Apr 02 11:44:35 2013 +0300
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Tue Apr 02 12:01:30 2013 +0300
     5.3 @@ -19,6 +19,6 @@
     5.4  
     5.5  	@Override
     5.6  	public String getURI() {
     5.7 -		return GeoConstants.buffer;
     5.8 +		return GeoConstants.stSPARQLbuffer;
     5.9  	}
    5.10  }

     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Tue Apr 02 11:44:35 2013 +0300
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Tue Apr 02 12:01:30 2013 +0300
     6.3 @@ -20,6 +20,6 @@
     6.4  
     6.5  	@Override
     6.6  	public String getURI() {
     6.7 -		return GeoConstants.convexHull;
     6.8 +		return GeoConstants.stSPARQLconvexHull;
     6.9  	}
    6.10  }

     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Tue Apr 02 11:44:35 2013 +0300
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Tue Apr 02 12:01:30 2013 +0300
     7.3 @@ -20,6 +20,6 @@
     7.4  
     7.5  	@Override
     7.6  	public String getURI() {
     7.7 -		return GeoConstants.difference;
     7.8 +		return GeoConstants.stSPARQLdifference;
     7.9  	}
    7.10  }

     8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Tue Apr 02 11:44:35 2013 +0300
     8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Tue Apr 02 12:01:30 2013 +0300
     8.3 @@ -20,6 +20,6 @@
     8.4  
     8.5  	@Override
     8.6  	public String getURI() {
     8.7 -		return GeoConstants.envelope;
     8.8 +		return GeoConstants.stSPARQLenvelope;
     8.9  	}
    8.10  }

     9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Tue Apr 02 11:44:35 2013 +0300
     9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Tue Apr 02 12:01:30 2013 +0300
     9.3 @@ -20,6 +20,6 @@
     9.4  
     9.5  	@Override
     9.6  	public String getURI() {
     9.7 -		return GeoConstants.intersection;
     9.8 +		return GeoConstants.stSPARQLintersection;
     9.9  	}
    9.10  }

    10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Tue Apr 02 11:44:35 2013 +0300
    10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Tue Apr 02 12:01:30 2013 +0300
    10.3 @@ -20,6 +20,6 @@
    10.4  
    10.5  	@Override
    10.6  	public String getURI() {
    10.7 -		return GeoConstants.symDifference;
    10.8 +		return GeoConstants.stSPARQLsymDifference;
    10.9  	}
   10.10  }

    11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Tue Apr 02 11:44:35 2013 +0300
    11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Tue Apr 02 12:01:30 2013 +0300
    11.3 @@ -20,6 +20,6 @@
    11.4  
    11.5  	@Override
    11.6  	public String getURI() {
    11.7 -		return GeoConstants.transform;
    11.8 +		return GeoConstants.stSPARQLtransform;
    11.9  	}
   11.10  }

    12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Tue Apr 02 11:44:35 2013 +0300
    12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Tue Apr 02 12:01:30 2013 +0300
    12.3 @@ -20,6 +20,6 @@
    12.4  
    12.5  	@Override
    12.6  	public String getURI() {
    12.7 -		return GeoConstants.union;
    12.8 +		return GeoConstants.stSPARQLunion;
    12.9  	}
   12.10  }

    13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Tue Apr 02 11:44:35 2013 +0300
    13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Tue Apr 02 12:01:30 2013 +0300
    13.3 @@ -21,6 +21,6 @@
    13.4  
    13.5  	@Override
    13.6  	public String getURI() {
    13.7 -		return GeoConstants.area;
    13.8 +		return GeoConstants.stSPARQLarea;
    13.9  	}
   13.10  }

    14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Tue Apr 02 11:44:35 2013 +0300
    14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Tue Apr 02 12:01:30 2013 +0300
    14.3 @@ -21,6 +21,6 @@
    14.4  
    14.5  	@Override
    14.6  	public String getURI() {
    14.7 -		return GeoConstants.distance;
    14.8 +		return GeoConstants.stSPARQLdistance;
    14.9  	}
   14.10  }

    15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java	Tue Apr 02 11:44:35 2013 +0300
    15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java	Tue Apr 02 12:01:30 2013 +0300
    15.3 @@ -21,6 +21,6 @@
    15.4  
    15.5  	@Override
    15.6  	public String getURI() {
    15.7 -		return GeoConstants.asGML;
    15.8 +		return GeoConstants.stSPARQLasGML;
    15.9  	}
   15.10  }

    16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Tue Apr 02 11:44:35 2013 +0300
    16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Tue Apr 02 12:01:30 2013 +0300
    16.3 @@ -21,6 +21,6 @@
    16.4  
    16.5  	@Override
    16.6  	public String getURI() {
    16.7 -		return GeoConstants.asText;
    16.8 +		return GeoConstants.stSPARQLasText;
    16.9  	}
   16.10  }

    17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Tue Apr 02 11:44:35 2013 +0300
    17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Tue Apr 02 12:01:30 2013 +0300
    17.3 @@ -21,6 +21,6 @@
    17.4  
    17.5  	@Override
    17.6  	public String getURI() {
    17.7 -		return GeoConstants.dimension;
    17.8 +		return GeoConstants.stSPARQLdimension;
    17.9  	}
   17.10  }

    18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Tue Apr 02 11:44:35 2013 +0300
    18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Tue Apr 02 12:01:30 2013 +0300
    18.3 @@ -21,6 +21,6 @@
    18.4  
    18.5  	@Override
    18.6  	public String getURI() {
    18.7 -		return GeoConstants.geometryType;
    18.8 +		return GeoConstants.stSPARQLgeometryType;
    18.9  	}
   18.10  }

    19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Tue Apr 02 11:44:35 2013 +0300
    19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Tue Apr 02 12:01:30 2013 +0300
    19.3 @@ -21,6 +21,6 @@
    19.4  
    19.5  	@Override
    19.6  	public String getURI() {
    19.7 -		return GeoConstants.isEmpty;
    19.8 +		return GeoConstants.stSPARQLisEmpty;
    19.9  	}
   19.10  }

    20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Tue Apr 02 11:44:35 2013 +0300
    20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Tue Apr 02 12:01:30 2013 +0300
    20.3 @@ -21,6 +21,6 @@
    20.4  
    20.5  	@Override
    20.6  	public String getURI() {
    20.7 -		return GeoConstants.isSimple;
    20.8 +		return GeoConstants.stSPARQLisSimple;
    20.9  	}
   20.10  }

    21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Tue Apr 02 11:44:35 2013 +0300
    21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Tue Apr 02 12:01:30 2013 +0300
    21.3 @@ -21,6 +21,6 @@
    21.4  
    21.5  	@Override
    21.6  	public String getURI() {
    21.7 -		return GeoConstants.srid.toString(); //changed this-constant
    21.8 +		return GeoConstants.stSPARQLsrid.toString(); //changed this-constant
    21.9  	}
   21.10  }

    22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Tue Apr 02 11:44:35 2013 +0300
    22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Tue Apr 02 12:01:30 2013 +0300
    22.3 @@ -20,6 +20,6 @@
    22.4  
    22.5  	@Override
    22.6  	public String getURI() {
    22.7 -		return GeoConstants.above;
    22.8 +		return GeoConstants.stSPARQLabove;
    22.9  	}
   22.10  }

    23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Tue Apr 02 11:44:35 2013 +0300
    23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Tue Apr 02 12:01:30 2013 +0300
    23.3 @@ -20,6 +20,6 @@
    23.4  
    23.5  	@Override
    23.6  	public String getURI() {
    23.7 -		return GeoConstants.below;
    23.8 +		return GeoConstants.stSPARQLbelow;
    23.9  	}
   23.10  }

    24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    24.3 @@ -20,6 +20,6 @@
    24.4  
    24.5  	@Override
    24.6  	public String getURI() {
    24.7 -		return GeoConstants.contains;
    24.8 +		return GeoConstants.stSPARQLcontains;
    24.9  	}
   24.10  }

    25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java	Tue Apr 02 11:44:35 2013 +0300
    25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java	Tue Apr 02 12:01:30 2013 +0300
    25.3 @@ -20,6 +20,6 @@
    25.4  
    25.5  	@Override
    25.6  	public String getURI() {
    25.7 -		return GeoConstants.crosses;
    25.8 +		return GeoConstants.stSPARQLcrosses;
    25.9  	}
   25.10  }

    26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Tue Apr 02 11:44:35 2013 +0300
    26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Tue Apr 02 12:01:30 2013 +0300
    26.3 @@ -20,6 +20,6 @@
    26.4  
    26.5  	@Override
    26.6  	public String getURI() {
    26.7 -		return GeoConstants.disjoint;
    26.8 +		return GeoConstants.stSPARQLdisjoint;
    26.9  	}
   26.10  }

    27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    27.3 @@ -20,6 +20,6 @@
    27.4  
    27.5  	@Override
    27.6  	public String getURI() {
    27.7 -		return GeoConstants.equals;
    27.8 +		return GeoConstants.stSPARQLequals;
    27.9  	}
   27.10  }

    28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    28.3 @@ -20,7 +20,7 @@
    28.4  
    28.5  	@Override
    28.6  	public String getURI() {
    28.7 -		return GeoConstants.intersects;
    28.8 +		return GeoConstants.stSPARQLintersects;
    28.9  		}
   28.10  
   28.11  }

    29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Tue Apr 02 11:44:35 2013 +0300
    29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Tue Apr 02 12:01:30 2013 +0300
    29.3 @@ -20,6 +20,6 @@
    29.4  
    29.5  	@Override
    29.6  	public String getURI() {
    29.7 -		return GeoConstants.left;
    29.8 +		return GeoConstants.stSPARQLleft;
    29.9  	}
   29.10  }

    30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    30.3 @@ -20,6 +20,6 @@
    30.4  
    30.5  	@Override
    30.6  	public String getURI() {
    30.7 -		return GeoConstants.overlaps;
    30.8 +		return GeoConstants.stSPARQLoverlaps;
    30.9  	}
   30.10  }

    31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Tue Apr 02 11:44:35 2013 +0300
    31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Tue Apr 02 12:01:30 2013 +0300
    31.3 @@ -19,7 +19,7 @@
    31.4  
    31.5  	@Override
    31.6  	public String getURI() {
    31.7 -		return GeoConstants.relate;
    31.8 +		return GeoConstants.stSPARQLrelate;
    31.9  	}
   31.10  
   31.11  //	public Literal evaluate(ValueFactory valueFactory, Value... args)

    32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Tue Apr 02 11:44:35 2013 +0300
    32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Tue Apr 02 12:01:30 2013 +0300
    32.3 @@ -20,6 +20,6 @@
    32.4  
    32.5  	@Override
    32.6  	public String getURI() {
    32.7 -		return GeoConstants.right;
    32.8 +		return GeoConstants.stSPARQLright;
    32.9  	}
   32.10  }

    33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java	Tue Apr 02 11:44:35 2013 +0300
    33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java	Tue Apr 02 12:01:30 2013 +0300
    33.3 @@ -20,6 +20,6 @@
    33.4  
    33.5  	@Override
    33.6  	public String getURI() {
    33.7 -		return GeoConstants.touches;
    33.8 +		return GeoConstants.stSPARQLtouches;
    33.9  	}
   33.10  }

    34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java	Tue Apr 02 11:44:35 2013 +0300
    34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java	Tue Apr 02 12:01:30 2013 +0300
    34.3 @@ -20,6 +20,6 @@
    34.4  
    34.5  	@Override
    34.6  	public String getURI() {
    34.7 -		return GeoConstants.within;
    34.8 +		return GeoConstants.stSPARQLwithin;
    34.9  	}
   34.10  }

    35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    35.3 @@ -20,7 +20,7 @@
    35.4  
    35.5  	@Override
    35.6  	public String getURI() {
    35.7 -		return GeoConstants.mbbContains;
    35.8 +		return GeoConstants.stSPARQLmbbContains;
    35.9  	}
   35.10  
   35.11  }

    36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    36.3 @@ -20,7 +20,7 @@
    36.4  
    36.5  	@Override
    36.6  	public String getURI() {
    36.7 -		return GeoConstants.mbbEquals;
    36.8 +		return GeoConstants.stSPARQLmbbEquals;
    36.9  	}
   36.10  
   36.11  }

    37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java	Tue Apr 02 11:44:35 2013 +0300
    37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java	Tue Apr 02 12:01:30 2013 +0300
    37.3 @@ -20,7 +20,7 @@
    37.4  
    37.5  	@Override
    37.6  	public String getURI() {
    37.7 -		return GeoConstants.mbbIntersects;
    37.8 +		return GeoConstants.stSPARQLmbbIntersects;
    37.9  	}
   37.10  
   37.11  }

    38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java	Tue Apr 02 11:44:35 2013 +0300
    38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java	Tue Apr 02 12:01:30 2013 +0300
    38.3 @@ -20,7 +20,7 @@
    38.4  
    38.5  	@Override
    38.6  	public String getURI() {
    38.7 -		return GeoConstants.mbbWithin;
    38.8 +		return GeoConstants.stSPARQLmbbWithin;
    38.9  	}
   38.10  
   38.11  }

    39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java	Tue Apr 02 11:44:35 2013 +0300
    39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java	Tue Apr 02 12:01:30 2013 +0300
    39.3 @@ -55,7 +55,7 @@
    39.4  				if(element.getExpr() instanceof FunctionCall)
    39.5  				{
    39.6  					FunctionCall fc = (FunctionCall) element.getExpr();
    39.7 -					if(fc.getURI().equals(GeoConstants.envelope) && fc.getArgs().size()==2)
    39.8 +					if(fc.getURI().equals(GeoConstants.stSPARQLenvelope) && fc.getArgs().size()==2)
    39.9  					{
   39.10  						mbbFlag = true;
   39.11  						FunctionCall expr = (FunctionCall) element.getExpr();

    40.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricTriple.java	Tue Apr 02 12:01:30 2013 +0300
    40.3 @@ -0,0 +1,20 @@
    40.4 +package org.openrdf.sail.generaldb.algebra;
    40.5 +
    40.6 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
    40.7 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
    40.8 +import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator;
    40.9 +
   40.10 +public class GeneralDBSqlSpatialMetricTriple extends TripleGeneralDBOperator
   40.11 +{
   40.12 +	public GeneralDBSqlSpatialMetricTriple(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) 
   40.13 +	{
   40.14 +		super(left, right, third);
   40.15 +	}
   40.16 +
   40.17 +	@Override
   40.18 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) throws X
   40.19 +	{
   40.20 +		visitor.meet(this);
   40.21 +	}
   40.22 +	
   40.23 +}

    41.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Tue Apr 02 11:44:35 2013 +0300
    41.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Tue Apr 02 12:01:30 2013 +0300
    41.3 @@ -667,12 +667,12 @@
    41.4  				}
    41.5  				else
    41.6  				{
    41.7 -					if(function.getURI().equals(GeoConstants.buffer))
    41.8 +					if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
    41.9  					{
   41.10  						//Be it a Var or a Value Constant, 'numeric' is the way to go
   41.11  						rightArg = numeric(right);
   41.12  					}
   41.13 -					else if(function.getURI().equals(GeoConstants.transform))
   41.14 +					else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
   41.15  					{
   41.16  						//Another special case -> Second argument of this function is a URI
   41.17  						rightArg = uri(right);
   41.18 @@ -904,12 +904,12 @@
   41.19  			}
   41.20  			else
   41.21  			{
   41.22 -				if(function.getURI().equals(GeoConstants.buffer))
   41.23 +				if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
   41.24  				{
   41.25  					//Be it a Var or a Value Constant, 'numeric' is the way to go
   41.26  					rightArg = numeric(right);
   41.27  				}
   41.28 -				else if(function.getURI().equals(GeoConstants.transform))
   41.29 +				else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
   41.30  				{
   41.31  					//Another special case -> Second argument of this function is a URI
   41.32  					rightArg = uri(right);
   41.33 @@ -1026,73 +1026,73 @@
   41.34  			GeneralDBSqlExpr thirdArg)
   41.35  	{
   41.36  		//XXX stSPARQL		
   41.37 -		if(function.getURI().equals(GeoConstants.equals))
   41.38 +		if(function.getURI().equals(GeoConstants.stSPARQLequals))
   41.39  		{
   41.40  			return equalsGeo(leftArg,rightArg);
   41.41  		}
   41.42 -		else if(function.getURI().equals(GeoConstants.disjoint))
   41.43 +		else if(function.getURI().equals(GeoConstants.stSPARQLdisjoint))
   41.44  		{
   41.45  			return disjoint(leftArg,rightArg);
   41.46  		}
   41.47 -		else if(function.getURI().equals(GeoConstants.intersects))
   41.48 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersects))
   41.49  		{
   41.50  			return intersects(leftArg,rightArg);
   41.51  		}
   41.52 -		else if(function.getURI().equals(GeoConstants.touches))
   41.53 +		else if(function.getURI().equals(GeoConstants.stSPARQLtouches))
   41.54  		{
   41.55  			return touches(leftArg,rightArg);
   41.56  		}
   41.57 -		else if(function.getURI().equals(GeoConstants.crosses))
   41.58 +		else if(function.getURI().equals(GeoConstants.stSPARQLcrosses))
   41.59  		{
   41.60  			return crosses(leftArg,rightArg);
   41.61  		}
   41.62 -		else if(function.getURI().equals(GeoConstants.within))
   41.63 +		else if(function.getURI().equals(GeoConstants.stSPARQLwithin))
   41.64  		{
   41.65  			return within(leftArg,rightArg);
   41.66  		}
   41.67 -		else if(function.getURI().equals(GeoConstants.contains))
   41.68 +		else if(function.getURI().equals(GeoConstants.stSPARQLcontains))
   41.69  		{
   41.70  			return contains(leftArg,rightArg);
   41.71  		}		
   41.72 -		else if(function.getURI().equals(GeoConstants.overlaps))
   41.73 +		else if(function.getURI().equals(GeoConstants.stSPARQLoverlaps))
   41.74  		{
   41.75  			return overlaps(leftArg,rightArg);
   41.76  		}		
   41.77 -		else if(function.getURI().equals(GeoConstants.relate))
   41.78 +		else if(function.getURI().equals(GeoConstants.stSPARQLrelate))
   41.79  		{
   41.80  			return relate(leftArg,rightArg,thirdArg);
   41.81  		}
   41.82  		// directional
   41.83 -		else if(function.getURI().equals(GeoConstants.left))
   41.84 +		else if(function.getURI().equals(GeoConstants.stSPARQLleft))
   41.85  		{
   41.86  			return left(leftArg,rightArg);
   41.87  		}
   41.88 -		else if(function.getURI().equals(GeoConstants.right))
   41.89 +		else if(function.getURI().equals(GeoConstants.stSPARQLright))
   41.90  		{
   41.91  			return right(leftArg,rightArg);
   41.92  		}
   41.93 -		else if(function.getURI().equals(GeoConstants.above))
   41.94 +		else if(function.getURI().equals(GeoConstants.stSPARQLabove))
   41.95  		{
   41.96  			return above(leftArg,rightArg);
   41.97  		}
   41.98 -		else if(function.getURI().equals(GeoConstants.below))
   41.99 +		else if(function.getURI().equals(GeoConstants.stSPARQLbelow))
  41.100  		{
  41.101  			return below(leftArg,rightArg);
  41.102  		}
  41.103  		// mbb
  41.104 -		else if(function.getURI().equals(GeoConstants.mbbIntersects))
  41.105 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbIntersects))
  41.106  		{
  41.107  			return mbbIntersects(leftArg,rightArg);
  41.108  		}
  41.109 -		else if(function.getURI().equals(GeoConstants.mbbWithin))
  41.110 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbWithin))
  41.111  		{
  41.112  			return mbbWithin(leftArg,rightArg);
  41.113  		}
  41.114 -		else if(function.getURI().equals(GeoConstants.mbbContains))
  41.115 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbContains))
  41.116  		{
  41.117  			return mbbContains(leftArg,rightArg);
  41.118  		}
  41.119 -		else if(function.getURI().equals(GeoConstants.mbbEquals))
  41.120 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbEquals))
  41.121  		{
  41.122  			return mbbEqualsGeo(leftArg,rightArg);
  41.123  		}
  41.124 @@ -1207,39 +1207,39 @@
  41.125  
  41.126  	GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg)
  41.127  	{
  41.128 -		if(function.getURI().equals(GeoConstants.union))
  41.129 +		if(function.getURI().equals(GeoConstants.stSPARQLunion))
  41.130  		{
  41.131  			return geoUnion(leftArg, rightArg);
  41.132  		}
  41.133 -		else if(function.getURI().equals(GeoConstants.buffer))
  41.134 +		else if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
  41.135  		{
  41.136  			return geoBuffer(leftArg,rightArg);
  41.137  		}
  41.138 -		else if(function.getURI().equals(GeoConstants.transform))
  41.139 +		else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
  41.140  		{
  41.141  			return geoTransform(leftArg,rightArg);
  41.142  		}
  41.143 -		else if(function.getURI().equals(GeoConstants.envelope))
  41.144 +		else if(function.getURI().equals(GeoConstants.stSPARQLenvelope))
  41.145  		{
  41.146  			return geoEnvelope(leftArg);
  41.147  		}
  41.148 -		else if(function.getURI().equals(GeoConstants.convexHull))
  41.149 +		else if(function.getURI().equals(GeoConstants.stSPARQLconvexHull))
  41.150  		{
  41.151  			return geoConvexHull(leftArg);
  41.152  		}
  41.153 -		else if(function.getURI().equals(GeoConstants.boundary))
  41.154 +		else if(function.getURI().equals(GeoConstants.stSPARQLboundary))
  41.155  		{
  41.156  			return geoBoundary(leftArg);
  41.157  		}
  41.158 -		else if(function.getURI().equals(GeoConstants.intersection))
  41.159 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersection))
  41.160  		{
  41.161  			return geoIntersection(leftArg, rightArg);
  41.162  		}
  41.163 -		else if(function.getURI().equals(GeoConstants.difference))
  41.164 +		else if(function.getURI().equals(GeoConstants.stSPARQLdifference))
  41.165  		{
  41.166  			return geoDifference(leftArg, rightArg);
  41.167  		}
  41.168 -		else if(function.getURI().equals(GeoConstants.symDifference))
  41.169 +		else if(function.getURI().equals(GeoConstants.stSPARQLsymDifference))
  41.170  		{
  41.171  			return geoSymDifference(leftArg, rightArg);
  41.172  		}
  41.173 @@ -1300,11 +1300,11 @@
  41.174  	//TODO more to be added here probably
  41.175  	GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg, GeneralDBSqlExpr thirdArg)
  41.176  	{
  41.177 -		if(function.getURI().equals(GeoConstants.distance))
  41.178 +		if(function.getURI().equals(GeoConstants.stSPARQLdistance))
  41.179  		{
  41.180  			return geoDistance(leftArg, rightArg, thirdArg);
  41.181  		}
  41.182 -		else if(function.getURI().equals(GeoConstants.area))
  41.183 +		else if(function.getURI().equals(GeoConstants.stSPARQLarea))
  41.184  		{
  41.185  			return geoArea(leftArg);
  41.186  		}
  41.187 @@ -1316,31 +1316,31 @@
  41.188  
  41.189  	GeneralDBSqlExpr spatialPropertyPicker(Function function,GeneralDBSqlExpr arg)
  41.190  	{
  41.191 -		if(function.getURI().equals(GeoConstants.dimension))
  41.192 +		if(function.getURI().equals(GeoConstants.stSPARQLdimension))
  41.193  		{
  41.194  			return dimension(arg);
  41.195  		}
  41.196 -		else if(function.getURI().equals(GeoConstants.geometryType))
  41.197 +		else if(function.getURI().equals(GeoConstants.stSPARQLgeometryType))
  41.198  		{
  41.199  			return geometryType(arg);
  41.200  		}
  41.201 -		else if(function.getURI().equals(GeoConstants.asText))
  41.202 +		else if(function.getURI().equals(GeoConstants.stSPARQLasText))
  41.203  		{
  41.204  			return asText(arg);
  41.205  		}
  41.206 -		else if(function.getURI().equals(GeoConstants.srid))
  41.207 +		else if(function.getURI().equals(GeoConstants.stSPARQLsrid))
  41.208  		{
  41.209  			return srid(arg);
  41.210  		}
  41.211 -		else if(function.getURI().equals(GeoConstants.isEmpty))
  41.212 +		else if(function.getURI().equals(GeoConstants.stSPARQLisEmpty))
  41.213  		{
  41.214  			return isEmpty(arg);
  41.215  		}
  41.216 -		else if(function.getURI().equals(GeoConstants.isSimple))
  41.217 +		else if(function.getURI().equals(GeoConstants.stSPARQLisSimple))
  41.218  		{
  41.219  			return isSimple(arg);
  41.220  
  41.221 -		} else if (function.getURI().equals(GeoConstants.asGML)) {
  41.222 +		} else if (function.getURI().equals(GeoConstants.stSPARQLasGML)) {
  41.223  			return asGML(arg);
  41.224  		}
  41.225  

    42.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java	Tue Apr 02 11:44:35 2013 +0300
    42.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java	Tue Apr 02 12:01:30 2013 +0300
    42.3 @@ -325,12 +325,12 @@
    42.4  			}
    42.5  			else
    42.6  			{
    42.7 -				if(function.getURI().equals(GeoConstants.buffer))
    42.8 +				if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
    42.9  				{
   42.10  					//Be it a Var or a Value Constant, 'numeric' is the way to go
   42.11  					rightArg = this.createNumericExpr(right);
   42.12  				}
   42.13 -				else if(function.getURI().equals(GeoConstants.transform))
   42.14 +				else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
   42.15  				{
   42.16  					//Another special case -> Second argument of this function is a URI
   42.17  					rightArg = uri(right);
   42.18 @@ -436,39 +436,39 @@
   42.19  
   42.20  	GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg)
   42.21  	{
   42.22 -		if(function.getURI().equals(GeoConstants.union))
   42.23 +		if(function.getURI().equals(GeoConstants.stSPARQLunion))
   42.24  		{
   42.25  			return geoUnion(leftArg, rightArg);
   42.26  		}
   42.27 -		else if(function.getURI().equals(GeoConstants.buffer))
   42.28 +		else if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
   42.29  		{
   42.30  			return geoBuffer(leftArg,rightArg);
   42.31  		}
   42.32 -		else if(function.getURI().equals(GeoConstants.transform))
   42.33 +		else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
   42.34  		{
   42.35  			return geoTransform(leftArg,rightArg);
   42.36  		}
   42.37 -		else if(function.getURI().equals(GeoConstants.envelope))
   42.38 +		else if(function.getURI().equals(GeoConstants.stSPARQLenvelope))
   42.39  		{
   42.40  			return geoEnvelope(leftArg);
   42.41  		}
   42.42 -		else if(function.getURI().equals(GeoConstants.convexHull))
   42.43 +		else if(function.getURI().equals(GeoConstants.stSPARQLconvexHull))
   42.44  		{
   42.45  			return geoConvexHull(leftArg);
   42.46  		}
   42.47 -		else if(function.getURI().equals(GeoConstants.boundary))
   42.48 +		else if(function.getURI().equals(GeoConstants.stSPARQLboundary))
   42.49  		{
   42.50  			return geoBoundary(leftArg);
   42.51  		}
   42.52 -		else if(function.getURI().equals(GeoConstants.intersection))
   42.53 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersection))
   42.54  		{
   42.55  			return geoIntersection(leftArg, rightArg);
   42.56  		}
   42.57 -		else if(function.getURI().equals(GeoConstants.difference))
   42.58 +		else if(function.getURI().equals(GeoConstants.stSPARQLdifference))
   42.59  		{
   42.60  			return geoDifference(leftArg, rightArg);
   42.61  		}
   42.62 -		else if(function.getURI().equals(GeoConstants.symDifference))
   42.63 +		else if(function.getURI().equals(GeoConstants.stSPARQLsymDifference))
   42.64  		{
   42.65  			return geoSymDifference(leftArg, rightArg);
   42.66  		}
   42.67 @@ -527,11 +527,11 @@
   42.68  	//TODO more to be added here probably
   42.69  	GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg, GeneralDBSqlExpr thirdArg)
   42.70  	{
   42.71 -		if(function.getURI().equals(GeoConstants.distance))
   42.72 +		if(function.getURI().equals(GeoConstants.stSPARQLdistance))
   42.73  		{
   42.74  			return geoDistance(leftArg, rightArg, thirdArg);
   42.75  		}
   42.76 -		else if(function.getURI().equals(GeoConstants.area))
   42.77 +		else if(function.getURI().equals(GeoConstants.stSPARQLarea))
   42.78  		{
   42.79  			return geoArea(leftArg);
   42.80  		}
   42.81 @@ -543,27 +543,27 @@
   42.82  
   42.83  	GeneralDBSqlExpr spatialPropertyPicker(Function function,GeneralDBSqlExpr arg)
   42.84  	{
   42.85 -		if(function.getURI().equals(GeoConstants.dimension))
   42.86 +		if(function.getURI().equals(GeoConstants.stSPARQLdimension))
   42.87  		{
   42.88  			return dimension(arg);
   42.89  		}
   42.90 -		else if(function.getURI().equals(GeoConstants.geometryType))
   42.91 +		else if(function.getURI().equals(GeoConstants.stSPARQLgeometryType))
   42.92  		{
   42.93  			return geometryType(arg);
   42.94  		}
   42.95 -		else if(function.getURI().equals(GeoConstants.asText))
   42.96 +		else if(function.getURI().equals(GeoConstants.stSPARQLasText))
   42.97  		{
   42.98  			return asText(arg);
   42.99  		}
  42.100 -		else if(function.getURI().equals(GeoConstants.srid))
  42.101 +		else if(function.getURI().equals(GeoConstants.stSPARQLsrid))
  42.102  		{
  42.103  			return srid(arg);
  42.104  		}
  42.105 -		else if(function.getURI().equals(GeoConstants.isEmpty))
  42.106 +		else if(function.getURI().equals(GeoConstants.stSPARQLisEmpty))
  42.107  		{
  42.108  			return isEmpty(arg);
  42.109  		}
  42.110 -		else if(function.getURI().equals(GeoConstants.isSimple))
  42.111 +		else if(function.getURI().equals(GeoConstants.stSPARQLisSimple))
  42.112  		{
  42.113  			return isSimple(arg);
  42.114  		}

    43.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Tue Apr 02 11:44:35 2013 +0300
    43.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Tue Apr 02 12:01:30 2013 +0300
    43.3 @@ -487,12 +487,12 @@
    43.4  	public StrabonPolyhedron spatialConstructPicker(Function function, Value left, Value right) throws Exception
    43.5  	{
    43.6  		StrabonPolyhedron leftArg = ((GeneralDBPolyhedron) left).getPolyhedron();
    43.7 -		if(function.getURI().equals(GeoConstants.union))
    43.8 +		if(function.getURI().equals(GeoConstants.stSPARQLunion))
    43.9  		{
   43.10  			StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron();
   43.11  			return StrabonPolyhedron.union(leftArg, rightArg);
   43.12  		}
   43.13 -		else if(function.getURI().equals(GeoConstants.buffer))
   43.14 +		else if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
   43.15  		{
   43.16  			if(right instanceof LiteralImpl)
   43.17  			{
   43.18 @@ -506,7 +506,7 @@
   43.19  			}
   43.20  
   43.21  		}
   43.22 -		else if(function.getURI().equals(GeoConstants.transform))
   43.23 +		else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
   43.24  		{
   43.25  			if(right instanceof URIImpl)
   43.26  			{
   43.27 @@ -522,29 +522,29 @@
   43.28  			}
   43.29  
   43.30  		}
   43.31 -		else if(function.getURI().equals(GeoConstants.envelope))
   43.32 +		else if(function.getURI().equals(GeoConstants.stSPARQLenvelope))
   43.33  		{
   43.34  			return StrabonPolyhedron.envelope(leftArg);
   43.35  		}
   43.36 -		else if(function.getURI().equals(GeoConstants.convexHull))
   43.37 +		else if(function.getURI().equals(GeoConstants.stSPARQLconvexHull))
   43.38  		{
   43.39  			return StrabonPolyhedron.convexHull(leftArg);
   43.40  		}
   43.41 -		else if(function.getURI().equals(GeoConstants.boundary))
   43.42 +		else if(function.getURI().equals(GeoConstants.stSPARQLboundary))
   43.43  		{
   43.44  			return StrabonPolyhedron.boundary(leftArg);
   43.45  		}
   43.46 -		else if(function.getURI().equals(GeoConstants.intersection))
   43.47 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersection))
   43.48  		{
   43.49  			StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron();
   43.50  			return StrabonPolyhedron.intersection(leftArg, rightArg);
   43.51  		}
   43.52 -		else if(function.getURI().equals(GeoConstants.difference))
   43.53 +		else if(function.getURI().equals(GeoConstants.stSPARQLdifference))
   43.54  		{
   43.55  			StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron();
   43.56  			return StrabonPolyhedron.difference(leftArg, rightArg);		
   43.57  		}
   43.58 -		else if(function.getURI().equals(GeoConstants.symDifference))
   43.59 +		else if(function.getURI().equals(GeoConstants.stSPARQLsymDifference))
   43.60  		{
   43.61  			StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron();
   43.62  			return StrabonPolyhedron.symDifference(leftArg, rightArg);		

    44.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java	Tue Apr 02 11:44:35 2013 +0300
    44.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java	Tue Apr 02 12:01:30 2013 +0300
    44.3 @@ -1280,7 +1280,7 @@
    44.4  							String originalName = copy.getName();
    44.5  							//((Var) expr).setName(originalName+"?spatial");
    44.6  
    44.7 -							FunctionCall fc = new FunctionCall(GeoConstants.envelope,copy);
    44.8 +							FunctionCall fc = new FunctionCall(GeoConstants.stSPARQLenvelope,copy);
    44.9  							//XXX volatile - using an extra arg to 'hang' the name I need
   44.10  							fc.addArg(new Var("-mbb-"+originalName));
   44.11  							ExtensionElem extElem = new ExtensionElem(fc,"-mbb-"+originalName);
   44.12 @@ -1315,7 +1315,7 @@
   44.13  				}
   44.14  				else //Function call met
   44.15  				{
   44.16 -					FunctionCall fc = new FunctionCall(GeoConstants.envelope,expr);
   44.17 +					FunctionCall fc = new FunctionCall(GeoConstants.stSPARQLenvelope,expr);
   44.18  
   44.19  					fc.addArg(new Var("-mbb-"+(++mbbCounter)));
   44.20  					ExtensionElem extElem = new ExtensionElem(fc,"-mbb-"+(mbbCounter));