Strabon
changeset 1424:c8cc4daeeafa
corrected tests that were expecting a WKT in 4326 to contain also the URI of the CRS; we do not include this anymore, if the CRS is the default for that datatype
line diff
1.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Sep 23 14:11:32 2014 +0300 1.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Tue Sep 23 14:36:26 2014 +0300 1.3 @@ -6,7 +6,7 @@ 1.4 <results> 1.5 <result> 1.6 <binding name='buffer'> 1.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 1.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 1.9 </binding> 1.10 </result> 1.11 </results>
2.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Sep 23 14:11:32 2014 +0300 2.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Tue Sep 23 14:36:26 2014 +0300 2.3 @@ -6,7 +6,7 @@ 2.4 <results> 2.5 <result> 2.6 <binding name='g'> 2.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 2.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))</literal> 2.9 </binding> 2.10 </result> 2.11 </results>
3.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Sep 23 14:11:32 2014 +0300 3.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Tue Sep 23 14:36:26 2014 +0300 3.3 @@ -6,7 +6,7 @@ 3.4 <results> 3.5 <result> 3.6 <binding name='buffer'> 3.7 - <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));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 3.8 + <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> 3.9 </binding> 3.10 </result> 3.11 </results>
4.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Tue Sep 23 14:11:32 2014 +0300 4.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Tue Sep 23 14:36:26 2014 +0300 4.3 @@ -6,7 +6,7 @@ 4.4 <results> 4.5 <result> 4.6 <binding name='convexHull'> 4.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 4.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 4.9 </binding> 4.10 </result> 4.11 </results>
5.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Tue Sep 23 14:11:32 2014 +0300 5.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Tue Sep 23 14:36:26 2014 +0300 5.3 @@ -6,7 +6,7 @@ 5.4 <results> 5.5 <result> 5.6 <binding name='difference'> 5.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 1, 0 2, 2 2, 2 0, 1 0, 1 1, 0 1));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 5.8 + <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> 5.9 </binding> 5.10 </result> 5.11 </results>
6.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Tue Sep 23 14:11:32 2014 +0300 6.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Tue Sep 23 14:36:26 2014 +0300 6.3 @@ -6,7 +6,7 @@ 6.4 <results> 6.5 <result> 6.6 <binding name='intersection'> 6.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1);http://www.opengis.net/def/crs/EPSG/0/4326</literal> 6.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1)</literal> 6.9 </binding> 6.10 </result> 6.11 </results>
7.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Tue Sep 23 14:11:32 2014 +0300 7.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Tue Sep 23 14:36:26 2014 +0300 7.3 @@ -6,7 +6,7 @@ 7.4 <results> 7.5 <result> 7.6 <binding name='union'> 7.7 - <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)));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 7.8 + <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> 7.9 </binding> 7.10 </result> 7.11 </results>