Strabon
changeset 1217:f4bec2b78f1f
Added stSPARQL's Spatial Analysis Functions Tests.
line diff
1.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java Tue Jul 16 14:39:06 2013 +0300 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,20 +0,0 @@ 1.4 -/** 1.5 - * This Source Code Form is subject to the terms of the Mozilla Public 1.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 1.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 1.8 - * 1.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 1.10 - * 1.11 - * http://www.strabon.di.uoa.gr/ 1.12 - */ 1.13 -package eu.earthobservatory.testsuite.stSPARQL; 1.14 - 1.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 1.16 - 1.17 -/** 1.18 - * A test for the strdf:union function. 1.19 - * 1.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr 1.21 - */ 1.22 - 1.23 -public class UnionTest extends TemplateTest {}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.rq Tue Jul 16 18:32:54 2013 +0300 2.3 @@ -0,0 +1,5 @@ 2.4 +select (strdf:boundary(?g) as ?boundary) 2.5 +where 2.6 +{ 2.7 +ex:A ex:hasGeometry ?g. 2.8 +} 2.9 \ No newline at end of file
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.srx Tue Jul 16 18:32:54 2013 +0300 3.3 @@ -0,0 +1,13 @@ 3.4 +<?xml version='1.0' encoding='UTF-8'?> 3.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 3.6 + <head> 3.7 + <variable name='boundary'/> 3.8 + </head> 3.9 + <results> 3.10 + <result> 3.11 + <binding name='boundary'> 3.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)</literal> 3.13 + </binding> 3.14 + </result> 3.15 + </results> 3.16 +</sparql>
4.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq Tue Jul 16 14:39:06 2013 +0300 4.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq Tue Jul 16 18:32:54 2013 +0300 4.3 @@ -1,4 +1,4 @@ 4.4 -select (strdf:isEmpty(strdf:buffer(?g, 1, ogc:degree)) as ?empty) 4.5 +select (strdf:buffer(?g, 1, ogc:degree) as ?buffer) 4.6 where 4.7 { 4.8 ex:A ex:hasGeometry ?g.
5.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Tue Jul 16 14:39:06 2013 +0300 5.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Tue Jul 16 18:32:54 2013 +0300 5.3 @@ -1,13 +1,13 @@ 5.4 -<?xml version='1.0' encoding='UTF-8'?> 5.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 5.6 - <head> 5.7 - <variable name='empty'/> 5.8 - </head> 5.9 - <results> 5.10 - <result> 5.11 - <binding name='empty'> 5.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 5.13 - </binding> 5.14 - </result> 5.15 - </results> 5.16 -</sparql> 5.17 \ No newline at end of file 5.18 +<?xml version='1.0' encoding='UTF-8'?> 5.19 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 5.20 + <head> 5.21 + <variable name='buffer'/> 5.22 + </head> 5.23 + <results> 5.24 + <result> 5.25 + <binding name='buffer'> 5.26 + <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> 5.27 + </binding> 5.28 + </result> 5.29 + </results> 5.30 +</sparql>
6.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq Tue Jul 16 14:39:06 2013 +0300 6.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq Tue Jul 16 18:32:54 2013 +0300 6.3 @@ -1,4 +1,4 @@ 6.4 -select (strdf:isEmpty(strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree)) as ?empty) 6.5 +select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buffer) 6.6 where 6.7 { 6.8 ex:A ex:hasGeometry ?g1 .
7.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Jul 16 14:39:06 2013 +0300 7.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Jul 16 18:32:54 2013 +0300 7.3 @@ -1,13 +1,13 @@ 7.4 -<?xml version='1.0' encoding='UTF-8'?> 7.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 7.6 - <head> 7.7 - <variable name='empty'/> 7.8 - </head> 7.9 - <results> 7.10 - <result> 7.11 - <binding name='empty'> 7.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 7.13 - </binding> 7.14 - </result> 7.15 - </results> 7.16 -</sparql> 7.17 \ No newline at end of file 7.18 +<?xml version='1.0' encoding='UTF-8'?> 7.19 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 7.20 + <head> 7.21 + <variable name='buffer'/> 7.22 + </head> 7.23 + <results> 7.24 + <result> 7.25 + <binding name='buffer'> 7.26 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 7.27 + </binding> 7.28 + </result> 7.29 + </results> 7.30 +</sparql>
8.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq Tue Jul 16 14:39:06 2013 +0300 8.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq Tue Jul 16 18:32:54 2013 +0300 8.3 @@ -1,4 +1,4 @@ 8.4 -select (strdf:isEmpty(?g) as ?empty) 8.5 +select ?g 8.6 where 8.7 { 8.8 ex:A ex:hasGeometry ?g.
9.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Jul 16 14:39:06 2013 +0300 9.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Jul 16 18:32:54 2013 +0300 9.3 @@ -1,13 +1,13 @@ 9.4 -<?xml version='1.0' encoding='UTF-8'?> 9.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 9.6 - <head> 9.7 - <variable name='empty'/> 9.8 - </head> 9.9 - <results> 9.10 - <result> 9.11 - <binding name='empty'> 9.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 9.13 - </binding> 9.14 - </result> 9.15 - </results> 9.16 -</sparql> 9.17 \ No newline at end of file 9.18 +<?xml version='1.0' encoding='UTF-8'?> 9.19 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 9.20 + <head> 9.21 + <variable name='g'/> 9.22 + </head> 9.23 + <results> 9.24 + <result> 9.25 + <binding name='g'> 9.26 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))</literal> 9.27 + </binding> 9.28 + </result> 9.29 + </results> 9.30 +</sparql>
10.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq Tue Jul 16 14:39:06 2013 +0300 10.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq Tue Jul 16 18:32:54 2013 +0300 10.3 @@ -1,4 +1,4 @@ 10.4 -select (strdf:isEmpty(strdf:buffer(?g, 1, ogc:metre)) as ?empty) 10.5 +select (strdf:buffer(?g, 1, ogc:metre) as ?buffer) 10.6 where 10.7 { 10.8 ex:A ex:hasGeometry ?g.
11.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Jul 16 14:39:06 2013 +0300 11.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Jul 16 18:32:54 2013 +0300 11.3 @@ -1,13 +1,13 @@ 11.4 -<?xml version='1.0' encoding='UTF-8'?> 11.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 11.6 - <head> 11.7 - <variable name='empty'/> 11.8 - </head> 11.9 - <results> 11.10 - <result> 11.11 - <binding name='empty'> 11.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 11.13 - </binding> 11.14 - </result> 11.15 - </results> 11.16 -</sparql> 11.17 \ No newline at end of file 11.18 +<?xml version='1.0' encoding='UTF-8'?> 11.19 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 11.20 + <head> 11.21 + <variable name='buffer'/> 11.22 + </head> 11.23 + <results> 11.24 + <result> 11.25 + <binding name='buffer'> 11.26 + <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> 11.27 + </binding> 11.28 + </result> 11.29 + </results> 11.30 +</sparql>
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.rq Tue Jul 16 18:32:54 2013 +0300 12.3 @@ -0,0 +1,5 @@ 12.4 +select (strdf:convexHull(?g) as ?convexHull) 12.5 +where 12.6 +{ 12.7 +ex:A ex:hasGeometry ?g. 12.8 +} 12.9 \ No newline at end of file
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Tue Jul 16 18:32:54 2013 +0300 13.3 @@ -0,0 +1,13 @@ 13.4 +<?xml version='1.0' encoding='UTF-8'?> 13.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 13.6 + <head> 13.7 + <variable name='convexHull'/> 13.8 + </head> 13.9 + <results> 13.10 + <result> 13.11 + <binding name='convexHull'> 13.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 13.13 + </binding> 13.14 + </result> 13.15 + </results> 13.16 +</sparql>
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.rq Tue Jul 16 18:32:54 2013 +0300 14.3 @@ -0,0 +1,6 @@ 14.4 +select (strdf:difference(?g1, ?g2) as ?difference) 14.5 +where 14.6 +{ 14.7 +ex:B ex:hasGeometry ?g1. 14.8 +ex:A ex:hasGeometry ?g2. 14.9 +} 14.10 \ No newline at end of file
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Tue Jul 16 18:32:54 2013 +0300 15.3 @@ -0,0 +1,13 @@ 15.4 +<?xml version='1.0' encoding='UTF-8'?> 15.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 15.6 + <head> 15.7 + <variable name='difference'/> 15.8 + </head> 15.9 + <results> 15.10 + <result> 15.11 + <binding name='difference'> 15.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> 15.13 + </binding> 15.14 + </result> 15.15 + </results> 15.16 +</sparql>
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.rq Tue Jul 16 18:32:54 2013 +0300 16.3 @@ -0,0 +1,5 @@ 16.4 +select (strdf:envelope(?g) as ?envelope) 16.5 +where 16.6 +{ 16.7 +ex:A ex:hasGeometry ?g. 16.8 +} 16.9 \ No newline at end of file
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx Tue Jul 16 18:32:54 2013 +0300 17.3 @@ -0,0 +1,13 @@ 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='envelope'/> 17.8 + </head> 17.9 + <results> 17.10 + <result> 17.11 + <binding name='envelope'> 17.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 17.13 + </binding> 17.14 + </result> 17.15 + </results> 17.16 +</sparql>
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.rq Tue Jul 16 18:32:54 2013 +0300 18.3 @@ -0,0 +1,7 @@ 18.4 +select (strdf:intersection(?g1, ?g2) as ?intersection) 18.5 +where 18.6 +{ 18.7 +ex:A ex:hasGeometry ?g1. 18.8 +ex:C ex:hasGeometry ?g2. 18.9 + 18.10 +} 18.11 \ No newline at end of file
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Tue Jul 16 18:32:54 2013 +0300 19.3 @@ -0,0 +1,13 @@ 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='intersection'/> 19.8 + </head> 19.9 + <results> 19.10 + <result> 19.11 + <binding name='intersection'> 19.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1)</literal> 19.13 + </binding> 19.14 + </result> 19.15 + </results> 19.16 +</sparql>
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.rq Tue Jul 16 18:32:54 2013 +0300 20.3 @@ -0,0 +1,6 @@ 20.4 +select (strdf:intersection(?g1, ?g2) as ?intersection) 20.5 +where 20.6 +{ 20.7 +ex:A ex:hasGeometry ?g1. 20.8 +ex:D ex:hasGeometry ?g2. 20.9 +} 20.10 \ No newline at end of file
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx Tue Jul 16 18:32:54 2013 +0300 21.3 @@ -0,0 +1,13 @@ 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='intersection'/> 21.8 + </head> 21.9 + <results> 21.10 + <result> 21.11 + <binding name='intersection'> 21.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION EMPTY</literal> 21.13 + </binding> 21.14 + </result> 21.15 + </results> 21.16 +</sparql>
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.rq Tue Jul 16 18:32:54 2013 +0300 22.3 @@ -0,0 +1,6 @@ 22.4 +select (strdf:symDifference(?g1, ?g2) as ?symDifference) 22.5 +where 22.6 +{ 22.7 +ex:B ex:hasGeometry ?g1. 22.8 +ex:C ex:hasGeometry ?g2. 22.9 +} 22.10 \ No newline at end of file
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx Tue Jul 16 18:32:54 2013 +0300 23.3 @@ -0,0 +1,13 @@ 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='symDifference'/> 23.8 + </head> 23.9 + <results> 23.10 + <result> 23.11 + <binding name='symDifference'> 23.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> 23.13 + </binding> 23.14 + </result> 23.15 + </results> 23.16 +</sparql>
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.rq Tue Jul 16 18:32:54 2013 +0300 24.3 @@ -0,0 +1,6 @@ 24.4 +select (strdf:union(?g1, ?g2) as ?union) 24.5 +where 24.6 +{ 24.7 +ex:A ex:hasGeometry ?g1. 24.8 +ex:C ex:hasGeometry ?g2. 24.9 +} 24.10 \ No newline at end of file
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Tue Jul 16 18:32:54 2013 +0300 25.3 @@ -0,0 +1,13 @@ 25.4 +<?xml version='1.0' encoding='UTF-8'?> 25.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 25.6 + <head> 25.7 + <variable name='union'/> 25.8 + </head> 25.9 + <results> 25.10 + <result> 25.11 + <binding name='union'> 25.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> 25.13 + </binding> 25.14 + </result> 25.15 + </results> 25.16 +</sparql>
26.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq Tue Jul 16 14:39:06 2013 +0300 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,6 +0,0 @@ 26.4 -select (strdf:union(?g) as ?union) 26.5 -where 26.6 -{ 26.7 - ?x <http://example.org/ontology/hasGeometry> ?g . 26.8 - ?x rdf:type <http://example.org/ontology/b> . 26.9 -} 26.10 \ No newline at end of file
27.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx Tue Jul 16 14:39:06 2013 +0300 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,13 +0,0 @@ 27.4 -<?xml version='1.0' encoding='UTF-8'?> 27.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 27.6 - <head> 27.7 - <variable name='union'/> 27.8 - </head> 27.9 - <results> 27.10 - <result> 27.11 - <binding name='union'> 27.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> 27.13 - </binding> 27.14 - </result> 27.15 - </results> 27.16 -</sparql> 27.17 \ No newline at end of file
28.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq Tue Jul 16 14:39:06 2013 +0300 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,7 +0,0 @@ 28.4 -select (strdf:union(?g) as ?union) 28.5 -where 28.6 -{ 28.7 - ?x <http://example.org/ontology/hasGeometry> ?g . 28.8 - ?x rdf:type <http://example.org/ontology/b> . 28.9 -} 28.10 -group by ?x 28.11 \ No newline at end of file
29.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx Tue Jul 16 14:39:06 2013 +0300 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,19 +0,0 @@ 29.4 -<?xml version='1.0' encoding='UTF-8'?> 29.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 29.6 - <head> 29.7 - <variable name='union'/> 29.8 - </head> 29.9 - <results> 29.10 - <result> 29.11 - <binding name='union'> 29.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> 29.13 - </binding> 29.14 - </result> 29.15 - <result> 29.16 - <binding name='union'> 29.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> 29.18 - </binding> 29.19 - </result> 29.20 - </results> 29.21 -</sparql> 29.22 -
30.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt Tue Jul 16 14:39:06 2013 +0300 30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 30.3 @@ -1,8 +0,0 @@ 30.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 30.5 -<http://example.org/id/Point/5531> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> . 30.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> . 30.7 -<http://example.org/id/Point/5532> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> . 30.8 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 30.9 -<http://example.org/id/Point/5533> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> . 30.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> . 30.11 -<http://example.org/id/Point/5534> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> .
31.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.rq Tue Jul 16 14:39:06 2013 +0300 31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 31.3 @@ -1,7 +0,0 @@ 31.4 -select (strdf:union(?g1, ?g2) as ?union) 31.5 -where 31.6 -{ 31.7 - ?x <http://example.org/ontology/hasGeometry> ?g1 . 31.8 - ?y <http://example.org/ontology/hasGeometry> ?g2 . 31.9 - FILTER(?x != ?y) 31.10 -} 31.11 \ No newline at end of file
32.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.srx Tue Jul 16 14:39:06 2013 +0300 32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 32.3 @@ -1,68 +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='union'/> 32.8 - </head> 32.9 - <results> 32.10 - <result> 32.11 - <binding name='union'> 32.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> 32.13 - </binding> 32.14 - </result> 32.15 - <result> 32.16 - <binding name='union'> 32.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047))</literal> 32.18 - </binding> 32.19 - </result> 32.20 - <result> 32.21 - <binding name='union'> 32.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> 32.23 - </binding> 32.24 - </result> 32.25 - <result> 32.26 - <binding name='union'> 32.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> 32.28 - </binding> 32.29 - </result> 32.30 - <result> 32.31 - <binding name='union'> 32.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> 32.33 - </binding> 32.34 - </result> 32.35 - <result> 32.36 - <binding name='union'> 32.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> 32.38 - </binding> 32.39 - </result> 32.40 - <result> 32.41 - <binding name='union'> 32.42 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198))</literal> 32.43 - </binding> 32.44 - </result> 32.45 - <result> 32.46 - <binding name='union'> 32.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> 32.48 - </binding> 32.49 - </result> 32.50 - <result> 32.51 - <binding name='union'> 32.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> 32.53 - </binding> 32.54 - </result> 32.55 - <result> 32.56 - <binding name='union'> 32.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> 32.58 - </binding> 32.59 - </result> 32.60 - <result> 32.61 - <binding name='union'> 32.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> 32.63 - </binding> 32.64 - </result> 32.65 - <result> 32.66 - <binding name='union'> 32.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> 32.68 - </binding> 32.69 - </result> 32.70 - </results> 32.71 -</sparql> 32.72 \ 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/untested/UnionUnaryTest.rq Tue Jul 16 18:32:54 2013 +0300 33.3 @@ -0,0 +1,6 @@ 33.4 +select (strdf:union(?g) as ?union) 33.5 +where 33.6 +{ 33.7 +?x ex:hasGeometry ?g. 33.8 +FILTER(?x=ex:A || ?x=ex:B) 33.9 +} 33.10 \ 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/untested/UnionUnaryTest.srx Tue Jul 16 18:32:54 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='union'/> 34.8 + </head> 34.9 + <results> 34.10 + <result> 34.11 + <binding name='union'> 34.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> 34.13 + </binding> 34.14 + </result> 34.15 + </results> 34.16 +</sparql>