1.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/EhSpatialRelationsTest.java	Tue Jul 16 19:48:37 2013 +0300
     1.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/EhSpatialRelationsTest.java	Wed Jul 17 11:04:22 2013 +0300
     1.3 @@ -17,11 +17,4 @@
     1.4   * 
     1.5   * @author Panayiotis Smeros <psmeros@di.uoa.gr
     1.6   */
     1.7 -public class EhSpatialRelationsTest extends TemplateTest
     1.8 -{
     1.9 -	public EhSpatialRelationsTest() 
    1.10 -	{
    1.11 -		super();
    1.12 -		this.inference=true;
    1.13 -	}
    1.14 -}
    1.15 \ No newline at end of file
    1.16 +public class EhSpatialRelationsTest extends TemplateTest {}
    1.17 \ No newline at end of file

     2.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/Rcc8SpatialRelationsTest.java	Tue Jul 16 19:48:37 2013 +0300
     2.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/Rcc8SpatialRelationsTest.java	Wed Jul 17 11:04:22 2013 +0300
     2.3 @@ -17,11 +17,4 @@
     2.4   * 
     2.5   * @author Panayiotis Smeros <psmeros@di.uoa.gr
     2.6   */
     2.7 -public class Rcc8SpatialRelationsTest extends TemplateTest
     2.8 -{
     2.9 -	public Rcc8SpatialRelationsTest() 
    2.10 -	{
    2.11 -		super();
    2.12 -		this.inference=true;
    2.13 -	}
    2.14 -}
    2.15 \ No newline at end of file
    2.16 +public class Rcc8SpatialRelationsTest extends TemplateTest {}
    2.17 \ No newline at end of file

     3.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/SfSpatialRelationsTest.java	Tue Jul 16 19:48:37 2013 +0300
     3.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/SfSpatialRelationsTest.java	Wed Jul 17 11:04:22 2013 +0300
     3.3 @@ -17,11 +17,4 @@
     3.4   * 
     3.5   * @author Panayiotis Smeros <psmeros@di.uoa.gr
     3.6   */
     3.7 -public class SfSpatialRelationsTest extends TemplateTest
     3.8 -{
     3.9 -	public SfSpatialRelationsTest() 
    3.10 -	{
    3.11 -		super();
    3.12 -		this.inference=true;
    3.13 -	}
    3.14 -}
    3.15 \ No newline at end of file
    3.16 +public class SfSpatialRelationsTest extends TemplateTest {}
    3.17 \ No newline at end of file

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/AggregateFunctionsTest.java	Wed Jul 17 11:04:22 2013 +0300
     4.3 @@ -0,0 +1,20 @@
     4.4 +/**
     4.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     4.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     4.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     4.8 + * 
     4.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    4.10 + * 
    4.11 + * http://www.strabon.di.uoa.gr/
    4.12 + */
    4.13 +package eu.earthobservatory.testsuite.stSPARQL;
    4.14 +
    4.15 +import eu.earthobservatory.testsuite.utils.TemplateTest;
    4.16 +
    4.17 +/**
    4.18 + * A test for the aggregate functions of stSPARQL.
    4.19 + * 
    4.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    4.21 + */
    4.22 +
    4.23 +public class AggregateFunctionsTest extends TemplateTest {}

     5.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/BufferTest.java	Tue Jul 16 19:48:37 2013 +0300
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,20 +0,0 @@
     5.4 -/**
     5.5 - * This Source Code Form is subject to the terms of the Mozilla Public
     5.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
     5.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     5.8 - * 
     5.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    5.10 - * 
    5.11 - * http://www.strabon.di.uoa.gr/
    5.12 - */
    5.13 -package eu.earthobservatory.testsuite.stSPARQL;
    5.14 -
    5.15 -import eu.earthobservatory.testsuite.utils.TemplateTest;
    5.16 -
    5.17 -/**
    5.18 - * A test for the strdf:buffer function.
    5.19 - * 
    5.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr
    5.21 - */
    5.22 -
    5.23 -public class BufferTest extends TemplateTest {}

     6.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/DistanceTest.java	Tue Jul 16 19:48:37 2013 +0300
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,20 +0,0 @@
     6.4 -/**
     6.5 - * This Source Code Form is subject to the terms of the Mozilla Public
     6.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
     6.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     6.8 - * 
     6.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    6.10 - * 
    6.11 - * http://www.strabon.di.uoa.gr/
    6.12 - */
    6.13 -package eu.earthobservatory.testsuite.stSPARQL;
    6.14 -
    6.15 -import eu.earthobservatory.testsuite.utils.TemplateTest;
    6.16 -
    6.17 -/**
    6.18 - * A test for the strdf:distance function.
    6.19 - * 
    6.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr
    6.21 - */
    6.22 -
    6.23 -public class DistanceTest extends TemplateTest {}

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/MetricFunctionsTest.java	Wed Jul 17 11:04:22 2013 +0300
     7.3 @@ -0,0 +1,20 @@
     7.4 +/**
     7.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     7.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     7.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     7.8 + * 
     7.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    7.10 + * 
    7.11 + * http://www.strabon.di.uoa.gr/
    7.12 + */
    7.13 +package eu.earthobservatory.testsuite.stSPARQL;
    7.14 +
    7.15 +import eu.earthobservatory.testsuite.utils.TemplateTest;
    7.16 +
    7.17 +/**
    7.18 + * A test for the metric functions of stSPARQL.
    7.19 + * 
    7.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    7.21 + */
    7.22 +
    7.23 +public class MetricFunctionsTest extends TemplateTest {}

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/SpatialAnalysisFunctionsTest.java	Wed Jul 17 11:04:22 2013 +0300
     8.3 @@ -0,0 +1,20 @@
     8.4 +/**
     8.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     8.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     8.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     8.8 + * 
     8.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    8.10 + * 
    8.11 + * http://www.strabon.di.uoa.gr/
    8.12 + */
    8.13 +package eu.earthobservatory.testsuite.stSPARQL;
    8.14 +
    8.15 +import eu.earthobservatory.testsuite.utils.TemplateTest;
    8.16 +
    8.17 +/**
    8.18 + * A test for the spatial analysis functions of stSPARQL.
    8.19 + * 
    8.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr>
    8.21 + */
    8.22 +
    8.23 +public class SpatialAnalysisFunctionsTest extends TemplateTest {}

     9.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java	Tue Jul 16 19:48:37 2013 +0300
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,20 +0,0 @@
     9.4 -/**
     9.5 - * This Source Code Form is subject to the terms of the Mozilla Public
     9.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
     9.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     9.8 - * 
     9.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
    9.10 - * 
    9.11 - * http://www.strabon.di.uoa.gr/
    9.12 - */
    9.13 -package eu.earthobservatory.testsuite.stSPARQL;
    9.14 -
    9.15 -import eu.earthobservatory.testsuite.utils.TemplateTest;
    9.16 -
    9.17 -/**
    9.18 - * A test for the strdf:union function.
    9.19 - * 
    9.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr
    9.21 - */
    9.22 -
    9.23 -public class UnionTest extends TemplateTest {}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/AggregateFunctionsTest.nt	Wed Jul 17 11:04:22 2013 +0300
    10.3 @@ -0,0 +1,2 @@
    10.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    10.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    10.6 \ No newline at end of file

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/ExtentTest.rq	Wed Jul 17 11:04:22 2013 +0300
    11.3 @@ -0,0 +1,5 @@
    11.4 +select (strdf:extent(?g) as ?extent)
    11.5 +where
    11.6 +{
    11.7 +	?x ex:hasGeometry ?g.
    11.8 +}
    11.9 \ No newline at end of file

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/ExtentTest.srx	Wed Jul 17 11:04:22 2013 +0300
    12.3 @@ -0,0 +1,13 @@
    12.4 +<?xml version='1.0' encoding='UTF-8'?>
    12.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    12.6 +	<head>
    12.7 +		<variable name='extent'/>
    12.8 +	</head>
    12.9 +	<results>
   12.10 +		<result>
   12.11 +			<binding name='extent'>
   12.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 2, 2 2, 2 0, 0 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal>
   12.13 +			</binding>
   12.14 +		</result>
   12.15 +	</results>
   12.16 +</sparql>

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/UnionTest.rq	Wed Jul 17 11:04:22 2013 +0300
    13.3 @@ -0,0 +1,5 @@
    13.4 +select (strdf:union(?g) as ?union)
    13.5 +where
    13.6 +{
    13.7 +	?x ex:hasGeometry ?g.
    13.8 +}
    13.9 \ No newline at end of file

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/UnionTest.srx	Wed Jul 17 11:04:22 2013 +0300
    14.3 @@ -0,0 +1,13 @@
    14.4 +<?xml version='1.0' encoding='UTF-8'?>
    14.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    14.6 +	<head>
    14.7 +		<variable name='union'/>
    14.8 +	</head>
    14.9 +	<results>
   14.10 +		<result>
   14.11 +			<binding name='union'>
   14.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((1 0, 0 0, 0 1, 0 2, 2 2, 2 0, 1 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal>
   14.13 +			</binding>
   14.14 +		</result>
   14.15 +	</results>
   14.16 +</sparql>

    15.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTest.nt	Tue Jul 16 19:48:37 2013 +0300
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,3 +0,0 @@
    15.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    15.5 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    15.6 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    15.7 \ No newline at end of file

    16.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.rq	Tue Jul 16 19:48:37 2013 +0300
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,5 +0,0 @@
    16.4 -select (strdf:buffer(?g, 0.2, ogc:degree) as ?buf)
    16.5 -where
    16.6 -{
    16.7 -?x <http://example.org/ontology/hasGeometry> ?g
    16.8 -}
    16.9 \ No newline at end of file

    17.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.srx	Tue Jul 16 19:48:37 2013 +0300
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,23 +0,0 @@
    17.4 -<?xml version='1.0' encoding='UTF-8'?>
    17.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    17.6 -	<head>
    17.7 -		<variable name='buf'/>
    17.8 -	</head>
    17.9 -	<results>
   17.10 -		<result>
   17.11 -			<binding name='buf'>
   17.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((23.842375699999998 37.9521198, 23.838532756080646 37.913101735596776, 23.827151606502255 37.87558311352698, 23.808669622460506 37.841005753396075, 23.783797056237308 37.81069844376269, 23.75348974660392 37.78582587753949, 23.71891238647302 37.76734389349774, 23.681393764403225 37.755962743919355, 23.6423757 37.752119799999996, 23.603357635596772 37.755962743919355, 23.565839013526983 37.76734389349774, 23.53126165339608 37.78582587753949, 23.50095434376269 37.81069844376269, 23.47608177753949 37.841005753396075, 23.457599793497742 37.87558311352698, 23.44621864391935 37.913101735596776, 23.4423757 37.9521198, 23.44621864391935 37.99113786440322, 23.457599793497742 38.02865648647302, 23.476081777539488 38.06323384660392, 23.50095434376269 38.09354115623731, 23.53126165339608 38.11841372246051, 23.56583901352698 38.13689570650226, 23.603357635596772 38.14827685608064, 23.6423757 38.1521198, 23.681393764403225 38.14827685608064, 23.718912386473015 38.13689570650226, 23.75348974660392 38.11841372246051, 23.783797056237308 38.09354115623731, 23.808669622460506 38.06323384660392, 23.827151606502255 38.02865648647302, 23.838532756080646 37.99113786440322, 23.842375699999998 37.9521198))</literal>
   17.13 -			</binding>
   17.14 -		</result>
   17.15 -		<result>
   17.16 -			<binding name='buf'>
   17.17 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-6.858578643762691 4.341421356237309, -6.833706077539491 4.311114046603921, -6.815224093497743 4.276536686473018, -6.803842943919354 4.239018064403226, -6.8 4.2, -6.803842943919354 4.160981935596775, -6.815224093497743 4.123463313526982, -6.833706077539491 4.08888595339608, -6.858578643762691 4.058578643762691, -6.88888595339608 4.033706077539491, -6.923463313526982 4.015224093497743, -6.960981935596775 4.003842943919354, -7 4, -7.1 4, -7.139018064403227 4.003842943919354, -7.1765366864730185 4.015224093497743, -7.211114046603921 4.033706077539492, -7.24142135623731 4.058578643762691, -7.266293922460509 4.08888595339608, -7.284775906502257 4.123463313526982, -7.296157056080646 4.160981935596775, -7.3 4.2, -7.3 4.3, -7.296157056080646 4.339018064403225, -7.284775906502257 4.376536686473018, -7.266293922460509 4.41111404660392, -7.241421356237309 4.441421356237309, -7.21111404660392 4.466293922460509, -7.176536686473018 4.484775906502257, -7.139018064403225 4.496157056080646, -7.1 4.5, -7.060981935596774 4.496157056080646, -7.023463313526982 4.484775906502257, -6.988885953396079 4.466293922460509, -6.95857864376269 4.441421356237309, -6.858578643762691 4.341421356237309))</literal>
   17.18 -			</binding>
   17.19 -		</result>
   17.20 -		<result>
   17.21 -			<binding name='buf'>
   17.22 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((22.041968 38.045047, 22.03812505608065 38.006028935596774, 22.026743906502258 37.96851031352698, 22.00826192246051 37.933932953396074, 21.98338935623731 37.90362564376269, 21.95308204660392 37.878753077539486, 21.91850468647302 37.86027109349774, 21.880986064403228 37.84888994391935, 21.841968 37.845046999999994, 21.802949935596775 37.84888994391935, 21.765431313526985 37.86027109349774, 21.730853953396082 37.878753077539486, 21.700546643762692 37.90362564376269, 21.675674077539494 37.933932953396074, 21.657192093497745 37.96851031352698, 21.645810943919354 38.006028935596774, 21.641968000000002 38.045047, 21.645810943919354 38.08406506440322, 21.657192093497745 38.121583686473016, 21.67567407753949 38.15616104660392, 21.700546643762692 38.186468356237306, 21.730853953396082 38.21134092246051, 21.76543131352698 38.22982290650226, 21.802949935596775 38.24120405608064, 21.841968 38.245047, 21.880986064403228 38.24120405608064, 21.918504686473018 38.22982290650226, 21.95308204660392 38.21134092246051, 21.98338935623731 38.186468356237306, 22.00826192246051 38.15616104660392, 22.026743906502258 38.121583686473016, 22.03812505608065 38.08406506440322, 22.041968 38.045047))</literal>
   17.23 -			</binding>
   17.24 -		</result>
   17.25 -	</results>
   17.26 -</sparql>
   17.27 \ No newline at end of file

    18.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.rq	Tue Jul 16 19:48:37 2013 +0300
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,6 +0,0 @@
    18.4 -select ?g1
    18.5 -where
    18.6 -{
    18.7 -	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    18.8 -	FILTER(strdf:within(?g1, strdf:buffer(?g1, 30, ogc:metre)))
    18.9 -}
   18.10 \ No newline at end of file

    19.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.srx	Tue Jul 16 19:48:37 2013 +0300
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,13 +0,0 @@
    19.4 -<?xml version='1.0' encoding='UTF-8'?>
    19.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    19.6 -	<head>
    19.7 -		<variable name='g1'/>
    19.8 -	</head>
    19.9 -	<results>
   19.10 -		<result>
   19.11 -			<binding name='g1'>
   19.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (23.6423757 37.9521198)</literal>
   19.13 -			</binding>
   19.14 -		</result>
   19.15 -	</results>
   19.16 -</sparql>
   19.17 \ No newline at end of file

    20.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.rq	Tue Jul 16 19:48:37 2013 +0300
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,5 +0,0 @@
    20.4 -select (strdf:buffer(?g, 0.2, ogc:metre) as ?buf)
    20.5 -where
    20.6 -{
    20.7 -?x <http://example.org/ontology/hasGeometry> ?g
    20.8 -}
    20.9 \ No newline at end of file

    21.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.srx	Tue Jul 16 19:48:37 2013 +0300
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,24 +0,0 @@
    21.4 -<?xml version='1.0' encoding='UTF-8'?>
    21.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    21.6 -	<head>
    21.7 -		<variable name='buf'/>
    21.8 -	</head>
    21.9 -	<results>
   21.10 -		<result>
   21.11 -			<binding name='buf'>
   21.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((23.642377974091588 37.95211974887083, 23.64237791780389 37.95211939855895, 23.642377776288168 37.952119063673464, 23.64237755498278 37.952118757083795, 23.64237726239237 37.952118490572026, 23.642376909761026 37.95211827438005, 23.642376510640172 37.952118116816, 23.642376080367796 37.95211802393498, 23.642375635479024 37.95211799930635, 23.64237519307068 37.95211804387658, 23.64237477014427 37.95211815593286, 23.642374382952614 37.952118331168926, 23.642374046375274 37.95211856285056, 23.642373773346723 37.95211884207436, 23.6423735743593 37.952119158109916, 23.642373457059982 37.95211949881216, 23.642373425956514 37.95211985108811, 23.64237348224418 37.95212020139997, 23.64237362375989 37.95212053628546, 23.64237384506527 37.95212084287514, 23.642374137655676 37.95212110938693, 23.642374490287025 37.952121325578915, 23.642374889407893 37.95212148314297, 23.64237531968029 37.95212157602399, 23.642375764569085 37.95212160065262, 23.64237620697745 37.95212155608239, 23.642376629903875 37.952121444026105, 23.64237701709554 37.95212126879002, 23.642377353672885 37.95212103710839, 23.64237762670143 37.95212075788458, 23.642377825688836 37.95212044184901, 23.642377942988137 37.95212010114676, 23.642377974091588 37.95211974887083))</literal>
   21.13 -			</binding>
   21.14 -		</result>
   21.15 -		<result>
   21.16 -			<binding name='buf'>
   21.17 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-6.999998728930015 4.200001281097435, -6.9999985042528285 4.2000010072645715, -6.999998337153763 4.200000694657804, -6.999998234065173 4.200000355310692, -6.999998198955376 4.2000000022861546, -6.999998233175899 4.1999996491736065, -6.999998335409446 4.199999309565852, -6.999998501720614 4.199998996535837, -6.999998725707379 4.19999872213342, -6.999998998747537 4.199998496921517, -6.99999931033061 4.199998329569492, -6.999999648462441 4.199998226519436, -7.000000000126898 4.199998191738187, -7.099999999893686 4.199998191630642, -7.10000035129349 4.199998226356922, -7.100000689193024 4.199998329246345, -7.100001000606421 4.19999849634475, -7.100001273565705 4.199998721230353, -7.100001497580733 4.19999899526054, -7.100001664042355 4.199999307904017, -7.1000017665532535 4.199999647145535, -7.10000180117382 4.199999999947651, -7.100001801406124 4.300000000052062, -7.100001766842003 4.300000352545832, -7.100001664495917 4.3000006915146916, -7.100001498294219 4.300001003954596, -7.100001274613 4.300001277879246, -7.1000010020334585 4.300001502779922, -7.100000691012711 4.3000016700286405, -7.100000353482613 4.300001773209148, -7.100000002392014 4.300001808363074, -7.09999965120999 4.300001774141791, -7.0999993134091275 4.3000016718581495, -7.099999001948662 4.30000150543611, -7.099998728777317 4.3000012812602115, -6.999998728930015 4.200001281097435))</literal>
   21.18 -			</binding>
   21.19 -		</result>
   21.20 -		<result>
   21.21 -			<binding name='buf'>
   21.22 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((21.841970279121966 38.04504698367591, 21.841970231302223 38.045046632364425, 21.841970097734794 38.045046295180974, 21.841969883552594 38.04504598508332, 21.841969596986527 38.04504571398833, 21.841969249049175 38.045045492314046, 21.841968853111563 38.045045328579306, 21.84196842438936 38.04504522907631, 21.841967979358117 38.04504519762891, 21.84196753512013 38.04504523544562, 21.841967108747212 38.04504534107318, 21.841966716624647 38.04504551045233, 21.84196637382147 38.04504573707399, 21.841966093511427 38.045046012229186, 21.841965886466667 38.04504632534384, 21.84196576064381 38.045046664385154, 21.841965720878154 38.04504701632397, 21.841965768697875 38.04504736763546, 21.84196590226529 38.04504770481892, 21.84196611644748 38.04504801491659, 21.84196640301354 38.045048286011586, 21.8419667509509 38.04504850768586, 21.84196714688852 38.04504867142062, 21.841967575610745 38.04504877092362, 21.84196802064201 38.045048802371014, 21.84196846488002 38.045048764554295, 21.84196889125295 38.04504865892675, 21.84196928337553 38.045048489547575, 21.84196962617871 38.04504826292592, 21.841969906488746 38.04504798777072, 21.841970113533492 38.04504767465605, 21.841970239356336 38.045047335614726, 21.841970279121966 38.04504698367591))</literal>
   21.23 -			</binding>
   21.24 -		</result>
   21.25 -	</results>
   21.26 -</sparql>
   21.27 -

    22.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.rq	Tue Jul 16 19:48:37 2013 +0300
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,6 +0,0 @@
    22.4 -select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buf)
    22.5 -where
    22.6 -{
    22.7 -	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    22.8 -	<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 .
    22.9 -}
   22.10 \ No newline at end of file

    23.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.srx	Tue Jul 16 19:48:37 2013 +0300
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,13 +0,0 @@
    23.4 -<?xml version='1.0' encoding='UTF-8'?>
    23.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    23.6 -	<head>
    23.7 -		<variable name='buf'/>
    23.8 -	</head>
    23.9 -	<results>
   23.10 -		<result>
   23.11 -			<binding name='buf'>
   23.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((69.22262175806229 37.9521198, 68.34681011090487 29.059854918958273, 65.75303211987202 20.509314790455388, 61.540965218551676 12.629091876431552, 55.87247677580727 5.722018724192779, 48.965403623568506 0.05353028144836, 41.08518070954467 -4.158536619871988, 32.53464058104179 -6.752314610904847, 23.642375700000073 -7.628126258062288, 14.750110818958348 -6.752314610904875, 6.1995706904554595 -4.158536619872045, -1.6806522235683943 0.0535302814482819, -8.587725375807171 5.722018724192679, -14.256213818551597 12.629091876431435, -18.46828071987196 20.509314790455253, -21.062058710904832 29.05985491895813, -21.937870358062288 37.95211979999985, -21.06205871090489 46.844384681041575, -18.468280719872073 55.39492480954447, -14.256213818551768 63.275147723568324, -8.587725375807377 70.1822208758071, -1.6806522235686359 75.85070931855155, 6.199570690455197 80.06277621987194, 14.75011081895809 82.65655421090483, 23.64237569999983 83.53236585806229, 32.53464058104157 82.65655421090489, 41.08518070954449 80.06277621987206, 48.96540362356835 75.85070931855174, 55.872476775807144 70.18222087580733, 61.54096521855159 63.275147723568566, 65.75303211987196 55.39492480954473, 68.34681011090484 46.84438468104183, 69.22262175806229 37.9521198))</literal>
   23.13 -			</binding>
   23.14 -		</result>
   23.15 -	</results>
   23.16 -</sparql>

    24.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTest.nt	Tue Jul 16 19:48:37 2013 +0300
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,3 +0,0 @@
    24.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    24.5 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    24.6 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    24.7 \ No newline at end of file

    25.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.rq	Tue Jul 16 19:48:37 2013 +0300
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,6 +0,0 @@
    25.4 -select (strdf:distance(?g1, ?g2, ogc:degree) as ?dist)
    25.5 -where
    25.6 -{
    25.7 -	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    25.8 -	<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 .
    25.9 -}
   25.10 \ No newline at end of file

    26.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.srx	Tue Jul 16 19:48:37 2013 +0300
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,13 +0,0 @@
    26.4 -<?xml version='1.0' encoding='UTF-8'?>
    26.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    26.6 -	<head>
    26.7 -		<variable name='dist'/>
    26.8 -	</head>
    26.9 -	<results>
   26.10 -		<result>
   26.11 -			<binding name='dist'>
   26.12 -				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>45.58024597167969</literal>
   26.13 -			</binding>
   26.14 -		</result>
   26.15 -	</results>
   26.16 -</sparql>
   26.17 \ No newline at end of file

    27.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.rq	Tue Jul 16 19:48:37 2013 +0300
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,7 +0,0 @@
    27.4 -select ?x ?y
    27.5 -where
    27.6 -{
    27.7 -	?x <http://example.org/ontology/hasGeometry> ?g1 .
    27.8 -	?y <http://example.org/ontology/hasGeometry> ?g2 .
    27.9 -	FILTER(strdf:distance(?g1, ?g2, ogc:metre) < 5)
   27.10 -}
   27.11 \ No newline at end of file

    28.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.srx	Tue Jul 16 19:48:37 2013 +0300
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,33 +0,0 @@
    28.4 -<?xml version='1.0' encoding='UTF-8'?>
    28.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    28.6 -	<head>
    28.7 -		<variable name='x'/>
    28.8 -		<variable name='y'/>
    28.9 -	</head>
   28.10 -	<results>
   28.11 -		<result>
   28.12 -			<binding name='y'>
   28.13 -				<uri>http://example.org/id/Point/5531</uri>
   28.14 -			</binding>
   28.15 -			<binding name='x'>
   28.16 -				<uri>http://example.org/id/Point/5531</uri>
   28.17 -			</binding>
   28.18 -		</result>
   28.19 -		<result>
   28.20 -			<binding name='y'>
   28.21 -				<uri>http://example.org/id/Point/5532</uri>
   28.22 -			</binding>
   28.23 -			<binding name='x'>
   28.24 -				<uri>http://example.org/id/Point/5532</uri>
   28.25 -			</binding>
   28.26 -		</result>
   28.27 -		<result>
   28.28 -			<binding name='y'>
   28.29 -				<uri>http://example.org/id/Point/5533</uri>
   28.30 -			</binding>
   28.31 -			<binding name='x'>
   28.32 -				<uri>http://example.org/id/Point/5533</uri>
   28.33 -			</binding>
   28.34 -		</result>
   28.35 -	</results>
   28.36 -</sparql>
   28.37 \ No newline at end of file

    29.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.rq	Tue Jul 16 19:48:37 2013 +0300
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,6 +0,0 @@
    29.4 -select (strdf:distance(?g1, ?g2, ogc:metre) as ?dist)
    29.5 -where
    29.6 -{
    29.7 -	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    29.8 -	<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 .
    29.9 -}
   29.10 \ No newline at end of file

    30.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.srx	Tue Jul 16 19:48:37 2013 +0300
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,13 +0,0 @@
    30.4 -<?xml version='1.0' encoding='UTF-8'?>
    30.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    30.6 -	<head>
    30.7 -		<variable name='dist'/>
    30.8 -	</head>
    30.9 -	<results>
   30.10 -		<result>
   30.11 -			<binding name='dist'>
   30.12 -				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>4860346.0</literal>
   30.13 -			</binding>
   30.14 -		</result>
   30.15 -	</results>
   30.16 -</sparql>

    31.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.rq	Tue Jul 16 19:48:37 2013 +0300
    31.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.3 @@ -1,7 +0,0 @@
    31.4 -select (strdf:distance(strdf:union(?g1, ?g2), ?g3, ogc:metre) as ?dist)
    31.5 -where
    31.6 -{
    31.7 -	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    31.8 -	<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 .
    31.9 -        <http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> ?g3 .
   31.10 -}
   31.11 \ No newline at end of file

    32.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.srx	Tue Jul 16 19:48:37 2013 +0300
    32.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.3 @@ -1,13 +0,0 @@
    32.4 -<?xml version='1.0' encoding='UTF-8'?>
    32.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    32.6 -	<head>
    32.7 -		<variable name='dist'/>
    32.8 -	</head>
    32.9 -	<results>
   32.10 -		<result>
   32.11 -			<binding name='dist'>
   32.12 -				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>158470.796875</literal>
   32.13 -			</binding>
   32.14 -		</result>
   32.15 -	</results>
   32.16 -</sparql>
   32.17 \ No newline at end of file

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/AreaTest.rq	Wed Jul 17 11:04:22 2013 +0300
    33.3 @@ -0,0 +1,5 @@
    33.4 +select (strdf:area(?g) as ?area)
    33.5 +where
    33.6 +{
    33.7 +	ex:A ex:hasGeometry ?g .
    33.8 +}
    33.9 \ No newline at end of file

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/AreaTest.srx	Wed Jul 17 11:04:22 2013 +0300
    34.3 @@ -0,0 +1,13 @@
    34.4 +<?xml version='1.0' encoding='UTF-8'?>
    34.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    34.6 +	<head>
    34.7 +		<variable name='area'/>
    34.8 +	</head>
    34.9 +	<results>
   34.10 +		<result>
   34.11 +			<binding name='area'>
   34.12 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>1.0</literal>
   34.13 +			</binding>
   34.14 +		</result>
   34.15 +	</results>
   34.16 +</sparql>

    35.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceDegreesTest.rq	Wed Jul 17 11:04:22 2013 +0300
    35.3 @@ -0,0 +1,6 @@
    35.4 +select (strdf:distance(?g1, ?g2, ogc:degree) as ?dist)
    35.5 +where
    35.6 +{
    35.7 +	ex:A ex:hasGeometry ?g1 .
    35.8 +	ex:D ex:hasGeometry ?g2 .
    35.9 +}
   35.10 \ No newline at end of file

    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceDegreesTest.srx	Wed Jul 17 11:04:22 2013 +0300
    36.3 @@ -0,0 +1,13 @@
    36.4 +<?xml version='1.0' encoding='UTF-8'?>
    36.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    36.6 +	<head>
    36.7 +		<variable name='dist'/>
    36.8 +	</head>
    36.9 +	<results>
   36.10 +		<result>
   36.11 +			<binding name='dist'>
   36.12 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>2.0</literal>
   36.13 +			</binding>
   36.14 +		</result>
   36.15 +	</results>
   36.16 +</sparql>

    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceFilterTest.rq	Wed Jul 17 11:04:22 2013 +0300
    37.3 @@ -0,0 +1,7 @@
    37.4 +select ?x ?y
    37.5 +where
    37.6 +{
    37.7 +	?x ex:hasGeometry ?g1 .
    37.8 +	?y ex:hasGeometry ?g2 .
    37.9 +	FILTER(strdf:distance(?g1, ?g2, ogc:degree) > 2)
   37.10 +}
   37.11 \ No newline at end of file

    38.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceFilterTest.srx	Wed Jul 17 11:04:22 2013 +0300
    38.3 @@ -0,0 +1,41 @@
    38.4 +<?xml version='1.0' encoding='UTF-8'?>
    38.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    38.6 +	<head>
    38.7 +		<variable name='x'/>
    38.8 +		<variable name='y'/>
    38.9 +	</head>
   38.10 +	<results>
   38.11 +		<result>
   38.12 +			<binding name='y'>
   38.13 +				<uri>http://example.org#F</uri>
   38.14 +			</binding>
   38.15 +			<binding name='x'>
   38.16 +				<uri>http://example.org#A</uri>
   38.17 +			</binding>
   38.18 +		</result>
   38.19 +		<result>
   38.20 +			<binding name='y'>
   38.21 +				<uri>http://example.org#A</uri>
   38.22 +			</binding>
   38.23 +			<binding name='x'>
   38.24 +				<uri>http://example.org#F</uri>
   38.25 +			</binding>
   38.26 +		</result>
   38.27 +		<result>
   38.28 +			<binding name='y'>
   38.29 +				<uri>http://example.org#G</uri>
   38.30 +			</binding>
   38.31 +			<binding name='x'>
   38.32 +				<uri>http://example.org#F</uri>
   38.33 +			</binding>
   38.34 +		</result>
   38.35 +		<result>
   38.36 +			<binding name='y'>
   38.37 +				<uri>http://example.org#F</uri>
   38.38 +			</binding>
   38.39 +			<binding name='x'>
   38.40 +				<uri>http://example.org#G</uri>
   38.41 +			</binding>
   38.42 +		</result>
   38.43 +	</results>
   38.44 +</sparql>

    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceMetresTest.rq	Wed Jul 17 11:04:22 2013 +0300
    39.3 @@ -0,0 +1,6 @@
    39.4 +select (strdf:distance(?g1, ?g2, ogc:metre) as ?dist)
    39.5 +where
    39.6 +{
    39.7 +	ex:A ex:hasGeometry ?g1 .
    39.8 +	ex:D ex:hasGeometry ?g2 .
    39.9 +}
   39.10 \ No newline at end of file

    40.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceMetresTest.srx	Wed Jul 17 11:04:22 2013 +0300
    40.3 @@ -0,0 +1,13 @@
    40.4 +<?xml version='1.0' encoding='UTF-8'?>
    40.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    40.6 +	<head>
    40.7 +		<variable name='dist'/>
    40.8 +	</head>
    40.9 +	<results>
   40.10 +		<result>
   40.11 +			<binding name='dist'>
   40.12 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>222605.28125</literal>
   40.13 +			</binding>
   40.14 +		</result>
   40.15 +	</results>
   40.16 +</sparql>

    41.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceUnionTest.rq	Wed Jul 17 11:04:22 2013 +0300
    41.3 @@ -0,0 +1,7 @@
    41.4 +select (strdf:distance(strdf:union(?g1, ?g2), ?g3, ogc:metre) as ?dist)
    41.5 +where
    41.6 +{
    41.7 +	ex:A ex:hasGeometry ?g1 .
    41.8 +	ex:B ex:hasGeometry ?g2 .
    41.9 +	ex:D ex:hasGeometry ?g3 .
   41.10 +}
   41.11 \ No newline at end of file

    42.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceUnionTest.srx	Wed Jul 17 11:04:22 2013 +0300
    42.3 @@ -0,0 +1,13 @@
    42.4 +<?xml version='1.0' encoding='UTF-8'?>
    42.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    42.6 +	<head>
    42.7 +		<variable name='dist'/>
    42.8 +	</head>
    42.9 +	<results>
   42.10 +		<result>
   42.11 +			<binding name='dist'>
   42.12 +				<literal datatype='http://www.w3.org/2001/XMLSchema#double'>111252.1328125</literal>
   42.13 +			</binding>
   42.14 +		</result>
   42.15 +	</results>
   42.16 +</sparql>
   42.17 \ No newline at end of file

    43.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/MetricFunctionsTest.nt	Wed Jul 17 11:04:22 2013 +0300
    43.3 @@ -0,0 +1,8 @@
    43.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    43.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    43.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    43.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    43.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    43.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
   43.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
   43.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.

    44.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.rq	Wed Jul 17 11:04:22 2013 +0300
    44.3 @@ -0,0 +1,5 @@
    44.4 +select (strdf:boundary(?g) as ?boundary)
    44.5 +where
    44.6 +{
    44.7 +ex:A ex:hasGeometry ?g.
    44.8 +}
    44.9 \ No newline at end of file

    45.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.srx	Wed Jul 17 11:04:22 2013 +0300
    45.3 @@ -0,0 +1,13 @@
    45.4 +<?xml version='1.0' encoding='UTF-8'?>
    45.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    45.6 +	<head>
    45.7 +		<variable name='boundary'/>
    45.8 +	</head>
    45.9 +	<results>
   45.10 +		<result>
   45.11 +			<binding name='boundary'>
   45.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)</literal>
   45.13 +			</binding>
   45.14 +		</result>
   45.15 +	</results>
   45.16 +</sparql>

    46.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    46.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq	Wed Jul 17 11:04:22 2013 +0300
    46.3 @@ -0,0 +1,5 @@
    46.4 +select (strdf:buffer(?g, 1, ogc:degree) as ?buffer)
    46.5 +where
    46.6 +{
    46.7 +ex:A ex:hasGeometry ?g.
    46.8 +}
    46.9 \ No newline at end of file

    47.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    47.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx	Wed Jul 17 11:04:22 2013 +0300
    47.3 @@ -0,0 +1,13 @@
    47.4 +<?xml version='1.0' encoding='UTF-8'?>
    47.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    47.6 +	<head>
    47.7 +		<variable name='buffer'/>
    47.8 +	</head>
    47.9 +	<results>
   47.10 +		<result>
   47.11 +			<binding name='buffer'>
   47.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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>
   47.13 +			</binding>
   47.14 +		</result>
   47.15 +	</results>
   47.16 +</sparql>

    48.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    48.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq	Wed Jul 17 11:04:22 2013 +0300
    48.3 @@ -0,0 +1,6 @@
    48.4 +select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buffer)
    48.5 +where
    48.6 +{
    48.7 +	ex:A ex:hasGeometry ?g1 .
    48.8 +	ex:B ex:hasGeometry ?g2 .
    48.9 +}
   48.10 \ No newline at end of file

    49.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    49.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx	Wed Jul 17 11:04:22 2013 +0300
    49.3 @@ -0,0 +1,13 @@
    49.4 +<?xml version='1.0' encoding='UTF-8'?>
    49.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    49.6 +	<head>
    49.7 +		<variable name='buffer'/>
    49.8 +	</head>
    49.9 +	<results>
   49.10 +		<result>
   49.11 +			<binding name='buffer'>
   49.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal>
   49.13 +			</binding>
   49.14 +		</result>
   49.15 +	</results>
   49.16 +</sparql>

    50.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    50.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq	Wed Jul 17 11:04:22 2013 +0300
    50.3 @@ -0,0 +1,6 @@
    50.4 +select ?g
    50.5 +where
    50.6 +{
    50.7 +	ex:A ex:hasGeometry ?g.
    50.8 +	FILTER(strdf:within(?g, strdf:buffer(?g, 30, ogc:metre)))
    50.9 +}
   50.10 \ No newline at end of file

    51.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    51.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx	Wed Jul 17 11:04:22 2013 +0300
    51.3 @@ -0,0 +1,13 @@
    51.4 +<?xml version='1.0' encoding='UTF-8'?>
    51.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    51.6 +	<head>
    51.7 +		<variable name='g'/>
    51.8 +	</head>
    51.9 +	<results>
   51.10 +		<result>
   51.11 +			<binding name='g'>
   51.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))</literal>
   51.13 +			</binding>
   51.14 +		</result>
   51.15 +	</results>
   51.16 +</sparql>

    52.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    52.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq	Wed Jul 17 11:04:22 2013 +0300
    52.3 @@ -0,0 +1,5 @@
    52.4 +select (strdf:buffer(?g, 1, ogc:metre) as ?buffer)
    52.5 +where
    52.6 +{
    52.7 +ex:A ex:hasGeometry ?g.
    52.8 +}
    52.9 \ No newline at end of file

    53.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    53.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx	Wed Jul 17 11:04:22 2013 +0300
    53.3 @@ -0,0 +1,13 @@
    53.4 +<?xml version='1.0' encoding='UTF-8'?>
    53.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    53.6 +	<head>
    53.7 +		<variable name='buffer'/>
    53.8 +	</head>
    53.9 +	<results>
   53.10 +		<result>
   53.11 +			<binding name='buffer'>
   53.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-0.0000089742421724 0.0000000041320001, -0.0000089756042497 0.9999999958676328, -0.0000088038727715 1.000001758887806, -0.0000082936785241 1.000003454288746, -0.0000074646355678 1.0000050168919496, -0.0000063486158786 1.0000063866242281, -0.0000049885240509 1.0000075108271815, -0.0000034366478647 1.0000083462816112, -0.0000017526481133 1.0000088608690552, -0.0000000012649917 1.0000090348065567, 1.000000001382874 1.0000090417390572, 1.000001753270632 1.0000088678363337, 1.0000034378207576 1.000008353345387, 1.0000049903344987 1.0000075180263417, 1.0000063511842439 1.0000063939614114, 1.000007468103648 1.0000050243227139, 1.00000829819503 1.0000034617141529, 1.0000088095769561 1.0000017661510532, 1.000008982608709 1.0000000027551426, 1.0000089812481228 -0.0000000027553523, 1.0000088082090899 -0.0000017663254316, 1.0000082968068948 -0.0000034620428641, 1.0000074666868386 -0.0000050247673794, 1.0000063497376341 -0.0000063944675745, 1.0000049888664135 -0.0000075185269942, 1.0000034363504715 -0.0000083537653708, 1.0000017518290543 -0.0000088680973752, 1.0000000000123404 -0.0000090417651615, 0.0000000001052692 -0.0000090348310455, -0.000001751206439 -0.0000088611285075, -0.000003435177146 -0.0000083467000897, -0.0000049870552338 -0.0000075113264655, -0.0000063471682793 -0.0000063871292121, -0.0000074632175604 -0.0000050173356793, -0.0000082922890308 -0.0000034546168228, -0.0000088025034469 -0.0000017590619133, -0.0000089742421724 0.0000000041320001))</literal>
   53.13 +			</binding>
   53.14 +		</result>
   53.15 +	</results>
   53.16 +</sparql>

    54.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    54.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.rq	Wed Jul 17 11:04:22 2013 +0300
    54.3 @@ -0,0 +1,5 @@
    54.4 +select (strdf:convexHull(?g) as ?convexHull)
    54.5 +where
    54.6 +{
    54.7 +ex:A ex:hasGeometry ?g.
    54.8 +}
    54.9 \ No newline at end of file

    55.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    55.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx	Wed Jul 17 11:04:22 2013 +0300
    55.3 @@ -0,0 +1,13 @@
    55.4 +<?xml version='1.0' encoding='UTF-8'?>
    55.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    55.6 +	<head>
    55.7 +		<variable name='convexHull'/>
    55.8 +	</head>
    55.9 +	<results>
   55.10 +		<result>
   55.11 +			<binding name='convexHull'>
   55.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal>
   55.13 +			</binding>
   55.14 +		</result>
   55.15 +	</results>
   55.16 +</sparql>

    56.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    56.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.rq	Wed Jul 17 11:04:22 2013 +0300
    56.3 @@ -0,0 +1,6 @@
    56.4 +select (strdf:difference(?g1, ?g2) as ?difference)
    56.5 +where
    56.6 +{
    56.7 +ex:B ex:hasGeometry ?g1.
    56.8 +ex:A ex:hasGeometry ?g2.
    56.9 +}
   56.10 \ No newline at end of file

    57.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    57.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx	Wed Jul 17 11:04:22 2013 +0300
    57.3 @@ -0,0 +1,13 @@
    57.4 +<?xml version='1.0' encoding='UTF-8'?>
    57.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    57.6 +	<head>
    57.7 +		<variable name='difference'/>
    57.8 +	</head>
    57.9 +	<results>
   57.10 +		<result>
   57.11 +			<binding name='difference'>
   57.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 1, 0 2, 2 2, 2 0, 1 0, 1 1, 0 1))</literal>
   57.13 +			</binding>
   57.14 +		</result>
   57.15 +	</results>
   57.16 +</sparql>

    58.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    58.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.rq	Wed Jul 17 11:04:22 2013 +0300
    58.3 @@ -0,0 +1,5 @@
    58.4 +select (strdf:envelope(?g) as ?envelope)
    58.5 +where
    58.6 +{
    58.7 +ex:A ex:hasGeometry ?g.
    58.8 +}
    58.9 \ No newline at end of file

    59.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    59.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx	Wed Jul 17 11:04:22 2013 +0300
    59.3 @@ -0,0 +1,13 @@
    59.4 +<?xml version='1.0' encoding='UTF-8'?>
    59.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    59.6 +	<head>
    59.7 +		<variable name='envelope'/>
    59.8 +	</head>
    59.9 +	<results>
   59.10 +		<result>
   59.11 +			<binding name='envelope'>
   59.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal>
   59.13 +			</binding>
   59.14 +		</result>
   59.15 +	</results>
   59.16 +</sparql>

    60.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    60.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.rq	Wed Jul 17 11:04:22 2013 +0300
    60.3 @@ -0,0 +1,7 @@
    60.4 +select (strdf:intersection(?g1, ?g2) as ?intersection)
    60.5 +where
    60.6 +{
    60.7 +ex:A ex:hasGeometry ?g1.
    60.8 +ex:C ex:hasGeometry ?g2.
    60.9 +
   60.10 +}
   60.11 \ No newline at end of file

    61.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    61.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx	Wed Jul 17 11:04:22 2013 +0300
    61.3 @@ -0,0 +1,13 @@
    61.4 +<?xml version='1.0' encoding='UTF-8'?>
    61.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    61.6 +	<head>
    61.7 +		<variable name='intersection'/>
    61.8 +	</head>
    61.9 +	<results>
   61.10 +		<result>
   61.11 +			<binding name='intersection'>
   61.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1)</literal>
   61.13 +			</binding>
   61.14 +		</result>
   61.15 +	</results>
   61.16 +</sparql>

    62.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    62.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.rq	Wed Jul 17 11:04:22 2013 +0300
    62.3 @@ -0,0 +1,6 @@
    62.4 +select (strdf:intersection(?g1, ?g2) as ?intersection)
    62.5 +where
    62.6 +{
    62.7 +ex:A ex:hasGeometry ?g1.
    62.8 +ex:D ex:hasGeometry ?g2.
    62.9 +}
   62.10 \ No newline at end of file

    63.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    63.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx	Wed Jul 17 11:04:22 2013 +0300
    63.3 @@ -0,0 +1,13 @@
    63.4 +<?xml version='1.0' encoding='UTF-8'?>
    63.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    63.6 +	<head>
    63.7 +		<variable name='intersection'/>
    63.8 +	</head>
    63.9 +	<results>
   63.10 +		<result>
   63.11 +			<binding name='intersection'>
   63.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION EMPTY</literal>
   63.13 +			</binding>
   63.14 +		</result>
   63.15 +	</results>
   63.16 +</sparql>

    64.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    64.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SpatialAnalysisFunctionsTest.nt	Wed Jul 17 11:04:22 2013 +0300
    64.3 @@ -0,0 +1,8 @@
    64.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    64.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    64.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    64.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    64.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
    64.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
   64.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
   64.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.

    65.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    65.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.rq	Wed Jul 17 11:04:22 2013 +0300
    65.3 @@ -0,0 +1,6 @@
    65.4 +select (strdf:symDifference(?g1, ?g2) as ?symDifference)
    65.5 +where
    65.6 +{
    65.7 +ex:B ex:hasGeometry ?g1.
    65.8 +ex:C ex:hasGeometry ?g2.
    65.9 +}
   65.10 \ No newline at end of file

    66.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    66.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx	Wed Jul 17 11:04:22 2013 +0300
    66.3 @@ -0,0 +1,13 @@
    66.4 +<?xml version='1.0' encoding='UTF-8'?>
    66.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    66.6 +	<head>
    66.7 +		<variable name='symDifference'/>
    66.8 +	</head>
    66.9 +	<results>
   66.10 +		<result>
   66.11 +			<binding name='symDifference'>
   66.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((2 1, 2 0, 0 0, 0 2, 1 2, 1 1, 2 1)), ((2 1, 2 2, 3 2, 3 1, 2 1)))</literal>
   66.13 +			</binding>
   66.14 +		</result>
   66.15 +	</results>
   66.16 +</sparql>

    67.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    67.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.rq	Wed Jul 17 11:04:22 2013 +0300
    67.3 @@ -0,0 +1,6 @@
    67.4 +select (strdf:union(?g1, ?g2) as ?union)
    67.5 +where
    67.6 +{
    67.7 +ex:A ex:hasGeometry ?g1.
    67.8 +ex:C ex:hasGeometry ?g2.
    67.9 +}
   67.10 \ No newline at end of file

    68.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    68.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx	Wed Jul 17 11:04:22 2013 +0300
    68.3 @@ -0,0 +1,13 @@
    68.4 +<?xml version='1.0' encoding='UTF-8'?>
    68.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    68.6 +	<head>
    68.7 +		<variable name='union'/>
    68.8 +	</head>
    68.9 +	<results>
   68.10 +		<result>
   68.11 +			<binding name='union'>
   68.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((1 1, 1 0, 0 0, 0 1, 1 1)), ((1 1, 1 2, 3 2, 3 1, 1 1)))</literal>
   68.13 +			</binding>
   68.14 +		</result>
   68.15 +	</results>
   68.16 +</sparql>

    69.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq	Tue Jul 16 19:48:37 2013 +0300
    69.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    69.3 @@ -1,6 +0,0 @@
    69.4 -select (strdf:union(?g) as ?union)
    69.5 -where
    69.6 -{
    69.7 -	?x <http://example.org/ontology/hasGeometry> ?g .
    69.8 -	?x rdf:type <http://example.org/ontology/b> .
    69.9 -}
   69.10 \ No newline at end of file

    70.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx	Tue Jul 16 19:48:37 2013 +0300
    70.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    70.3 @@ -1,13 +0,0 @@
    70.4 -<?xml version='1.0' encoding='UTF-8'?>
    70.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    70.6 -	<head>
    70.7 -		<variable name='union'/>
    70.8 -	</head>
    70.9 -	<results>
   70.10 -		<result>
   70.11 -			<binding name='union'>
   70.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), ((34.8 19.37, 34.8 29.64, 41.74 29.64, 41.74 19.37, 34.8 19.37)));http://www.opengis.net/def/crs/EPSG/0/4326</literal>
   70.13 -			</binding>
   70.14 -		</result>
   70.15 -	</results>
   70.16 -</sparql>
   70.17 \ No newline at end of file

    71.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq	Tue Jul 16 19:48:37 2013 +0300
    71.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    71.3 @@ -1,7 +0,0 @@
    71.4 -select (strdf:union(?g) as ?union)
    71.5 -where
    71.6 -{
    71.7 -	?x <http://example.org/ontology/hasGeometry> ?g .
    71.8 -	?x rdf:type <http://example.org/ontology/b> .
    71.9 -}
   71.10 -group by ?x
   71.11 \ No newline at end of file

    72.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx	Tue Jul 16 19:48:37 2013 +0300
    72.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    72.3 @@ -1,19 +0,0 @@
    72.4 -<?xml version='1.0' encoding='UTF-8'?>
    72.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    72.6 -	<head>
    72.7 -		<variable name='union'/>
    72.8 -	</head>
    72.9 -	<results>
   72.10 -		<result>
   72.11 -			<binding name='union'>
   72.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2));http://www.opengis.net/def/crs/EPSG/0/4326</literal>
   72.13 -			</binding>
   72.14 -		</result>
   72.15 -		<result>
   72.16 -			<binding name='union'>
   72.17 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37));http://www.opengis.net/def/crs/EPSG/0/4326</literal>
   72.18 -			</binding>
   72.19 -		</result>
   72.20 -	</results>
   72.21 -</sparql>
   72.22 -

    73.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt	Tue Jul 16 19:48:37 2013 +0300
    73.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    73.3 @@ -1,8 +0,0 @@
    73.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    73.5 -<http://example.org/id/Point/5531> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> .
    73.6 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    73.7 -<http://example.org/id/Point/5532> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> .
    73.8 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> .
    73.9 -<http://example.org/id/Point/5533> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> .
   73.10 -<http://example.org/id/Point/5534> <http://example.org/ontology/hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37))"^^<http://strdf.di.uoa.gr/ontology#WKT> .
   73.11 -<http://example.org/id/Point/5534> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> .

    74.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.rq	Tue Jul 16 19:48:37 2013 +0300
    74.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    74.3 @@ -1,7 +0,0 @@
    74.4 -select (strdf:union(?g1, ?g2) as ?union)
    74.5 -where
    74.6 -{
    74.7 -	?x <http://example.org/ontology/hasGeometry> ?g1 .
    74.8 -	?y <http://example.org/ontology/hasGeometry> ?g2 .
    74.9 -	FILTER(?x != ?y)
   74.10 -}
   74.11 \ No newline at end of file

    75.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.srx	Tue Jul 16 19:48:37 2013 +0300
    75.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    75.3 @@ -1,68 +0,0 @@
    75.4 -<?xml version='1.0' encoding='UTF-8'?>
    75.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
    75.6 -	<head>
    75.7 -		<variable name='union'/>
    75.8 -	</head>
    75.9 -	<results>
   75.10 -		<result>
   75.11 -			<binding name='union'>
   75.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
   75.13 -			</binding>
   75.14 -		</result>
   75.15 -		<result>
   75.16 -			<binding name='union'>
   75.17 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047))</literal>
   75.18 -			</binding>
   75.19 -		</result>
   75.20 -		<result>
   75.21 -			<binding name='union'>
   75.22 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
   75.23 -			</binding>
   75.24 -		</result>
   75.25 -		<result>
   75.26 -			<binding name='union'>
   75.27 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (23.6423757 37.9521198))</literal>
   75.28 -			</binding>
   75.29 -		</result>
   75.30 -		<result>
   75.31 -			<binding name='union'>
   75.32 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (21.841968 38.045047))</literal>
   75.33 -			</binding>
   75.34 -		</result>
   75.35 -		<result>
   75.36 -			<binding name='union'>
   75.37 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
   75.38 -			</binding>
   75.39 -		</result>
   75.40 -		<result>
   75.41 -			<binding name='union'>
   75.42 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198))</literal>
   75.43 -			</binding>
   75.44 -		</result>
   75.45 -		<result>
   75.46 -			<binding name='union'>
   75.47 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
   75.48 -			</binding>
   75.49 -		</result>
   75.50 -		<result>
   75.51 -			<binding name='union'>
   75.52 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
   75.53 -			</binding>
   75.54 -		</result>
   75.55 -		<result>
   75.56 -			<binding name='union'>
   75.57 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (23.6423757 37.9521198))</literal>
   75.58 -			</binding>
   75.59 -		</result>
   75.60 -		<result>
   75.61 -			<binding name='union'>
   75.62 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
   75.63 -			</binding>
   75.64 -		</result>
   75.65 -		<result>
   75.66 -			<binding name='union'>
   75.67 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (21.841968 38.045047))</literal>
   75.68 -			</binding>
   75.69 -		</result>
   75.70 -	</results>
   75.71 -</sparql>
   75.72 \ No newline at end of file