# HG changeset patch # User Panayiotis Smeros # Date 1373988774 -10800 # Node ID f4bec2b78f1f6993a3c1d04b13d1918be9bd848d # Parent 9efe530195958f428dee0ee8934e734b1c8cc008 Added stSPARQL's Spatial Analysis Functions Tests. diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/** - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team - * - * http://www.strabon.di.uoa.gr/ - */ -package eu.earthobservatory.testsuite.stSPARQL; - -import eu.earthobservatory.testsuite.utils.TemplateTest; - -/** - * A test for the strdf:union function. - * - * @author Stella Giannakopoulou + + + + + + + + LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -1,4 +1,4 @@ -select (strdf:isEmpty(strdf:buffer(?g, 1, ogc:degree)) as ?empty) +select (strdf:buffer(?g, 1, ogc:degree) as ?buffer) where { ex:A ex:hasGeometry ?g. diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -1,13 +1,13 @@ - - - - - - - - - false - - - - \ No newline at end of file + + + + + + + + + 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)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -1,4 +1,4 @@ -select (strdf:isEmpty(strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree)) as ?empty) +select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buffer) where { ex:A ex:hasGeometry ?g1 . diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -1,13 +1,13 @@ - - - - - - - - - false - - - - \ No newline at end of file + + + + + + + + + POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -1,4 +1,4 @@ -select (strdf:isEmpty(?g) as ?empty) +select ?g where { ex:A ex:hasGeometry ?g. diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -1,13 +1,13 @@ - - - - - - - - - false - - - - \ No newline at end of file + + + + + + + + + POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -1,4 +1,4 @@ -select (strdf:isEmpty(strdf:buffer(?g, 1, ogc:metre)) as ?empty) +select (strdf:buffer(?g, 1, ogc:metre) as ?buffer) where { ex:A ex:hasGeometry ?g. diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Jul 16 14:39:06 2013 +0300 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -1,13 +1,13 @@ - - - - - - - - - false - - - - \ No newline at end of file + + + + + + + + + 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)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,5 @@ +select (strdf:convexHull(?g) as ?convexHull) +where +{ +ex:A ex:hasGeometry ?g. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,6 @@ +select (strdf:difference(?g1, ?g2) as ?difference) +where +{ +ex:B ex:hasGeometry ?g1. +ex:A ex:hasGeometry ?g2. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + POLYGON ((0 1, 0 2, 2 2, 2 0, 1 0, 1 1, 0 1)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,5 @@ +select (strdf:envelope(?g) as ?envelope) +where +{ +ex:A ex:hasGeometry ?g. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0)) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,7 @@ +select (strdf:intersection(?g1, ?g2) as ?intersection) +where +{ +ex:A ex:hasGeometry ?g1. +ex:C ex:hasGeometry ?g2. + +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + POINT (1 1) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,6 @@ +select (strdf:intersection(?g1, ?g2) as ?intersection) +where +{ +ex:A ex:hasGeometry ?g1. +ex:D ex:hasGeometry ?g2. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + GEOMETRYCOLLECTION EMPTY + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,6 @@ +select (strdf:symDifference(?g1, ?g2) as ?symDifference) +where +{ +ex:B ex:hasGeometry ?g1. +ex:C ex:hasGeometry ?g2. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + 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))) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,6 @@ +select (strdf:union(?g1, ?g2) as ?union) +where +{ +ex:A ex:hasGeometry ?g1. +ex:C ex:hasGeometry ?g2. +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + MULTIPOLYGON (((1 1, 1 0, 0 0, 0 1, 1 1)), ((1 1, 1 2, 3 2, 3 1, 1 1))) + + + + diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -select (strdf:union(?g) as ?union) -where -{ - ?x ?g . - ?x rdf:type . -} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - - - - - - - - - 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 - - - - \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -select (strdf:union(?g) as ?union) -where -{ - ?x ?g . - ?x rdf:type . -} -group by ?x \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ - - - - - - - - - POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2));http://www.opengis.net/def/crs/EPSG/0/4326 - - - - - 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 - - - - - diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - "POINT(23.6423757 37.9521198)"^^ . - . - "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^ . - . - "POINT(21.841968 38.045047)"^^ . - . - "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37))"^^ . - . diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/untested/UnionAsConstructBinary.rq --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.rq Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -select (strdf:union(?g1, ?g2) as ?union) -where -{ - ?x ?g1 . - ?y ?g2 . - FILTER(?x != ?y) -} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/untested/UnionAsConstructBinary.srx --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.srx Tue Jul 16 14:39:06 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ - - - - - - - - - GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2))) - - - - - MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047)) - - - - - 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))) - - - - - GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (23.6423757 37.9521198)) - - - - - GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (21.841968 38.045047)) - - - - - 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))) - - - - - MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198)) - - - - - GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2))) - - - - - 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))) - - - - - 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)) - - - - - 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))) - - - - - 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)) - - - - \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/untested/UnionUnaryTest.rq --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/untested/UnionUnaryTest.rq Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,6 @@ +select (strdf:union(?g) as ?union) +where +{ +?x ex:hasGeometry ?g. +FILTER(?x=ex:A || ?x=ex:B) +} \ No newline at end of file diff -r 9efe53019595 -r f4bec2b78f1f testsuite/src/test/resources/untested/UnionUnaryTest.srx --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testsuite/src/test/resources/untested/UnionUnaryTest.srx Tue Jul 16 18:32:54 2013 +0300 @@ -0,0 +1,13 @@ + + + + + + + + + POLYGON ((1 0, 0 0, 0 1, 0 2, 2 2, 2 0, 1 0));http://www.opengis.net/def/crs/EPSG/0/4326 + + + +