Strabon

changeset 1433:612f816ca032 temporals

merge with default
author Babis Nikolaou <charnik@di.uoa.gr>
date Tue Oct 14 12:09:19 2014 +0300 (2014-10-14)
parents 5b6b65340693 dabf45d0f369
children f1f992d1cfd4
files endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java pom.xml postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java resultio-spatial/sparqlkml/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java testsuite/pom.xml
line diff
     1.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Wed Sep 24 18:44:26 2014 +0300
     1.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Tue Oct 14 12:09:19 2014 +0300
     1.3 @@ -154,9 +154,8 @@
     1.4  	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
     1.5  	 * @throws IOException 
     1.6  	 */
     1.7 -	
     1.8  	public boolean store(String data, RDFFormat format, URL namedGraph) throws IOException {
     1.9 -assert(format != null);
    1.10 +		assert(format != null);
    1.11  		
    1.12  		// create a post method to execute
    1.13  		HttpPost method = new HttpPost(getConnectionURL());
     2.1 --- a/endpoint-exec/src/deb/control/control	Wed Sep 24 18:44:26 2014 +0300
     2.2 +++ b/endpoint-exec/src/deb/control/control	Tue Oct 14 12:09:19 2014 +0300
     2.3 @@ -3,6 +3,6 @@
     2.4  Section: strabon-endpoint
     2.5  Priority: optional
     2.6  Architecture: all
     2.7 -Maintainer: Manolis Karpathiotakis <manos.karpathiotakis@epfl.ch>, Kostis Kyzirakos <Kostis.Kyzirakos@cwi.nl>, Charalambos Nikolaou <charnik@di.uoa.gr>, Konstantina Bereta <konstantina.bereta@di.uoa.gr>, Georgios Garbis <ggarbis@di.uoa.gr>,  Dimitrios Bilidas <dbilidas@di.uoa.gr>, Stella Giannakopoulou <sgian@di.uoa.gr>, Panayiotis Smeros <psmeros@di.uoa.gr>, Kalliroi Dogani <kallirroi@di.uoa.gr>, Maria Karpathiotaki <mkarpat@di.uoa.gr>, Ioannis Vlachopoulos <johnvl@di.uoa.gr>, Dimitrianos Savva <dimis@di.uoa.gr>, Georgios Stamoulis <gstam@di.uoa.gr>, Kanela Kaligosi <kalkan@di.uoa.gr>
     2.8 +Maintainer: Manolis Karpathiotakis <manos.karpathiotakis@epfl.ch>, Kostis Kyzirakos <Kostis.Kyzirakos@cwi.nl>, Charalampos Nikolaou <charnik@di.uoa.gr>, Konstantina Bereta <konstantina.bereta@di.uoa.gr>, Georgios Garbis <ggarbis@di.uoa.gr>,  Dimitrios Bilidas <dbilidas@di.uoa.gr>, Stella Giannakopoulou <sgian@di.uoa.gr>, Panayiotis Smeros <psmeros@di.uoa.gr>, Kalliroi Dogani <kallirroi@di.uoa.gr>, Maria Karpathiotaki <mkarpat@di.uoa.gr>, Ioannis Vlachopoulos <johnvl@di.uoa.gr>, Dimitrianos Savva <dimis@di.uoa.gr>, Georgios Stamoulis <gstam@di.uoa.gr>, Kanela Kaligosi <kalkan@di.uoa.gr>
     2.9  Description: Strabon endpoint executable
    2.10  Distribution: Mozilla v2.0 Public Liscence
     3.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/BrowseBean.java	Wed Sep 24 18:44:26 2014 +0300
     3.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/BrowseBean.java	Tue Oct 14 12:09:19 2014 +0300
     3.3 @@ -11,7 +11,6 @@
     3.4  
     3.5  import java.io.ByteArrayOutputStream;
     3.6  import java.io.IOException;
     3.7 -import java.net.URLDecoder;
     3.8  
     3.9  import javax.servlet.RequestDispatcher;
    3.10  import javax.servlet.ServletConfig;
    3.11 @@ -77,8 +76,7 @@
    3.12  				.getWebApplicationContext(context);
    3.13  
    3.14  		// the the strabon wrapper
    3.15 -		strabonWrapper = (StrabonBeanWrapper) applicationContext
    3.16 -				.getBean("strabonBean");
    3.17 +		strabonWrapper = (StrabonBeanWrapper) applicationContext.getBean("strabonBean");
    3.18  
    3.19  	}
    3.20  
    3.21 @@ -146,7 +144,9 @@
    3.22  
    3.23  		} else {
    3.24  			// decode the query
    3.25 -			query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    3.26 +			// do not decode the SPARQL query (see bugs #65 and #49)
    3.27 +			//query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    3.28 +			query = request.getParameter("query");
    3.29  
    3.30  			response.setContentType(format.getDefaultMIMEType());
    3.31  			try {
    3.32 @@ -176,7 +176,9 @@
    3.33  	private void processVIEWRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
    3.34  		RequestDispatcher dispatcher;
    3.35  
    3.36 -		String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    3.37 +		// do not decode the SPARQL query (see bugs #65 and #49)
    3.38 +		//String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    3.39 +		String query = request.getParameter("query");
    3.40  		String format = request.getParameter("format");
    3.41  		
    3.42  		// get stSPARQLQueryResultFormat from given format name
     4.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/DescribeBean.java	Wed Sep 24 18:44:26 2014 +0300
     4.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/DescribeBean.java	Tue Oct 14 12:09:19 2014 +0300
     4.3 @@ -11,7 +11,6 @@
     4.4  
     4.5  import java.io.ByteArrayOutputStream;
     4.6  import java.io.IOException;
     4.7 -import java.net.URLDecoder;
     4.8  
     4.9  import javax.servlet.RequestDispatcher;
    4.10  import javax.servlet.ServletConfig;
    4.11 @@ -109,7 +108,10 @@
    4.12  		// get the dispatcher for forwarding the rendering of the response
    4.13  		RequestDispatcher dispatcher = request.getRequestDispatcher("describe.jsp");
    4.14  		
    4.15 -		String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    4.16 +		// do not decode the SPARQL query (see bugs #65 and #49)
    4.17 +		//String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    4.18 +		String query = request.getParameter("query");
    4.19 +		
    4.20  		String format = request.getParameter("format");
    4.21  		String handle = request.getParameter("handle");
    4.22  		RDFFormat rdfFormat = RDFFormat.valueOf(format);
    4.23 @@ -188,8 +190,8 @@
    4.24  			out.print(ResponseMessages.getXMLFooter());
    4.25      		
    4.26      	} else {
    4.27 -    		// decode the query
    4.28 -    		query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    4.29 +    		// do not decode the SPARQL query (see bugs #65 and #49)
    4.30 +    		//query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    4.31      		
    4.32  	    	response.setContentType(format.getDefaultMIMEType());
    4.33  		    response.setHeader("Content-Disposition", 
     5.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Wed Sep 24 18:44:26 2014 +0300
     5.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Tue Oct 14 12:09:19 2014 +0300
     5.3 @@ -3,7 +3,7 @@
     5.4   * License, v. 2.0. If a copy of the MPL was not distributed with this
     5.5   * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     5.6   * 
     5.7 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team
     5.8 + * Copyright (C) 2010, 2011, 2012, 2013, 2014 Pyravlos Team
     5.9   * 
    5.10   * http://www.strabon.di.uoa.gr/
    5.11   */
    5.12 @@ -14,7 +14,6 @@
    5.13  import java.io.FileOutputStream;
    5.14  import java.io.IOException;
    5.15  import java.math.BigInteger;
    5.16 -import java.net.URLDecoder;
    5.17  import java.security.SecureRandom;
    5.18  import java.util.ArrayList;
    5.19  import java.util.Date;
    5.20 @@ -189,8 +188,9 @@
    5.21  			// just use the first specified format
    5.22  			stSPARQLQueryResultFormat format = formats.get(0);
    5.23  		
    5.24 -			// decode the query
    5.25 -			query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    5.26 +			// do not decode the SPARQL query (see bugs #65 and #49)
    5.27 +			//query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    5.28 +			query = request.getParameter("query");
    5.29  			
    5.30  	    	response.setContentType(format.getDefaultMIMEType());
    5.31  	    	
    5.32 @@ -231,7 +231,10 @@
    5.33  			dispatcher.forward(request, response);
    5.34  			
    5.35  		} else {
    5.36 -			String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    5.37 +			// do not decode the SPARQL query (see bugs #65 and #49)
    5.38 +			//String query = URLDecoder.decode(request.getParameter("query"), "UTF-8");
    5.39 +			
    5.40 +			String query = request.getParameter("query");
    5.41  			String format = request.getParameter("format");
    5.42  			String handle = request.getParameter("handle");
    5.43  			String maxLimit = request.getParameter("maxLimit");
     6.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StoreBean.java	Wed Sep 24 18:44:26 2014 +0300
     6.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StoreBean.java	Tue Oct 14 12:09:19 2014 +0300
     6.3 @@ -13,8 +13,6 @@
     6.4  import java.io.UnsupportedEncodingException;
     6.5  import java.net.InetAddress;
     6.6  import java.net.MalformedURLException;
     6.7 -import java.net.URLDecoder;
     6.8 -import java.util.Map;
     6.9  
    6.10  import javax.servlet.RequestDispatcher;
    6.11  import javax.servlet.ServletConfig;
    6.12 @@ -31,7 +29,6 @@
    6.13  import org.springframework.web.context.WebApplicationContext;
    6.14  import org.springframework.web.context.support.WebApplicationContextUtils;
    6.15  
    6.16 -
    6.17  /**
    6.18   * 
    6.19   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    6.20 @@ -95,7 +92,6 @@
    6.21  	
    6.22  	@Override
    6.23  	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
    6.24 -   	         	
    6.25  		doPost(request, response);	
    6.26  	}
    6.27  	
    6.28 @@ -103,13 +99,15 @@
    6.29  		// check whether we read from INPUT or URL
    6.30  		boolean input = (request.getParameter(Common.SUBMIT_URL) != null) ? false:true;
    6.31  		
    6.32 -		// return "data" value accordingly
    6.33 -		return input ? URLDecoder.decode(request.getParameter(Common.PARAM_DATA), "UTF-8"):request.getParameter(Common.PARAM_DATA_URL);
    6.34 +		// return "data" value accordingly, but do not decode the RDF input data (see bugs #65 and #49)
    6.35 +		//return input ? URLDecoder.decode(request.getParameter(Common.PARAM_DATA), "UTF-8"):request.getParameter(Common.PARAM_DATA_URL);
    6.36 +		return input ? request.getParameter(Common.PARAM_DATA):request.getParameter(Common.PARAM_DATA_URL);
    6.37  	}
    6.38  	
    6.39  	@Override
    6.40  	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
    6.41 -						 
    6.42 +		request.setCharacterEncoding("UTF-8");
    6.43 +		
    6.44  		boolean authorized;
    6.45  		
    6.46  		if(!isLocalClient(request)) {
    6.47 @@ -117,9 +115,10 @@
    6.48  			String authorization = request.getHeader("Authorization");
    6.49  	   		
    6.50  			authorized = authenticate.authenticateUser(authorization, context);
    6.51 +			
    6.52 +		} else {
    6.53 +			authorized = true;
    6.54  		}
    6.55 -		else
    6.56 -			authorized = true;
    6.57  				
    6.58  	   	 if (!authorized) {	   		 
    6.59  	   		 // not allowed, so report he's unauthorized
    6.60 @@ -129,7 +128,8 @@
    6.61  	   	 else {	 		
    6.62  			// check whether the request was from store.jsp
    6.63  			if (Common.VIEW_TYPE.equals(request.getParameter(Common.VIEW))) {
    6.64 -				processVIEWRequest(request, response);				
    6.65 +				processVIEWRequest(request, response);
    6.66 +				
    6.67  			} else {
    6.68  				processRequest(request, response);
    6.69  			}
    6.70 @@ -154,6 +154,7 @@
    6.71      			
    6.72      	// RDF data to store
    6.73      	String data = getData(request);
    6.74 +    	System.out.println(data);
    6.75      			
    6.76      	// the format of the data
    6.77      	RDFFormat format = (request.getParameter(Common.PARAM_FORMAT) != null) ? RDFFormat.valueOf(request.getParameter(Common.PARAM_FORMAT)):null;
     7.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Wed Sep 24 18:44:26 2014 +0300
     7.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Tue Oct 14 12:09:19 2014 +0300
     7.3 @@ -386,4 +386,31 @@
     7.4  		}
     7.5  		return null;
     7.6  	}
     7.7 +	
     7.8 +	/**
     7.9 +	 * This function is called only for SELECT constructs, thus we do not create an id
    7.10 +	 * for the resulting geometry because we don't push it in the database since
    7.11 +	 * there is small possibility to meet this geometry in the future.
    7.12 +	 * {@link PostGISBindingIteration.createWellKnownTextGeoValueForSelectConstructs},
    7.13 +	 * {@link PostGISBindingIteration.createWellKnownTextLiteralGeoValueForSelectConstructs},
    7.14 +	 * {@link and MonetDBBindingIteration.createWellKnownTextGeoValueForSelectConstructs},
    7.15 +	 * {@link and MonetDBBindingIteration.createWellKnownTextLiteralGeoValueForSelectConstructs}
    7.16 +	 * @param datatype
    7.17 +	 * @param wkb
    7.18 +	 * @param srid
    7.19 +	 * @return
    7.20 +	 */
    7.21 +	public GeneralDBPolyhedron getRdbmsPolyhedron(String datatype, byte[] wkb, int srid)  {
    7.22 +
    7.23 +		try {
    7.24 +			if(wkb != null) {
    7.25 +				return new GeneralDBPolyhedron(vf.createURI(datatype), wkb, srid);
    7.26 +			}
    7.27 +		} catch (IOException e) {
    7.28 +			e.printStackTrace();
    7.29 +		} catch (ClassNotFoundException e) {
    7.30 +			e.printStackTrace();
    7.31 +		}
    7.32 +		return null;
    7.33 +	}
    7.34  }
     8.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java	Wed Sep 24 18:44:26 2014 +0300
     8.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java	Tue Oct 14 12:09:19 2014 +0300
     8.3 @@ -58,6 +58,34 @@
     8.4  		this.datatype = datatype;
     8.5  	}
     8.6  
     8.7 +	/**
     8.8 +	 * this method is called from the method:
     8.9 +	 * {@link GeneralDBValueFactory.getRdbmsPolyhedron}
    8.10 +	 * for SELECT constructs 
    8.11 +	 * 
    8.12 +	 * @param datatype
    8.13 +	 * @param polyhedron
    8.14 +	 * @param srid
    8.15 +	 */
    8.16 +	public GeneralDBPolyhedron(URI datatype, byte[] polyhedron, int srid) throws IOException, ClassNotFoundException {
    8.17 +		//set null id and version in the RdbmsSValue
    8.18 +		super(null, null);
    8.19 +		
    8.20 +		try {
    8.21 +			this.polyhedron = new StrabonPolyhedron(polyhedron, srid, GeometryDatatype.fromString(datatype.stringValue()));
    8.22 +			
    8.23 +		} catch (ParseException e) {
    8.24 +
    8.25 +			e.printStackTrace();
    8.26 +		} catch (Exception e) {
    8.27 +
    8.28 +			e.printStackTrace();
    8.29 +		}
    8.30 +		
    8.31 +		setPolyhedronStringRep(this.polyhedron);
    8.32 +		this.datatype = datatype;
    8.33 +	}
    8.34 +
    8.35  	public String getPolyhedronStringRep() {
    8.36  		return polyhedronStringRep;
    8.37  	}
     9.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java	Wed Sep 24 18:44:26 2014 +0300
     9.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java	Tue Oct 14 12:09:19 2014 +0300
     9.3 @@ -53,7 +53,7 @@
     9.4  		Blob labelBlob = rs.getBlob(index + 1); 
     9.5  		byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length());
     9.6  		int srid = rs.getInt(index + 2);
     9.7 -		return vf.getRdbmsPolyhedron(114, GeoConstants.WKT, label, srid);
     9.8 +		return vf.getRdbmsPolyhedron(GeoConstants.WKT, label, srid);
     9.9  	}
    9.10  	
    9.11  	@Override
    9.12 @@ -63,7 +63,7 @@
    9.13  		Blob labelBlob = rs.getBlob(index + 1); 
    9.14  		byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length());
    9.15  		int srid = rs.getInt(index + 2);
    9.16 -		return vf.getRdbmsPolyhedron(114, GeoConstants.WKTLITERAL, label, srid);
    9.17 +		return vf.getRdbmsPolyhedron(GeoConstants.WKTLITERAL, label, srid);
    9.18  	}
    9.19  
    9.20  	@Override
    10.1 --- a/pom.xml	Wed Sep 24 18:44:26 2014 +0300
    10.2 +++ b/pom.xml	Tue Oct 14 12:09:19 2014 +0300
    10.3 @@ -249,12 +249,24 @@
    10.4  				<artifactId>strabon-endpoint</artifactId>
    10.5  				<version>${eu.earthobservatory.version}</version>
    10.6  			</dependency>
    10.7 +			
    10.8 +			<dependency>
    10.9 +				<groupId>org.openrdf.sesame</groupId>
   10.10 +				<artifactId>strabon-endpoint-client</artifactId>
   10.11 +				<version>${eu.earthobservatory.version}</version>
   10.12 +			</dependency>
   10.13  
   10.14  			<dependency>
   10.15  				<groupId>eu.earthobservatory</groupId>
   10.16  				<artifactId>strabon-vocabulary</artifactId>
   10.17  				<version>${eu.earthobservatory.version}</version>
   10.18  			</dependency>
   10.19 +			
   10.20 +			<dependency>
   10.21 +				<groupId>eu.earthobservatory</groupId>
   10.22 +				<artifactId>strabon-testsuite</artifactId>
   10.23 +				<version>${eu.earthobservatory.version}</version>
   10.24 +			</dependency>
   10.25  
   10.26  			<dependency>
   10.27  				<groupId>org.openrdf.sesame</groupId>
    11.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java	Wed Sep 24 18:44:26 2014 +0300
    11.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java	Tue Oct 14 12:09:19 2014 +0300
    11.3 @@ -118,7 +118,8 @@
    11.4  		//Case of spatial constructs
    11.5  		byte[] label = rs.getBytes(index + 1);
    11.6  		int srid = rs.getInt(index + 2);
    11.7 -		return vf.getRdbmsPolyhedron(114, GeoConstants.WKT, label, srid);
    11.8 +		
    11.9 +		return vf.getRdbmsPolyhedron(GeoConstants.WKT, label, srid);
   11.10  	}
   11.11  	
   11.12  	@Override
   11.13 @@ -127,7 +128,7 @@
   11.14  		//Case of spatial constructs
   11.15  		byte[] label = rs.getBytes(index + 1);
   11.16  		int srid = rs.getInt(index + 2);
   11.17 -		return vf.getRdbmsPolyhedron(114, GeoConstants.WKTLITERAL, label, srid);
   11.18 +		return vf.getRdbmsPolyhedron(GeoConstants.WKTLITERAL, label, srid);
   11.19  	}
   11.20  
   11.21  	@Override
    12.1 --- a/resultio-spatial/sparqlhtml/src/main/java/org/openrdf/query/resultio/sparqlhtml/stSPARQLResultsHTMLWriter.java	Wed Sep 24 18:44:26 2014 +0300
    12.2 +++ b/resultio-spatial/sparqlhtml/src/main/java/org/openrdf/query/resultio/sparqlhtml/stSPARQLResultsHTMLWriter.java	Tue Oct 14 12:09:19 2014 +0300
    12.3 @@ -145,7 +145,12 @@
    12.4  								         "(?predicate = <"+ boundValue.toString()+ ">)  || "+
    12.5  								         "(?object = <"+ boundValue.toString()+ ">)) " +  
    12.6  								"}";
    12.7 -							href = "Browse?view=HTML&query="+URLEncoder.encode(query, "UTF-8")+"&format=HTML&resource="+URLEncoder.encode(boundValue.toString(), "UTF-8");						
    12.8 +							
    12.9 +							// FIXME maybe using URLEncoder.encode() for encoding the query and the "boundValue" 
   12.10 +							// is not the proper way to encode the final URL (see related bugs #65 and #49), but
   12.11 +							// I am not 100% sure
   12.12 +							href = "Browse?view=HTML&query="+URLEncoder.encode(query, "UTF-8")+"&format=HTML&resource="+URLEncoder.encode(boundValue.toString(), "UTF-8");
   12.13 +							
   12.14  						}
   12.15  						else{							
   12.16  							href = boundValue.toString();
    13.1 --- a/resultio-spatial/sparqlkml/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java	Wed Sep 24 18:44:26 2014 +0300
    13.2 +++ b/resultio-spatial/sparqlkml/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java	Tue Oct 14 12:09:19 2014 +0300
    13.3 @@ -62,33 +62,33 @@
    13.4  	private static final Logger logger = LoggerFactory.getLogger(org.openrdf.query.resultio.sparqlkml.stSPARQLResultsKMLWriter.class);
    13.5  
    13.6  	// KML tags/attributes
    13.7 -	private static final String ROOT_TAG 			= "kml";
    13.8 -	private static final String NAMESPACE 			= "http://www.opengis.net/kml/2.2";
    13.9 -	private static final String RESULT_SET_TAG 		= "Folder";
   13.10 -	private static final String DOCUMENT_TAG 		= "Document";
   13.11 -	private static final String PLACEMARK_TAG 		= "Placemark";
   13.12 -	private static final String TIMESTAMP_TAG 		= "TimeStamp";
   13.13 -	private static final String TIMESPAN_TAG 		= "TimeSpan";
   13.14 -	private static final String BEGIN_TAG 			= "begin";
   13.15 -	private static final String END_TAG 			= "end";
   13.16 -	private static final String WHEN_TAG 			= "when";
   13.17 -	private static final String NAME_TAG 			= "name";
   13.18 -	private static final String DESC_TAG 			= "description";
   13.19 -	private static final String EXT_DATA_TAG 		= "ExtendedData";
   13.20 -	private static final String DATA_TAG 			= "Data";
   13.21 -	private static final String VALUE_TAG			= "value";
   13.22 -	private static final String NAME_ATTR			= NAME_TAG;
   13.23 +	protected static final String ROOT_TAG 			= "kml";
   13.24 +	protected static final String NAMESPACE 		= "http://www.opengis.net/kml/2.2";
   13.25 +	protected static final String RESULT_SET_TAG 	= "Folder";
   13.26 +	protected static final String PLACEMARK_TAG 	= "Placemark";
   13.27 +	protected static final String DOCUMENT_TAG 	= "Document";
   13.28 +	protected static final String TIMESTAMP_TAG 	= "TimeStamp";
   13.29 +	protected static final String TIMESPAN_TAG 		= "TimeSpan";
   13.30 +	protected static final String BEGIN_TAG 		= "begin";
   13.31 +	protected static final String END_TAG 			= "end";
   13.32 +	protected static final String WHEN_TAG 			= "when";
   13.33 +	protected static final String NAME_TAG 			= "name";
   13.34 +	protected static final String DESC_TAG 			= "description";
   13.35 +	protected static final String EXT_DATA_TAG 		= "ExtendedData";
   13.36 +	protected static final String DATA_TAG 			= "Data";
   13.37 +	protected static final String VALUE_TAG			= "value";
   13.38 +	protected static final String NAME_ATTR			= NAME_TAG;
   13.39  	
   13.40 -	private static final String STYLE_TAG			= "Style";
   13.41 -	private static final String POLY_STYLE_TAG	= "PolyStyle";
   13.42 +	protected static final String STYLE_TAG		= "Style";
   13.43 +	protected static final String POLY_STYLE_TAG	= "PolyStyle";
   13.44  
   13.45 -	private static final String TABLE_ROW_BEGIN 		= "<TR>";
   13.46 -	private static final String TABLE_ROW_END 		= "</TR>";
   13.47 -	private static final String TABLE_DATA_BEGIN 		= "<TD>";
   13.48 -	private static final String TABLE_DATA_END 		= "</TD>";
   13.49 -	private static final String NEWLINE 			= "\n";
   13.50 -	private static final String TABLE_DESC_BEGIN 		= "<![CDATA[<TABLE border=\"1\">"+ NEWLINE;
   13.51 -	private static final String TABLE_DESC_END 		= "</TABLE>]]>" + NEWLINE;
   13.52 +	protected static final String TABLE_ROW_BEGIN 	= "<TR>";
   13.53 +	protected static final String TABLE_ROW_END 	= "</TR>";
   13.54 +	protected static final String TABLE_DATA_BEGIN 	= "<TD>";
   13.55 +	protected static final String TABLE_DATA_END 	= "</TD>";
   13.56 +	protected static final String NEWLINE 			= "\n";
   13.57 +	protected static final String TABLE_DESC_BEGIN 	= "<![CDATA[<TABLE border=\"1\">"+ NEWLINE;
   13.58 +	protected static final String TABLE_DESC_END 	= "</TABLE>]]>" + NEWLINE;
   13.59  
   13.60  	
   13.61  	/**
    14.1 --- a/testsuite/pom.xml	Wed Sep 24 18:44:26 2014 +0300
    14.2 +++ b/testsuite/pom.xml	Tue Oct 14 12:09:19 2014 +0300
    14.3 @@ -19,7 +19,7 @@
    14.4  			<groupId>eu.earthobservatory</groupId>
    14.5  			<artifactId>strabon-runtime</artifactId>
    14.6  		</dependency>
    14.7 -
    14.8 + 
    14.9  		<!-- Testing: JUnit -->
   14.10  		<dependency>
   14.11  			<groupId>junit</groupId>
    15.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Wed Sep 24 18:44:26 2014 +0300
    15.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/utils/Utils.java	Tue Oct 14 12:09:19 2014 +0300
    15.3 @@ -143,21 +143,28 @@
    15.4  	}
    15.5  	
    15.6  	
    15.7 -	public static void testQuery(String queryFile, String resultsFile,boolean orderOn) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, URISyntaxException, QueryResultParseException, UnsupportedQueryResultFormatException
    15.8 +	public static void testQuery(String queryFile, String resultsFile, boolean orderOn) throws IOException, MalformedQueryException, QueryEvaluationException, TupleQueryResultHandlerException, URISyntaxException, QueryResultParseException, UnsupportedQueryResultFormatException
    15.9  	{
   15.10  		ByteArrayOutputStream resultsStream = new ByteArrayOutputStream();
   15.11  		String query = FileUtils.readFileToString(new File(Utils.class.getResource(prefixesFile).toURI()))+"\n"+FileUtils.readFileToString(new File(Utils.class.getResource(queryFile).toURI()));
   15.12  		
   15.13  		//Pose the query
   15.14  		strabon.query(query, Format.XML, strabon.getSailRepoConnection(), resultsStream);
   15.15 -
   15.16 +		
   15.17  		//Check if the results of the query are the expected
   15.18 -		TupleQueryResult expectedResults = QueryResultIO.parse(Utils.class.getResourceAsStream(resultsFile), TupleQueryResultFormat.SPARQL);
   15.19 -		TupleQueryResult actualResults = QueryResultIO.parse((new ByteArrayInputStream(resultsStream.toByteArray())), TupleQueryResultFormat.SPARQL);
   15.20 -
   15.21 +		compareResults(queryFile, orderOn, 
   15.22 +					   QueryResultIO.parse(Utils.class.getResourceAsStream(resultsFile), TupleQueryResultFormat.SPARQL),
   15.23 +					   QueryResultIO.parse((new ByteArrayInputStream(resultsStream.toByteArray())), TupleQueryResultFormat.SPARQL));
   15.24 +	}
   15.25 +	
   15.26 +	protected static void compareResults(String queryFile, boolean orderOn, 
   15.27 +															 TupleQueryResult expectedResults, 
   15.28 +															 TupleQueryResult actualResults) throws QueryEvaluationException {
   15.29 +		
   15.30  		List<String> eBindingNames = expectedResults.getBindingNames();
   15.31  		List<String> aBindingNames = actualResults.getBindingNames();
   15.32 -		assertTrue("Results are not the expected. QueryFile: "+queryFile, aBindingNames.containsAll(aBindingNames) && eBindingNames.containsAll(aBindingNames));		
   15.33 +		
   15.34 +		assertTrue("Results are not the expected. QueryFile: " + queryFile, aBindingNames.containsAll(aBindingNames) && eBindingNames.containsAll(aBindingNames));		
   15.35  		
   15.36  		//Sort each binding's values
   15.37  		List<String> eBindingList = new ArrayList<String>();
    16.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDegreesTest.srx	Wed Sep 24 18:44:26 2014 +0300
    16.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDegreesTest.srx	Tue Oct 14 12:09:19 2014 +0300
    16.3 @@ -6,43 +6,43 @@
    16.4  	<results>
    16.5  		<result>
    16.6  			<binding name='buffer'>
    16.7 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111319.49079327231 -0.0000000007081155, -111319.49079327231 0.9999999994774795, -109180.5179920264 21718.39727593167, -102845.79911348295 42601.44158500647, -92558.77385160125 61847.7646607793, -78714.76681815831 78717.76512783514, -61845.79543964266 92563.02285962063, -42600.12482590362 102851.2563084728, -21717.355305532114 109186.85060744215, 0 111326.14301871415, 0.9999999999775806 111326.14301871415, 21718.35530553209 109186.85060744215, 42601.1248259036 102851.2563084728, 61846.795439642636 92563.02285962063, 78715.7668181583 78717.76512783514, 92559.77385160122 61847.7646607793, 102846.79911348294 42601.44158500647, 109181.51799202638 21718.39727593167, 111320.49079327229 0.9999999994774795, 111320.49079327229 -0.0000000007081155, 109181.51799202638 -21717.39727013562, 102846.79911348294 -42600.44156270125, 92559.77385160122 -61846.76461376663, 78715.7668181583 -78716.76505167512, 61846.795439642636 -92562.02275431334, 42601.1248259036 -102850.2561784551, 21718.35530553209 -109185.85046091139, 0.9999999999775806 -111325.14286638597, 0 -111325.14286638597, -21717.355305532114 -109185.85046091139, -42600.12482590362 -102850.2561784551, -61845.79543964266 -92562.02275431334, -78714.76681815831 -78716.76505167512, -92558.77385159841 -61846.76461376663, -102845.79911348295 -42600.441562702676, -109180.5179920264 -21717.39727013704, -111319.49079327231 -0.0000000007081155))</literal>
    16.8 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-1 0, -1 1, -0.9807852804032304 1.1950903220161286, -0.9238795325112867 1.3826834323650898, -0.8314696123025453 1.5555702330196022, -0.7071067811865475 1.7071067811865475, -0.555570233019602 1.8314696123025453, -0.3826834323650897 1.9238795325112867, -0.1950903220161282 1.9807852804032304, 0 2, 1 2, 1.1950903220161284 1.9807852804032304, 1.3826834323650898 1.9238795325112867, 1.5555702330196022 1.8314696123025453, 1.7071067811865475 1.7071067811865475, 1.8314696123025453 1.5555702330196022, 1.9238795325112867 1.3826834323650898, 1.9807852804032304 1.1950903220161282, 2 1, 2 0, 1.9807852804032304 -0.1950903220161282, 1.9238795325112867 -0.3826834323650898, 1.8314696123025453 -0.5555702330196022, 1.7071067811865475 -0.7071067811865475, 1.5555702330196022 -0.8314696123025452, 1.3826834323650898 -0.9238795325112867, 1.1950903220161284 -0.9807852804032304, 1 -1, 0 -1, -0.1950903220161276 -0.9807852804032305, -0.3826834323650883 -0.9238795325112874, -0.5555702330196002 -0.8314696123025467, -0.7071067811865452 -0.7071067811865498, -0.8314696123025431 -0.5555702330196054, -0.9238795325112849 -0.3826834323650944, -0.9807852804032293 -0.1950903220161338, -1 0))</literal>
    16.9  			</binding>
   16.10  		</result>
   16.11  		<result>
   16.12  			<binding name='buffer'>
   16.13 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111319.49079327231 -0.0000000007081155, -111319.49079327231 1.9999999993709712, -109180.5179920264 21719.39728173002, -102845.79911348295 42602.44160731312, -92558.77385160125 61848.7647077953, -78714.76681815831 78718.76520399722, -61845.79543964266 92564.02296492962, -42600.12482590362 102852.25643849418, -21717.355305532114 109187.85075397529, 0 111327.14317104667, 1.9999999999551612 111327.14317104667, 21719.35530553207 109187.85075397529, 42602.12482590358 102852.25643849418, 61847.795439642614 92564.02296492962, 78716.76681815827 78718.76520399722, 92560.7738516012 61848.7647077953, 102847.7991134829 42602.44160731312, 109182.51799202636 21719.39728173002, 111321.49079327227 1.9999999993709712, 111321.49079327227 -0.0000000007081155, 109182.51799202636 -21717.39727013562, 102847.7991134829 -42600.44156270125, 92560.7738516012 -61846.76461376663, 78716.76681815827 -78716.76505167512, 61847.795439642614 -92562.02275431334, 42602.12482590358 -102850.2561784551, 21719.35530553207 -109185.85046091139, 1.9999999999551612 -111325.14286638597, 0 -111325.14286638597, -21717.355305532114 -109185.85046091139, -42600.12482590362 -102850.2561784551, -61845.79543964266 -92562.02275431334, -78714.76681815831 -78716.76505167512, -92558.77385159841 -61846.76461376663, -102845.79911348295 -42600.441562702676, -109180.5179920264 -21717.39727013704, -111319.49079327231 -0.0000000007081155))</literal>
   16.14 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-1 0, -1 2, -0.9807852804032304 2.1950903220161284, -0.9238795325112867 2.38268343236509, -0.8314696123025453 2.555570233019602, -0.7071067811865475 2.7071067811865475, -0.555570233019602 2.8314696123025453, -0.3826834323650897 2.923879532511287, -0.1950903220161282 2.9807852804032304, 0 3, 2 3, 2.1950903220161284 2.9807852804032304, 2.3826834323650896 2.923879532511287, 2.555570233019602 2.8314696123025453, 2.7071067811865475 2.7071067811865475, 2.8314696123025453 2.555570233019602, 2.923879532511287 2.3826834323650896, 2.9807852804032304 2.1950903220161284, 3 2, 3 0, 2.9807852804032304 -0.1950903220161282, 2.923879532511287 -0.3826834323650898, 2.8314696123025453 -0.5555702330196022, 2.7071067811865475 -0.7071067811865475, 2.555570233019602 -0.8314696123025452, 2.3826834323650896 -0.9238795325112867, 2.1950903220161284 -0.9807852804032304, 2 -1, 0 -1, -0.1950903220161276 -0.9807852804032305, -0.3826834323650883 -0.9238795325112874, -0.5555702330196002 -0.8314696123025467, -0.7071067811865452 -0.7071067811865498, -0.8314696123025431 -0.5555702330196054, -0.9238795325112849 -0.3826834323650944, -0.9807852804032293 -0.1950903220161338, -1 0))</literal>
   16.15  			</binding>
   16.16  		</result>
   16.17  		<result>
   16.18  			<binding name='buffer'>
   16.19 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111318.49079327233 0.9999999994774795, -111318.49079327233 1.9999999993709712, -109179.51799202642 21719.39728173002, -102844.79911348298 42602.44160731312, -92557.77385160128 61848.7647077953, -78713.76681815834 78718.76520399722, -61844.79543964268 92564.02296492962, -42599.124825903644 102852.25643849418, -21716.35530553214 109187.85075397529, 0.9999999999775806 111327.14317104667, 2.999999999932742 111327.14317104667, 21720.355305532048 109187.85075397529, 42603.12482590356 102852.25643849418, 61848.79543964259 92564.02296492962, 78717.76681815826 78718.76520399722, 92561.77385160117 61848.7647077953, 102848.79911348289 42602.44160731312, 109183.51799202633 21719.39728173002, 111322.49079327224 1.9999999993709712, 111322.49079327224 0.9999999994774795, 109183.51799202633 -21716.397264339004, 102848.79911348289 -42599.44154039624, 92561.77385160117 -61845.76456675433, 78717.76681815826 -78715.76497551735, 61848.79543964259 -92561.02264900785, 42603.12482590356 -102849.25604843823, 21720.355305532048 -109184.85031438306, 2.999999999932742 -111324.14271405865, 0.9999999999775806 -111324.14271405865, -21716.35530553214 -109184.85031438306, -42599.124825903644 -102849.25604843823, -61844.79543964268 -92561.02264900785, -78713.76681815834 -78715.76497551735, -92557.77385159844 -61845.76456675433, -102844.79911348298 -42599.44154039766, -109179.51799202642 -21716.397264339717, -111318.49079327233 0.9999999994774795))</literal>
   16.20 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((0 1, 0 2, 0.0192147195967696 2.1950903220161284, 0.0761204674887133 2.38268343236509, 0.1685303876974546 2.555570233019602, 0.2928932188134525 2.7071067811865475, 0.444429766980398 2.8314696123025453, 0.6173165676349103 2.923879532511287, 0.8049096779838718 2.9807852804032304, 1 3, 3 3, 3.1950903220161284 2.9807852804032304, 3.3826834323650896 2.923879532511287, 3.555570233019602 2.8314696123025453, 3.7071067811865475 2.7071067811865475, 3.8314696123025453 2.555570233019602, 3.923879532511287 2.3826834323650896, 3.9807852804032304 2.1950903220161284, 4 2, 4 1, 3.9807852804032304 0.8049096779838718, 3.923879532511287 0.6173165676349102, 3.8314696123025453 0.4444297669803978, 3.7071067811865475 0.2928932188134525, 3.555570233019602 0.1685303876974548, 3.3826834323650896 0.0761204674887133, 3.1950903220161284 0.0192147195967696, 3 0, 1 0, 0.8049096779838725 0.0192147195967695, 0.6173165676349117 0.0761204674887126, 0.4444297669803998 0.1685303876974533, 0.2928932188134548 0.2928932188134502, 0.1685303876974569 0.4444297669803946, 0.0761204674887152 0.6173165676349056, 0.0192147195967707 0.8049096779838661, 0 1))</literal>
   16.21  			</binding>
   16.22  		</result>
   16.23  		<result>
   16.24  			<binding name='buffer'>
   16.25 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111316.49079327237 0.9999999994774795, -111316.49079327237 1.9999999993709712, -109177.51799202646 21719.39728173002, -102842.79911348302 42602.44160731312, -92555.77385160132 61848.7647077953, -78711.76681815839 78718.76520399722, -61842.79543964272 92564.02296492962, -42597.12482590369 102852.25643849418, -21714.355305532183 109187.85075397529, 2.999999999932742 111327.14317104667, 3.9999999999103224 111327.14317104667, 21721.355305532026 109187.85075397529, 42604.124825903535 102852.25643849418, 61849.79543964257 92564.02296492962, 78718.76681815823 78718.76520399722, 92562.77385160116 61848.7647077953, 102849.79911348286 42602.44160731312, 109184.5179920263 21719.39728173002, 111323.49079327221 1.9999999993709712, 111323.49079327221 0.9999999994774795, 109184.5179920263 -21716.397264339004, 102849.79911348286 -42599.44154039624, 92562.77385160116 -61845.76456675433, 78718.76681815823 -78715.76497551735, 61849.79543964257 -92561.02264900785, 42604.124825903535 -102849.25604843823, 21721.355305532026 -109184.85031438306, 3.9999999999103224 -111324.14271405865, 2.999999999932742 -111324.14271405865, -21714.355305532183 -109184.85031438306, -42597.12482590369 -102849.25604843823, -61842.79543964272 -92561.02264900785, -78711.76681815555 -78715.76497551735, -92555.77385159848 -61845.76456675433, -102842.79911348302 -42599.44154039766, -109177.51799202646 -21716.397264339717, -111316.49079327237 0.9999999994774795))</literal>
   16.26 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((2 1, 2 2, 2.0192147195967696 2.1950903220161284, 2.076120467488713 2.38268343236509, 2.1685303876974547 2.555570233019602, 2.2928932188134525 2.7071067811865475, 2.444429766980398 2.8314696123025453, 2.6173165676349104 2.923879532511287, 2.804909677983872 2.9807852804032304, 3 3, 4 3, 4.195090322016128 2.9807852804032304, 4.38268343236509 2.923879532511287, 4.555570233019602 2.8314696123025453, 4.707106781186548 2.7071067811865475, 4.831469612302545 2.555570233019602, 4.923879532511287 2.3826834323650896, 4.98078528040323 2.1950903220161284, 5 2, 5 1, 4.98078528040323 0.8049096779838718, 4.923879532511287 0.6173165676349102, 4.831469612302545 0.4444297669803978, 4.707106781186548 0.2928932188134525, 4.555570233019602 0.1685303876974548, 4.38268343236509 0.0761204674887133, 4.195090322016128 0.0192147195967696, 4 0, 3 0, 2.8049096779838725 0.0192147195967695, 2.6173165676349117 0.0761204674887126, 2.4444297669803996 0.1685303876974533, 2.2928932188134548 0.2928932188134502, 2.168530387697457 0.4444297669803946, 2.0761204674887153 0.6173165676349056, 2.0192147195967705 0.8049096779838661, 2 1))</literal>
   16.27  			</binding>
   16.28  		</result>
   16.29  		<result>
   16.30  			<binding name='buffer'>
   16.31 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111316.49079327237 0.9999999994774795, -111316.49079327237 1.9999999993709712, -109177.51799202646 21719.39728173002, -102842.79911348302 42602.44160731312, -92555.77385160132 61848.7647077953, -78711.76681815839 78718.76520399722, -61842.79543964272 92564.02296492962, -42597.12482590369 102852.25643849418, -21714.355305532183 109187.85075397529, 2.999999999932742 111327.14317104667, 3.9999999999103224 111327.14317104667, 21721.355305532026 109187.85075397529, 42604.124825903535 102852.25643849418, 61849.79543964257 92564.02296492962, 78718.76681815823 78718.76520399722, 92562.77385160116 61848.7647077953, 102849.79911348286 42602.44160731312, 109184.5179920263 21719.39728173002, 111323.49079327221 1.9999999993709712, 111323.49079327221 0.9999999994774795, 109184.5179920263 -21716.397264339004, 102849.79911348286 -42599.44154039624, 92562.77385160116 -61845.76456675433, 78718.76681815823 -78715.76497551735, 61849.79543964257 -92561.02264900785, 42604.124825903535 -102849.25604843823, 21721.355305532026 -109184.85031438306, 3.9999999999103224 -111324.14271405865, 2.999999999932742 -111324.14271405865, -21714.355305532183 -109184.85031438306, -42597.12482590369 -102849.25604843823, -61842.79543964272 -92561.02264900785, -78711.76681815555 -78715.76497551735, -92555.77385159848 -61845.76456675433, -102842.79911348302 -42599.44154039766, -109177.51799202646 -21716.397264339717, -111316.49079327237 0.9999999994774795))</literal>
   16.32 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((2 1, 2 2, 2.0192147195967696 2.1950903220161284, 2.076120467488713 2.38268343236509, 2.1685303876974547 2.555570233019602, 2.2928932188134525 2.7071067811865475, 2.444429766980398 2.8314696123025453, 2.6173165676349104 2.923879532511287, 2.804909677983872 2.9807852804032304, 3 3, 4 3, 4.195090322016128 2.9807852804032304, 4.38268343236509 2.923879532511287, 4.555570233019602 2.8314696123025453, 4.707106781186548 2.7071067811865475, 4.831469612302545 2.555570233019602, 4.923879532511287 2.3826834323650896, 4.98078528040323 2.1950903220161284, 5 2, 5 1, 4.98078528040323 0.8049096779838718, 4.923879532511287 0.6173165676349102, 4.831469612302545 0.4444297669803978, 4.707106781186548 0.2928932188134525, 4.555570233019602 0.1685303876974548, 4.38268343236509 0.0761204674887133, 4.195090322016128 0.0192147195967696, 4 0, 3 0, 2.8049096779838725 0.0192147195967695, 2.6173165676349117 0.0761204674887126, 2.4444297669803996 0.1685303876974533, 2.2928932188134548 0.2928932188134502, 2.168530387697457 0.4444297669803946, 2.0761204674887153 0.6173165676349056, 2.0192147195967705 0.8049096779838661, 2 1))</literal>
   16.33  			</binding>
   16.34  		</result>
   16.35  		<result>
   16.36  			<binding name='buffer'>
   16.37 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((99571.1794533233 49784.095233765314, 107370.32057019752 29402.523047645867, 111043.43419928358 7891.331633639709, 110449.36464372445 -13923.030097627636, 105610.94166338131 -35202.492608737426, 96714.1031399717 -55129.489996122364, 84100.74958854054 -72938.31391010896, 68255.60511242234 -87944.51401695433, 49787.58972777618 -99571.22368602054, 29406.41890885074 -107371.3915985718, 7895.329620324772 -111045.04371917108, -13919.019040003313 -110450.88460588455, -35198.313886741154 -105611.76745125338, -55124.80355249933 -96713.80910711788, -72932.72421432048 -84099.18637554247, -87937.7274679757 -68252.90771551307, -99563.17945332348 -49784.095233765554, -99564.17945332346 -49782.095172843314, -107363.32057019768 -29400.523026397652, -111036.43419928374 -7889.331632109998, -110442.36464372459 13925.030102392711, -105603.94166338147 35204.49263920068, -96707.10313997185 55131.49007083525, -84093.74958854068 72940.31404088806, -68248.6051124225 87946.51420708228, -49780.589727776336 99573.22392974293, -29399.4189088509 107373.39188197645, -7888.329620324928 111047.04402230024, 13926.019040003157 110452.88490577831, 35205.313886741 105613.76772544422, 55131.80355249917 96715.80933705314, 72939.72421432033 84101.18654940644, 87944.72746797555 68254.90783002945, 99570.17945332333 49786.095294692954, 99571.1794533233 49784.095233765314))</literal>
   16.38 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((4.894427190999916 0.4472135954999579, 4.964488067681204 0.2641264229504072, 4.997484208812643 0.0708890200906782, 4.992147591195001 -0.125072608056115, 4.948683298050514 -0.3162277660168385, 4.868761637789668 -0.4952304682721092, 4.755453954995707 -0.655201741360129, 4.613114600374718 -0.7899939789690489, 4.447213595499958 -0.8944271909999157, 4.264126422950409 -0.9644880676812034, 4.07088902009068 -0.9974842088126424, 3.8749273919438867 -0.9921475911950005, 3.6837722339831633 -0.9486832980505142, 3.5047695317278924 -0.8687616377896696, 3.344798258639872 -0.7554539549957073, 3.2100060210309524 -0.6131146003747194, 3.1055728090000843 -0.4472135954999579, 2.1055728090000843 1.5527864045000421, 2.035511932318796 1.7358735770495932, 2.0025157911873572 1.929110979909322, 2.007852408805 2.1250726080561155, 2.0513167019494865 2.316227766016839, 2.1312383622103317 2.4952304682721094, 2.244546045004294 2.655201741360129, 2.3868853996252826 2.789993978969049, 2.552786404500042 2.8944271909999157, 2.7358735770495914 2.9644880676812035, 2.9291109799093205 2.9974842088126423, 3.1250726080561138 2.9921475911950006, 3.316227766016837 2.948683298050514, 3.495230468272108 2.868761637789669, 3.655201741360128 2.755453954995707, 3.789993978969048 2.613114600374719, 3.8944271909999157 2.447213595499958, 4.894427190999916 0.4472135954999579))</literal>
   16.39  			</binding>
   16.40  		</result>
   16.41  		<result>
   16.42  			<binding name='buffer'>
   16.43 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((111320.49079327229 0.9999999994774795, 109181.51799202638 -21716.397264339004, 102846.79911348294 -42599.44154039624, 92559.77385160122 -61845.76456675433, 78715.7668181583 -78715.76497551735, 61846.795439642636 -92561.02264900785, 42601.1248259036 -102849.25604843823, 21718.35530553209 -109184.85031438306, 0.9999999999775806 -111324.14271405865, -21716.35530553214 -109184.85031438306, -42599.124825903644 -102849.25604843823, -61844.79543964268 -92561.02264900785, -78713.76681815834 -78715.76497551735, -92557.77385159844 -61845.76456675433, -102844.79911348298 -42599.44154039624, -109179.51799202642 -21716.397264339717, -111318.49079327233 0.9999999994774795, -109179.51799202642 21718.39727593167, -102844.79911348298 42601.44158500647, -92557.77385160128 61847.7646607793, -78713.76681815834 78717.76512783514, -61844.79543964268 92563.02285962063, -42599.124825903644 102851.2563084728, -21716.35530553214 109186.85060744215, 0.9999999999775806 111326.14301871415, 21718.35530553209 109186.85060744351, 42601.1248259036 102851.2563084728, 61846.795439642636 92563.02285962063, 78715.7668181583 78717.76512783514, 92559.7738515984 61847.7646607793, 102846.79911348294 42601.44158500647, 109181.51799202638 21718.397275933083, 111320.49079327229 0.9999999994774795))</literal>
   16.44 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((2 1, 1.9807852804032304 0.8049096779838719, 1.923879532511287 0.6173165676349106, 1.8314696123025456 0.4444297669803983, 1.7071067811865481 0.2928932188134531, 1.555570233019603 0.1685303876974553, 1.382683432365091 0.0761204674887137, 1.1950903220161297 0.0192147195967698, 1.0000000000000016 0, 0.8049096779838736 0.0192147195967692, 0.6173165676349122 0.0761204674887125, 0.4444297669803995 0.1685303876974536, 0.2928932188134541 0.2928932188134509, 0.1685303876974562 0.4444297669803957, 0.0761204674887143 0.6173165676349077, 0.0192147195967701 0.8049096779838688, 0 0.9999999999999968, 0.0192147195967689 1.1950903220161249, 0.0761204674887118 1.3826834323650863, 0.1685303876974525 1.555570233019599, 0.2928932188134495 1.7071067811865446, 0.4444297669803942 1.8314696123025427, 0.6173165676349064 1.9238795325112852, 0.8049096779838678 1.9807852804032295, 0.9999999999999962 2, 1.1950903220161249 1.980785280403231, 1.3826834323650867 1.923879532511288, 1.5555702330195995 1.831469612302547, 1.7071067811865455 1.7071067811865497, 1.8314696123025438 1.5555702330196044, 1.9238795325112859 1.382683432365092, 1.98078528040323 1.1950903220161304, 2 1))</literal>
   16.45  			</binding>
   16.46  		</result>
   16.47  		<result>
   16.48  			<binding name='buffer'>
   16.49 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-111317.39079327292 1.0999999994410274, -111317.39079327292 1.9000000007720514, -109178.41799202701 21719.297281149902, -102843.69911348357 42602.34160508346, -92556.67385159903 61848.66470309359, -78712.6668181561 78718.66519638135, -61843.69543964327 92563.92295439992, -42598.024825904235 102852.1564254931, -21715.255305529896 109187.7507393229, 2.099999999386427 111327.04315581366, 2.900000000501476 111327.04315581366, 21720.255305529783 109187.7507393229, 42603.024825904125 102852.1564254931, 61848.69543964316 92563.92295439992, 78717.666818156 78718.66519638135, 92561.67385159891 61848.66470309359, 102848.69911348345 42602.34160508346, 109183.4179920269 21719.297281149902, 111322.39079327282 1.9000000007720514, 111322.39079327282 1.0999999994410274, 109183.4179920269 -21716.297263759512, 102848.69911348345 -42599.34153816638, 92561.67385159891 -61845.66456205315, 78717.666818156 -78715.66496790186, 61848.69543964316 -92560.92263847838, 42603.024825904125 -102849.15603543755, 21720.255305529783 -109184.750299731, 2.900000000501476 -111324.04269882677, 2.099999999386427 -111324.04269882677, -21715.255305529896 -109184.750299731, -42598.024825904235 -102849.15603543755, -61843.69543964327 -92560.92263847838, -78712.6668181561 -78715.66496790186, -92556.67385159903 -61845.66456205315, -102843.69911348357 -42599.3415381678, -109178.41799202419 -21716.29726376093, -111317.39079327292 1.0999999994410274))</literal>
   16.50 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((1.1 1.1, 1.1 1.9, 1.1192147195967697 2.0950903220161283, 1.1761204674887134 2.28268343236509, 1.2685303876974547 2.455570233019602, 1.3928932188134526 2.6071067811865474, 1.5444297669803981 2.7314696123025453, 1.7173165676349105 2.8238795325112864, 1.904909677983872 2.8807852804032303, 2.1 2.9, 2.9 2.9, 3.0950903220161283 2.8807852804032303, 3.28268343236509 2.8238795325112864, 3.455570233019602 2.7314696123025453, 3.6071067811865474 2.6071067811865474, 3.7314696123025453 2.455570233019602, 3.8238795325112864 2.2826834323650895, 3.8807852804032303 2.0950903220161283, 3.9 1.9, 3.9 1.1, 3.8807852804032303 0.9049096779838719, 3.8238795325112864 0.7173165676349103, 3.7314696123025453 0.5444297669803979, 3.6071067811865474 0.3928932188134526, 3.455570233019602 0.2685303876974548, 3.28268343236509 0.1761204674887134, 3.0950903220161283 0.1192147195967697, 2.9 0.1000000000000001, 2.1 0.1000000000000001, 1.9049096779838726 0.1192147195967696, 1.7173165676349118 0.1761204674887127, 1.5444297669804 0.2685303876974534, 1.3928932188134548 0.3928932188134503, 1.268530387697457 0.5444297669803947, 1.1761204674887153 0.7173165676349057, 1.1192147195967708 0.9049096779838662, 1.1 1.1))</literal>
   16.51  			</binding>
   16.52  		</result>
   16.53  	</results>
   16.54 -</sparql>
   16.55 +</sparql>
   16.56 \ No newline at end of file
    17.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDistanceTest.rq	Wed Sep 24 18:44:26 2014 +0300
    17.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDistanceTest.rq	Tue Oct 14 12:09:19 2014 +0300
    17.3 @@ -1,9 +1,9 @@
    17.4  select (geof:buffer(?g1, geof:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buffer)
    17.5  where
    17.6  {
    17.7 -	ex:A geo:hasGeometry ?geom1 .
    17.8 +	<http://example.org#A> geo:hasGeometry ?geom1 .
    17.9  	?geom1 geo:asWKT ?g1.
   17.10  	
   17.11 -	ex:G geo:hasGeometry ?geom2 .
   17.12 +	<http://example.org#G> geo:hasGeometry ?geom2 .
   17.13  	?geom2 geo:asWKT ?g2.
   17.14  }
   17.15 \ No newline at end of file
    18.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDistanceTest.srx	Wed Sep 24 18:44:26 2014 +0300
    18.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferDistanceTest.srx	Tue Oct 14 12:09:19 2014 +0300
    18.3 @@ -6,10 +6,8 @@
    18.4  	<results>
    18.5  		<result>
    18.6  			<binding name='buffer'>
    18.7 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((0 -0.0000000007081155, 0 0.9999999994774795, 0.9999999999775806 0.9999999994774795, 0.9999999999775806 -0.0000000007081155, 0 -0.0000000007081155))</literal>
    18.8 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal>
    18.9  			</binding>
   18.10  		</result>
   18.11  	</results>
   18.12 -</sparql>
   18.13 -
   18.14 -
   18.15 +</sparql>
   18.16 \ No newline at end of file
    19.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferMetresTest.rq	Wed Sep 24 18:44:26 2014 +0300
    19.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferMetresTest.rq	Tue Oct 14 12:09:19 2014 +0300
    19.3 @@ -1,4 +1,4 @@
    19.4 -select (geof:buffer(?g, 1, ogc:metre) as ?buffer)
    19.5 +select (geof:buffer(?g, 55000, ogc:metre) as ?buffer)
    19.6  where
    19.7  {
    19.8  	?x geo:hasGeometry ?geom .
    20.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferMetresTest.srx	Wed Sep 24 18:44:26 2014 +0300
    20.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferMetresTest.srx	Tue Oct 14 12:09:19 2014 +0300
    20.3 @@ -6,43 +6,43 @@
    20.4  	<results>
    20.5  		<result>
    20.6  			<binding name='buffer'>
    20.7 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((-0.9990081738166161 0.0000000042486927, -0.9990081738166161 0.9999999952287875, -0.9798122883145344 1.1962126302901517, -0.9229623124999344 1.3848849246898498, -0.8306429666620074 1.5587663054501864, -0.7064020253620464 1.7111746129273868, -0.5550139995434042 1.836252877299558, -0.3822966468222901 1.9291944153368505, -0.1948873967788809 1.9864275306074628, 0.000011717894552 2.0057527898363583, 1.0000117178721326 2.005752798333741, 1.1949108325455655 1.9864275433535372, 1.3823200854214366 1.9291944294991554, 1.5550374438074743 1.836252894294324, 1.7064254724585783 1.7111746299221529, 1.830666419423463 1.5587663224449533, 1.9229857709263136 1.3848849388521558, 1.9798357467409136 1.1962126430362277, 1.9990316350754571 1.0000000037261716, 1.9990316350754571 -0.0000000049568082, 1.9798357467409136 -0.1962126435362148, 1.9229857709263136 -0.3848849393871292, 1.830666419423463 -0.5587663235673946, 1.7064254724585783 -0.7111746307609169, 1.5550374438074743 -0.8362528955212613, 1.3823200854214366 -0.929194429953204, 1.1949108325455655 -0.9864275444782631, 1.0000117178721326 -1.005752800027154, 0.000011717894552 -1.0057527915297673, -0.1948873967788809 -0.9864275317321829, -0.3822966468222901 -0.9291944157908929, -0.5550139995434042 -0.8362528785264882, -0.7064020253620464 -0.7111746137661441, -0.8306429666620074 -0.5587663065726222, -0.9229623124999344 -0.3848849252248193, -0.9798122883145344 -0.1962126307901362, -0.9990081738166161 0.0000000042486927))</literal>
    20.8 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-0.4934708114101906 0.0002271482510326, -0.4935456666610935 0.9997354110552062, -0.4841242080938577 1.0966562144099703, -0.4561026436245716 1.1898680102152706, -0.410553282208809 1.2757915623756033, -0.3492211177193835 1.3511257905672007, -0.2744578710669827 1.4129743293759003, -0.189132690513658 1.4589569753168727, -0.0965227155210549 1.4873016992022086, -0.0001875476607689 1.4969135657184365, 1.0000005263956748 1.4972948311226395, 1.0963777175974405 1.4877569202889709, 1.1890585425068627 1.4594785703123097, 1.2744794985893708 1.4135441629688796, 1.3493560257516437 1.3517175238918997, 1.410809252687709 1.276374090288751, 1.4564769416938732 1.1904094168864645, 1.4846043450167032 1.0971276177803917, 1.4941115222050074 1.0001141053741225, 1.4940366699842065 -0.0001515846426103, 1.4845148499495897 -0.0971732816950403, 1.45637425712857 -0.1904595893247133, 1.4106969222243664 -0.276424680124105, 1.349239222062513 -0.3517644619740744, 1.2743643466001149 -0.4135837598507727, 1.1889513390225168 -0.4595077592752931, 1.0962841717199516 -0.4877733722771482, 0.9999251377504871 -0.4972969509773938, -0.0001121792622424 -0.4969155655191135, -0.0964291849610737 -0.4873180132960953, -0.1890254994213698 -0.4589860143111308, -0.2743427298855454 -0.4130137728760041, -0.3491043235517613 -0.3511725821191289, -0.4104409593229888 -0.2758420227997601, -0.4559999636040494 -0.1899180790198089, -0.4840347137423852 -0.09670180619879, -0.4934708114101906 0.0002271482510326))</literal>
    20.9  			</binding>
   20.10  		</result>
   20.11  		<result>
   20.12  			<binding name='buffer'>
   20.13 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((-0.9990081738166161 0.0000000084973855, -0.9990081738166161 1.9999999908735884, -0.9798122883145344 2.196212627744941, -0.9229623153323963 2.3848849223043818, -0.8306429666620074 2.5587663041272326, -0.7064020253620464 2.711174611784923, -0.5550139995434042 2.8362528777900806, -0.3822966468222901 2.9291944154177822, -0.1948873967788809 2.986427530212449, 0.000011717894552 3.005752790660113, 2.000011717849713 3.0057528076548756, 2.194910835355608 2.9864275500396724, 2.382320088231479 2.9291944380774666, 2.5550374466175167 2.836252901865995, 2.7064254781010826 2.7111746372770686, 2.830666425065967 2.5587663296193788, 2.922985776568818 2.384884944964068, 2.979835752383418 2.196212647572167, 2.999031643550423 2.000000007868354, 2.999031643550423 -0.0000000092055009, 2.979835752383418 -0.1962126477849076, 2.922985776568818 -0.3848849450520532, 2.830666425065967 -0.5587663306485497, 2.7064254781010826 -0.7111746378420722, 2.5550374466175167 -0.8362529026024169, 2.382320088231479 -0.9291944384505907, 2.194910835355608 -0.9864275515594186, 2.000011717849713 -1.0057528085245409, 0.000011717894552 -1.0057527915297673, -0.1948873967788809 -0.9864275317321829, -0.3822966468222901 -0.9291944157908929, -0.5550139995434042 -0.8362528785264882, -0.7064020253620464 -0.7111746123499131, -0.8306429666620074 -0.5587663051563913, -0.9229623153323963 -0.3848849223923573, -0.9798122883145344 -0.1962126279576742, -0.9990081738166161 0.0000000084973855))</literal>
   20.14 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((-0.4934706567399499 0.0004542622593026, -0.4937701920076767 1.9994709087683613, -0.4844027181429565 2.0963966526101903, -0.4564228368465431 2.1896245606854228, -0.4108998788779539 2.2755743284921475, -0.3495768989567895 2.35094319423577, -0.2748049335458116 2.412832664985624, -0.1894537787095414 2.458860166617276, -0.0968024822664599 2.487251268835251, -0.0004136032789173 2.4969088004383324, 2.000264185958585 2.49751830039762, 2.0967088525706234 2.4879214379969645, 2.189441021014613 2.4595876668365992, 2.2748968325330634 2.413604712617372, 2.34979275888062 2.3517388498252805, 2.4112521642206497 2.2763667697122636, 2.4569158995497915 2.19038391975501, 2.4850326894360593 2.0970929426303413, 2.4945259262183512 2.0000765842733847, 2.494226589085509 -0.000151572974658, 2.4847032560005826 -0.0972035047325681, 2.4565578437853786 -0.190520528844268, 2.410871643962594 -0.2765170278107154, 2.3493999913943084 -0.3518886307888129, 2.274504981995999 -0.4137392647593552, 2.189064803278674 -0.4596925831015758, 2.0963630914606846 -0.4879834405504209, 1.9999625460532446 -0.4975258277919249, -0.0001121792622424 -0.4969155655191134, -0.0964568514297702 -0.4873124574013823, -0.1890776093582916 -0.458964246924041, -0.2744130565819016 -0.4129663980252777, -0.3491840405564219 -0.3510922166944947, -0.4105192164054043 -0.2757239320069514, -0.4560646030431 -0.1897606566806234, -0.4840730878443185 -0.0965068706716664, -0.4934706567399499 0.0004542622593026))</literal>
   20.15  			</binding>
   20.16  		</result>
   20.17  		<result>
   20.18  			<binding name='buffer'>
   20.19 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((0.000991817663579 1.0000000037261716, 0.000991817663579 1.9999999951222798, 0.0201877059981226 2.196212631993632, 0.0770376789802607 2.3848849279693036, 0.1693570276506495 2.5587663112083843, 0.2935979689506105 2.7111746188660746, 0.4449859976017145 2.836252884871232, 0.6177033503228286 2.9291944224989335, 0.8051126031986997 2.9864275387098305, 1.0000117178721326 3.005752799157494, 3.000011717827294 3.0057528161522575, 3.1949108353331885 2.986427558537054, 3.3823200910415214 2.929194445158618, 3.555037452260021 2.8362529089471464, 3.706425483743587 2.7111746429419896, 3.8306664307084715 2.5587663324518393, 3.922985785043784 2.3848849463802986, 3.9798357636908457 2.1962126461559364, 3.9990316520253892 2.0000000036196623, 3.9990316520253892 0.9999999952287875, 3.9798357636908457 0.8037873527150411, 3.922985785043784 0.6151150538719149, 3.8306664307084715 0.4412336672128966, 3.706425483743587 0.2888253562982981, 3.555037452260021 0.1637470899049591, 3.3823200910415214 0.070805554466369, 3.1949108353331885 0.0135724404172515, 3.000011717827294 -0.0057528170585263, 1.0000117178721326 -0.0057528000637554, 0.8051126031986997 0.0135724602444842, 0.6177033503228286 0.0708055771260633, 0.4449859976017145 0.1637471139808839, 0.2935979689506105 0.2888253803742225, 0.1693570276506495 0.4412336884563588, 0.0770376789802607 0.615115072282915, 0.0201877059981226 0.8037873668773485, 0.000991817663579 1.0000000037261716))</literal>
   20.20 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((0.5060381924209781 1.000113997915035, 0.505813655632483 1.9997736369244767, 0.5152426136792002 2.0967451692387096, 0.5432871523608308 2.1900067120756517, 0.5888753697625193 2.2759780469621935, 0.6502616772220519 2.3513572056348604, 0.7250927972409914 2.4132472098007756, 0.8104972505104089 2.4592676272600165, 0.9031950923816323 2.487646594767676, 0.9996238020586696 2.4972896406655662, 3.0003014435397177 2.4975944362251004, 3.096776518334607 2.4879780301286503, 3.1895311210690194 2.4596169273863406, 3.2750000753993533 2.4136017143300217, 3.349899459993322 2.351701516702786, 3.4113530237871172 2.2762955903181417, 3.457002559826935 2.1902814769292425, 3.485098042318725 2.0969633693538547, 3.4945641882338605 1.9999250523240422, 3.494339725680029 0.999962537120769, 3.484824130621445 0.9028717603326814, 3.45667296608698 0.8095154378948406, 3.410969030393131 0.7234816260507345, 3.3494692318336763 0.6480770781286758, 3.2745372650742524 0.5862002483909361, 3.1890530098097924 0.5402298570368103, 3.0963020349827244 0.5119333249148786, 2.999849391712009 0.5023986600769961, 1.0000756930162298 0.5027037437551442, 0.9036694298965092 0.512265093580472, 0.8109752387240544 0.540579519651579, 0.7255555152535794 0.5865551215350016, 0.6506918501688285 0.6484217367488734, 0.5892593480786775 0.723799468498733, 0.5436167694651722 0.8097904299327032, 0.5155165801383599 0.9030900998027467, 0.5060381924209781 1.000113997915035))</literal>
   20.21  			</binding>
   20.22  		</result>
   20.23  		<result>
   20.24  			<binding name='buffer'>
   20.25 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((2.0009918006239693 1.0000000037261716, 2.0009918006239693 1.9999999951222798, 2.020187688958513 2.1962126362423238, 2.077037661940651 2.384884933634225, 2.1693570134435016 2.5587663197057666, 2.2935979575759244 2.7111746316121472, 2.4449859862270285 2.8362528990335347, 2.617703344613066 2.9291944380774666, 2.805112600321399 2.9864275557045934, 3.000011717827294 3.0057528161522575, 4.000011717804874 3.005752824649639, 4.194910838143231 2.9864275670344353, 4.382320093851564 2.929194452239769, 4.555037455070064 2.836252916028298, 4.706425489386091 2.7111746486069106, 4.830666439183437 2.5587663367005304, 4.92298579351875 2.384884949212759, 4.97983576933335 2.196212647572167, 4.999031660500355 2.0000000036196623, 4.999031660500355 0.9999999952287875, 4.97983576933335 0.8037873512988103, 4.92298579351875 0.6151150510394534, 4.830666439183437 0.4412336629642042, 4.706425489386091 0.2888253506333747, 4.555037455070064 0.1637470828238047, 4.382320093851564 0.0708055473852146, 4.194910838143231 0.0135724319198661, 4.000011717804874 -0.0057528255559118, 3.000011717827294 -0.0057528170585263, 2.8051125974889373 0.0135724432497134, 2.617703344613066 0.0708055615475235, 2.4449859862270285 0.1637470998185752, 2.2935979575759244 0.2888253676281449, 2.1693570134435016 0.441233679958974, 2.077037661940651 0.615115066617992, 2.020187688958513 0.8037873626286562, 2.0009918006239693 1.0000000037261716))</literal>
   20.26 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((2.505660274319971 0.9999625371207693, 2.5054358117661395 1.9999250523240422, 2.514905626142041 2.0969819592913836, 2.5430118450021153 2.1903165032273937, 2.5886783573996213 2.2763428810163244, 2.650153808314832 2.3517551496016385, 2.7250782367872857 2.413654401738775, 2.8105733151876113 2.459660496836502, 2.9033528458296165 2.488003974932592, 2.999849313165722 2.4975945055353352, 4.000188132413319 2.4975183009353223, 4.096676195517416 2.4879129693190603, 4.189441549509623 2.4595562065145153, 4.2749174603633495 2.4135404548675763, 4.349819216706593 2.351636815929412, 4.4112704381472225 2.2762263840443318, 4.456913269676148 2.190208228650599, 4.484998309175389 2.0968876856626157, 4.494450973349105 1.999849322156218, 4.494226509024875 1.0000382904812943, 4.484729904818083 0.9029753727932949, 4.456605292783763 0.8096412864688206, 4.410933527317735 0.7236218400122066, 4.349468897859102 0.6482223029664494, 4.274572116090395 0.5863406087146761, 4.1891200774041435 0.5403559896922157, 4.096395728293762 0.5120373431116666, 3.9999621710058166 0.5024749193699874, 3.0000752866705103 0.502398642751658, 2.903633322208444 0.511946254761696, 2.810894794711294 0.5402516093754741, 2.725423587547454 0.5862265697897175, 2.6505041328962324 0.6481038813437343, 2.5890152728116647 0.7235052653566969, 2.543319824667216 0.8095329496722874, 2.515174030978355 0.9028810558464934, 2.505660274319971 0.9999625371207693))</literal>
   20.27  			</binding>
   20.28  		</result>
   20.29  		<result>
   20.30  			<binding name='buffer'>
   20.31 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((2.0009918006239693 1.0000000037261716, 2.0009918006239693 1.9999999951222798, 2.020187688958513 2.1962126362423238, 2.077037661940651 2.384884933634225, 2.1693570134435016 2.5587663197057666, 2.2935979575759244 2.7111746316121472, 2.4449859862270285 2.8362528990335347, 2.617703344613066 2.9291944380774666, 2.805112600321399 2.9864275557045934, 3.000011717827294 3.0057528161522575, 4.000011717804874 3.005752824649639, 4.194910838143231 2.9864275670344353, 4.382320093851564 2.929194452239769, 4.555037455070064 2.836252916028298, 4.706425489386091 2.7111746486069106, 4.830666439183437 2.5587663367005304, 4.92298579351875 2.384884949212759, 4.97983576933335 2.196212647572167, 4.999031660500355 2.0000000036196623, 4.999031660500355 0.9999999952287875, 4.97983576933335 0.8037873512988103, 4.92298579351875 0.6151150510394534, 4.830666439183437 0.4412336629642042, 4.706425489386091 0.2888253506333747, 4.555037455070064 0.1637470828238047, 4.382320093851564 0.0708055473852146, 4.194910838143231 0.0135724319198661, 4.000011717804874 -0.0057528255559118, 3.000011717827294 -0.0057528170585263, 2.8051125974889373 0.0135724432497134, 2.617703344613066 0.0708055615475235, 2.4449859862270285 0.1637470998185752, 2.2935979575759244 0.2888253676281449, 2.1693570134435016 0.441233679958974, 2.077037661940651 0.615115066617992, 2.020187688958513 0.8037873626286562, 2.0009918006239693 1.0000000037261716))</literal>
   20.32 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((2.505660274319971 0.9999625371207693, 2.5054358117661395 1.9999250523240422, 2.514905626142041 2.0969819592913836, 2.5430118450021153 2.1903165032273937, 2.5886783573996213 2.2763428810163244, 2.650153808314832 2.3517551496016385, 2.7250782367872857 2.413654401738775, 2.8105733151876113 2.459660496836502, 2.9033528458296165 2.488003974932592, 2.999849313165722 2.4975945055353352, 4.000188132413319 2.4975183009353223, 4.096676195517416 2.4879129693190603, 4.189441549509623 2.4595562065145153, 4.2749174603633495 2.4135404548675763, 4.349819216706593 2.351636815929412, 4.4112704381472225 2.2762263840443318, 4.456913269676148 2.190208228650599, 4.484998309175389 2.0968876856626157, 4.494450973349105 1.999849322156218, 4.494226509024875 1.0000382904812943, 4.484729904818083 0.9029753727932949, 4.456605292783763 0.8096412864688206, 4.410933527317735 0.7236218400122066, 4.349468897859102 0.6482223029664494, 4.274572116090395 0.5863406087146761, 4.1891200774041435 0.5403559896922157, 4.096395728293762 0.5120373431116666, 3.9999621710058166 0.5024749193699874, 3.0000752866705103 0.502398642751658, 2.903633322208444 0.511946254761696, 2.810894794711294 0.5402516093754741, 2.725423587547454 0.5862265697897175, 2.6505041328962324 0.6481038813437343, 2.5890152728116647 0.7235052653566969, 2.543319824667216 0.8095329496722874, 2.515174030978355 0.9028810558464934, 2.505660274319971 0.9999625371207693))</literal>
   20.33  			</binding>
   20.34  		</result>
   20.35  		<result>
   20.36  			<binding name='buffer'>
   20.37 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((4.892356290662825 0.4522064960767662, 4.962840667011444 0.2682564216646194, 4.996324064926611 0.0739974018390475, 4.991519739490134 -0.1231052973699739, 4.9486123133959445 -0.3154771269815041, 4.86925070146047 -0.495725347890648, 4.756484720127086 -0.6569231212775386, 4.614647908520599 -0.7928757071754876, 4.4491909711948034 -0.8983585240191035, 4.266472326078234 -0.9693179273504574, 4.07351375365782 -1.003026984213504, 3.8777305370113853 -0.9981902766065905, 3.6866465189809543 -0.9549936778710609, 3.5076049503077904 -0.8750972077887265, 3.347486297126129 -0.7615712411396766, 3.2124438306522203 -0.6187785219475874, 3.107667156276771 -0.4522064898997295, 2.1076671704614993 1.5477934983172499, 2.037182796945342 1.7317435698161605, 2.0036993961977134 1.9260025830548837, 2.0085037188017285 2.123105276297947, 2.051411139230994 2.3154771024624923, 2.1307727455015453 2.4957253211107155, 2.2435387183375437 2.6569230941281, 2.3853755271115693 2.7928756815524096, 2.550832458772441 2.8983585024963183, 2.733551095391625 2.9693179095337885, 2.9265096678120393 3.0030269723109986, 3.122292881626012 2.998190271278887, 3.313376899656443 2.9549936794894767, 3.4924184711620687 2.8750972134820656, 3.652537127176192 2.7615712534974763, 3.7875795993150243 2.6187785363401255, 3.8923562765229356 2.4522065080179463, 4.892356290662825 0.4522064960767662))</literal>
   20.38 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((4.441397579310631 0.2236689949754997, 4.476253496430849 0.1326861847305157, 4.4928121842578195 0.0366075250054787, 4.490438388824665 -0.060877008926872, 4.469223173737631 -0.1560236126689771, 4.429980459506286 -0.245178001124344, 4.37421607469027 -0.3249153972668052, 4.304070417196624 -0.3921718883698105, 4.222236785549133 -0.4443621564248297, 4.131858365352413 -0.4794790473531218, 4.036407711775401 -0.4961710818902606, 3.9395533095486415 -0.4937948225088334, 3.8450183670331657 -0.472439973775908, 3.756437363468368 -0.4329261699884899, 3.677215985333219 -0.3767715413585866, 3.6103999468008334 -0.3061342876486996, 3.558557802248454 -0.22372956502612, 2.5583049501208333 1.776209060166941, 2.523391233793181 1.8672059872592661, 2.5067876924572876 1.9633072261989055, 2.5091349757482155 2.0608209083907725, 2.5303462608660063 2.15600035905891, 2.5696100601026726 2.2451878219691808, 2.6254207284696633 2.324954917400893, 2.6956356430808084 2.3922344915439715, 2.777557024158427 2.4444387912222076, 2.8680353969341588 2.479559362764822, 2.9635907947457722 2.496244729123141, 3.060547028002909 2.493852735269546, 3.1551737475063177 2.4724754431804574, 3.243830664123788 2.432935561852698, 3.323108183951678 2.376754558123565, 3.3899588887411607 2.306093746228953, 3.44181471918722 2.223670734837559, 4.441397579310631 0.2236689949754997))</literal>
   20.39  			</binding>
   20.40  		</result>
   20.41  		<result>
   20.42  			<binding name='buffer'>
   20.43 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((1.9990316350754571 1.0000000079748637, 1.9798357495733754 0.8037873682935792, 1.9229857737587754 0.6151150708666843, 1.8306664250883866 0.4412336856238972, 1.7064254809559638 0.2888253761255299, 1.5550374523048598 0.1637471097321913, 1.382320093918822 0.0708055728773707, 1.194910841042951 0.0135724588282533, 1.000011726369518 -0.0057528000637554, 0.8051126116960852 0.0135724588282533, 0.6177033588202141 0.0708055728773707, 0.4449860032666382 0.1637471083159604, 0.293597977447996 0.2888253718768374, 0.1693570333155732 0.441233679958974, 0.0770376818127225 0.6151150623692996, 0.0201877059981226 0.8037873541312718, 0.000991817663579 0.9999999909800954, 0.0201877031656608 1.1962126274576905, 0.0770376761477989 1.3848849232736193, 0.1693570248181877 1.5587663054501864, 0.2935979661181487 1.711174614343617, 0.4449859919367909 1.8362528815482495, 0.617703344657905 1.929194419585542, 0.8051125947013142 1.9864275376886154, 1.0000117093747471 2.005752798333741, 1.1949108268806419 1.9864275447697675, 1.382320079756513 1.9291944323316164, 1.5550374381425507 1.8362528985430158, 1.7064254696261165 1.7111746341708447, 1.8306664165910012 1.5587663266936451, 1.9229857680938518 1.3848849445170783, 1.9798357467409136 1.1962126472849197, 1.9990316350754571 1.0000000079748637))</literal>
   20.44 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((1.4941114760448242 1.0002656895689852, 1.48465844334401 0.903218354188106, 1.4565755318987466 0.8098939913478284, 1.4109443469372922 0.7238808269756556, 1.3495210882390627 0.6484854034084169, 1.274668858224344 0.586605357299263, 1.1892666214643333 0.5406179599460267, 1.096598290177959 0.5122887429186055, 1.0002262089672516 0.502703767092398, 0.9038539554115113 0.5122281697183206, 0.8111838169875689 0.5404925778504197, 0.7257745149580362 0.5864078568477391, 0.6509047062558502 0.6482075283605179, 0.5894475111710343 0.7235161034621705, 0.5437608152912005 0.8094405871736376, 0.5155974213664015 0.9026815612440451, 0.5060383292181231 0.9996595671409454, 0.5154515445125576 1.0966519999363562, 0.5434778946221298 1.189935384636339, 0.5890443835523699 1.2759277337466557, 0.6504046597742672 1.351325674570359, 0.7252052094919487 1.4132311883389634, 0.8105749372852248 1.4592631274050478, 0.9032348818477622 1.4876491792438657, 0.9996239765142181 1.4972946296901322, 1.0960360534473923 1.4878251336659738, 1.1887627611277156 1.4596017042142753, 1.274236764418951 1.4137072372263417, 1.349169555073809 1.351905043317305, 1.4106784244846065 1.2765709965399066, 1.456397621410486 1.1906019705754853, 1.4845693968286346 1.097304164946152, 1.4941114760448242 1.0002656895689852))</literal>
   20.45  			</binding>
   20.46  		</result>
   20.47  		<result>
   20.48  			<binding name='buffer'>
   20.49 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/OGC/1.3/CRS84&gt; POLYGON ((1.1009918085750399 1.1000000022734888, 1.1009918085750399 1.8999999979395905, 1.1201876940771216 2.0962126350548136, 1.1770376698917215 2.284884932572364, 1.2693570185621104 2.458766317121424, 1.3935979626945332 2.6111746257524264, 1.5449859913456372 2.7362528937186306, 1.7177033468992131 2.8291944313872914, 1.9051125997750842 2.886427549911751, 2.100011717280979 2.9057528092461773, 2.900011718396028 2.9057528149110983, 3.094910835901923 2.8864275598253633, 3.2823200916102557 2.829194444133364, 3.4550374499962935 2.7362529078809334, 3.606425484312321 2.61117464133096, 3.7306664312772058 2.4587663312837273, 3.8229857856125182 2.2848849453184377, 3.879835761427118 2.096212644968426, 3.8990316497616617 1.9000000036045124, 3.8990316497616617 1.099999996608566, 3.879835761427118 0.90378735433869, 3.8229857856125182 0.7151150542049814, 3.7306664312772058 0.5412336674397112, 3.606425484312321 0.3888253574984246, 3.4550374499962935 0.2637470916499018, 3.2823200916102557 0.1708055548360394, 3.094910835901923 0.113572438851793, 2.900011718396028 0.0942471838033537, 2.100011717280979 0.0942471894682772, 1.9051125997750842 0.1135724487654092, 1.7177033468992131 0.1708055675821173, 1.5449859913456372 0.2637471058122103, 1.3935979626945332 0.3888253730769637, 1.2693570185621104 0.5412336816020191, 1.1770376698917215 0.7151150669510582, 1.1201876969095834 0.903787364252305, 1.1009918085750399 1.1000000022734888))</literal>
   20.50 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((1.6057396417426655 1.1000133341008838, 1.6055600770891043 1.8998742751842157, 1.615018647034787 1.9969183309120746, 1.6431098940423081 2.0902429614525575, 1.6887587248520843 2.176263210107767, 1.7502152087055989 2.251673507273506, 1.8251210012123964 2.313574723561859, 1.9105993240140788 2.3595858779522474, 2.0033651988678276 2.3879361376528014, 2.0998517783906254 2.397533452420771, 2.9001107683378806 2.397594423773529, 2.9966046428273283 2.3880118353399094, 3.0893834846230526 2.3596746493753034, 3.1748795736112525 2.313672854227895, 3.249806372172682 2.251775720637398, 3.311285107477008 2.176363379333804, 3.356955313859029 2.0903349174108454, 3.3850651283413487 1.9969966390464415, 3.3945379885207423 1.899934862126788, 3.3943584196328853 1.0999527283552053, 3.384841858008238 1.0028721300345445, 3.3566931375209905 0.9095253893124443, 3.3109949411987802 0.8234994557326389, 3.2495037793506376 0.7481000379166741, 3.17458266179189 0.6862246731626713, 3.089110514040267 0.6402513607718573, 2.9963717238913694 0.6119470629201429, 2.8999300019796097 0.6023996491860443, 2.100032540940559 0.6024606668156243, 2.003598114030539 0.612022815656822, 1.910872289438933 0.640340193635087, 1.825417905755009 0.6863228679113019, 1.7505177923584976 0.748202313479427, 1.6890488811640878 0.8235996806999417, 1.6433720611540792 0.9096173906790982, 1.6152419102710192 1.0029504706950134, 1.6057396417426655 1.1000133341008838))</literal>
   20.51  			</binding>
   20.52  		</result>
   20.53  	</results>
   20.54 -</sparql>
   20.55 +</sparql>
   20.56 \ No newline at end of file
    21.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferWithConstantTest.rq	Wed Sep 24 18:44:26 2014 +0300
    21.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferWithConstantTest.rq	Tue Oct 14 12:09:19 2014 +0300
    21.3 @@ -1,6 +1,6 @@
    21.4  select (geof:buffer("<http://www.opengis.net/def/crs/EPSG/0/2100> POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WktLiteral>, 1, ogc:degree) as ?buffer)
    21.5  where
    21.6  {
    21.7 -	ex:A geo:hasGeometry ?geom .
    21.8 +	<http://example.org#A> geo:hasGeometry ?geom .
    21.9  	?geom geo:asWKT ?g.
   21.10  }
   21.11 \ No newline at end of file
    22.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferWithConstantTest.srx	Wed Sep 24 18:44:26 2014 +0300
    22.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/BufferWithConstantTest.srx	Tue Oct 14 12:09:19 2014 +0300
    22.3 @@ -6,7 +6,7 @@
    22.4  	<results>
    22.5  		<result>
    22.6  			<binding name='buffer'>
    22.7 -				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>&lt;http://www.opengis.net/def/crs/EPSG/0/4326&gt; POLYGON ((18.51248908676886 0.0022304072306898, 18.512489086768802 0.0022394268391313, 18.531703805007 0.1973297483274672, 18.5886095513394 0.3849228584614706, 18.681019469862246 0.5578096592705463, 18.80538229925464 0.7093462080002653, 18.956918845758608 0.8337090401047385, 19.129805644913805 0.9261189617217735, 19.317398754029355 0.983024711411565, 19.512489075173807 1.0022394331413353, 19.51249803440009 1.0022394331414393, 19.7075883572879 0.9830247156776696, 19.89518146887027 0.9261189695835728, 20.0680682710241 0.833709050783125, 20.219604820854016 0.7093462206556026, 20.343967653693618 0.5578096730514313, 20.436377575588256 0.3849228725514822, 20.493283325039744 0.1973297619875636, 20.512498045995084 0.002239439443644, 20.51249804599514 0.0022304198350916, 20.493283327453618 -0.1928599031781553, 20.436377580234563 -0.3804530146601173, 20.34396766031032 -0.5533398164745945, 20.21960482911171 -0.7048763657236403, 20.06806828054155 -0.8292391977494786, 19.895181479231532 -0.9216491186174952, 19.707588368060215 -0.9785548668606079, 19.512498045151858 -0.9977695864671131, 19.512489085925576 -0.9977695864671056, 19.317398764801673 -0.9785548668800716, 19.12980565527507 -0.9216491193392968, 18.956918855276065 -0.8292391997898305, 18.805382307512332 -0.7048763695836736, 18.681019476478948 -0.5533398224988286, 18.588609555985705 -0.3804530230042807, 18.531703807420875 -0.1928599137883199, 18.51248908676886 0.0022304072306898))</literal>
    22.8 +				<literal datatype='http://www.opengis.net/ont/geosparql#wktLiteral'>POLYGON ((18.51248908676886 0.0022304072306898, 18.512489086768802 0.0022394268391313, 18.531703805007 0.1973297483274672, 18.5886095513394 0.3849228584614706, 18.681019469862246 0.5578096592705463, 18.80538229925464 0.7093462080002653, 18.956918845758608 0.8337090401047385, 19.129805644913805 0.9261189617217735, 19.317398754029355 0.983024711411565, 19.512489075173807 1.0022394331413353, 19.51249803440009 1.0022394331414393, 19.7075883572879 0.9830247156776696, 19.89518146887027 0.9261189695835728, 20.0680682710241 0.833709050783125, 20.219604820854016 0.7093462206556026, 20.343967653693618 0.5578096730514313, 20.436377575588256 0.3849228725514822, 20.493283325039744 0.1973297619875636, 20.512498045995084 0.002239439443644, 20.51249804599514 0.0022304198350916, 20.493283327453618 -0.1928599031781553, 20.436377580234563 -0.3804530146601173, 20.34396766031032 -0.5533398164745945, 20.21960482911171 -0.7048763657236403, 20.06806828054155 -0.8292391977494786, 19.895181479231532 -0.9216491186174952, 19.707588368060215 -0.9785548668606079, 19.512498045151858 -0.9977695864671131, 19.512489085925576 -0.9977695864671056, 19.317398764801673 -0.9785548668800716, 19.12980565527507 -0.9216491193392968, 18.956918855276065 -0.8292391997898305, 18.805382307512332 -0.7048763695836736, 18.681019476478948 -0.5533398224988286, 18.588609555985705 -0.3804530230042807, 18.531703807420875 -0.1928599137883199, 18.51248908676886 0.0022304072306898))</literal>
    22.9  			</binding>
   22.10  		</result>
   22.11  	</results>
    23.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/DistanceDegreeTest.srx	Wed Sep 24 18:44:26 2014 +0300
    23.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/DistanceDegreeTest.srx	Tue Oct 14 12:09:19 2014 +0300
    23.3 @@ -6,9 +6,8 @@
    23.4  	<results>
    23.5  		<result>
    23.6  			<binding name='dist'>
    23.7 -				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>1.796630567696411E-5</literal>
    23.8 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>2.0</literal>
    23.9  			</binding>
   23.10  		</result>
   23.11  	</results>
   23.12  </sparql>
   23.13 -
    24.1 --- a/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/DistanceMetreTest.srx	Wed Sep 24 18:44:26 2014 +0300
    24.2 +++ b/testsuite/src/test/resources/geoSPARQL/QueryFunctionsTest/DistanceMetreTest.srx	Tue Oct 14 12:09:19 2014 +0300
    24.3 @@ -6,7 +6,7 @@
    24.4  	<results>
    24.5  		<result>
    24.6  			<binding name='dist'>
    24.7 -				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>2.0</literal>
    24.8 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>222605.28125</literal>
    24.9  			</binding>
   24.10  		</result>
   24.11  	</results>