Strabon
changeset 1110:e4e634998fbd
Added one more polygon for the ntpp test (had to modify some results files).
line diff
1.1 --- a/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhContainsTest.srx Fri Apr 26 21:07:31 2013 +0300 1.2 +++ b/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhContainsTest.srx Fri Apr 26 21:27:26 2013 +0300 1.3 @@ -13,5 +13,13 @@ 1.4 <uri>http://example.org#B</uri> 1.5 </binding> 1.6 </result> 1.7 + <result> 1.8 + <binding name='y'> 1.9 + <uri>http://example.org#H</uri> 1.10 + </binding> 1.11 + <binding name='x'> 1.12 + <uri>http://example.org#C</uri> 1.13 + </binding> 1.14 + </result> 1.15 </results> 1.16 -</sparql> 1.17 \ No newline at end of file 1.18 +</sparql>
2.1 --- a/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhDisjointTest.srx Fri Apr 26 21:07:31 2013 +0300 2.2 +++ b/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhDisjointTest.srx Fri Apr 26 21:27:26 2013 +0300 2.3 @@ -31,6 +31,14 @@ 2.4 </result> 2.5 <result> 2.6 <binding name='y'> 2.7 + <uri>http://example.org#A</uri> 2.8 + </binding> 2.9 + <binding name='x'> 2.10 + <uri>http://example.org#H</uri> 2.11 + </binding> 2.12 + </result> 2.13 + <result> 2.14 + <binding name='y'> 2.15 <uri>http://example.org#B</uri> 2.16 </binding> 2.17 <binding name='x'> 2.18 @@ -55,6 +63,14 @@ 2.19 </result> 2.20 <result> 2.21 <binding name='y'> 2.22 + <uri>http://example.org#B</uri> 2.23 + </binding> 2.24 + <binding name='x'> 2.25 + <uri>http://example.org#H</uri> 2.26 + </binding> 2.27 + </result> 2.28 + <result> 2.29 + <binding name='y'> 2.30 <uri>http://example.org#D</uri> 2.31 </binding> 2.32 <binding name='x'> 2.33 @@ -79,6 +95,14 @@ 2.34 </result> 2.35 <result> 2.36 <binding name='y'> 2.37 + <uri>http://example.org#D</uri> 2.38 + </binding> 2.39 + <binding name='x'> 2.40 + <uri>http://example.org#H</uri> 2.41 + </binding> 2.42 + </result> 2.43 + <result> 2.44 + <binding name='y'> 2.45 <uri>http://example.org#E</uri> 2.46 </binding> 2.47 <binding name='x'> 2.48 @@ -103,6 +127,14 @@ 2.49 </result> 2.50 <result> 2.51 <binding name='y'> 2.52 + <uri>http://example.org#E</uri> 2.53 + </binding> 2.54 + <binding name='x'> 2.55 + <uri>http://example.org#H</uri> 2.56 + </binding> 2.57 + </result> 2.58 + <result> 2.59 + <binding name='y'> 2.60 <uri>http://example.org#F</uri> 2.61 </binding> 2.62 <binding name='x'> 2.63 @@ -127,6 +159,14 @@ 2.64 </result> 2.65 <result> 2.66 <binding name='y'> 2.67 + <uri>http://example.org#F</uri> 2.68 + </binding> 2.69 + <binding name='x'> 2.70 + <uri>http://example.org#H</uri> 2.71 + </binding> 2.72 + </result> 2.73 + <result> 2.74 + <binding name='y'> 2.75 <uri>http://example.org#G</uri> 2.76 </binding> 2.77 <binding name='x'> 2.78 @@ -149,5 +189,61 @@ 2.79 <uri>http://example.org#F</uri> 2.80 </binding> 2.81 </result> 2.82 + <result> 2.83 + <binding name='y'> 2.84 + <uri>http://example.org#G</uri> 2.85 + </binding> 2.86 + <binding name='x'> 2.87 + <uri>http://example.org#H</uri> 2.88 + </binding> 2.89 + </result> 2.90 + <result> 2.91 + <binding name='y'> 2.92 + <uri>http://example.org#H</uri> 2.93 + </binding> 2.94 + <binding name='x'> 2.95 + <uri>http://example.org#A</uri> 2.96 + </binding> 2.97 + </result> 2.98 + <result> 2.99 + <binding name='y'> 2.100 + <uri>http://example.org#H</uri> 2.101 + </binding> 2.102 + <binding name='x'> 2.103 + <uri>http://example.org#B</uri> 2.104 + </binding> 2.105 + </result> 2.106 + <result> 2.107 + <binding name='y'> 2.108 + <uri>http://example.org#H</uri> 2.109 + </binding> 2.110 + <binding name='x'> 2.111 + <uri>http://example.org#E</uri> 2.112 + </binding> 2.113 + </result> 2.114 + <result> 2.115 + <binding name='y'> 2.116 + <uri>http://example.org#H</uri> 2.117 + </binding> 2.118 + <binding name='x'> 2.119 + <uri>http://example.org#D</uri> 2.120 + </binding> 2.121 + </result> 2.122 + <result> 2.123 + <binding name='y'> 2.124 + <uri>http://example.org#H</uri> 2.125 + </binding> 2.126 + <binding name='x'> 2.127 + <uri>http://example.org#F</uri> 2.128 + </binding> 2.129 + </result> 2.130 + <result> 2.131 + <binding name='y'> 2.132 + <uri>http://example.org#H</uri> 2.133 + </binding> 2.134 + <binding name='x'> 2.135 + <uri>http://example.org#G</uri> 2.136 + </binding> 2.137 + </result> 2.138 </results> 2.139 -</sparql> 2.140 +</sparql> 2.141 \ No newline at end of file
3.1 --- a/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhInsideTest.srx Fri Apr 26 21:07:31 2013 +0300 3.2 +++ b/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhInsideTest.srx Fri Apr 26 21:27:26 2013 +0300 3.3 @@ -13,5 +13,14 @@ 3.4 <uri>http://example.org#G</uri> 3.5 </binding> 3.6 </result> 3.7 + <result> 3.8 + <binding name='y'> 3.9 + <uri>http://example.org#C</uri> 3.10 + </binding> 3.11 + <binding name='x'> 3.12 + <uri>http://example.org#H</uri> 3.13 + </binding> 3.14 + </result> 3.15 </results> 3.16 -</sparql> 3.17 \ No newline at end of file 3.18 +</sparql> 3.19 +
4.1 --- a/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhSpatialRelationsTest.nt Fri Apr 26 21:07:31 2013 +0300 4.2 +++ b/testsuite/src/test/resources/geoSPARQL/EhSpatialRelationsTest/EhSpatialRelationsTest.nt Fri Apr 26 21:27:26 2013 +0300 4.3 @@ -5,6 +5,7 @@ 4.4 <http://example.org#E> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomE>. 4.5 <http://example.org#F> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomF>. 4.6 <http://example.org#G> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomG>. 4.7 +<http://example.org#H> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomH>. 4.8 <http://example.org#geomA> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 1 0, 1 1, 0 1, 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.9 <http://example.org#geomB> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 2 0, 2 2, 0 2 , 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.10 <http://example.org#geomC> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 1, 3 1, 3 2, 1 2, 1 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.11 @@ -12,3 +13,4 @@ 4.12 <http://example.org#geomE> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 1, 4 1, 4 2, 3 2, 3 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.13 <http://example.org#geomF> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Linestring(3 2, 4 0) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.14 <http://example.org#geomG> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Point(1 1) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 4.15 +<http://example.org#geomH> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>.
5.1 --- a/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8DcTest.srx Fri Apr 26 21:07:31 2013 +0300 5.2 +++ b/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8DcTest.srx Fri Apr 26 21:27:26 2013 +0300 5.3 @@ -31,6 +31,14 @@ 5.4 </result> 5.5 <result> 5.6 <binding name='y'> 5.7 + <uri>http://example.org#A</uri> 5.8 + </binding> 5.9 + <binding name='x'> 5.10 + <uri>http://example.org#H</uri> 5.11 + </binding> 5.12 + </result> 5.13 + <result> 5.14 + <binding name='y'> 5.15 <uri>http://example.org#B</uri> 5.16 </binding> 5.17 <binding name='x'> 5.18 @@ -55,6 +63,14 @@ 5.19 </result> 5.20 <result> 5.21 <binding name='y'> 5.22 + <uri>http://example.org#B</uri> 5.23 + </binding> 5.24 + <binding name='x'> 5.25 + <uri>http://example.org#H</uri> 5.26 + </binding> 5.27 + </result> 5.28 + <result> 5.29 + <binding name='y'> 5.30 <uri>http://example.org#D</uri> 5.31 </binding> 5.32 <binding name='x'> 5.33 @@ -71,6 +87,14 @@ 5.34 </result> 5.35 <result> 5.36 <binding name='y'> 5.37 + <uri>http://example.org#D</uri> 5.38 + </binding> 5.39 + <binding name='x'> 5.40 + <uri>http://example.org#H</uri> 5.41 + </binding> 5.42 + </result> 5.43 + <result> 5.44 + <binding name='y'> 5.45 <uri>http://example.org#E</uri> 5.46 </binding> 5.47 <binding name='x'> 5.48 @@ -87,6 +111,14 @@ 5.49 </result> 5.50 <result> 5.51 <binding name='y'> 5.52 + <uri>http://example.org#E</uri> 5.53 + </binding> 5.54 + <binding name='x'> 5.55 + <uri>http://example.org#H</uri> 5.56 + </binding> 5.57 + </result> 5.58 + <result> 5.59 + <binding name='y'> 5.60 <uri>http://example.org#F</uri> 5.61 </binding> 5.62 <binding name='x'> 5.63 @@ -101,5 +133,53 @@ 5.64 <uri>http://example.org#B</uri> 5.65 </binding> 5.66 </result> 5.67 + <result> 5.68 + <binding name='y'> 5.69 + <uri>http://example.org#F</uri> 5.70 + </binding> 5.71 + <binding name='x'> 5.72 + <uri>http://example.org#H</uri> 5.73 + </binding> 5.74 + </result> 5.75 + <result> 5.76 + <binding name='y'> 5.77 + <uri>http://example.org#H</uri> 5.78 + </binding> 5.79 + <binding name='x'> 5.80 + <uri>http://example.org#A</uri> 5.81 + </binding> 5.82 + </result> 5.83 + <result> 5.84 + <binding name='y'> 5.85 + <uri>http://example.org#H</uri> 5.86 + </binding> 5.87 + <binding name='x'> 5.88 + <uri>http://example.org#B</uri> 5.89 + </binding> 5.90 + </result> 5.91 + <result> 5.92 + <binding name='y'> 5.93 + <uri>http://example.org#H</uri> 5.94 + </binding> 5.95 + <binding name='x'> 5.96 + <uri>http://example.org#E</uri> 5.97 + </binding> 5.98 + </result> 5.99 + <result> 5.100 + <binding name='y'> 5.101 + <uri>http://example.org#H</uri> 5.102 + </binding> 5.103 + <binding name='x'> 5.104 + <uri>http://example.org#D</uri> 5.105 + </binding> 5.106 + </result> 5.107 + <result> 5.108 + <binding name='y'> 5.109 + <uri>http://example.org#H</uri> 5.110 + </binding> 5.111 + <binding name='x'> 5.112 + <uri>http://example.org#F</uri> 5.113 + </binding> 5.114 + </result> 5.115 </results> 5.116 -</sparql> 5.117 +</sparql> 5.118 \ No newline at end of file
6.1 --- a/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8NtppTest.srx Fri Apr 26 21:07:31 2013 +0300 6.2 +++ b/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8NtppTest.srx Fri Apr 26 21:27:26 2013 +0300 6.3 @@ -5,5 +5,14 @@ 6.4 <variable name='y'/> 6.5 </head> 6.6 <results> 6.7 + <result> 6.8 + <binding name='y'> 6.9 + <uri>http://example.org#C</uri> 6.10 + </binding> 6.11 + <binding name='x'> 6.12 + <uri>http://example.org#H</uri> 6.13 + </binding> 6.14 + </result> 6.15 </results> 6.16 -</sparql> 6.17 \ No newline at end of file 6.18 +</sparql> 6.19 +
7.1 --- a/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8NtppiTest.srx Fri Apr 26 21:07:31 2013 +0300 7.2 +++ b/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8NtppiTest.srx Fri Apr 26 21:27:26 2013 +0300 7.3 @@ -5,5 +5,14 @@ 7.4 <variable name='y'/> 7.5 </head> 7.6 <results> 7.7 + <result> 7.8 + <binding name='y'> 7.9 + <uri>http://example.org#H</uri> 7.10 + </binding> 7.11 + <binding name='x'> 7.12 + <uri>http://example.org#C</uri> 7.13 + </binding> 7.14 + </result> 7.15 </results> 7.16 -</sparql> 7.17 \ No newline at end of file 7.18 +</sparql> 7.19 +
8.1 --- a/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8SpatialRelationsTest.nt Fri Apr 26 21:07:31 2013 +0300 8.2 +++ b/testsuite/src/test/resources/geoSPARQL/Rcc8SpatialRelationsTest/Rcc8SpatialRelationsTest.nt Fri Apr 26 21:27:26 2013 +0300 8.3 @@ -5,6 +5,7 @@ 8.4 <http://example.org#E> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomE>. 8.5 <http://example.org#F> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomF>. 8.6 <http://example.org#G> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomG>. 8.7 +<http://example.org#H> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomH>. 8.8 <http://example.org#geomA> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 1 0, 1 1, 0 1, 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.9 <http://example.org#geomB> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 2 0, 2 2, 0 2 , 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.10 <http://example.org#geomC> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 1, 3 1, 3 2, 1 2, 1 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.11 @@ -12,3 +13,4 @@ 8.12 <http://example.org#geomE> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 1, 4 1, 4 2, 3 2, 3 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.13 <http://example.org#geomF> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Linestring(3 2, 4 0) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.14 <http://example.org#geomG> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Point(1 1) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 8.15 +<http://example.org#geomH> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>.
9.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfContainsTest.srx Fri Apr 26 21:07:31 2013 +0300 9.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfContainsTest.srx Fri Apr 26 21:27:26 2013 +0300 9.3 @@ -15,14 +15,6 @@ 9.4 </result> 9.5 <result> 9.6 <binding name='y'> 9.7 - <uri>http://example.org#G</uri> 9.8 - </binding> 9.9 - <binding name='x'> 9.10 - <uri>http://example.org#B</uri> 9.11 - </binding> 9.12 - </result> 9.13 - <result> 9.14 - <binding name='y'> 9.15 <uri>http://example.org#E</uri> 9.16 </binding> 9.17 <binding name='x'> 9.18 @@ -37,6 +29,21 @@ 9.19 <uri>http://example.org#E</uri> 9.20 </binding> 9.21 </result> 9.22 + <result> 9.23 + <binding name='y'> 9.24 + <uri>http://example.org#G</uri> 9.25 + </binding> 9.26 + <binding name='x'> 9.27 + <uri>http://example.org#B</uri> 9.28 + </binding> 9.29 + </result> 9.30 + <result> 9.31 + <binding name='y'> 9.32 + <uri>http://example.org#H</uri> 9.33 + </binding> 9.34 + <binding name='x'> 9.35 + <uri>http://example.org#C</uri> 9.36 + </binding> 9.37 + </result> 9.38 </results> 9.39 -</sparql> 9.40 - 9.41 +</sparql> 9.42 \ No newline at end of file
10.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfDisjointTest.srx Fri Apr 26 21:07:31 2013 +0300 10.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfDisjointTest.srx Fri Apr 26 21:27:26 2013 +0300 10.3 @@ -31,6 +31,14 @@ 10.4 </result> 10.5 <result> 10.6 <binding name='y'> 10.7 + <uri>http://example.org#A</uri> 10.8 + </binding> 10.9 + <binding name='x'> 10.10 + <uri>http://example.org#H</uri> 10.11 + </binding> 10.12 + </result> 10.13 + <result> 10.14 + <binding name='y'> 10.15 <uri>http://example.org#B</uri> 10.16 </binding> 10.17 <binding name='x'> 10.18 @@ -55,6 +63,14 @@ 10.19 </result> 10.20 <result> 10.21 <binding name='y'> 10.22 + <uri>http://example.org#B</uri> 10.23 + </binding> 10.24 + <binding name='x'> 10.25 + <uri>http://example.org#H</uri> 10.26 + </binding> 10.27 + </result> 10.28 + <result> 10.29 + <binding name='y'> 10.30 <uri>http://example.org#D</uri> 10.31 </binding> 10.32 <binding name='x'> 10.33 @@ -79,6 +95,14 @@ 10.34 </result> 10.35 <result> 10.36 <binding name='y'> 10.37 + <uri>http://example.org#D</uri> 10.38 + </binding> 10.39 + <binding name='x'> 10.40 + <uri>http://example.org#H</uri> 10.41 + </binding> 10.42 + </result> 10.43 + <result> 10.44 + <binding name='y'> 10.45 <uri>http://example.org#E</uri> 10.46 </binding> 10.47 <binding name='x'> 10.48 @@ -103,6 +127,14 @@ 10.49 </result> 10.50 <result> 10.51 <binding name='y'> 10.52 + <uri>http://example.org#E</uri> 10.53 + </binding> 10.54 + <binding name='x'> 10.55 + <uri>http://example.org#H</uri> 10.56 + </binding> 10.57 + </result> 10.58 + <result> 10.59 + <binding name='y'> 10.60 <uri>http://example.org#F</uri> 10.61 </binding> 10.62 <binding name='x'> 10.63 @@ -127,6 +159,14 @@ 10.64 </result> 10.65 <result> 10.66 <binding name='y'> 10.67 + <uri>http://example.org#F</uri> 10.68 + </binding> 10.69 + <binding name='x'> 10.70 + <uri>http://example.org#H</uri> 10.71 + </binding> 10.72 + </result> 10.73 + <result> 10.74 + <binding name='y'> 10.75 <uri>http://example.org#G</uri> 10.76 </binding> 10.77 <binding name='x'> 10.78 @@ -149,5 +189,61 @@ 10.79 <uri>http://example.org#F</uri> 10.80 </binding> 10.81 </result> 10.82 + <result> 10.83 + <binding name='y'> 10.84 + <uri>http://example.org#G</uri> 10.85 + </binding> 10.86 + <binding name='x'> 10.87 + <uri>http://example.org#H</uri> 10.88 + </binding> 10.89 + </result> 10.90 + <result> 10.91 + <binding name='y'> 10.92 + <uri>http://example.org#H</uri> 10.93 + </binding> 10.94 + <binding name='x'> 10.95 + <uri>http://example.org#A</uri> 10.96 + </binding> 10.97 + </result> 10.98 + <result> 10.99 + <binding name='y'> 10.100 + <uri>http://example.org#H</uri> 10.101 + </binding> 10.102 + <binding name='x'> 10.103 + <uri>http://example.org#B</uri> 10.104 + </binding> 10.105 + </result> 10.106 + <result> 10.107 + <binding name='y'> 10.108 + <uri>http://example.org#H</uri> 10.109 + </binding> 10.110 + <binding name='x'> 10.111 + <uri>http://example.org#E</uri> 10.112 + </binding> 10.113 + </result> 10.114 + <result> 10.115 + <binding name='y'> 10.116 + <uri>http://example.org#H</uri> 10.117 + </binding> 10.118 + <binding name='x'> 10.119 + <uri>http://example.org#D</uri> 10.120 + </binding> 10.121 + </result> 10.122 + <result> 10.123 + <binding name='y'> 10.124 + <uri>http://example.org#H</uri> 10.125 + </binding> 10.126 + <binding name='x'> 10.127 + <uri>http://example.org#F</uri> 10.128 + </binding> 10.129 + </result> 10.130 + <result> 10.131 + <binding name='y'> 10.132 + <uri>http://example.org#H</uri> 10.133 + </binding> 10.134 + <binding name='x'> 10.135 + <uri>http://example.org#G</uri> 10.136 + </binding> 10.137 + </result> 10.138 </results> 10.139 -</sparql> 10.140 +</sparql> 10.141 \ No newline at end of file
11.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfIntersectsTest.srx Fri Apr 26 21:07:31 2013 +0300 11.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfIntersectsTest.srx Fri Apr 26 21:27:26 2013 +0300 11.3 @@ -74,14 +74,6 @@ 11.4 <uri>http://example.org#C</uri> 11.5 </binding> 11.6 <binding name='x'> 11.7 - <uri>http://example.org#G</uri> 11.8 - </binding> 11.9 - </result> 11.10 - <result> 11.11 - <binding name='y'> 11.12 - <uri>http://example.org#C</uri> 11.13 - </binding> 11.14 - <binding name='x'> 11.15 <uri>http://example.org#D</uri> 11.16 </binding> 11.17 </result> 11.18 @@ -103,26 +95,18 @@ 11.19 </result> 11.20 <result> 11.21 <binding name='y'> 11.22 - <uri>http://example.org#G</uri> 11.23 + <uri>http://example.org#C</uri> 11.24 </binding> 11.25 <binding name='x'> 11.26 - <uri>http://example.org#A</uri> 11.27 + <uri>http://example.org#G</uri> 11.28 </binding> 11.29 </result> 11.30 <result> 11.31 <binding name='y'> 11.32 - <uri>http://example.org#G</uri> 11.33 + <uri>http://example.org#C</uri> 11.34 </binding> 11.35 <binding name='x'> 11.36 - <uri>http://example.org#B</uri> 11.37 - </binding> 11.38 - </result> 11.39 - <result> 11.40 - <binding name='y'> 11.41 - <uri>http://example.org#G</uri> 11.42 - </binding> 11.43 - <binding name='x'> 11.44 - <uri>http://example.org#C</uri> 11.45 + <uri>http://example.org#H</uri> 11.46 </binding> 11.47 </result> 11.48 <result> 11.49 @@ -197,5 +181,37 @@ 11.50 <uri>http://example.org#E</uri> 11.51 </binding> 11.52 </result> 11.53 + <result> 11.54 + <binding name='y'> 11.55 + <uri>http://example.org#G</uri> 11.56 + </binding> 11.57 + <binding name='x'> 11.58 + <uri>http://example.org#A</uri> 11.59 + </binding> 11.60 + </result> 11.61 + <result> 11.62 + <binding name='y'> 11.63 + <uri>http://example.org#G</uri> 11.64 + </binding> 11.65 + <binding name='x'> 11.66 + <uri>http://example.org#B</uri> 11.67 + </binding> 11.68 + </result> 11.69 + <result> 11.70 + <binding name='y'> 11.71 + <uri>http://example.org#G</uri> 11.72 + </binding> 11.73 + <binding name='x'> 11.74 + <uri>http://example.org#C</uri> 11.75 + </binding> 11.76 + </result> 11.77 + <result> 11.78 + <binding name='y'> 11.79 + <uri>http://example.org#H</uri> 11.80 + </binding> 11.81 + <binding name='x'> 11.82 + <uri>http://example.org#C</uri> 11.83 + </binding> 11.84 + </result> 11.85 </results> 11.86 -</sparql> 11.87 \ No newline at end of file 11.88 +</sparql>
12.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfSpatialRelationsTest.nt Fri Apr 26 21:07:31 2013 +0300 12.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfSpatialRelationsTest.nt Fri Apr 26 21:27:26 2013 +0300 12.3 @@ -5,6 +5,7 @@ 12.4 <http://example.org#E> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomE>. 12.5 <http://example.org#F> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomF>. 12.6 <http://example.org#G> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomG>. 12.7 +<http://example.org#H> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomH>. 12.8 <http://example.org#geomA> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 1 0, 1 1, 0 1, 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.9 <http://example.org#geomB> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 2 0, 2 2, 0 2 , 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.10 <http://example.org#geomC> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 1, 3 1, 3 2, 1 2, 1 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.11 @@ -12,3 +13,4 @@ 12.12 <http://example.org#geomE> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 1, 4 1, 4 2, 3 2, 3 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.13 <http://example.org#geomF> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Linestring(3 2, 4 0) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.14 <http://example.org#geomG> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Point(1 1) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 12.15 +<http://example.org#geomH> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>.
13.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfWithinTest.srx Fri Apr 26 21:07:31 2013 +0300 13.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfWithinTest.srx Fri Apr 26 21:27:26 2013 +0300 13.3 @@ -23,6 +23,14 @@ 13.4 </result> 13.5 <result> 13.6 <binding name='y'> 13.7 + <uri>http://example.org#C</uri> 13.8 + </binding> 13.9 + <binding name='x'> 13.10 + <uri>http://example.org#H</uri> 13.11 + </binding> 13.12 + </result> 13.13 + <result> 13.14 + <binding name='y'> 13.15 <uri>http://example.org#E</uri> 13.16 </binding> 13.17 <binding name='x'> 13.18 @@ -38,5 +46,4 @@ 13.19 </binding> 13.20 </result> 13.21 </results> 13.22 -</sparql> 13.23 - 13.24 +</sparql> 13.25 \ No newline at end of file