Strabon

changeset 1136:1bf09942bfec

Merge.
author Panayiotis Smeros <psmeros@di.uoa.gr>
date Mon Apr 29 20:46:25 2013 +0300 (2013-04-29)
parents 977335334f9a 40fe983c1488
children 148e7194be4b
files
line diff
     1.1 --- a/testsuite/src/test/resources/prefixes	Mon Apr 29 17:49:25 2013 +0300
     1.2 +++ b/testsuite/src/test/resources/prefixes	Mon Apr 29 20:46:25 2013 +0300
     1.3 @@ -11,4 +11,5 @@
     1.4  PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
     1.5  PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     1.6  PREFIX geo: <http://www.opengis.net/ont/geosparql#>
     1.7 -PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
     1.8 \ No newline at end of file
     1.9 +PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
    1.10 +PREFIX ogc: <http://www.opengis.net/def/uom/OGC/1.0/>
    1.11 \ No newline at end of file
     2.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.rq	Mon Apr 29 17:49:25 2013 +0300
     2.2 +++ b/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.rq	Mon Apr 29 20:46:25 2013 +0300
     2.3 @@ -1,4 +1,4 @@
     2.4 -select (strdf:buffer(?g, 0.2, <http://www.opengis.net/def/uom/OGC/1.0/degree>) as ?buf)
     2.5 +select (strdf:buffer(?g, 0.2, ogc:degree) as ?buf)
     2.6  where
     2.7  {
     2.8  ?x <http://example.org/ontology/hasGeometry> ?g
     3.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.rq	Mon Apr 29 17:49:25 2013 +0300
     3.2 +++ b/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.rq	Mon Apr 29 20:46:25 2013 +0300
     3.3 @@ -2,5 +2,5 @@
     3.4  where
     3.5  {
     3.6  	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
     3.7 -	FILTER(strdf:within(?g1, strdf:buffer(?g1, 30, <http://www.opengis.net/def/uom/OGC/1.0/metre>)))
     3.8 +	FILTER(strdf:within(?g1, strdf:buffer(?g1, 30, ogc:metre)))
     3.9  }
    3.10 \ No newline at end of file
     4.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.rq	Mon Apr 29 17:49:25 2013 +0300
     4.2 +++ b/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.rq	Mon Apr 29 20:46:25 2013 +0300
     4.3 @@ -1,4 +1,4 @@
     4.4 -select (strdf:buffer(?g, 0.2, <http://www.opengis.net/def/uom/OGC/1.0/metre>) as ?buf)
     4.5 +select (strdf:buffer(?g, 0.2, ogc:metre) as ?buf)
     4.6  where
     4.7  {
     4.8  ?x <http://example.org/ontology/hasGeometry> ?g
     5.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.rq	Mon Apr 29 17:49:25 2013 +0300
     5.2 +++ b/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.rq	Mon Apr 29 20:46:25 2013 +0300
     5.3 @@ -1,4 +1,4 @@
     5.4 -select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, <http://www.opengis.net/def/uom/OGC/1.0/degree>), <http://www.opengis.net/def/uom/OGC/1.0/degree>) as ?buf)
     5.5 +select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buf)
     5.6  where
     5.7  {
     5.8  	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
     6.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.rq	Mon Apr 29 17:49:25 2013 +0300
     6.2 +++ b/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.rq	Mon Apr 29 20:46:25 2013 +0300
     6.3 @@ -1,4 +1,4 @@
     6.4 -select (strdf:distance(?g1, ?g2, <http://www.opengis.net/def/uom/OGC/1.0/degree>) as ?dist)
     6.5 +select (strdf:distance(?g1, ?g2, ogc:degree) as ?dist)
     6.6  where
     6.7  {
     6.8  	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.rq	Mon Apr 29 20:46:25 2013 +0300
     7.3 @@ -0,0 +1,7 @@
     7.4 +select ?x ?y
     7.5 +where
     7.6 +{
     7.7 +	?x <http://example.org/ontology/hasGeometry> ?g1 .
     7.8 +	?y <http://example.org/ontology/hasGeometry> ?g2 .
     7.9 +	FILTER(strdf:distance(?g1, ?g2, ogc:metre) < 5)
    7.10 +}
    7.11 \ No newline at end of file
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.srx	Mon Apr 29 20:46:25 2013 +0300
     8.3 @@ -0,0 +1,33 @@
     8.4 +<?xml version='1.0' encoding='UTF-8'?>
     8.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
     8.6 +	<head>
     8.7 +		<variable name='x'/>
     8.8 +		<variable name='y'/>
     8.9 +	</head>
    8.10 +	<results>
    8.11 +		<result>
    8.12 +			<binding name='y'>
    8.13 +				<uri>http://example.org/id/Point/5531</uri>
    8.14 +			</binding>
    8.15 +			<binding name='x'>
    8.16 +				<uri>http://example.org/id/Point/5531</uri>
    8.17 +			</binding>
    8.18 +		</result>
    8.19 +		<result>
    8.20 +			<binding name='y'>
    8.21 +				<uri>http://example.org/id/Point/5532</uri>
    8.22 +			</binding>
    8.23 +			<binding name='x'>
    8.24 +				<uri>http://example.org/id/Point/5532</uri>
    8.25 +			</binding>
    8.26 +		</result>
    8.27 +		<result>
    8.28 +			<binding name='y'>
    8.29 +				<uri>http://example.org/id/Point/5533</uri>
    8.30 +			</binding>
    8.31 +			<binding name='x'>
    8.32 +				<uri>http://example.org/id/Point/5533</uri>
    8.33 +			</binding>
    8.34 +		</result>
    8.35 +	</results>
    8.36 +</sparql>
    8.37 \ No newline at end of file
     9.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.rq	Mon Apr 29 17:49:25 2013 +0300
     9.2 +++ b/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.rq	Mon Apr 29 20:46:25 2013 +0300
     9.3 @@ -1,4 +1,4 @@
     9.4 -select (strdf:distance(?g1, ?g2, <http://www.opengis.net/def/uom/OGC/1.0/metre>) as ?dist)
     9.5 +select (strdf:distance(?g1, ?g2, ogc:metre) as ?dist)
     9.6  where
     9.7  {
     9.8  	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .
    10.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.rq	Mon Apr 29 17:49:25 2013 +0300
    10.2 +++ b/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.rq	Mon Apr 29 20:46:25 2013 +0300
    10.3 @@ -1,4 +1,4 @@
    10.4 -select (strdf:distance(strdf:union(?g1, ?g2), ?g3, <http://www.opengis.net/def/uom/OGC/1.0/metre>) as ?dist)
    10.5 +select (strdf:distance(strdf:union(?g1, ?g2), ?g3, ogc:metre) as ?dist)
    10.6  where
    10.7  {
    10.8  	<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 .