Strabon
changeset 1254:cc00626f90b3
merge
author | Konstantina Bereta <Konstantina.Bereta@di.uoa.gr> |
---|---|
date | Fri Aug 02 18:10:49 2013 +0300 (2013-08-02) |
parents | 596e8d1f9d98 b0b702ec95b4 |
children | f116234d150c |
files |
line diff
1.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Fri Aug 02 18:10:16 2013 +0300 1.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Fri Aug 02 18:10:49 2013 +0300 1.3 @@ -111,7 +111,7 @@ 1.4 1.5 1.6 public String stringValue() { 1.7 - return new String(this.polyhedronStringRep); 1.8 + return new String(this.polyhedronStringRep)+";http://www.opengis.net/def/crs/EPSG/0/"+this.getPolyhedron().getGeometry().getSRID(); 1.9 } 1.10 1.11 @Override
2.1 --- a/resultio-spatial/text/src/main/java/org/openrdf/query/resultio/text/stSPARQLResultsTSVWriter.java Fri Aug 02 18:10:16 2013 +0300 2.2 +++ b/resultio-spatial/text/src/main/java/org/openrdf/query/resultio/text/stSPARQLResultsTSVWriter.java Fri Aug 02 18:10:49 2013 +0300 2.3 @@ -33,7 +33,7 @@ 2.4 // catch the spatial case and create a new literal 2.5 // constructing a new literal is the only way if we want to reuse the {@link #writeValue(Value)} method 2.6 GeneralDBPolyhedron dbpolyhedron = (GeneralDBPolyhedron) val; 2.7 - val = new LiteralImpl(dbpolyhedron.getPolyhedronStringRep(), dbpolyhedron.getDatatype()); 2.8 + val = new LiteralImpl(dbpolyhedron.getPolyhedronStringRep()+";http://www.opengis.net/def/crs/EPSG/0/"+dbpolyhedron.getPolyhedron().getGeometry().getSRID(), dbpolyhedron.getDatatype()); 2.9 } 2.10 2.11 // write value
3.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.srx Fri Aug 02 18:10:16 2013 +0300 3.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.srx Fri Aug 02 18:10:49 2013 +0300 3.3 @@ -6,7 +6,7 @@ 3.4 <results> 3.5 <result> 3.6 <binding name='boundary'> 3.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)</literal> 3.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0);http://www.opengis.net/def/crs/EPSG/0/4326</literal> 3.9 </binding> 3.10 </result> 3.11 </results>
4.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Fri Aug 02 18:10:16 2013 +0300 4.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Fri Aug 02 18:10:49 2013 +0300 4.3 @@ -6,7 +6,7 @@ 4.4 <results> 4.5 <result> 4.6 <binding name='buffer'> 4.7 - <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> 4.8 + <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));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 4.9 </binding> 4.10 </result> 4.11 </results>
5.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Fri Aug 02 18:10:16 2013 +0300 5.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Fri Aug 02 18:10:49 2013 +0300 5.3 @@ -6,7 +6,7 @@ 5.4 <results> 5.5 <result> 5.6 <binding name='buffer'> 5.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 5.8 + <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> 5.9 </binding> 5.10 </result> 5.11 </results>
6.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Fri Aug 02 18:10:16 2013 +0300 6.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Fri Aug 02 18:10:49 2013 +0300 6.3 @@ -6,7 +6,7 @@ 6.4 <results> 6.5 <result> 6.6 <binding name='g'> 6.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))</literal> 6.8 + <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> 6.9 </binding> 6.10 </result> 6.11 </results>
7.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Fri Aug 02 18:10:16 2013 +0300 7.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Fri Aug 02 18:10:49 2013 +0300 7.3 @@ -6,7 +6,7 @@ 7.4 <results> 7.5 <result> 7.6 <binding name='buffer'> 7.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))</literal> 7.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));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 7.9 </binding> 7.10 </result> 7.11 </results>
8.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Fri Aug 02 18:10:16 2013 +0300 8.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Fri Aug 02 18:10:49 2013 +0300 8.3 @@ -6,7 +6,7 @@ 8.4 <results> 8.5 <result> 8.6 <binding name='convexHull'> 8.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 8.8 + <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> 8.9 </binding> 8.10 </result> 8.11 </results>
9.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Fri Aug 02 18:10:16 2013 +0300 9.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Fri Aug 02 18:10:49 2013 +0300 9.3 @@ -6,7 +6,7 @@ 9.4 <results> 9.5 <result> 9.6 <binding name='difference'> 9.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))</literal> 9.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));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 9.9 </binding> 9.10 </result> 9.11 </results>
10.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx Fri Aug 02 18:10:16 2013 +0300 10.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx Fri Aug 02 18:10:49 2013 +0300 10.3 @@ -6,7 +6,7 @@ 10.4 <results> 10.5 <result> 10.6 <binding name='envelope'> 10.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 10.8 + <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> 10.9 </binding> 10.10 </result> 10.11 </results>
11.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Fri Aug 02 18:10:16 2013 +0300 11.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Fri Aug 02 18:10:49 2013 +0300 11.3 @@ -6,7 +6,7 @@ 11.4 <results> 11.5 <result> 11.6 <binding name='intersection'> 11.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1)</literal> 11.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1);http://www.opengis.net/def/crs/EPSG/0/4326</literal> 11.9 </binding> 11.10 </result> 11.11 </results>
12.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx Fri Aug 02 18:10:16 2013 +0300 12.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx Fri Aug 02 18:10:49 2013 +0300 12.3 @@ -6,7 +6,7 @@ 12.4 <results> 12.5 <result> 12.6 <binding name='intersection'> 12.7 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION EMPTY</literal> 12.8 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION EMPTY;http://www.opengis.net/def/crs/EPSG/0/4326</literal> 12.9 </binding> 12.10 </result> 12.11 </results>
13.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx Fri Aug 02 18:10:16 2013 +0300 13.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx Fri Aug 02 18:10:49 2013 +0300 13.3 @@ -6,7 +6,7 @@ 13.4 <results> 13.5 <result> 13.6 <binding name='symDifference'> 13.7 - <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> 13.8 + <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)));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 13.9 </binding> 13.10 </result> 13.11 </results>
14.1 --- a/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Fri Aug 02 18:10:16 2013 +0300 14.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Fri Aug 02 18:10:49 2013 +0300 14.3 @@ -6,7 +6,7 @@ 14.4 <results> 14.5 <result> 14.6 <binding name='union'> 14.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)))</literal> 14.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)));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 14.9 </binding> 14.10 </result> 14.11 </results>