Strabon
changeset 1228:d41dcbd64b02
merge
| author | Stella Giannakopoulou <sgian@di.uoa.gr> |
|---|---|
| date | Wed Jul 17 14:18:17 2013 +0300 (2013-07-17) |
| parents | 33a5a1ae743a 3536728b4877 |
| children | a28f8ce7489f |
| files | testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/StoreTest.java testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/BufferTest.java testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/DistanceTest.java testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/StoreGMLTest.java testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/StoreWKTTest.java testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java testsuite/src/test/resources/bugs/StoreTest/StoreTest.nt testsuite/src/test/resources/bugs/StoreTest/StoreTest.rq testsuite/src/test/resources/bugs/StoreTest/StoreTest.srx testsuite/src/test/resources/stSPARQL/BufferTest/BufferTest.nt testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.rq testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.srx testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.rq testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.srx testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.rq testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.srx testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.rq testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.srx testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTest.nt testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.rq testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.srx testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.rq testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.srx testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.rq testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.srx testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.rq testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.srx testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.nt testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.rq testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.srx testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.nt testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.rq testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.srx testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt testsuite/src/test/resources/untested/UnionAsConstructBinary.rq testsuite/src/test/resources/untested/UnionAsConstructBinary.srx |
line diff
1.1 --- a/README Wed Jul 17 13:39:41 2013 +0300 1.2 +++ b/README Wed Jul 17 14:18:17 2013 +0300 1.3 @@ -61,7 +61,7 @@ 1.4 1.5 $ mvn clean package 1.6 1.7 -In order to run automatically the JUnit tests, pass the option `-DskipTests=true' 1.8 +In order to run automatically the JUnit tests, pass the option `-DskipTests=false' 1.9 to the above command. The complete command is the following: 1.10 1.11 $ mvn -DskipTests=false clean package
2.1 --- a/endpoint/WebContent/query.jsp Wed Jul 17 13:39:41 2013 +0300 2.2 +++ b/endpoint/WebContent/query.jsp Wed Jul 17 14:18:17 2013 +0300 2.3 @@ -260,15 +260,12 @@ 2.4 2.5 // Create the data table. 2.6 var data = new google.visualization.DataTable(); 2.7 - <% if (request.getParameter("format")!=null && request.getAttribute("response") != null) { 2.8 - if (request.getParameter("format").equals("CHART")) { 2.9 + <% if (request.getAttribute("format")!=null && request.getAttribute("response") != null) { 2.10 + if (request.getAttribute("format").equals("CHART")) { 2.11 out.println(request.getAttribute("response")); 2.12 %> 2.13 2.14 - var options = {'title':'Displaying results in chart','width':1000, 'height':1000}; 2.15 - 2.16 - 2.17 - var chart = new google.visualization.PieChart(document.getElementById('chart_div')); 2.18 + 2.19 chart.draw(data, options); 2.20 2.21 <%}}%> 2.22 @@ -419,15 +416,14 @@ 2.23 <a name="#results"> </a> 2.24 <div id="divResultsStart"></div> 2.25 <!-- Response --> 2.26 -<% 2.27 -if (request.getAttribute("response") != null && !request.getParameter("format").equals("CHART")) { 2.28 - if (!Common.getHTMLFormat().equals(request.getParameter("format"))) {%> 2.29 +<% if(request.getAttribute("format") == null || !request.getAttribute("format").equals("CHART")){ 2.30 + if (request.getAttribute("response") != null) { 2.31 + if (Common.getHTMLFormat().equals(request.getParameter("format"))) {%> 2.32 <%=request.getAttribute("response")%> 2.33 - <%} else { 2.34 - %> 2.35 + <%} else { %> 2.36 <PRE><%=request.getAttribute("response") %></PRE> 2.37 <%}%> 2.38 -<%}%> 2.39 +<%}}%> 2.40 <!-- Response --> 2.41 <% if (request.getAttribute("pathToKML") != null) { %> 2.42 <div id="map_canvas"></div>
3.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java Wed Jul 17 13:39:41 2013 +0300 3.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java Wed Jul 17 14:18:17 2013 +0300 3.3 @@ -138,9 +138,16 @@ 3.4 3.5 // pass the other parameters as well 3.6 request.setAttribute("query", request.getParameter("query")); 3.7 - request.setAttribute("format", request.getParameter("format")); 3.8 + if(request.getParameter("format").equalsIgnoreCase("PIECHART") || 3.9 + request.getParameter("format").equalsIgnoreCase("AREACHART")){ 3.10 + request.setAttribute("format", "CHART"); 3.11 + } else{ 3.12 + request.setAttribute("format", request.getParameter("format")); 3.13 + } 3.14 request.setAttribute("handle", request.getParameter("handle")); 3.15 3.16 + System.out.println("SET FORMAT: "+request.getAttribute("format")); 3.17 + 3.18 // forward the request 3.19 dispatcher.forward(request, response); 3.20 3.21 @@ -336,7 +343,12 @@ 3.22 if (format.equals(Common.getHTMLFormat())) { 3.23 request.setAttribute(RESPONSE, bos.toString()); 3.24 } 3.25 - else if(format.equals(Format.CHART.toString())){ 3.26 + else if(format.equals(Format.PIECHART.toString())){ 3.27 + request.setAttribute("format","CHART"); 3.28 + request.setAttribute(RESPONSE, strabonWrapper.getgChartString()); 3.29 + } 3.30 + else if(format.equals(Format.AREACHART.toString())){ 3.31 + request.setAttribute("format","CHART"); 3.32 request.setAttribute(RESPONSE, strabonWrapper.getgChartString()); 3.33 } 3.34 else {
4.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java Wed Jul 17 13:39:41 2013 +0300 4.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java Wed Jul 17 14:18:17 2013 +0300 4.3 @@ -191,56 +191,80 @@ 4.4 if ((this.strabon == null) && (!init())) { 4.5 throw new RepositoryException("Could not connect to Strabon."); 4.6 } 4.7 - if(answerFormatStrabon.equalsIgnoreCase(Format.CHART.toString())){ 4.8 + if(answerFormatStrabon.equalsIgnoreCase(Format.PIECHART.toString()) || answerFormatStrabon.equalsIgnoreCase( Format.AREACHART.toString())){ 4.9 TupleQueryResult result = (TupleQueryResult) strabon.query(queryString, Format.fromString(answerFormatStrabon), strabon.getSailRepoConnection(), out); 4.10 List<String> bindingNames = result.getBindingNames(); 4.11 - if(bindingNames.size() !=2 ){ 4.12 - logger.error("Strabon endpoint: to display results in chart, exactly TWO variables must be projected"); 4.13 + if(bindingNames.size() !=2 && answerFormatStrabon.equalsIgnoreCase(Format.PIECHART.toString())){ 4.14 + logger.error("Strabon endpoint: to display results in a pie chart, exactly TWO variables must be projected"); 4.15 } 4.16 else{ 4.17 - 4.18 - ArrayList<String> arr = new ArrayList<String>(2); 4.19 - arr.add(0, bindingNames.get(0)); 4.20 - arr.add(1, bindingNames.get(1)); 4.21 + if(answerFormatStrabon.equalsIgnoreCase(Format.PIECHART.toString())){ 4.22 + 4.23 + ArrayList<String> arr = new ArrayList<String>(2); 4.24 + arr.add(0, bindingNames.get(0)); 4.25 + arr.add(1, bindingNames.get(1)); 4.26 4.27 - 4.28 - gChartString = "data.addColumn('string',\'"+arr.get(0)+"');\n"; 4.29 - gChartString += "data.addColumn('number',\'"+arr.get(1)+"');\n"; 4.30 - 4.31 - int i=1; 4.32 - int index=0; 4.33 - while(result.hasNext()){ 4.34 - BindingSet bindings = result.next(); 4.35 - arr.add(0, bindings.getValue(bindingNames.get(0)).stringValue()); 4.36 - arr.add(1, bindings.getValue(bindingNames.get(1)).stringValue()); 4.37 -//.replace("<http://www.w3.org/2001/XMLSchema#integer>","") 4.38 - if(!arr.get(0).contains("http") ){ //plain literal case- no prefixes to remove 4.39 - gChartString += "data.addRow([\'"+arr.get(0)+"\', "+ 4.40 - arr.get(1).replace("\"", "").replace("^^","")+"]);\n"; 4.41 - i++; 4.42 + gChartString +="var data = new google.visualization.DataTable();"; 4.43 + gChartString += "data.addColumn('string',\'"+arr.get(0)+"');\n"; 4.44 + gChartString += "data.addColumn('number',\'"+arr.get(1)+"');\n"; 4.45 + 4.46 + int i=1; 4.47 + int index=0; 4.48 + while(result.hasNext()){ 4.49 + BindingSet bindings = result.next(); 4.50 + arr.add(0, bindings.getValue(bindingNames.get(0)).stringValue()); 4.51 + arr.add(1, bindings.getValue(bindingNames.get(1)).stringValue()); 4.52 + 4.53 + gChartString += "data.addRow([\'"+withoutPrefix(arr.get(0))+"\', "+ 4.54 + arr.get(1).replace("\"", "").replace("^^","").replace("<http://www.w3.org/2001/XMLSchema#integer>","")+"]);\n"; 4.55 + i++; 4.56 + } 4.57 + gChartString += "var options = {'title':'','width':1000, 'height':1000, is3D: true};\n"; 4.58 + gChartString += "var chart = new google.visualization.PieChart(document.getElementById('chart_div'));\n"; 4.59 + 4.60 + 4.61 } 4.62 - else{ //URI case 4.63 - //removing prefixes so that they will not be displayed in the chart 4.64 - if(arr.get(0).lastIndexOf('#') > arr.get(0).lastIndexOf('/')){ 4.65 - index = arr.get(0).lastIndexOf('#')+1; 4.66 + else if(answerFormatStrabon.equalsIgnoreCase(Format.AREACHART.toString())){ 4.67 + int varNum = bindingNames.size(); 4.68 + ArrayList<String> arr = new ArrayList<String>(varNum); 4.69 + 4.70 + gChartString += "var data = google.visualization.arrayToDataTable([["; 4.71 + for(int j=0; j<varNum; j++){ 4.72 + String chartValue =bindingNames.get(j); 4.73 + gChartString += "'"+chartValue+"'"; 4.74 + 4.75 + if(j != varNum-1){ 4.76 + gChartString+=","; 4.77 + } 4.78 } 4.79 - else{ 4.80 - index = arr.get(0).lastIndexOf("/")+1; 4.81 + gChartString += "],"; 4.82 + 4.83 + while(result.hasNext()){ 4.84 + BindingSet bindings = result.next(); 4.85 + gChartString += "["; 4.86 + for(int j=0; j<varNum; j++){ 4.87 + 4.88 + String chartValue =bindings.getValue(bindingNames.get(j)).stringValue(); 4.89 + if(j==0){ //the first variable is a string variable. 4.90 + gChartString += "'"+withoutPrefix(chartValue).replace("\"", "")+"'"; 4.91 + } 4.92 + else{ //numeric value 4.93 + gChartString += withoutPrefix(chartValue).replace("\"", ""); 4.94 + } 4.95 + if(j != varNum-1){ 4.96 + gChartString+=","; 4.97 + } 4.98 + } 4.99 + gChartString += "],"; 4.100 } 4.101 - 4.102 - int endIndex= arr.get(0).length(); 4.103 - gChartString += "data.addRow([\'"+arr.get(0).subSequence(index, endIndex )+"\', "+ 4.104 - arr.get(1).replace("\"", "").replace("^^","").replace("<http://www.w3.org/2001/XMLSchema#integer>","")+"]);\n"; 4.105 - i++; 4.106 + gChartString += "]);"; 4.107 + gChartString += " var options = {title: '', hAxis: {title:'"+ bindingNames.get(0) +"', titleTextStyle: {color: \'red\'}}};"; 4.108 + gChartString += "var chart = new google.visualization.AreaChart(document.getElementById('chart_div')); \n"; 4.109 + 4.110 } 4.111 4.112 - } 4.113 - /* gChartString += "var options = {'title':'Displaying results in chart','width':400, 'height':300};"; 4.114 - gChartString += "var chart = new google.visualization.PieChart(document.getElementById('chart_div'));"; 4.115 - gChartString += "chart.draw(data, options);";*/ 4.116 - //System.out.println(gChartString); 4.117 - 4.118 - }} 4.119 + 4.120 + }} 4.121 else{ 4.122 strabon.query(queryString, Format.fromString(answerFormatStrabon), strabon.getSailRepoConnection(), out); 4.123 } 4.124 @@ -446,6 +470,25 @@ 4.125 } 4.126 4.127 4.128 + public String withoutPrefix(String inputURI){ 4.129 + int index; 4.130 + 4.131 + if(!inputURI.contains("http") ){ //plain literal case- no prefixes to remove 4.132 + return inputURI; 4.133 + } 4.134 + else{ //URI case 4.135 + //removing prefixes so that they will not be displayed in the chart 4.136 + if(inputURI.lastIndexOf('#') > inputURI.lastIndexOf('/')){ 4.137 + index = inputURI.lastIndexOf('#')+1; 4.138 + } 4.139 + else{ 4.140 + index = inputURI.lastIndexOf("/")+1; 4.141 + } 4.142 + 4.143 + int endIndex= inputURI.length(); 4.144 + return inputURI.substring(index, endIndex ); 4.145 4.146 + } 4.147 + } 4.148 } 4.149
5.1 --- a/resultio-spatial/api/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java Wed Jul 17 13:39:41 2013 +0300 5.2 +++ b/resultio-spatial/api/src/main/java/org/openrdf/query/resultio/stSPARQLQueryResultFormat.java Wed Jul 17 14:18:17 2013 +0300 5.3 @@ -76,8 +76,11 @@ 5.4 /** 5.5 * CHART format (so that results can be displayed using google charts) 5.6 */ 5.7 - public static final stSPARQLQueryResultFormat CHART = new stSPARQLQueryResultFormat("CHART", 5.8 - Arrays.asList("text/plain"), Charset.forName("UTF-8"), Arrays.asList("chart", "chart")); 5.9 + public static final stSPARQLQueryResultFormat PIECHART = new stSPARQLQueryResultFormat("PIECHART", 5.10 + Arrays.asList("text/plain"), Charset.forName("UTF-8"), Arrays.asList("piechart", "piechart")); 5.11 + 5.12 + public static final stSPARQLQueryResultFormat AREACHART = new stSPARQLQueryResultFormat("AREACHART", 5.13 + Arrays.asList("text/plain"), Charset.forName("UTF-8"), Arrays.asList("areachart", "areachart")); 5.14 5.15 /** 5.16 * The available stSPARQLQuery Result Formats 5.17 @@ -92,8 +95,9 @@ 5.18 register(GEOJSON); 5.19 register(TSV); 5.20 register(HTML); 5.21 - register(CHART); 5.22 - 5.23 + register(PIECHART); 5.24 + register(AREACHART); 5.25 + 5.26 } 5.27 5.28 /**
6.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Wed Jul 17 13:39:41 2013 +0300 6.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Wed Jul 17 14:18:17 2013 +0300 6.3 @@ -265,7 +265,10 @@ 6.4 6.5 return tupleQuery; 6.6 // break; 6.7 - case CHART: 6.8 + case PIECHART: 6.9 + return tupleQuery.evaluate(); 6.10 + 6.11 + case AREACHART: 6.12 return tupleQuery.evaluate(); 6.13 6.14 default:
7.1 --- a/runtime/src/main/java/eu/earthobservatory/utils/Format.java Wed Jul 17 13:39:41 2013 +0300 7.2 +++ b/runtime/src/main/java/eu/earthobservatory/utils/Format.java Wed Jul 17 14:18:17 2013 +0300 7.3 @@ -96,7 +96,9 @@ 7.4 */ 7.5 INVALID("INVALID"), 7.6 7.7 - CHART("CHART"); 7.8 + PIECHART("PIECHART"), 7.9 + 7.10 + AREACHART("AREACHART"); 7.11 7.12 /** 7.13 * The string representation of this format
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/StoreGMLTest.java Wed Jul 17 14:18:17 2013 +0300 8.3 @@ -0,0 +1,20 @@ 8.4 +/** 8.5 + * This Source Code Form is subject to the terms of the Mozilla Public 8.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 8.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 8.8 + * 8.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 8.10 + * 8.11 + * http://www.strabon.di.uoa.gr/ 8.12 + */ 8.13 +package eu.earthobservatory.testsuite.bugs; 8.14 + 8.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 8.16 + 8.17 + 8.18 +/** 8.19 + * A simple store test. It tests if triples with GML serialization are stored and retrieved correctly. 8.20 + * 8.21 + * @author Panayiotis Smeros <psmeros@di.uoa.gr 8.22 + */ 8.23 +public class StoreGMLTest extends TemplateTest{}
9.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/StoreTest.java Wed Jul 17 13:39:41 2013 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,20 +0,0 @@ 9.4 -/** 9.5 - * This Source Code Form is subject to the terms of the Mozilla Public 9.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 9.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 9.8 - * 9.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 9.10 - * 9.11 - * http://www.strabon.di.uoa.gr/ 9.12 - */ 9.13 -package eu.earthobservatory.testsuite.bugs; 9.14 - 9.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 9.16 - 9.17 - 9.18 -/** 9.19 - * A simple store test. It tests if the input dataset is stored and retrieved correctly. 9.20 - * 9.21 - * @author Panayiotis Smeros <psmeros@di.uoa.gr 9.22 - */ 9.23 -public class StoreTest extends TemplateTest{}
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/bugs/StoreWKTTest.java Wed Jul 17 14:18:17 2013 +0300 10.3 @@ -0,0 +1,20 @@ 10.4 +/** 10.5 + * This Source Code Form is subject to the terms of the Mozilla Public 10.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 10.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 10.8 + * 10.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 10.10 + * 10.11 + * http://www.strabon.di.uoa.gr/ 10.12 + */ 10.13 +package eu.earthobservatory.testsuite.bugs; 10.14 + 10.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 10.16 + 10.17 + 10.18 +/** 10.19 + * A simple store test. It tests if triples with WKT serialization are stored and retrieved correctly. 10.20 + * 10.21 + * @author Panayiotis Smeros <psmeros@di.uoa.gr 10.22 + */ 10.23 +public class StoreWKTTest extends TemplateTest{}
11.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/EhSpatialRelationsTest.java Wed Jul 17 13:39:41 2013 +0300 11.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/EhSpatialRelationsTest.java Wed Jul 17 14:18:17 2013 +0300 11.3 @@ -17,11 +17,4 @@ 11.4 * 11.5 * @author Panayiotis Smeros <psmeros@di.uoa.gr 11.6 */ 11.7 -public class EhSpatialRelationsTest extends TemplateTest 11.8 -{ 11.9 - public EhSpatialRelationsTest() 11.10 - { 11.11 - super(); 11.12 - this.inference=true; 11.13 - } 11.14 -} 11.15 \ No newline at end of file 11.16 +public class EhSpatialRelationsTest extends TemplateTest {} 11.17 \ No newline at end of file
12.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/Rcc8SpatialRelationsTest.java Wed Jul 17 13:39:41 2013 +0300 12.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/Rcc8SpatialRelationsTest.java Wed Jul 17 14:18:17 2013 +0300 12.3 @@ -17,11 +17,4 @@ 12.4 * 12.5 * @author Panayiotis Smeros <psmeros@di.uoa.gr 12.6 */ 12.7 -public class Rcc8SpatialRelationsTest extends TemplateTest 12.8 -{ 12.9 - public Rcc8SpatialRelationsTest() 12.10 - { 12.11 - super(); 12.12 - this.inference=true; 12.13 - } 12.14 -} 12.15 \ No newline at end of file 12.16 +public class Rcc8SpatialRelationsTest extends TemplateTest {} 12.17 \ No newline at end of file
13.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/SfSpatialRelationsTest.java Wed Jul 17 13:39:41 2013 +0300 13.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/geoSPARQL/SfSpatialRelationsTest.java Wed Jul 17 14:18:17 2013 +0300 13.3 @@ -17,11 +17,4 @@ 13.4 * 13.5 * @author Panayiotis Smeros <psmeros@di.uoa.gr 13.6 */ 13.7 -public class SfSpatialRelationsTest extends TemplateTest 13.8 -{ 13.9 - public SfSpatialRelationsTest() 13.10 - { 13.11 - super(); 13.12 - this.inference=true; 13.13 - } 13.14 -} 13.15 \ No newline at end of file 13.16 +public class SfSpatialRelationsTest extends TemplateTest {} 13.17 \ No newline at end of file
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/AggregateFunctionsTest.java Wed Jul 17 14:18:17 2013 +0300 14.3 @@ -0,0 +1,20 @@ 14.4 +/** 14.5 + * This Source Code Form is subject to the terms of the Mozilla Public 14.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 14.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 14.8 + * 14.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 14.10 + * 14.11 + * http://www.strabon.di.uoa.gr/ 14.12 + */ 14.13 +package eu.earthobservatory.testsuite.stSPARQL; 14.14 + 14.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 14.16 + 14.17 +/** 14.18 + * A test for the aggregate functions of stSPARQL. 14.19 + * 14.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 14.21 + */ 14.22 + 14.23 +public class AggregateFunctionsTest extends TemplateTest {}
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/BasicFunctionsTest.java Wed Jul 17 14:18:17 2013 +0300 15.3 @@ -0,0 +1,20 @@ 15.4 +/** 15.5 + * This Source Code Form is subject to the terms of the Mozilla Public 15.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 15.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 15.8 + * 15.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 15.10 + * 15.11 + * http://www.strabon.di.uoa.gr/ 15.12 + */ 15.13 +package eu.earthobservatory.testsuite.stSPARQL; 15.14 + 15.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 15.16 + 15.17 +/** 15.18 + * A test for the basic functions of stSPARQL. 15.19 + * 15.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 15.21 + */ 15.22 + 15.23 +public class BasicFunctionsTest extends TemplateTest {}
16.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/BufferTest.java Wed Jul 17 13:39:41 2013 +0300 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,20 +0,0 @@ 16.4 -/** 16.5 - * This Source Code Form is subject to the terms of the Mozilla Public 16.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 16.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 16.8 - * 16.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 16.10 - * 16.11 - * http://www.strabon.di.uoa.gr/ 16.12 - */ 16.13 -package eu.earthobservatory.testsuite.stSPARQL; 16.14 - 16.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 16.16 - 16.17 -/** 16.18 - * A test for the strdf:buffer function. 16.19 - * 16.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr 16.21 - */ 16.22 - 16.23 -public class BufferTest extends TemplateTest {}
17.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/DistanceTest.java Wed Jul 17 13:39:41 2013 +0300 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,20 +0,0 @@ 17.4 -/** 17.5 - * This Source Code Form is subject to the terms of the Mozilla Public 17.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 17.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 17.8 - * 17.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 17.10 - * 17.11 - * http://www.strabon.di.uoa.gr/ 17.12 - */ 17.13 -package eu.earthobservatory.testsuite.stSPARQL; 17.14 - 17.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 17.16 - 17.17 -/** 17.18 - * A test for the strdf:distance function. 17.19 - * 17.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr 17.21 - */ 17.22 - 17.23 -public class DistanceTest extends TemplateTest {}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/MBBRelationsTest.java Wed Jul 17 14:18:17 2013 +0300 18.3 @@ -0,0 +1,20 @@ 18.4 +/** 18.5 + * This Source Code Form is subject to the terms of the Mozilla Public 18.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 18.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 18.8 + * 18.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 18.10 + * 18.11 + * http://www.strabon.di.uoa.gr/ 18.12 + */ 18.13 +package eu.earthobservatory.testsuite.stSPARQL; 18.14 + 18.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 18.16 + 18.17 +/** 18.18 + * A test for the mbb relations of stSPARQL. 18.19 + * 18.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 18.21 + */ 18.22 + 18.23 +public class MBBRelationsTest extends TemplateTest {}
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/MetricFunctionsTest.java Wed Jul 17 14:18:17 2013 +0300 19.3 @@ -0,0 +1,20 @@ 19.4 +/** 19.5 + * This Source Code Form is subject to the terms of the Mozilla Public 19.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 19.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 19.8 + * 19.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 19.10 + * 19.11 + * http://www.strabon.di.uoa.gr/ 19.12 + */ 19.13 +package eu.earthobservatory.testsuite.stSPARQL; 19.14 + 19.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 19.16 + 19.17 +/** 19.18 + * A test for the metric functions of stSPARQL. 19.19 + * 19.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 19.21 + */ 19.22 + 19.23 +public class MetricFunctionsTest extends TemplateTest {}
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/SpatialAnalysisFunctionsTest.java Wed Jul 17 14:18:17 2013 +0300 20.3 @@ -0,0 +1,20 @@ 20.4 +/** 20.5 + * This Source Code Form is subject to the terms of the Mozilla Public 20.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 20.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 20.8 + * 20.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 20.10 + * 20.11 + * http://www.strabon.di.uoa.gr/ 20.12 + */ 20.13 +package eu.earthobservatory.testsuite.stSPARQL; 20.14 + 20.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 20.16 + 20.17 +/** 20.18 + * A test for the spatial analysis functions of stSPARQL. 20.19 + * 20.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 20.21 + */ 20.22 + 20.23 +public class SpatialAnalysisFunctionsTest extends TemplateTest {}
21.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/StoreGMLTest.java Wed Jul 17 13:39:41 2013 +0300 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,20 +0,0 @@ 21.4 -/** 21.5 - * This Source Code Form is subject to the terms of the Mozilla Public 21.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 21.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 21.8 - * 21.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 21.10 - * 21.11 - * http://www.strabon.di.uoa.gr/ 21.12 - */ 21.13 -package eu.earthobservatory.testsuite.stSPARQL; 21.14 - 21.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 21.16 - 21.17 - 21.18 -/** 21.19 - * A simple store test. It tests if triples with GML serialization are stored and retrieved correctly. 21.20 - * 21.21 - * @author Panayiotis Smeros <psmeros@di.uoa.gr 21.22 - */ 21.23 -public class StoreGMLTest extends TemplateTest{}
22.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/StoreWKTTest.java Wed Jul 17 13:39:41 2013 +0300 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,20 +0,0 @@ 22.4 -/** 22.5 - * This Source Code Form is subject to the terms of the Mozilla Public 22.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 22.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 22.8 - * 22.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 22.10 - * 22.11 - * http://www.strabon.di.uoa.gr/ 22.12 - */ 22.13 -package eu.earthobservatory.testsuite.stSPARQL; 22.14 - 22.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 22.16 - 22.17 - 22.18 -/** 22.19 - * A simple store test. It tests if triples with WKT serialization are stored and retrieved correctly. 22.20 - * 22.21 - * @author Panayiotis Smeros <psmeros@di.uoa.gr 22.22 - */ 22.23 -public class StoreWKTTest extends TemplateTest{}
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/TopologicalRelationsTest.java Wed Jul 17 14:18:17 2013 +0300 23.3 @@ -0,0 +1,20 @@ 23.4 +/** 23.5 + * This Source Code Form is subject to the terms of the Mozilla Public 23.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 23.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 23.8 + * 23.9 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 23.10 + * 23.11 + * http://www.strabon.di.uoa.gr/ 23.12 + */ 23.13 +package eu.earthobservatory.testsuite.stSPARQL; 23.14 + 23.15 +import eu.earthobservatory.testsuite.utils.TemplateTest; 23.16 + 23.17 +/** 23.18 + * A test for the topological relations of stSPARQL. 23.19 + * 23.20 + * @author Panayiotis Smeros <psmeros@di.uoa.gr> 23.21 + */ 23.22 + 23.23 +public class TopologicalRelationsTest extends TemplateTest {}
24.1 --- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/UnionTest.java Wed Jul 17 13:39:41 2013 +0300 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,20 +0,0 @@ 24.4 -/** 24.5 - * This Source Code Form is subject to the terms of the Mozilla Public 24.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 24.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 24.8 - * 24.9 - * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team 24.10 - * 24.11 - * http://www.strabon.di.uoa.gr/ 24.12 - */ 24.13 -package eu.earthobservatory.testsuite.stSPARQL; 24.14 - 24.15 -import eu.earthobservatory.testsuite.utils.TemplateTest; 24.16 - 24.17 -/** 24.18 - * A test for the strdf:union function. 24.19 - * 24.20 - * @author Stella Giannakopoulou <sgian@di.uoa.gr 24.21 - */ 24.22 - 24.23 -public class UnionTest extends TemplateTest {}
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/testsuite/src/test/resources/bugs/StoreGMLTest/StoreGMLTest.nt Wed Jul 17 14:18:17 2013 +0300 25.3 @@ -0,0 +1,4 @@ 25.4 +<http://example.org/point> <http://strdf.di.uoa.gr/ontology#hasGeometry> _:point. 25.5 +_:point <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2003/01/geo/wgs84_pos#Point>. 25.6 +_:point <http://www.w3.org/2003/01/geo/wgs84_pos#lat> "55.701". 25.7 +_:point <http://www.w3.org/2003/01/geo/wgs84_pos#long> "12.552". 25.8 \ No newline at end of file
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/testsuite/src/test/resources/bugs/StoreGMLTest/StoreGMLTest.rq Wed Jul 17 14:18:17 2013 +0300 26.3 @@ -0,0 +1,3 @@ 26.4 +SELECT ?o 26.5 +WHERE {?s strdf:hasGeometry ?geo. 26.6 +?geo lgdgeo:lat ?o.} 26.7 \ No newline at end of file
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/testsuite/src/test/resources/bugs/StoreGMLTest/StoreGMLTest.srx Wed Jul 17 14:18:17 2013 +0300 27.3 @@ -0,0 +1,13 @@ 27.4 +<?xml version='1.0' encoding='UTF-8'?> 27.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 27.6 + <head> 27.7 + <variable name='o'/> 27.8 + </head> 27.9 + <results> 27.10 + <result> 27.11 + <binding name='o'> 27.12 + <literal>55.701</literal> 27.13 + </binding> 27.14 + </result> 27.15 + </results> 27.16 +</sparql> 27.17 \ No newline at end of file
28.1 --- a/testsuite/src/test/resources/bugs/StoreTest/StoreTest.nt Wed Jul 17 13:39:41 2013 +0300 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,9 +0,0 @@ 28.4 -<http://example.org/item1> <http://example.org/id> "1"^^<http://www.w3.org/2001/XMLSchema#int>. 28.5 -<http://example.org/item1> <http://example.org/value> "10"^^<http://www.w3.org/2001/XMLSchema#int>. 28.6 -<http://example.org/item1> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(1 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 28.7 -<http://example.org/item2> <http://example.org/id> "2"^^<http://www.w3.org/2001/XMLSchema#int>. 28.8 -<http://example.org/item2> <http://example.org/value> "20"^^<http://www.w3.org/2001/XMLSchema#int>. 28.9 -<http://example.org/item2> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(2 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 28.10 -<http://example.org/item3> <http://example.org/id> "3"^^<http://www.w3.org/2001/XMLSchema#int>. 28.11 -<http://example.org/item3> <http://example.org/value> "30"^^<http://www.w3.org/2001/XMLSchema#int>. 28.12 -<http://example.org/item3> <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry> "POINT(3 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>.
29.1 --- a/testsuite/src/test/resources/bugs/StoreTest/StoreTest.rq Wed Jul 17 13:39:41 2013 +0300 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,2 +0,0 @@ 29.4 -SELECT * 29.5 -WHERE{?s ?p ?o} 29.6 \ No newline at end of file
30.1 --- a/testsuite/src/test/resources/bugs/StoreTest/StoreTest.srx Wed Jul 17 13:39:41 2013 +0300 30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 30.3 @@ -1,109 +0,0 @@ 30.4 -<?xml version='1.0' encoding='UTF-8'?> 30.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 30.6 - <head> 30.7 - <variable name='s'/> 30.8 - <variable name='p'/> 30.9 - <variable name='o'/> 30.10 - </head> 30.11 - <results> 30.12 - <result> 30.13 - <binding name='s'> 30.14 - <uri>http://example.org/item1</uri> 30.15 - </binding> 30.16 - <binding name='o'> 30.17 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>1</literal> 30.18 - </binding> 30.19 - <binding name='p'> 30.20 - <uri>http://example.org/id</uri> 30.21 - </binding> 30.22 - </result> 30.23 - <result> 30.24 - <binding name='s'> 30.25 - <uri>http://example.org/item1</uri> 30.26 - </binding> 30.27 - <binding name='o'> 30.28 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>10</literal> 30.29 - </binding> 30.30 - <binding name='p'> 30.31 - <uri>http://example.org/value</uri> 30.32 - </binding> 30.33 - </result> 30.34 - <result> 30.35 - <binding name='s'> 30.36 - <uri>http://example.org/item1</uri> 30.37 - </binding> 30.38 - <binding name='o'> 30.39 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT(1 0)</literal> 30.40 - </binding> 30.41 - <binding name='p'> 30.42 - <uri>http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry</uri> 30.43 - </binding> 30.44 - </result> 30.45 - <result> 30.46 - <binding name='s'> 30.47 - <uri>http://example.org/item2</uri> 30.48 - </binding> 30.49 - <binding name='o'> 30.50 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>2</literal> 30.51 - </binding> 30.52 - <binding name='p'> 30.53 - <uri>http://example.org/id</uri> 30.54 - </binding> 30.55 - </result> 30.56 - <result> 30.57 - <binding name='s'> 30.58 - <uri>http://example.org/item2</uri> 30.59 - </binding> 30.60 - <binding name='o'> 30.61 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>20</literal> 30.62 - </binding> 30.63 - <binding name='p'> 30.64 - <uri>http://example.org/value</uri> 30.65 - </binding> 30.66 - </result> 30.67 - <result> 30.68 - <binding name='s'> 30.69 - <uri>http://example.org/item2</uri> 30.70 - </binding> 30.71 - <binding name='o'> 30.72 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT(2 0)</literal> 30.73 - </binding> 30.74 - <binding name='p'> 30.75 - <uri>http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry</uri> 30.76 - </binding> 30.77 - </result> 30.78 - <result> 30.79 - <binding name='s'> 30.80 - <uri>http://example.org/item3</uri> 30.81 - </binding> 30.82 - <binding name='o'> 30.83 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>3</literal> 30.84 - </binding> 30.85 - <binding name='p'> 30.86 - <uri>http://example.org/id</uri> 30.87 - </binding> 30.88 - </result> 30.89 - <result> 30.90 - <binding name='s'> 30.91 - <uri>http://example.org/item3</uri> 30.92 - </binding> 30.93 - <binding name='o'> 30.94 - <literal datatype='http://www.w3.org/2001/XMLSchema#int'>30</literal> 30.95 - </binding> 30.96 - <binding name='p'> 30.97 - <uri>http://example.org/value</uri> 30.98 - </binding> 30.99 - </result> 30.100 - <result> 30.101 - <binding name='s'> 30.102 - <uri>http://example.org/item3</uri> 30.103 - </binding> 30.104 - <binding name='o'> 30.105 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT(3 0)</literal> 30.106 - </binding> 30.107 - <binding name='p'> 30.108 - <uri>http://teleios.di.uoa.gr/ontologies/noaOntology.owl#hasGeometry</uri> 30.109 - </binding> 30.110 - </result> 30.111 - </results> 30.112 -</sparql> 30.113 \ No newline at end of file
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/testsuite/src/test/resources/bugs/StoreWKTTest/StoreWKTTest.nt Wed Jul 17 14:18:17 2013 +0300 31.3 @@ -0,0 +1,2 @@ 31.4 +<http://example.org/Area1> <http://strdf.di.uoa.gr/ontology#hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/4326"^^<http://strdf.di.uoa.gr/ontology#WKT> . 31.5 +<http://example.org/Area1> <http://strdf.di.uoa.gr/ontology#hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/32630"^^<http://strdf.di.uoa.gr/ontology#WKT> . 31.6 \ No newline at end of file
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/testsuite/src/test/resources/bugs/StoreWKTTest/StoreWKTTest.rq Wed Jul 17 14:18:17 2013 +0300 32.3 @@ -0,0 +1,2 @@ 32.4 +SELECT ?o 32.5 +WHERE {?s strdf:hasGeometry ?o} 32.6 \ No newline at end of file
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/testsuite/src/test/resources/bugs/StoreWKTTest/StoreWKTTest.srx Wed Jul 17 14:18:17 2013 +0300 33.3 @@ -0,0 +1,18 @@ 33.4 +<?xml version='1.0' encoding='UTF-8'?> 33.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 33.6 + <head> 33.7 + <variable name='o'/> 33.8 + </head> 33.9 + <results> 33.10 + <result> 33.11 + <binding name='o'> 33.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 33.13 + </binding> 33.14 + </result> 33.15 + <result> 33.16 + <binding name='o'> 33.17 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/32630</literal> 33.18 + </binding> 33.19 + </result> 33.20 + </results> 33.21 +</sparql> 33.22 \ No newline at end of file
34.1 --- a/testsuite/src/test/resources/prefixes Wed Jul 17 13:39:41 2013 +0300 34.2 +++ b/testsuite/src/test/resources/prefixes Wed Jul 17 14:18:17 2013 +0300 34.3 @@ -12,4 +12,5 @@ 34.4 PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 34.5 PREFIX geo: <http://www.opengis.net/ont/geosparql#> 34.6 PREFIX geof: <http://www.opengis.net/def/function/geosparql/> 34.7 -PREFIX ogc: <http://www.opengis.net/def/uom/OGC/1.0/> 34.8 \ No newline at end of file 34.9 +PREFIX ogc: <http://www.opengis.net/def/uom/OGC/1.0/> 34.10 +PREFIX ex: <http://example.org#> 34.11 \ No newline at end of file
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/AggregateFunctionsTest.nt Wed Jul 17 14:18:17 2013 +0300 35.3 @@ -0,0 +1,2 @@ 35.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 35.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 35.6 \ No newline at end of file
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/ExtentTest.rq Wed Jul 17 14:18:17 2013 +0300 36.3 @@ -0,0 +1,5 @@ 36.4 +select (strdf:extent(?g) as ?extent) 36.5 +where 36.6 +{ 36.7 + ?x ex:hasGeometry ?g. 36.8 +} 36.9 \ No newline at end of file
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 37.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/ExtentTest.srx Wed Jul 17 14:18:17 2013 +0300 37.3 @@ -0,0 +1,13 @@ 37.4 +<?xml version='1.0' encoding='UTF-8'?> 37.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 37.6 + <head> 37.7 + <variable name='extent'/> 37.8 + </head> 37.9 + <results> 37.10 + <result> 37.11 + <binding name='extent'> 37.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 2, 2 2, 2 0, 0 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 37.13 + </binding> 37.14 + </result> 37.15 + </results> 37.16 +</sparql>
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 38.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/UnionTest.rq Wed Jul 17 14:18:17 2013 +0300 38.3 @@ -0,0 +1,5 @@ 38.4 +select (strdf:union(?g) as ?union) 38.5 +where 38.6 +{ 38.7 + ?x ex:hasGeometry ?g. 38.8 +} 38.9 \ No newline at end of file
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 39.2 +++ b/testsuite/src/test/resources/stSPARQL/AggregateFunctionsTest/UnionTest.srx Wed Jul 17 14:18:17 2013 +0300 39.3 @@ -0,0 +1,13 @@ 39.4 +<?xml version='1.0' encoding='UTF-8'?> 39.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 39.6 + <head> 39.7 + <variable name='union'/> 39.8 + </head> 39.9 + <results> 39.10 + <result> 39.11 + <binding name='union'> 39.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((1 0, 0 0, 0 1, 0 2, 2 2, 2 0, 1 0));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 39.13 + </binding> 39.14 + </result> 39.15 + </results> 39.16 +</sparql>
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 40.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/AsGMLTest.rq Wed Jul 17 14:18:17 2013 +0300 40.3 @@ -0,0 +1,5 @@ 40.4 +select (strdf:asGML(?g) as ?gml) 40.5 +where 40.6 +{ 40.7 + ex:polygon1 ex:hasGeometry ?g. 40.8 +} 40.9 \ No newline at end of file
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/AsGMLTest.srx Wed Jul 17 14:18:17 2013 +0300 41.3 @@ -0,0 +1,13 @@ 41.4 +<?xml version='1.0' encoding='UTF-8'?> 41.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 41.6 + <head> 41.7 + <variable name='gml'/> 41.8 + </head> 41.9 + <results> 41.10 + <result> 41.11 + <binding name='gml'> 41.12 + <literal><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>0,0 1,0 1,1 0,1 0,0</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></literal> 41.13 + </binding> 41.14 + </result> 41.15 + </results> 41.16 + </sparql> 41.17 \ No newline at end of file
42.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 42.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/AsTextTest.rq Wed Jul 17 14:18:17 2013 +0300 42.3 @@ -0,0 +1,5 @@ 42.4 +select (strdf:asText(?g) as ?wkt) 42.5 +where 42.6 +{ 42.7 + ex:polygon1 ex:hasGeometry ?g. 42.8 +} 42.9 \ No newline at end of file
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 43.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/AsTextTest.srx Wed Jul 17 14:18:17 2013 +0300 43.3 @@ -0,0 +1,13 @@ 43.4 +<?xml version='1.0' encoding='UTF-8'?> 43.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 43.6 + <head> 43.7 + <variable name='wkt'/> 43.8 + </head> 43.9 + <results> 43.10 + <result> 43.11 + <binding name='wkt'> 43.12 + <literal>POLYGON((0 0,1 0,1 1,0 1,0 0))</literal> 43.13 + </binding> 43.14 + </result> 43.15 + </results> 43.16 + </sparql> 43.17 \ No newline at end of file
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 44.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/BasicFunctionsTest.nt Wed Jul 17 14:18:17 2013 +0300 44.3 @@ -0,0 +1,3 @@ 44.4 +<http://example.org#polygon1> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT> . 44.5 +<http://example.org#polygon2> <http://example.org#hasGeometry> "Linestring(0 0, 1 0, 0 1, 1 1, 0 0)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 44.6 +<http://example.org#polygon3> <http://example.org#hasGeometry> ""^^<http://strdf.di.uoa.gr/ontology#WKT> . 44.7 \ No newline at end of file
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 45.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/DimensionTest.rq Wed Jul 17 14:18:17 2013 +0300 45.3 @@ -0,0 +1,5 @@ 45.4 +select (strdf:dimension(?g) as ?dimension) 45.5 +where 45.6 +{ 45.7 + ex:polygon1 ex:hasGeometry ?g. 45.8 +} 45.9 \ No newline at end of file
46.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 46.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/DimensionTest.srx Wed Jul 17 14:18:17 2013 +0300 46.3 @@ -0,0 +1,13 @@ 46.4 +<?xml version='1.0' encoding='UTF-8'?> 46.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 46.6 + <head> 46.7 + <variable name='dimension'/> 46.8 + </head> 46.9 + <results> 46.10 + <result> 46.11 + <binding name='dimension'> 46.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#int'>2</literal> 46.13 + </binding> 46.14 + </result> 46.15 + </results> 46.16 + </sparql> 46.17 \ No newline at end of file
47.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 47.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/GeometryTypeTest.rq Wed Jul 17 14:18:17 2013 +0300 47.3 @@ -0,0 +1,5 @@ 47.4 +select (strdf:geometryType(?g) as ?geomType) 47.5 +where 47.6 +{ 47.7 + ex:polygon1 ex:hasGeometry ?g. 47.8 +} 47.9 \ No newline at end of file
48.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 48.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/GeometryTypeTest.srx Wed Jul 17 14:18:17 2013 +0300 48.3 @@ -0,0 +1,13 @@ 48.4 +<?xml version='1.0' encoding='UTF-8'?> 48.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 48.6 + <head> 48.7 + <variable name='geomType'/> 48.8 + </head> 48.9 + <results> 48.10 + <result> 48.11 + <binding name='geomType'> 48.12 + <literal>ST_Polygon</literal> 48.13 + </binding> 48.14 + </result> 48.15 + </results> 48.16 + </sparql> 48.17 \ No newline at end of file
49.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 49.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/IsEmptyTest.rq Wed Jul 17 14:18:17 2013 +0300 49.3 @@ -0,0 +1,5 @@ 49.4 +select (strdf:isEmpty(?g) as ?empty) 49.5 +where 49.6 +{ 49.7 + ?x ex:hasGeometry ?g. 49.8 +} 49.9 \ No newline at end of file
50.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 50.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/IsEmptyTest.srx Wed Jul 17 14:18:17 2013 +0300 50.3 @@ -0,0 +1,23 @@ 50.4 +<?xml version='1.0' encoding='UTF-8'?> 50.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 50.6 + <head> 50.7 + <variable name='empty'/> 50.8 + </head> 50.9 + <results> 50.10 + <result> 50.11 + <binding name='empty'> 50.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 50.13 + </binding> 50.14 + </result> 50.15 + <result> 50.16 + <binding name='empty'> 50.17 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 50.18 + </binding> 50.19 + </result> 50.20 + <result> 50.21 + <binding name='empty'> 50.22 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>true</literal> 50.23 + </binding> 50.24 + </result> 50.25 + </results> 50.26 + </sparql> 50.27 \ No newline at end of file
51.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 51.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/IsSimpleTest.rq Wed Jul 17 14:18:17 2013 +0300 51.3 @@ -0,0 +1,5 @@ 51.4 +select (strdf:isSimple(?g) as ?simple) 51.5 +where 51.6 +{ 51.7 + ?x ex:hasGeometry ?g. 51.8 +} 51.9 \ No newline at end of file
52.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 52.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/IsSimpleTest.srx Wed Jul 17 14:18:17 2013 +0300 52.3 @@ -0,0 +1,23 @@ 52.4 +<?xml version='1.0' encoding='UTF-8'?> 52.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 52.6 + <head> 52.7 + <variable name='simple'/> 52.8 + </head> 52.9 + <results> 52.10 + <result> 52.11 + <binding name='simple'> 52.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>true</literal> 52.13 + </binding> 52.14 + </result> 52.15 + <result> 52.16 + <binding name='simple'> 52.17 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>false</literal> 52.18 + </binding> 52.19 + </result> 52.20 + <result> 52.21 + <binding name='simple'> 52.22 + <literal datatype='http://www.w3.org/2001/XMLSchema#boolean'>true</literal> 52.23 + </binding> 52.24 + </result> 52.25 + </results> 52.26 + </sparql> 52.27 \ No newline at end of file
53.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 53.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/SridTest.rq Wed Jul 17 14:18:17 2013 +0300 53.3 @@ -0,0 +1,5 @@ 53.4 +select (strdf:srid(?g) as ?srid) 53.5 +where 53.6 +{ 53.7 + ex:polygon1 ex:hasGeometry ?g. 53.8 +} 53.9 \ No newline at end of file
54.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 54.2 +++ b/testsuite/src/test/resources/stSPARQL/BasicFunctionsTest/SridTest.srx Wed Jul 17 14:18:17 2013 +0300 54.3 @@ -0,0 +1,13 @@ 54.4 +<?xml version='1.0' encoding='UTF-8'?> 54.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 54.6 + <head> 54.7 + <variable name='srid'/> 54.8 + </head> 54.9 + <results> 54.10 + <result> 54.11 + <binding name='srid'> 54.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#int'>4326</literal> 54.13 + </binding> 54.14 + </result> 54.15 + </results> 54.16 + </sparql> 54.17 \ No newline at end of file
55.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTest.nt Wed Jul 17 13:39:41 2013 +0300 55.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 55.3 @@ -1,3 +0,0 @@ 55.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 55.5 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> . 55.6 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 55.7 \ No newline at end of file
56.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.rq Wed Jul 17 13:39:41 2013 +0300 56.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 56.3 @@ -1,5 +0,0 @@ 56.4 -select (strdf:buffer(?g, 0.2, ogc:degree) as ?buf) 56.5 -where 56.6 -{ 56.7 -?x <http://example.org/ontology/hasGeometry> ?g 56.8 -} 56.9 \ No newline at end of file
57.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestDegrees.srx Wed Jul 17 13:39:41 2013 +0300 57.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 57.3 @@ -1,23 +0,0 @@ 57.4 -<?xml version='1.0' encoding='UTF-8'?> 57.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 57.6 - <head> 57.7 - <variable name='buf'/> 57.8 - </head> 57.9 - <results> 57.10 - <result> 57.11 - <binding name='buf'> 57.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((23.842375699999998 37.9521198, 23.838532756080646 37.913101735596776, 23.827151606502255 37.87558311352698, 23.808669622460506 37.841005753396075, 23.783797056237308 37.81069844376269, 23.75348974660392 37.78582587753949, 23.71891238647302 37.76734389349774, 23.681393764403225 37.755962743919355, 23.6423757 37.752119799999996, 23.603357635596772 37.755962743919355, 23.565839013526983 37.76734389349774, 23.53126165339608 37.78582587753949, 23.50095434376269 37.81069844376269, 23.47608177753949 37.841005753396075, 23.457599793497742 37.87558311352698, 23.44621864391935 37.913101735596776, 23.4423757 37.9521198, 23.44621864391935 37.99113786440322, 23.457599793497742 38.02865648647302, 23.476081777539488 38.06323384660392, 23.50095434376269 38.09354115623731, 23.53126165339608 38.11841372246051, 23.56583901352698 38.13689570650226, 23.603357635596772 38.14827685608064, 23.6423757 38.1521198, 23.681393764403225 38.14827685608064, 23.718912386473015 38.13689570650226, 23.75348974660392 38.11841372246051, 23.783797056237308 38.09354115623731, 23.808669622460506 38.06323384660392, 23.827151606502255 38.02865648647302, 23.838532756080646 37.99113786440322, 23.842375699999998 37.9521198))</literal> 57.13 - </binding> 57.14 - </result> 57.15 - <result> 57.16 - <binding name='buf'> 57.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-6.858578643762691 4.341421356237309, -6.833706077539491 4.311114046603921, -6.815224093497743 4.276536686473018, -6.803842943919354 4.239018064403226, -6.8 4.2, -6.803842943919354 4.160981935596775, -6.815224093497743 4.123463313526982, -6.833706077539491 4.08888595339608, -6.858578643762691 4.058578643762691, -6.88888595339608 4.033706077539491, -6.923463313526982 4.015224093497743, -6.960981935596775 4.003842943919354, -7 4, -7.1 4, -7.139018064403227 4.003842943919354, -7.1765366864730185 4.015224093497743, -7.211114046603921 4.033706077539492, -7.24142135623731 4.058578643762691, -7.266293922460509 4.08888595339608, -7.284775906502257 4.123463313526982, -7.296157056080646 4.160981935596775, -7.3 4.2, -7.3 4.3, -7.296157056080646 4.339018064403225, -7.284775906502257 4.376536686473018, -7.266293922460509 4.41111404660392, -7.241421356237309 4.441421356237309, -7.21111404660392 4.466293922460509, -7.176536686473018 4.484775906502257, -7.139018064403225 4.496157056080646, -7.1 4.5, -7.060981935596774 4.496157056080646, -7.023463313526982 4.484775906502257, -6.988885953396079 4.466293922460509, -6.95857864376269 4.441421356237309, -6.858578643762691 4.341421356237309))</literal> 57.18 - </binding> 57.19 - </result> 57.20 - <result> 57.21 - <binding name='buf'> 57.22 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((22.041968 38.045047, 22.03812505608065 38.006028935596774, 22.026743906502258 37.96851031352698, 22.00826192246051 37.933932953396074, 21.98338935623731 37.90362564376269, 21.95308204660392 37.878753077539486, 21.91850468647302 37.86027109349774, 21.880986064403228 37.84888994391935, 21.841968 37.845046999999994, 21.802949935596775 37.84888994391935, 21.765431313526985 37.86027109349774, 21.730853953396082 37.878753077539486, 21.700546643762692 37.90362564376269, 21.675674077539494 37.933932953396074, 21.657192093497745 37.96851031352698, 21.645810943919354 38.006028935596774, 21.641968000000002 38.045047, 21.645810943919354 38.08406506440322, 21.657192093497745 38.121583686473016, 21.67567407753949 38.15616104660392, 21.700546643762692 38.186468356237306, 21.730853953396082 38.21134092246051, 21.76543131352698 38.22982290650226, 21.802949935596775 38.24120405608064, 21.841968 38.245047, 21.880986064403228 38.24120405608064, 21.918504686473018 38.22982290650226, 21.95308204660392 38.21134092246051, 21.98338935623731 38.186468356237306, 22.00826192246051 38.15616104660392, 22.026743906502258 38.121583686473016, 22.03812505608065 38.08406506440322, 22.041968 38.045047))</literal> 57.23 - </binding> 57.24 - </result> 57.25 - </results> 57.26 -</sparql> 57.27 \ No newline at end of file
58.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.rq Wed Jul 17 13:39:41 2013 +0300 58.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 58.3 @@ -1,6 +0,0 @@ 58.4 -select ?g1 58.5 -where 58.6 -{ 58.7 - <http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 . 58.8 - FILTER(strdf:within(?g1, strdf:buffer(?g1, 30, ogc:metre))) 58.9 -} 58.10 \ No newline at end of file
59.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestFilter.srx Wed Jul 17 13:39:41 2013 +0300 59.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 59.3 @@ -1,13 +0,0 @@ 59.4 -<?xml version='1.0' encoding='UTF-8'?> 59.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 59.6 - <head> 59.7 - <variable name='g1'/> 59.8 - </head> 59.9 - <results> 59.10 - <result> 59.11 - <binding name='g1'> 59.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (23.6423757 37.9521198)</literal> 59.13 - </binding> 59.14 - </result> 59.15 - </results> 59.16 -</sparql> 59.17 \ No newline at end of file
60.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.rq Wed Jul 17 13:39:41 2013 +0300 60.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 60.3 @@ -1,5 +0,0 @@ 60.4 -select (strdf:buffer(?g, 0.2, ogc:metre) as ?buf) 60.5 -where 60.6 -{ 60.7 -?x <http://example.org/ontology/hasGeometry> ?g 60.8 -} 60.9 \ No newline at end of file
61.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestMetres.srx Wed Jul 17 13:39:41 2013 +0300 61.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 61.3 @@ -1,24 +0,0 @@ 61.4 -<?xml version='1.0' encoding='UTF-8'?> 61.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 61.6 - <head> 61.7 - <variable name='buf'/> 61.8 - </head> 61.9 - <results> 61.10 - <result> 61.11 - <binding name='buf'> 61.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((23.642377974091588 37.95211974887083, 23.64237791780389 37.95211939855895, 23.642377776288168 37.952119063673464, 23.64237755498278 37.952118757083795, 23.64237726239237 37.952118490572026, 23.642376909761026 37.95211827438005, 23.642376510640172 37.952118116816, 23.642376080367796 37.95211802393498, 23.642375635479024 37.95211799930635, 23.64237519307068 37.95211804387658, 23.64237477014427 37.95211815593286, 23.642374382952614 37.952118331168926, 23.642374046375274 37.95211856285056, 23.642373773346723 37.95211884207436, 23.6423735743593 37.952119158109916, 23.642373457059982 37.95211949881216, 23.642373425956514 37.95211985108811, 23.64237348224418 37.95212020139997, 23.64237362375989 37.95212053628546, 23.64237384506527 37.95212084287514, 23.642374137655676 37.95212110938693, 23.642374490287025 37.952121325578915, 23.642374889407893 37.95212148314297, 23.64237531968029 37.95212157602399, 23.642375764569085 37.95212160065262, 23.64237620697745 37.95212155608239, 23.642376629903875 37.952121444026105, 23.64237701709554 37.95212126879002, 23.642377353672885 37.95212103710839, 23.64237762670143 37.95212075788458, 23.642377825688836 37.95212044184901, 23.642377942988137 37.95212010114676, 23.642377974091588 37.95211974887083))</literal> 61.13 - </binding> 61.14 - </result> 61.15 - <result> 61.16 - <binding name='buf'> 61.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-6.999998728930015 4.200001281097435, -6.9999985042528285 4.2000010072645715, -6.999998337153763 4.200000694657804, -6.999998234065173 4.200000355310692, -6.999998198955376 4.2000000022861546, -6.999998233175899 4.1999996491736065, -6.999998335409446 4.199999309565852, -6.999998501720614 4.199998996535837, -6.999998725707379 4.19999872213342, -6.999998998747537 4.199998496921517, -6.99999931033061 4.199998329569492, -6.999999648462441 4.199998226519436, -7.000000000126898 4.199998191738187, -7.099999999893686 4.199998191630642, -7.10000035129349 4.199998226356922, -7.100000689193024 4.199998329246345, -7.100001000606421 4.19999849634475, -7.100001273565705 4.199998721230353, -7.100001497580733 4.19999899526054, -7.100001664042355 4.199999307904017, -7.1000017665532535 4.199999647145535, -7.10000180117382 4.199999999947651, -7.100001801406124 4.300000000052062, -7.100001766842003 4.300000352545832, -7.100001664495917 4.3000006915146916, -7.100001498294219 4.300001003954596, -7.100001274613 4.300001277879246, -7.1000010020334585 4.300001502779922, -7.100000691012711 4.3000016700286405, -7.100000353482613 4.300001773209148, -7.100000002392014 4.300001808363074, -7.09999965120999 4.300001774141791, -7.0999993134091275 4.3000016718581495, -7.099999001948662 4.30000150543611, -7.099998728777317 4.3000012812602115, -6.999998728930015 4.200001281097435))</literal> 61.18 - </binding> 61.19 - </result> 61.20 - <result> 61.21 - <binding name='buf'> 61.22 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((21.841970279121966 38.04504698367591, 21.841970231302223 38.045046632364425, 21.841970097734794 38.045046295180974, 21.841969883552594 38.04504598508332, 21.841969596986527 38.04504571398833, 21.841969249049175 38.045045492314046, 21.841968853111563 38.045045328579306, 21.84196842438936 38.04504522907631, 21.841967979358117 38.04504519762891, 21.84196753512013 38.04504523544562, 21.841967108747212 38.04504534107318, 21.841966716624647 38.04504551045233, 21.84196637382147 38.04504573707399, 21.841966093511427 38.045046012229186, 21.841965886466667 38.04504632534384, 21.84196576064381 38.045046664385154, 21.841965720878154 38.04504701632397, 21.841965768697875 38.04504736763546, 21.84196590226529 38.04504770481892, 21.84196611644748 38.04504801491659, 21.84196640301354 38.045048286011586, 21.8419667509509 38.04504850768586, 21.84196714688852 38.04504867142062, 21.841967575610745 38.04504877092362, 21.84196802064201 38.045048802371014, 21.84196846488002 38.045048764554295, 21.84196889125295 38.04504865892675, 21.84196928337553 38.045048489547575, 21.84196962617871 38.04504826292592, 21.841969906488746 38.04504798777072, 21.841970113533492 38.04504767465605, 21.841970239356336 38.045047335614726, 21.841970279121966 38.04504698367591))</literal> 61.23 - </binding> 61.24 - </result> 61.25 - </results> 61.26 -</sparql> 61.27 -
62.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.rq Wed Jul 17 13:39:41 2013 +0300 62.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 62.3 @@ -1,6 +0,0 @@ 62.4 -select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buf) 62.5 -where 62.6 -{ 62.7 - <http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 . 62.8 - <http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 . 62.9 -} 62.10 \ No newline at end of file
63.1 --- a/testsuite/src/test/resources/stSPARQL/BufferTest/BufferTestWithDistance.srx Wed Jul 17 13:39:41 2013 +0300 63.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 63.3 @@ -1,13 +0,0 @@ 63.4 -<?xml version='1.0' encoding='UTF-8'?> 63.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 63.6 - <head> 63.7 - <variable name='buf'/> 63.8 - </head> 63.9 - <results> 63.10 - <result> 63.11 - <binding name='buf'> 63.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((69.22262175806229 37.9521198, 68.34681011090487 29.059854918958273, 65.75303211987202 20.509314790455388, 61.540965218551676 12.629091876431552, 55.87247677580727 5.722018724192779, 48.965403623568506 0.05353028144836, 41.08518070954467 -4.158536619871988, 32.53464058104179 -6.752314610904847, 23.642375700000073 -7.628126258062288, 14.750110818958348 -6.752314610904875, 6.1995706904554595 -4.158536619872045, -1.6806522235683943 0.0535302814482819, -8.587725375807171 5.722018724192679, -14.256213818551597 12.629091876431435, -18.46828071987196 20.509314790455253, -21.062058710904832 29.05985491895813, -21.937870358062288 37.95211979999985, -21.06205871090489 46.844384681041575, -18.468280719872073 55.39492480954447, -14.256213818551768 63.275147723568324, -8.587725375807377 70.1822208758071, -1.6806522235686359 75.85070931855155, 6.199570690455197 80.06277621987194, 14.75011081895809 82.65655421090483, 23.64237569999983 83.53236585806229, 32.53464058104157 82.65655421090489, 41.08518070954449 80.06277621987206, 48.96540362356835 75.85070931855174, 55.872476775807144 70.18222087580733, 61.54096521855159 63.275147723568566, 65.75303211987196 55.39492480954473, 68.34681011090484 46.84438468104183, 69.22262175806229 37.9521198))</literal> 63.13 - </binding> 63.14 - </result> 63.15 - </results> 63.16 -</sparql>
64.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTest.nt Wed Jul 17 13:39:41 2013 +0300 64.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 64.3 @@ -1,3 +0,0 @@ 64.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 64.5 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> . 64.6 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 64.7 \ No newline at end of file
65.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.rq Wed Jul 17 13:39:41 2013 +0300 65.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 65.3 @@ -1,6 +0,0 @@ 65.4 -select (strdf:distance(?g1, ?g2, ogc:degree) as ?dist) 65.5 -where 65.6 -{ 65.7 - <http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 . 65.8 - <http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 . 65.9 -} 65.10 \ No newline at end of file
66.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestDegrees.srx Wed Jul 17 13:39:41 2013 +0300 66.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 66.3 @@ -1,13 +0,0 @@ 66.4 -<?xml version='1.0' encoding='UTF-8'?> 66.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 66.6 - <head> 66.7 - <variable name='dist'/> 66.8 - </head> 66.9 - <results> 66.10 - <result> 66.11 - <binding name='dist'> 66.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#double'>45.58024597167969</literal> 66.13 - </binding> 66.14 - </result> 66.15 - </results> 66.16 -</sparql> 66.17 \ No newline at end of file
67.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.rq Wed Jul 17 13:39:41 2013 +0300 67.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 67.3 @@ -1,7 +0,0 @@ 67.4 -select ?x ?y 67.5 -where 67.6 -{ 67.7 - ?x <http://example.org/ontology/hasGeometry> ?g1 . 67.8 - ?y <http://example.org/ontology/hasGeometry> ?g2 . 67.9 - FILTER(strdf:distance(?g1, ?g2, ogc:metre) < 5) 67.10 -} 67.11 \ No newline at end of file
68.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestFilter.srx Wed Jul 17 13:39:41 2013 +0300 68.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 68.3 @@ -1,33 +0,0 @@ 68.4 -<?xml version='1.0' encoding='UTF-8'?> 68.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 68.6 - <head> 68.7 - <variable name='x'/> 68.8 - <variable name='y'/> 68.9 - </head> 68.10 - <results> 68.11 - <result> 68.12 - <binding name='y'> 68.13 - <uri>http://example.org/id/Point/5531</uri> 68.14 - </binding> 68.15 - <binding name='x'> 68.16 - <uri>http://example.org/id/Point/5531</uri> 68.17 - </binding> 68.18 - </result> 68.19 - <result> 68.20 - <binding name='y'> 68.21 - <uri>http://example.org/id/Point/5532</uri> 68.22 - </binding> 68.23 - <binding name='x'> 68.24 - <uri>http://example.org/id/Point/5532</uri> 68.25 - </binding> 68.26 - </result> 68.27 - <result> 68.28 - <binding name='y'> 68.29 - <uri>http://example.org/id/Point/5533</uri> 68.30 - </binding> 68.31 - <binding name='x'> 68.32 - <uri>http://example.org/id/Point/5533</uri> 68.33 - </binding> 68.34 - </result> 68.35 - </results> 68.36 -</sparql> 68.37 \ No newline at end of file
69.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.rq Wed Jul 17 13:39:41 2013 +0300 69.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 69.3 @@ -1,6 +0,0 @@ 69.4 -select (strdf:distance(?g1, ?g2, ogc:metre) as ?dist) 69.5 -where 69.6 -{ 69.7 - <http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 . 69.8 - <http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 . 69.9 -} 69.10 \ No newline at end of file
70.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestMetres.srx Wed Jul 17 13:39:41 2013 +0300 70.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 70.3 @@ -1,13 +0,0 @@ 70.4 -<?xml version='1.0' encoding='UTF-8'?> 70.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 70.6 - <head> 70.7 - <variable name='dist'/> 70.8 - </head> 70.9 - <results> 70.10 - <result> 70.11 - <binding name='dist'> 70.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#double'>4860346.0</literal> 70.13 - </binding> 70.14 - </result> 70.15 - </results> 70.16 -</sparql>
71.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.rq Wed Jul 17 13:39:41 2013 +0300 71.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 71.3 @@ -1,7 +0,0 @@ 71.4 -select (strdf:distance(strdf:union(?g1, ?g2), ?g3, ogc:metre) as ?dist) 71.5 -where 71.6 -{ 71.7 - <http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> ?g1 . 71.8 - <http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> ?g2 . 71.9 - <http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> ?g3 . 71.10 -} 71.11 \ No newline at end of file
72.1 --- a/testsuite/src/test/resources/stSPARQL/DistanceTest/DistanceTestWithUnion.srx Wed Jul 17 13:39:41 2013 +0300 72.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 72.3 @@ -1,13 +0,0 @@ 72.4 -<?xml version='1.0' encoding='UTF-8'?> 72.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 72.6 - <head> 72.7 - <variable name='dist'/> 72.8 - </head> 72.9 - <results> 72.10 - <result> 72.11 - <binding name='dist'> 72.12 - <literal datatype='http://www.w3.org/2001/XMLSchema#double'>158470.796875</literal> 72.13 - </binding> 72.14 - </result> 72.15 - </results> 72.16 -</sparql> 72.17 \ No newline at end of file
73.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 73.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/AboveTest.rq Wed Jul 17 14:18:17 2013 +0300 73.3 @@ -0,0 +1,7 @@ 73.4 +SELECT ?x ?y 73.5 +WHERE 73.6 +{ 73.7 +?x ex:hasGeometry ?g1. 73.8 +?y ex:hasGeometry ?g2. 73.9 + 73.10 +FILTER((?x != ?y) && (strdf:above(?g1, ?g2)))} 73.11 \ No newline at end of file
74.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 74.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/AboveTest.srx Wed Jul 17 14:18:17 2013 +0300 74.3 @@ -0,0 +1,25 @@ 74.4 +<?xml version='1.0' encoding='UTF-8'?> 74.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 74.6 + <head> 74.7 + <variable name='x'/> 74.8 + <variable name='y'/> 74.9 + </head> 74.10 + <results> 74.11 + <result> 74.12 + <binding name='y'> 74.13 + <uri>http://example.org#A</uri> 74.14 + </binding> 74.15 + <binding name='x'> 74.16 + <uri>http://example.org#H</uri> 74.17 + </binding> 74.18 + </result> 74.19 + <result> 74.20 + <binding name='y'> 74.21 + <uri>http://example.org#G</uri> 74.22 + </binding> 74.23 + <binding name='x'> 74.24 + <uri>http://example.org#H</uri> 74.25 + </binding> 74.26 + </result> 74.27 + </results> 74.28 + </sparql> 74.29 \ No newline at end of file
75.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 75.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/BelowTest.rq Wed Jul 17 14:18:17 2013 +0300 75.3 @@ -0,0 +1,7 @@ 75.4 +SELECT ?x ?y 75.5 +WHERE 75.6 +{ 75.7 +?x ex:hasGeometry ?g1. 75.8 +?y ex:hasGeometry ?g2. 75.9 + 75.10 +FILTER((?x != ?y) && (strdf:below(?g1, ?g2)))} 75.11 \ No newline at end of file
76.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 76.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/BelowTest.srx Wed Jul 17 14:18:17 2013 +0300 76.3 @@ -0,0 +1,25 @@ 76.4 +<?xml version='1.0' encoding='UTF-8'?> 76.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 76.6 + <head> 76.7 + <variable name='x'/> 76.8 + <variable name='y'/> 76.9 + </head> 76.10 + <results> 76.11 + <result> 76.12 + <binding name='y'> 76.13 + <uri>http://example.org#H</uri> 76.14 + </binding> 76.15 + <binding name='x'> 76.16 + <uri>http://example.org#A</uri> 76.17 + </binding> 76.18 + </result> 76.19 + <result> 76.20 + <binding name='y'> 76.21 + <uri>http://example.org#H</uri> 76.22 + </binding> 76.23 + <binding name='x'> 76.24 + <uri>http://example.org#G</uri> 76.25 + </binding> 76.26 + </result> 76.27 + </results> 76.28 + </sparql> 76.29 \ No newline at end of file
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 77.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/LeftTest.rq Wed Jul 17 14:18:17 2013 +0300 77.3 @@ -0,0 +1,7 @@ 77.4 +SELECT ?x ?y 77.5 +WHERE 77.6 +{ 77.7 +?x ex:hasGeometry ?g1. 77.8 +?y ex:hasGeometry ?g2. 77.9 + 77.10 +FILTER((?x != ?y) && (strdf:left(?g1, ?g2)))} 77.11 \ No newline at end of file
78.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 78.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/LeftTest.srx Wed Jul 17 14:18:17 2013 +0300 78.3 @@ -0,0 +1,129 @@ 78.4 +<?xml version='1.0' encoding='UTF-8'?> 78.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 78.6 + <head> 78.7 + <variable name='x'/> 78.8 + <variable name='y'/> 78.9 + </head> 78.10 + <results> 78.11 + <result> 78.12 + <binding name='y'> 78.13 + <uri>http://example.org#E</uri> 78.14 + </binding> 78.15 + <binding name='x'> 78.16 + <uri>http://example.org#A</uri> 78.17 + </binding> 78.18 + </result> 78.19 + <result> 78.20 + <binding name='y'> 78.21 + <uri>http://example.org#D</uri> 78.22 + </binding> 78.23 + <binding name='x'> 78.24 + <uri>http://example.org#A</uri> 78.25 + </binding> 78.26 + </result> 78.27 + <result> 78.28 + <binding name='y'> 78.29 + <uri>http://example.org#F</uri> 78.30 + </binding> 78.31 + <binding name='x'> 78.32 + <uri>http://example.org#A</uri> 78.33 + </binding> 78.34 + </result> 78.35 + <result> 78.36 + <binding name='y'> 78.37 + <uri>http://example.org#H</uri> 78.38 + </binding> 78.39 + <binding name='x'> 78.40 + <uri>http://example.org#A</uri> 78.41 + </binding> 78.42 + </result> 78.43 + <result> 78.44 + <binding name='y'> 78.45 + <uri>http://example.org#E</uri> 78.46 + </binding> 78.47 + <binding name='x'> 78.48 + <uri>http://example.org#B</uri> 78.49 + </binding> 78.50 + </result> 78.51 + <result> 78.52 + <binding name='y'> 78.53 + <uri>http://example.org#D</uri> 78.54 + </binding> 78.55 + <binding name='x'> 78.56 + <uri>http://example.org#B</uri> 78.57 + </binding> 78.58 + </result> 78.59 + <result> 78.60 + <binding name='y'> 78.61 + <uri>http://example.org#F</uri> 78.62 + </binding> 78.63 + <binding name='x'> 78.64 + <uri>http://example.org#B</uri> 78.65 + </binding> 78.66 + </result> 78.67 + <result> 78.68 + <binding name='y'> 78.69 + <uri>http://example.org#H</uri> 78.70 + </binding> 78.71 + <binding name='x'> 78.72 + <uri>http://example.org#B</uri> 78.73 + </binding> 78.74 + </result> 78.75 + <result> 78.76 + <binding name='y'> 78.77 + <uri>http://example.org#E</uri> 78.78 + </binding> 78.79 + <binding name='x'> 78.80 + <uri>http://example.org#G</uri> 78.81 + </binding> 78.82 + </result> 78.83 + <result> 78.84 + <binding name='y'> 78.85 + <uri>http://example.org#D</uri> 78.86 + </binding> 78.87 + <binding name='x'> 78.88 + <uri>http://example.org#G</uri> 78.89 + </binding> 78.90 + </result> 78.91 + <result> 78.92 + <binding name='y'> 78.93 + <uri>http://example.org#F</uri> 78.94 + </binding> 78.95 + <binding name='x'> 78.96 + <uri>http://example.org#G</uri> 78.97 + </binding> 78.98 + </result> 78.99 + <result> 78.100 + <binding name='y'> 78.101 + <uri>http://example.org#H</uri> 78.102 + </binding> 78.103 + <binding name='x'> 78.104 + <uri>http://example.org#G</uri> 78.105 + </binding> 78.106 + </result> 78.107 + <result> 78.108 + <binding name='y'> 78.109 + <uri>http://example.org#E</uri> 78.110 + </binding> 78.111 + <binding name='x'> 78.112 + <uri>http://example.org#H</uri> 78.113 + </binding> 78.114 + </result> 78.115 + <result> 78.116 + <binding name='y'> 78.117 + <uri>http://example.org#D</uri> 78.118 + </binding> 78.119 + <binding name='x'> 78.120 + <uri>http://example.org#H</uri> 78.121 + </binding> 78.122 + </result> 78.123 + <result> 78.124 + <binding name='y'> 78.125 + <uri>http://example.org#F</uri> 78.126 + </binding> 78.127 + <binding name='x'> 78.128 + <uri>http://example.org#H</uri> 78.129 + </binding> 78.130 + </result> 78.131 + </results> 78.132 + </sparql> 78.133 \ No newline at end of file
79.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 79.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBContainsTest.rq Wed Jul 17 14:18:17 2013 +0300 79.3 @@ -0,0 +1,7 @@ 79.4 +SELECT ?x ?y 79.5 +WHERE 79.6 +{ 79.7 +?x ex:hasGeometry ?g1. 79.8 +?y ex:hasGeometry ?g2. 79.9 + 79.10 +FILTER((?x != ?y) && (strdf:mbbContains(?g1, ?g2)))} 79.11 \ No newline at end of file
80.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 80.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBContainsTest.srx Wed Jul 17 14:18:17 2013 +0300 80.3 @@ -0,0 +1,81 @@ 80.4 +<?xml version='1.0' encoding='UTF-8'?> 80.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 80.6 + <head> 80.7 + <variable name='x'/> 80.8 + <variable name='y'/> 80.9 + </head> 80.10 + <results> 80.11 + <result> 80.12 + <binding name='y'> 80.13 + <uri>http://example.org#G</uri> 80.14 + </binding> 80.15 + <binding name='x'> 80.16 + <uri>http://example.org#A</uri> 80.17 + </binding> 80.18 + </result> 80.19 + <result> 80.20 + <binding name='y'> 80.21 + <uri>http://example.org#A</uri> 80.22 + </binding> 80.23 + <binding name='x'> 80.24 + <uri>http://example.org#B</uri> 80.25 + </binding> 80.26 + </result> 80.27 + <result> 80.28 + <binding name='y'> 80.29 + <uri>http://example.org#G</uri> 80.30 + </binding> 80.31 + <binding name='x'> 80.32 + <uri>http://example.org#B</uri> 80.33 + </binding> 80.34 + </result> 80.35 + <result> 80.36 + <binding name='y'> 80.37 + <uri>http://example.org#G</uri> 80.38 + </binding> 80.39 + <binding name='x'> 80.40 + <uri>http://example.org#C</uri> 80.41 + </binding> 80.42 + </result> 80.43 + <result> 80.44 + <binding name='y'> 80.45 + <uri>http://example.org#H</uri> 80.46 + </binding> 80.47 + <binding name='x'> 80.48 + <uri>http://example.org#C</uri> 80.49 + </binding> 80.50 + </result> 80.51 + <result> 80.52 + <binding name='y'> 80.53 + <uri>http://example.org#D</uri> 80.54 + </binding> 80.55 + <binding name='x'> 80.56 + <uri>http://example.org#E</uri> 80.57 + </binding> 80.58 + </result> 80.59 + <result> 80.60 + <binding name='y'> 80.61 + <uri>http://example.org#E</uri> 80.62 + </binding> 80.63 + <binding name='x'> 80.64 + <uri>http://example.org#D</uri> 80.65 + </binding> 80.66 + </result> 80.67 + <result> 80.68 + <binding name='y'> 80.69 + <uri>http://example.org#E</uri> 80.70 + </binding> 80.71 + <binding name='x'> 80.72 + <uri>http://example.org#F</uri> 80.73 + </binding> 80.74 + </result> 80.75 + <result> 80.76 + <binding name='y'> 80.77 + <uri>http://example.org#D</uri> 80.78 + </binding> 80.79 + <binding name='x'> 80.80 + <uri>http://example.org#F</uri> 80.81 + </binding> 80.82 + </result> 80.83 + </results> 80.84 + </sparql> 80.85 \ No newline at end of file
81.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 81.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBEqualsTest.rq Wed Jul 17 14:18:17 2013 +0300 81.3 @@ -0,0 +1,7 @@ 81.4 +SELECT ?x ?y 81.5 +WHERE 81.6 +{ 81.7 +?x ex:hasGeometry ?g1. 81.8 +?y ex:hasGeometry ?g2. 81.9 + 81.10 +FILTER((?x != ?y) && (strdf:mbbEquals(?g1, ?g2)))} 81.11 \ No newline at end of file
82.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 82.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBEqualsTest.srx Wed Jul 17 14:18:17 2013 +0300 82.3 @@ -0,0 +1,25 @@ 82.4 +<?xml version='1.0' encoding='UTF-8'?> 82.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 82.6 + <head> 82.7 + <variable name='x'/> 82.8 + <variable name='y'/> 82.9 + </head> 82.10 + <results> 82.11 + <result> 82.12 + <binding name='y'> 82.13 + <uri>http://example.org#E</uri> 82.14 + </binding> 82.15 + <binding name='x'> 82.16 + <uri>http://example.org#D</uri> 82.17 + </binding> 82.18 + </result> 82.19 + <result> 82.20 + <binding name='y'> 82.21 + <uri>http://example.org#D</uri> 82.22 + </binding> 82.23 + <binding name='x'> 82.24 + <uri>http://example.org#E</uri> 82.25 + </binding> 82.26 + </result> 82.27 + </results> 82.28 +</sparql> 82.29 \ No newline at end of file
83.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 83.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBIntersectsTest.rq Wed Jul 17 14:18:17 2013 +0300 83.3 @@ -0,0 +1,7 @@ 83.4 +SELECT ?x ?y 83.5 +WHERE 83.6 +{ 83.7 +?x ex:hasGeometry ?g1. 83.8 +?y ex:hasGeometry ?g2. 83.9 + 83.10 +FILTER((?x != ?y) && (strdf:mbbIntersects(?g1, ?g2)))} 83.11 \ No newline at end of file
84.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 84.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBIntersectsTest.srx Wed Jul 17 14:18:17 2013 +0300 84.3 @@ -0,0 +1,217 @@ 84.4 +<?xml version='1.0' encoding='UTF-8'?> 84.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 84.6 + <head> 84.7 + <variable name='x'/> 84.8 + <variable name='y'/> 84.9 + </head> 84.10 + <results> 84.11 + <result> 84.12 + <binding name='y'> 84.13 + <uri>http://example.org#A</uri> 84.14 + </binding> 84.15 + <binding name='x'> 84.16 + <uri>http://example.org#B</uri> 84.17 + </binding> 84.18 + </result> 84.19 + <result> 84.20 + <binding name='y'> 84.21 + <uri>http://example.org#A</uri> 84.22 + </binding> 84.23 + <binding name='x'> 84.24 + <uri>http://example.org#C</uri> 84.25 + </binding> 84.26 + </result> 84.27 + <result> 84.28 + <binding name='y'> 84.29 + <uri>http://example.org#A</uri> 84.30 + </binding> 84.31 + <binding name='x'> 84.32 + <uri>http://example.org#G</uri> 84.33 + </binding> 84.34 + </result> 84.35 + <result> 84.36 + <binding name='y'> 84.37 + <uri>http://example.org#B</uri> 84.38 + </binding> 84.39 + <binding name='x'> 84.40 + <uri>http://example.org#A</uri> 84.41 + </binding> 84.42 + </result> 84.43 + <result> 84.44 + <binding name='y'> 84.45 + <uri>http://example.org#B</uri> 84.46 + </binding> 84.47 + <binding name='x'> 84.48 + <uri>http://example.org#C</uri> 84.49 + </binding> 84.50 + </result> 84.51 + <result> 84.52 + <binding name='y'> 84.53 + <uri>http://example.org#B</uri> 84.54 + </binding> 84.55 + <binding name='x'> 84.56 + <uri>http://example.org#G</uri> 84.57 + </binding> 84.58 + </result> 84.59 + <result> 84.60 + <binding name='y'> 84.61 + <uri>http://example.org#C</uri> 84.62 + </binding> 84.63 + <binding name='x'> 84.64 + <uri>http://example.org#A</uri> 84.65 + </binding> 84.66 + </result> 84.67 + <result> 84.68 + <binding name='y'> 84.69 + <uri>http://example.org#C</uri> 84.70 + </binding> 84.71 + <binding name='x'> 84.72 + <uri>http://example.org#B</uri> 84.73 + </binding> 84.74 + </result> 84.75 + <result> 84.76 + <binding name='y'> 84.77 + <uri>http://example.org#C</uri> 84.78 + </binding> 84.79 + <binding name='x'> 84.80 + <uri>http://example.org#D</uri> 84.81 + </binding> 84.82 + </result> 84.83 + <result> 84.84 + <binding name='y'> 84.85 + <uri>http://example.org#C</uri> 84.86 + </binding> 84.87 + <binding name='x'> 84.88 + <uri>http://example.org#E</uri> 84.89 + </binding> 84.90 + </result> 84.91 + <result> 84.92 + <binding name='y'> 84.93 + <uri>http://example.org#C</uri> 84.94 + </binding> 84.95 + <binding name='x'> 84.96 + <uri>http://example.org#F</uri> 84.97 + </binding> 84.98 + </result> 84.99 + <result> 84.100 + <binding name='y'> 84.101 + <uri>http://example.org#C</uri> 84.102 + </binding> 84.103 + <binding name='x'> 84.104 + <uri>http://example.org#G</uri> 84.105 + </binding> 84.106 + </result> 84.107 + <result> 84.108 + <binding name='y'> 84.109 + <uri>http://example.org#C</uri> 84.110 + </binding> 84.111 + <binding name='x'> 84.112 + <uri>http://example.org#H</uri> 84.113 + </binding> 84.114 + </result> 84.115 + <result> 84.116 + <binding name='y'> 84.117 + <uri>http://example.org#E</uri> 84.118 + </binding> 84.119 + <binding name='x'> 84.120 + <uri>http://example.org#C</uri> 84.121 + </binding> 84.122 + </result> 84.123 + <result> 84.124 + <binding name='y'> 84.125 + <uri>http://example.org#E</uri> 84.126 + </binding> 84.127 + <binding name='x'> 84.128 + <uri>http://example.org#D</uri> 84.129 + </binding> 84.130 + </result> 84.131 + <result> 84.132 + <binding name='y'> 84.133 + <uri>http://example.org#E</uri> 84.134 + </binding> 84.135 + <binding name='x'> 84.136 + <uri>http://example.org#F</uri> 84.137 + </binding> 84.138 + </result> 84.139 + <result> 84.140 + <binding name='y'> 84.141 + <uri>http://example.org#D</uri> 84.142 + </binding> 84.143 + <binding name='x'> 84.144 + <uri>http://example.org#C</uri> 84.145 + </binding> 84.146 + </result> 84.147 + <result> 84.148 + <binding name='y'> 84.149 + <uri>http://example.org#D</uri> 84.150 + </binding> 84.151 + <binding name='x'> 84.152 + <uri>http://example.org#E</uri> 84.153 + </binding> 84.154 + </result> 84.155 + <result> 84.156 + <binding name='y'> 84.157 + <uri>http://example.org#D</uri> 84.158 + </binding> 84.159 + <binding name='x'> 84.160 + <uri>http://example.org#F</uri> 84.161 + </binding> 84.162 + </result> 84.163 + <result> 84.164 + <binding name='y'> 84.165 + <uri>http://example.org#F</uri> 84.166 + </binding> 84.167 + <binding name='x'> 84.168 + <uri>http://example.org#C</uri> 84.169 + </binding> 84.170 + </result> 84.171 + <result> 84.172 + <binding name='y'> 84.173 + <uri>http://example.org#F</uri> 84.174 + </binding> 84.175 + <binding name='x'> 84.176 + <uri>http://example.org#D</uri> 84.177 + </binding> 84.178 + </result> 84.179 + <result> 84.180 + <binding name='y'> 84.181 + <uri>http://example.org#F</uri> 84.182 + </binding> 84.183 + <binding name='x'> 84.184 + <uri>http://example.org#E</uri> 84.185 + </binding> 84.186 + </result> 84.187 + <result> 84.188 + <binding name='y'> 84.189 + <uri>http://example.org#G</uri> 84.190 + </binding> 84.191 + <binding name='x'> 84.192 + <uri>http://example.org#A</uri> 84.193 + </binding> 84.194 + </result> 84.195 + <result> 84.196 + <binding name='y'> 84.197 + <uri>http://example.org#G</uri> 84.198 + </binding> 84.199 + <binding name='x'> 84.200 + <uri>http://example.org#B</uri> 84.201 + </binding> 84.202 + </result> 84.203 + <result> 84.204 + <binding name='y'> 84.205 + <uri>http://example.org#G</uri> 84.206 + </binding> 84.207 + <binding name='x'> 84.208 + <uri>http://example.org#C</uri> 84.209 + </binding> 84.210 + </result> 84.211 + <result> 84.212 + <binding name='y'> 84.213 + <uri>http://example.org#H</uri> 84.214 + </binding> 84.215 + <binding name='x'> 84.216 + <uri>http://example.org#C</uri> 84.217 + </binding> 84.218 + </result> 84.219 + </results> 84.220 +</sparql>
85.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 85.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBRelationsTest.nt Wed Jul 17 14:18:17 2013 +0300 85.3 @@ -0,0 +1,8 @@ 85.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 85.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
86.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 86.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBWithinTest.rq Wed Jul 17 14:18:17 2013 +0300 86.3 @@ -0,0 +1,7 @@ 86.4 +SELECT ?x ?y 86.5 +WHERE 86.6 +{ 86.7 +?x ex:hasGeometry ?g1. 86.8 +?y ex:hasGeometry ?g2. 86.9 + 86.10 +FILTER((?x != ?y) && (strdf:mbbWithin(?g1, ?g2)))} 86.11 \ No newline at end of file
87.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 87.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/MBBWithinTest.srx Wed Jul 17 14:18:17 2013 +0300 87.3 @@ -0,0 +1,81 @@ 87.4 +<?xml version='1.0' encoding='UTF-8'?> 87.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 87.6 + <head> 87.7 + <variable name='x'/> 87.8 + <variable name='y'/> 87.9 + </head> 87.10 + <results> 87.11 + <result> 87.12 + <binding name='y'> 87.13 + <uri>http://example.org#B</uri> 87.14 + </binding> 87.15 + <binding name='x'> 87.16 + <uri>http://example.org#A</uri> 87.17 + </binding> 87.18 + </result> 87.19 + <result> 87.20 + <binding name='y'> 87.21 + <uri>http://example.org#D</uri> 87.22 + </binding> 87.23 + <binding name='x'> 87.24 + <uri>http://example.org#E</uri> 87.25 + </binding> 87.26 + </result> 87.27 + <result> 87.28 + <binding name='y'> 87.29 + <uri>http://example.org#F</uri> 87.30 + </binding> 87.31 + <binding name='x'> 87.32 + <uri>http://example.org#E</uri> 87.33 + </binding> 87.34 + </result> 87.35 + <result> 87.36 + <binding name='y'> 87.37 + <uri>http://example.org#E</uri> 87.38 + </binding> 87.39 + <binding name='x'> 87.40 + <uri>http://example.org#D</uri> 87.41 + </binding> 87.42 + </result> 87.43 + <result> 87.44 + <binding name='y'> 87.45 + <uri>http://example.org#F</uri> 87.46 + </binding> 87.47 + <binding name='x'> 87.48 + <uri>http://example.org#D</uri> 87.49 + </binding> 87.50 + </result> 87.51 + <result> 87.52 + <binding name='y'> 87.53 + <uri>http://example.org#A</uri> 87.54 + </binding> 87.55 + <binding name='x'> 87.56 + <uri>http://example.org#G</uri> 87.57 + </binding> 87.58 + </result> 87.59 + <result> 87.60 + <binding name='y'> 87.61 + <uri>http://example.org#B</uri> 87.62 + </binding> 87.63 + <binding name='x'> 87.64 + <uri>http://example.org#G</uri> 87.65 + </binding> 87.66 + </result> 87.67 + <result> 87.68 + <binding name='y'> 87.69 + <uri>http://example.org#C</uri> 87.70 + </binding> 87.71 + <binding name='x'> 87.72 + <uri>http://example.org#G</uri> 87.73 + </binding> 87.74 + </result> 87.75 + <result> 87.76 + <binding name='y'> 87.77 + <uri>http://example.org#C</uri> 87.78 + </binding> 87.79 + <binding name='x'> 87.80 + <uri>http://example.org#H</uri> 87.81 + </binding> 87.82 + </result> 87.83 + </results> 87.84 + </sparql> 87.85 \ No newline at end of file
88.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 88.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/RightTest.rq Wed Jul 17 14:18:17 2013 +0300 88.3 @@ -0,0 +1,7 @@ 88.4 +SELECT ?x ?y 88.5 +WHERE 88.6 +{ 88.7 +?x ex:hasGeometry ?g1. 88.8 +?y ex:hasGeometry ?g2. 88.9 + 88.10 +FILTER((?x != ?y) && (strdf:right(?g1, ?g2)))} 88.11 \ No newline at end of file
89.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 89.2 +++ b/testsuite/src/test/resources/stSPARQL/MBBRelationsTest/RightTest.srx Wed Jul 17 14:18:17 2013 +0300 89.3 @@ -0,0 +1,129 @@ 89.4 +<?xml version='1.0' encoding='UTF-8'?> 89.5 + <sparql xmlns='http://www.w3.org/2005/sparql-results#'> 89.6 + <head> 89.7 + <variable name='x'/> 89.8 + <variable name='y'/> 89.9 + </head> 89.10 + <results> 89.11 + <result> 89.12 + <binding name='y'> 89.13 + <uri>http://example.org#A</uri> 89.14 + </binding> 89.15 + <binding name='x'> 89.16 + <uri>http://example.org#E</uri> 89.17 + </binding> 89.18 + </result> 89.19 + <result> 89.20 + <binding name='y'> 89.21 + <uri>http://example.org#A</uri> 89.22 + </binding> 89.23 + <binding name='x'> 89.24 + <uri>http://example.org#D</uri> 89.25 + </binding> 89.26 + </result> 89.27 + <result> 89.28 + <binding name='y'> 89.29 + <uri>http://example.org#A</uri> 89.30 + </binding> 89.31 + <binding name='x'> 89.32 + <uri>http://example.org#F</uri> 89.33 + </binding> 89.34 + </result> 89.35 + <result> 89.36 + <binding name='y'> 89.37 + <uri>http://example.org#A</uri> 89.38 + </binding> 89.39 + <binding name='x'> 89.40 + <uri>http://example.org#H</uri> 89.41 + </binding> 89.42 + </result> 89.43 + <result> 89.44 + <binding name='y'> 89.45 + <uri>http://example.org#B</uri> 89.46 + </binding> 89.47 + <binding name='x'> 89.48 + <uri>http://example.org#E</uri> 89.49 + </binding> 89.50 + </result> 89.51 + <result> 89.52 + <binding name='y'> 89.53 + <uri>http://example.org#B</uri> 89.54 + </binding> 89.55 + <binding name='x'> 89.56 + <uri>http://example.org#D</uri> 89.57 + </binding> 89.58 + </result> 89.59 + <result> 89.60 + <binding name='y'> 89.61 + <uri>http://example.org#B</uri> 89.62 + </binding> 89.63 + <binding name='x'> 89.64 + <uri>http://example.org#F</uri> 89.65 + </binding> 89.66 + </result> 89.67 + <result> 89.68 + <binding name='y'> 89.69 + <uri>http://example.org#B</uri> 89.70 + </binding> 89.71 + <binding name='x'> 89.72 + <uri>http://example.org#H</uri> 89.73 + </binding> 89.74 + </result> 89.75 + <result> 89.76 + <binding name='y'> 89.77 + <uri>http://example.org#G</uri> 89.78 + </binding> 89.79 + <binding name='x'> 89.80 + <uri>http://example.org#E</uri> 89.81 + </binding> 89.82 + </result> 89.83 + <result> 89.84 + <binding name='y'> 89.85 + <uri>http://example.org#G</uri> 89.86 + </binding> 89.87 + <binding name='x'> 89.88 + <uri>http://example.org#D</uri> 89.89 + </binding> 89.90 + </result> 89.91 + <result> 89.92 + <binding name='y'> 89.93 + <uri>http://example.org#G</uri> 89.94 + </binding> 89.95 + <binding name='x'> 89.96 + <uri>http://example.org#F</uri> 89.97 + </binding> 89.98 + </result> 89.99 + <result> 89.100 + <binding name='y'> 89.101 + <uri>http://example.org#G</uri> 89.102 + </binding> 89.103 + <binding name='x'> 89.104 + <uri>http://example.org#H</uri> 89.105 + </binding> 89.106 + </result> 89.107 + <result> 89.108 + <binding name='y'> 89.109 + <uri>http://example.org#H</uri> 89.110 + </binding> 89.111 + <binding name='x'> 89.112 + <uri>http://example.org#E</uri> 89.113 + </binding> 89.114 + </result> 89.115 + <result> 89.116 + <binding name='y'> 89.117 + <uri>http://example.org#H</uri> 89.118 + </binding> 89.119 + <binding name='x'> 89.120 + <uri>http://example.org#D</uri> 89.121 + </binding> 89.122 + </result> 89.123 + <result> 89.124 + <binding name='y'> 89.125 + <uri>http://example.org#H</uri> 89.126 + </binding> 89.127 + <binding name='x'> 89.128 + <uri>http://example.org#F</uri> 89.129 + </binding> 89.130 + </result> 89.131 + </results> 89.132 + </sparql> 89.133 \ No newline at end of file
90.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 90.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/AreaTest.rq Wed Jul 17 14:18:17 2013 +0300 90.3 @@ -0,0 +1,5 @@ 90.4 +select (strdf:area(?g) as ?area) 90.5 +where 90.6 +{ 90.7 + ex:A ex:hasGeometry ?g . 90.8 +} 90.9 \ No newline at end of file
91.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 91.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/AreaTest.srx Wed Jul 17 14:18:17 2013 +0300 91.3 @@ -0,0 +1,13 @@ 91.4 +<?xml version='1.0' encoding='UTF-8'?> 91.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 91.6 + <head> 91.7 + <variable name='area'/> 91.8 + </head> 91.9 + <results> 91.10 + <result> 91.11 + <binding name='area'> 91.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#double'>1.0</literal> 91.13 + </binding> 91.14 + </result> 91.15 + </results> 91.16 +</sparql>
92.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 92.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceDegreesTest.rq Wed Jul 17 14:18:17 2013 +0300 92.3 @@ -0,0 +1,6 @@ 92.4 +select (strdf:distance(?g1, ?g2, ogc:degree) as ?dist) 92.5 +where 92.6 +{ 92.7 + ex:A ex:hasGeometry ?g1 . 92.8 + ex:D ex:hasGeometry ?g2 . 92.9 +} 92.10 \ No newline at end of file
93.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 93.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceDegreesTest.srx Wed Jul 17 14:18:17 2013 +0300 93.3 @@ -0,0 +1,13 @@ 93.4 +<?xml version='1.0' encoding='UTF-8'?> 93.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 93.6 + <head> 93.7 + <variable name='dist'/> 93.8 + </head> 93.9 + <results> 93.10 + <result> 93.11 + <binding name='dist'> 93.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#double'>2.0</literal> 93.13 + </binding> 93.14 + </result> 93.15 + </results> 93.16 +</sparql>
94.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 94.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceFilterTest.rq Wed Jul 17 14:18:17 2013 +0300 94.3 @@ -0,0 +1,7 @@ 94.4 +select ?x ?y 94.5 +where 94.6 +{ 94.7 + ?x ex:hasGeometry ?g1 . 94.8 + ?y ex:hasGeometry ?g2 . 94.9 + FILTER(strdf:distance(?g1, ?g2, ogc:degree) > 2) 94.10 +} 94.11 \ No newline at end of file
95.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 95.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceFilterTest.srx Wed Jul 17 14:18:17 2013 +0300 95.3 @@ -0,0 +1,41 @@ 95.4 +<?xml version='1.0' encoding='UTF-8'?> 95.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 95.6 + <head> 95.7 + <variable name='x'/> 95.8 + <variable name='y'/> 95.9 + </head> 95.10 + <results> 95.11 + <result> 95.12 + <binding name='y'> 95.13 + <uri>http://example.org#F</uri> 95.14 + </binding> 95.15 + <binding name='x'> 95.16 + <uri>http://example.org#A</uri> 95.17 + </binding> 95.18 + </result> 95.19 + <result> 95.20 + <binding name='y'> 95.21 + <uri>http://example.org#A</uri> 95.22 + </binding> 95.23 + <binding name='x'> 95.24 + <uri>http://example.org#F</uri> 95.25 + </binding> 95.26 + </result> 95.27 + <result> 95.28 + <binding name='y'> 95.29 + <uri>http://example.org#G</uri> 95.30 + </binding> 95.31 + <binding name='x'> 95.32 + <uri>http://example.org#F</uri> 95.33 + </binding> 95.34 + </result> 95.35 + <result> 95.36 + <binding name='y'> 95.37 + <uri>http://example.org#F</uri> 95.38 + </binding> 95.39 + <binding name='x'> 95.40 + <uri>http://example.org#G</uri> 95.41 + </binding> 95.42 + </result> 95.43 + </results> 95.44 +</sparql>
96.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 96.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceMetresTest.rq Wed Jul 17 14:18:17 2013 +0300 96.3 @@ -0,0 +1,6 @@ 96.4 +select (strdf:distance(?g1, ?g2, ogc:metre) as ?dist) 96.5 +where 96.6 +{ 96.7 + ex:A ex:hasGeometry ?g1 . 96.8 + ex:D ex:hasGeometry ?g2 . 96.9 +} 96.10 \ No newline at end of file
97.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 97.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceMetresTest.srx Wed Jul 17 14:18:17 2013 +0300 97.3 @@ -0,0 +1,13 @@ 97.4 +<?xml version='1.0' encoding='UTF-8'?> 97.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 97.6 + <head> 97.7 + <variable name='dist'/> 97.8 + </head> 97.9 + <results> 97.10 + <result> 97.11 + <binding name='dist'> 97.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#double'>222605.28125</literal> 97.13 + </binding> 97.14 + </result> 97.15 + </results> 97.16 +</sparql>
98.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 98.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceUnionTest.rq Wed Jul 17 14:18:17 2013 +0300 98.3 @@ -0,0 +1,7 @@ 98.4 +select (strdf:distance(strdf:union(?g1, ?g2), ?g3, ogc:metre) as ?dist) 98.5 +where 98.6 +{ 98.7 + ex:A ex:hasGeometry ?g1 . 98.8 + ex:B ex:hasGeometry ?g2 . 98.9 + ex:D ex:hasGeometry ?g3 . 98.10 +} 98.11 \ No newline at end of file
99.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 99.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/DistanceUnionTest.srx Wed Jul 17 14:18:17 2013 +0300 99.3 @@ -0,0 +1,13 @@ 99.4 +<?xml version='1.0' encoding='UTF-8'?> 99.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 99.6 + <head> 99.7 + <variable name='dist'/> 99.8 + </head> 99.9 + <results> 99.10 + <result> 99.11 + <binding name='dist'> 99.12 + <literal datatype='http://www.w3.org/2001/XMLSchema#double'>111252.1328125</literal> 99.13 + </binding> 99.14 + </result> 99.15 + </results> 99.16 +</sparql> 99.17 \ No newline at end of file
100.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 100.2 +++ b/testsuite/src/test/resources/stSPARQL/MetricFunctionsTest/MetricFunctionsTest.nt Wed Jul 17 14:18:17 2013 +0300 100.3 @@ -0,0 +1,8 @@ 100.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 100.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
101.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 101.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.rq Wed Jul 17 14:18:17 2013 +0300 101.3 @@ -0,0 +1,5 @@ 101.4 +select (strdf:boundary(?g) as ?boundary) 101.5 +where 101.6 +{ 101.7 +ex:A ex:hasGeometry ?g. 101.8 +} 101.9 \ No newline at end of file
102.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 102.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BoundaryTest.srx Wed Jul 17 14:18:17 2013 +0300 102.3 @@ -0,0 +1,13 @@ 102.4 +<?xml version='1.0' encoding='UTF-8'?> 102.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 102.6 + <head> 102.7 + <variable name='boundary'/> 102.8 + </head> 102.9 + <results> 102.10 + <result> 102.11 + <binding name='boundary'> 102.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>LINESTRING (0 0, 1 0, 1 1, 0 1, 0 0)</literal> 102.13 + </binding> 102.14 + </result> 102.15 + </results> 102.16 +</sparql>
103.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 103.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.rq Wed Jul 17 14:18:17 2013 +0300 103.3 @@ -0,0 +1,5 @@ 103.4 +select (strdf:buffer(?g, 1, ogc:degree) as ?buffer) 103.5 +where 103.6 +{ 103.7 +ex:A ex:hasGeometry ?g. 103.8 +} 103.9 \ No newline at end of file
104.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 104.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDegreesTest.srx Wed Jul 17 14:18:17 2013 +0300 104.3 @@ -0,0 +1,13 @@ 104.4 +<?xml version='1.0' encoding='UTF-8'?> 104.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 104.6 + <head> 104.7 + <variable name='buffer'/> 104.8 + </head> 104.9 + <results> 104.10 + <result> 104.11 + <binding name='buffer'> 104.12 + <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> 104.13 + </binding> 104.14 + </result> 104.15 + </results> 104.16 +</sparql>
105.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 105.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.rq Wed Jul 17 14:18:17 2013 +0300 105.3 @@ -0,0 +1,6 @@ 105.4 +select (strdf:buffer(?g1, strdf:distance(?g1, ?g2, ogc:degree), ogc:degree) as ?buffer) 105.5 +where 105.6 +{ 105.7 + ex:A ex:hasGeometry ?g1 . 105.8 + ex:B ex:hasGeometry ?g2 . 105.9 +} 105.10 \ No newline at end of file
106.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 106.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferDistanceTest.srx Wed Jul 17 14:18:17 2013 +0300 106.3 @@ -0,0 +1,13 @@ 106.4 +<?xml version='1.0' encoding='UTF-8'?> 106.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 106.6 + <head> 106.7 + <variable name='buffer'/> 106.8 + </head> 106.9 + <results> 106.10 + <result> 106.11 + <binding name='buffer'> 106.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 106.13 + </binding> 106.14 + </result> 106.15 + </results> 106.16 +</sparql>
107.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 107.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.rq Wed Jul 17 14:18:17 2013 +0300 107.3 @@ -0,0 +1,6 @@ 107.4 +select ?g 107.5 +where 107.6 +{ 107.7 + ex:A ex:hasGeometry ?g. 107.8 + FILTER(strdf:within(?g, strdf:buffer(?g, 30, ogc:metre))) 107.9 +} 107.10 \ No newline at end of file
108.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 108.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferFilterTest.srx Wed Jul 17 14:18:17 2013 +0300 108.3 @@ -0,0 +1,13 @@ 108.4 +<?xml version='1.0' encoding='UTF-8'?> 108.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 108.6 + <head> 108.7 + <variable name='g'/> 108.8 + </head> 108.9 + <results> 108.10 + <result> 108.11 + <binding name='g'> 108.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 1 0, 1 1, 0 1, 0 0))</literal> 108.13 + </binding> 108.14 + </result> 108.15 + </results> 108.16 +</sparql>
109.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 109.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.rq Wed Jul 17 14:18:17 2013 +0300 109.3 @@ -0,0 +1,5 @@ 109.4 +select (strdf:buffer(?g, 1, ogc:metre) as ?buffer) 109.5 +where 109.6 +{ 109.7 +ex:A ex:hasGeometry ?g. 109.8 +} 109.9 \ No newline at end of file
110.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 110.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/BufferMetresTest.srx Wed Jul 17 14:18:17 2013 +0300 110.3 @@ -0,0 +1,13 @@ 110.4 +<?xml version='1.0' encoding='UTF-8'?> 110.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 110.6 + <head> 110.7 + <variable name='buffer'/> 110.8 + </head> 110.9 + <results> 110.10 + <result> 110.11 + <binding name='buffer'> 110.12 + <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> 110.13 + </binding> 110.14 + </result> 110.15 + </results> 110.16 +</sparql>
111.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 111.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.rq Wed Jul 17 14:18:17 2013 +0300 111.3 @@ -0,0 +1,5 @@ 111.4 +select (strdf:convexHull(?g) as ?convexHull) 111.5 +where 111.6 +{ 111.7 +ex:A ex:hasGeometry ?g. 111.8 +} 111.9 \ No newline at end of file
112.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 112.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/ConvexHullTest.srx Wed Jul 17 14:18:17 2013 +0300 112.3 @@ -0,0 +1,13 @@ 112.4 +<?xml version='1.0' encoding='UTF-8'?> 112.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 112.6 + <head> 112.7 + <variable name='convexHull'/> 112.8 + </head> 112.9 + <results> 112.10 + <result> 112.11 + <binding name='convexHull'> 112.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 112.13 + </binding> 112.14 + </result> 112.15 + </results> 112.16 +</sparql>
113.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 113.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.rq Wed Jul 17 14:18:17 2013 +0300 113.3 @@ -0,0 +1,6 @@ 113.4 +select (strdf:difference(?g1, ?g2) as ?difference) 113.5 +where 113.6 +{ 113.7 +ex:B ex:hasGeometry ?g1. 113.8 +ex:A ex:hasGeometry ?g2. 113.9 +} 113.10 \ No newline at end of file
114.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 114.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/DifferenceTest.srx Wed Jul 17 14:18:17 2013 +0300 114.3 @@ -0,0 +1,13 @@ 114.4 +<?xml version='1.0' encoding='UTF-8'?> 114.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 114.6 + <head> 114.7 + <variable name='difference'/> 114.8 + </head> 114.9 + <results> 114.10 + <result> 114.11 + <binding name='difference'> 114.12 + <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> 114.13 + </binding> 114.14 + </result> 114.15 + </results> 114.16 +</sparql>
115.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 115.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.rq Wed Jul 17 14:18:17 2013 +0300 115.3 @@ -0,0 +1,5 @@ 115.4 +select (strdf:envelope(?g) as ?envelope) 115.5 +where 115.6 +{ 115.7 +ex:A ex:hasGeometry ?g. 115.8 +} 115.9 \ No newline at end of file
116.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 116.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/EnvelopeTest.srx Wed Jul 17 14:18:17 2013 +0300 116.3 @@ -0,0 +1,13 @@ 116.4 +<?xml version='1.0' encoding='UTF-8'?> 116.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 116.6 + <head> 116.7 + <variable name='envelope'/> 116.8 + </head> 116.9 + <results> 116.10 + <result> 116.11 + <binding name='envelope'> 116.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))</literal> 116.13 + </binding> 116.14 + </result> 116.15 + </results> 116.16 +</sparql>
117.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 117.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.rq Wed Jul 17 14:18:17 2013 +0300 117.3 @@ -0,0 +1,7 @@ 117.4 +select (strdf:intersection(?g1, ?g2) as ?intersection) 117.5 +where 117.6 +{ 117.7 +ex:A ex:hasGeometry ?g1. 117.8 +ex:C ex:hasGeometry ?g2. 117.9 + 117.10 +} 117.11 \ No newline at end of file
118.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 118.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection1Test.srx Wed Jul 17 14:18:17 2013 +0300 118.3 @@ -0,0 +1,13 @@ 118.4 +<?xml version='1.0' encoding='UTF-8'?> 118.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 118.6 + <head> 118.7 + <variable name='intersection'/> 118.8 + </head> 118.9 + <results> 118.10 + <result> 118.11 + <binding name='intersection'> 118.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POINT (1 1)</literal> 118.13 + </binding> 118.14 + </result> 118.15 + </results> 118.16 +</sparql>
119.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 119.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.rq Wed Jul 17 14:18:17 2013 +0300 119.3 @@ -0,0 +1,6 @@ 119.4 +select (strdf:intersection(?g1, ?g2) as ?intersection) 119.5 +where 119.6 +{ 119.7 +ex:A ex:hasGeometry ?g1. 119.8 +ex:D ex:hasGeometry ?g2. 119.9 +} 119.10 \ No newline at end of file
120.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 120.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/Intersection2Test.srx Wed Jul 17 14:18:17 2013 +0300 120.3 @@ -0,0 +1,13 @@ 120.4 +<?xml version='1.0' encoding='UTF-8'?> 120.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 120.6 + <head> 120.7 + <variable name='intersection'/> 120.8 + </head> 120.9 + <results> 120.10 + <result> 120.11 + <binding name='intersection'> 120.12 + <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION EMPTY</literal> 120.13 + </binding> 120.14 + </result> 120.15 + </results> 120.16 +</sparql>
121.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 121.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SpatialAnalysisFunctionsTest.nt Wed Jul 17 14:18:17 2013 +0300 121.3 @@ -0,0 +1,8 @@ 121.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 121.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
122.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 122.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.rq Wed Jul 17 14:18:17 2013 +0300 122.3 @@ -0,0 +1,6 @@ 122.4 +select (strdf:symDifference(?g1, ?g2) as ?symDifference) 122.5 +where 122.6 +{ 122.7 +ex:B ex:hasGeometry ?g1. 122.8 +ex:C ex:hasGeometry ?g2. 122.9 +} 122.10 \ No newline at end of file
123.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 123.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/SymDifferenceTest.srx Wed Jul 17 14:18:17 2013 +0300 123.3 @@ -0,0 +1,13 @@ 123.4 +<?xml version='1.0' encoding='UTF-8'?> 123.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 123.6 + <head> 123.7 + <variable name='symDifference'/> 123.8 + </head> 123.9 + <results> 123.10 + <result> 123.11 + <binding name='symDifference'> 123.12 + <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> 123.13 + </binding> 123.14 + </result> 123.15 + </results> 123.16 +</sparql>
124.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 124.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.rq Wed Jul 17 14:18:17 2013 +0300 124.3 @@ -0,0 +1,6 @@ 124.4 +select (strdf:union(?g1, ?g2) as ?union) 124.5 +where 124.6 +{ 124.7 +ex:A ex:hasGeometry ?g1. 124.8 +ex:C ex:hasGeometry ?g2. 124.9 +} 124.10 \ No newline at end of file
125.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 125.2 +++ b/testsuite/src/test/resources/stSPARQL/SpatialAnalysisFunctionsTest/UnionTest.srx Wed Jul 17 14:18:17 2013 +0300 125.3 @@ -0,0 +1,13 @@ 125.4 +<?xml version='1.0' encoding='UTF-8'?> 125.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 125.6 + <head> 125.7 + <variable name='union'/> 125.8 + </head> 125.9 + <results> 125.10 + <result> 125.11 + <binding name='union'> 125.12 + <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> 125.13 + </binding> 125.14 + </result> 125.15 + </results> 125.16 +</sparql>
126.1 --- a/testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.nt Wed Jul 17 13:39:41 2013 +0300 126.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 126.3 @@ -1,4 +0,0 @@ 126.4 -<http://example.org/point> <http://strdf.di.uoa.gr/ontology#hasGeometry> _:point. 126.5 -_:point <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2003/01/geo/wgs84_pos#Point>. 126.6 -_:point <http://www.w3.org/2003/01/geo/wgs84_pos#lat> "55.701". 126.7 -_:point <http://www.w3.org/2003/01/geo/wgs84_pos#long> "12.552". 126.8 \ No newline at end of file
127.1 --- a/testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.rq Wed Jul 17 13:39:41 2013 +0300 127.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 127.3 @@ -1,3 +0,0 @@ 127.4 -SELECT ?o 127.5 -WHERE {?s strdf:hasGeometry ?geo. 127.6 -?geo lgdgeo:lat ?o.} 127.7 \ No newline at end of file
128.1 --- a/testsuite/src/test/resources/stSPARQL/StoreGMLTest/StoreGMLTest.srx Wed Jul 17 13:39:41 2013 +0300 128.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 128.3 @@ -1,13 +0,0 @@ 128.4 -<?xml version='1.0' encoding='UTF-8'?> 128.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 128.6 - <head> 128.7 - <variable name='o'/> 128.8 - </head> 128.9 - <results> 128.10 - <result> 128.11 - <binding name='o'> 128.12 - <literal>55.701</literal> 128.13 - </binding> 128.14 - </result> 128.15 - </results> 128.16 -</sparql> 128.17 \ No newline at end of file
129.1 --- a/testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.nt Wed Jul 17 13:39:41 2013 +0300 129.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 129.3 @@ -1,2 +0,0 @@ 129.4 -<http://example.org/Area1> <http://strdf.di.uoa.gr/ontology#hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/4326"^^<http://strdf.di.uoa.gr/ontology#WKT> . 129.5 -<http://example.org/Area1> <http://strdf.di.uoa.gr/ontology#hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/32630"^^<http://strdf.di.uoa.gr/ontology#WKT> . 129.6 \ No newline at end of file
130.1 --- a/testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.rq Wed Jul 17 13:39:41 2013 +0300 130.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 130.3 @@ -1,2 +0,0 @@ 130.4 -SELECT ?o 130.5 -WHERE {?s strdf:hasGeometry ?o} 130.6 \ No newline at end of file
131.1 --- a/testsuite/src/test/resources/stSPARQL/StoreWKTTest/StoreWKTTest.srx Wed Jul 17 13:39:41 2013 +0300 131.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 131.3 @@ -1,18 +0,0 @@ 131.4 -<?xml version='1.0' encoding='UTF-8'?> 131.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 131.6 - <head> 131.7 - <variable name='o'/> 131.8 - </head> 131.9 - <results> 131.10 - <result> 131.11 - <binding name='o'> 131.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 131.13 - </binding> 131.14 - </result> 131.15 - <result> 131.16 - <binding name='o'> 131.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37));http://www.opengis.net/def/crs/EPSG/0/32630</literal> 131.18 - </binding> 131.19 - </result> 131.20 - </results> 131.21 -</sparql> 131.22 \ No newline at end of file
132.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 132.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/ContainsTest.rq Wed Jul 17 14:18:17 2013 +0300 132.3 @@ -0,0 +1,7 @@ 132.4 +SELECT ?x ?y 132.5 +WHERE 132.6 +{ 132.7 +?x ex:hasGeometry ?g1. 132.8 +?y ex:hasGeometry ?g2. 132.9 + 132.10 +FILTER((?x != ?y) && (strdf:contains(?g1, ?g2)))} 132.11 \ No newline at end of file
133.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 133.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/ContainsTest.srx Wed Jul 17 14:18:17 2013 +0300 133.3 @@ -0,0 +1,49 @@ 133.4 +<?xml version='1.0' encoding='UTF-8'?> 133.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 133.6 + <head> 133.7 + <variable name='x'/> 133.8 + <variable name='y'/> 133.9 + </head> 133.10 + <results> 133.11 + <result> 133.12 + <binding name='y'> 133.13 + <uri>http://example.org#A</uri> 133.14 + </binding> 133.15 + <binding name='x'> 133.16 + <uri>http://example.org#B</uri> 133.17 + </binding> 133.18 + </result> 133.19 + <result> 133.20 + <binding name='y'> 133.21 + <uri>http://example.org#E</uri> 133.22 + </binding> 133.23 + <binding name='x'> 133.24 + <uri>http://example.org#D</uri> 133.25 + </binding> 133.26 + </result> 133.27 + <result> 133.28 + <binding name='y'> 133.29 + <uri>http://example.org#D</uri> 133.30 + </binding> 133.31 + <binding name='x'> 133.32 + <uri>http://example.org#E</uri> 133.33 + </binding> 133.34 + </result> 133.35 + <result> 133.36 + <binding name='y'> 133.37 + <uri>http://example.org#G</uri> 133.38 + </binding> 133.39 + <binding name='x'> 133.40 + <uri>http://example.org#B</uri> 133.41 + </binding> 133.42 + </result> 133.43 + <result> 133.44 + <binding name='y'> 133.45 + <uri>http://example.org#H</uri> 133.46 + </binding> 133.47 + <binding name='x'> 133.48 + <uri>http://example.org#C</uri> 133.49 + </binding> 133.50 + </result> 133.51 + </results> 133.52 +</sparql> 133.53 \ No newline at end of file
134.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 134.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/CrossesTest.rq Wed Jul 17 14:18:17 2013 +0300 134.3 @@ -0,0 +1,7 @@ 134.4 +SELECT ?x ?y 134.5 +WHERE 134.6 +{ 134.7 +?x ex:hasGeometry ?g1. 134.8 +?y ex:hasGeometry ?g2. 134.9 + 134.10 +FILTER((strdf:crosses(?g1, ?g2)))} 134.11 \ No newline at end of file
135.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 135.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/CrossesTest.srx Wed Jul 17 14:18:17 2013 +0300 135.3 @@ -0,0 +1,42 @@ 135.4 +<?xml version='1.0' encoding='UTF-8'?> 135.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 135.6 + <head> 135.7 + <variable name='x'/> 135.8 + <variable name='y'/> 135.9 + </head> 135.10 + <results> 135.11 + <result> 135.12 + <binding name='y'> 135.13 + <uri>http://example.org#E</uri> 135.14 + </binding> 135.15 + <binding name='x'> 135.16 + <uri>http://example.org#F</uri> 135.17 + </binding> 135.18 + </result> 135.19 + <result> 135.20 + <binding name='y'> 135.21 + <uri>http://example.org#D</uri> 135.22 + </binding> 135.23 + <binding name='x'> 135.24 + <uri>http://example.org#F</uri> 135.25 + </binding> 135.26 + </result> 135.27 + <result> 135.28 + <binding name='y'> 135.29 + <uri>http://example.org#F</uri> 135.30 + </binding> 135.31 + <binding name='x'> 135.32 + <uri>http://example.org#D</uri> 135.33 + </binding> 135.34 + </result> 135.35 + <result> 135.36 + <binding name='y'> 135.37 + <uri>http://example.org#F</uri> 135.38 + </binding> 135.39 + <binding name='x'> 135.40 + <uri>http://example.org#E</uri> 135.41 + </binding> 135.42 + </result> 135.43 + </results> 135.44 +</sparql> 135.45 +
136.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 136.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/DisjointTest.rq Wed Jul 17 14:18:17 2013 +0300 136.3 @@ -0,0 +1,7 @@ 136.4 +SELECT ?x ?y 136.5 +WHERE 136.6 +{ 136.7 +?x ex:hasGeometry ?g1. 136.8 +?y ex:hasGeometry ?g2. 136.9 + 136.10 +FILTER((strdf:disjoint(?g1, ?g2)))} 136.11 \ No newline at end of file
137.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 137.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/DisjointTest.srx Wed Jul 17 14:18:17 2013 +0300 137.3 @@ -0,0 +1,249 @@ 137.4 +<?xml version='1.0' encoding='UTF-8'?> 137.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 137.6 + <head> 137.7 + <variable name='x'/> 137.8 + <variable name='y'/> 137.9 + </head> 137.10 + <results> 137.11 + <result> 137.12 + <binding name='y'> 137.13 + <uri>http://example.org#A</uri> 137.14 + </binding> 137.15 + <binding name='x'> 137.16 + <uri>http://example.org#E</uri> 137.17 + </binding> 137.18 + </result> 137.19 + <result> 137.20 + <binding name='y'> 137.21 + <uri>http://example.org#A</uri> 137.22 + </binding> 137.23 + <binding name='x'> 137.24 + <uri>http://example.org#D</uri> 137.25 + </binding> 137.26 + </result> 137.27 + <result> 137.28 + <binding name='y'> 137.29 + <uri>http://example.org#A</uri> 137.30 + </binding> 137.31 + <binding name='x'> 137.32 + <uri>http://example.org#F</uri> 137.33 + </binding> 137.34 + </result> 137.35 + <result> 137.36 + <binding name='y'> 137.37 + <uri>http://example.org#A</uri> 137.38 + </binding> 137.39 + <binding name='x'> 137.40 + <uri>http://example.org#H</uri> 137.41 + </binding> 137.42 + </result> 137.43 + <result> 137.44 + <binding name='y'> 137.45 + <uri>http://example.org#B</uri> 137.46 + </binding> 137.47 + <binding name='x'> 137.48 + <uri>http://example.org#E</uri> 137.49 + </binding> 137.50 + </result> 137.51 + <result> 137.52 + <binding name='y'> 137.53 + <uri>http://example.org#B</uri> 137.54 + </binding> 137.55 + <binding name='x'> 137.56 + <uri>http://example.org#D</uri> 137.57 + </binding> 137.58 + </result> 137.59 + <result> 137.60 + <binding name='y'> 137.61 + <uri>http://example.org#B</uri> 137.62 + </binding> 137.63 + <binding name='x'> 137.64 + <uri>http://example.org#F</uri> 137.65 + </binding> 137.66 + </result> 137.67 + <result> 137.68 + <binding name='y'> 137.69 + <uri>http://example.org#B</uri> 137.70 + </binding> 137.71 + <binding name='x'> 137.72 + <uri>http://example.org#H</uri> 137.73 + </binding> 137.74 + </result> 137.75 + <result> 137.76 + <binding name='y'> 137.77 + <uri>http://example.org#D</uri> 137.78 + </binding> 137.79 + <binding name='x'> 137.80 + <uri>http://example.org#A</uri> 137.81 + </binding> 137.82 + </result> 137.83 + <result> 137.84 + <binding name='y'> 137.85 + <uri>http://example.org#D</uri> 137.86 + </binding> 137.87 + <binding name='x'> 137.88 + <uri>http://example.org#B</uri> 137.89 + </binding> 137.90 + </result> 137.91 + <result> 137.92 + <binding name='y'> 137.93 + <uri>http://example.org#D</uri> 137.94 + </binding> 137.95 + <binding name='x'> 137.96 + <uri>http://example.org#G</uri> 137.97 + </binding> 137.98 + </result> 137.99 + <result> 137.100 + <binding name='y'> 137.101 + <uri>http://example.org#D</uri> 137.102 + </binding> 137.103 + <binding name='x'> 137.104 + <uri>http://example.org#H</uri> 137.105 + </binding> 137.106 + </result> 137.107 + <result> 137.108 + <binding name='y'> 137.109 + <uri>http://example.org#E</uri> 137.110 + </binding> 137.111 + <binding name='x'> 137.112 + <uri>http://example.org#A</uri> 137.113 + </binding> 137.114 + </result> 137.115 + <result> 137.116 + <binding name='y'> 137.117 + <uri>http://example.org#E</uri> 137.118 + </binding> 137.119 + <binding name='x'> 137.120 + <uri>http://example.org#B</uri> 137.121 + </binding> 137.122 + </result> 137.123 + <result> 137.124 + <binding name='y'> 137.125 + <uri>http://example.org#E</uri> 137.126 + </binding> 137.127 + <binding name='x'> 137.128 + <uri>http://example.org#G</uri> 137.129 + </binding> 137.130 + </result> 137.131 + <result> 137.132 + <binding name='y'> 137.133 + <uri>http://example.org#E</uri> 137.134 + </binding> 137.135 + <binding name='x'> 137.136 + <uri>http://example.org#H</uri> 137.137 + </binding> 137.138 + </result> 137.139 + <result> 137.140 + <binding name='y'> 137.141 + <uri>http://example.org#F</uri> 137.142 + </binding> 137.143 + <binding name='x'> 137.144 + <uri>http://example.org#A</uri> 137.145 + </binding> 137.146 + </result> 137.147 + <result> 137.148 + <binding name='y'> 137.149 + <uri>http://example.org#F</uri> 137.150 + </binding> 137.151 + <binding name='x'> 137.152 + <uri>http://example.org#B</uri> 137.153 + </binding> 137.154 + </result> 137.155 + <result> 137.156 + <binding name='y'> 137.157 + <uri>http://example.org#F</uri> 137.158 + </binding> 137.159 + <binding name='x'> 137.160 + <uri>http://example.org#G</uri> 137.161 + </binding> 137.162 + </result> 137.163 + <result> 137.164 + <binding name='y'> 137.165 + <uri>http://example.org#F</uri> 137.166 + </binding> 137.167 + <binding name='x'> 137.168 + <uri>http://example.org#H</uri> 137.169 + </binding> 137.170 + </result> 137.171 + <result> 137.172 + <binding name='y'> 137.173 + <uri>http://example.org#G</uri> 137.174 + </binding> 137.175 + <binding name='x'> 137.176 + <uri>http://example.org#E</uri> 137.177 + </binding> 137.178 + </result> 137.179 + <result> 137.180 + <binding name='y'> 137.181 + <uri>http://example.org#G</uri> 137.182 + </binding> 137.183 + <binding name='x'> 137.184 + <uri>http://example.org#D</uri> 137.185 + </binding> 137.186 + </result> 137.187 + <result> 137.188 + <binding name='y'> 137.189 + <uri>http://example.org#G</uri> 137.190 + </binding> 137.191 + <binding name='x'> 137.192 + <uri>http://example.org#F</uri> 137.193 + </binding> 137.194 + </result> 137.195 + <result> 137.196 + <binding name='y'> 137.197 + <uri>http://example.org#G</uri> 137.198 + </binding> 137.199 + <binding name='x'> 137.200 + <uri>http://example.org#H</uri> 137.201 + </binding> 137.202 + </result> 137.203 + <result> 137.204 + <binding name='y'> 137.205 + <uri>http://example.org#H</uri> 137.206 + </binding> 137.207 + <binding name='x'> 137.208 + <uri>http://example.org#A</uri> 137.209 + </binding> 137.210 + </result> 137.211 + <result> 137.212 + <binding name='y'> 137.213 + <uri>http://example.org#H</uri> 137.214 + </binding> 137.215 + <binding name='x'> 137.216 + <uri>http://example.org#B</uri> 137.217 + </binding> 137.218 + </result> 137.219 + <result> 137.220 + <binding name='y'> 137.221 + <uri>http://example.org#H</uri> 137.222 + </binding> 137.223 + <binding name='x'> 137.224 + <uri>http://example.org#E</uri> 137.225 + </binding> 137.226 + </result> 137.227 + <result> 137.228 + <binding name='y'> 137.229 + <uri>http://example.org#H</uri> 137.230 + </binding> 137.231 + <binding name='x'> 137.232 + <uri>http://example.org#D</uri> 137.233 + </binding> 137.234 + </result> 137.235 + <result> 137.236 + <binding name='y'> 137.237 + <uri>http://example.org#H</uri> 137.238 + </binding> 137.239 + <binding name='x'> 137.240 + <uri>http://example.org#F</uri> 137.241 + </binding> 137.242 + </result> 137.243 + <result> 137.244 + <binding name='y'> 137.245 + <uri>http://example.org#H</uri> 137.246 + </binding> 137.247 + <binding name='x'> 137.248 + <uri>http://example.org#G</uri> 137.249 + </binding> 137.250 + </result> 137.251 + </results> 137.252 +</sparql> 137.253 \ No newline at end of file
138.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 138.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/EqualsTest.rq Wed Jul 17 14:18:17 2013 +0300 138.3 @@ -0,0 +1,7 @@ 138.4 +SELECT ?x ?y 138.5 +WHERE 138.6 +{ 138.7 +?x ex:hasGeometry ?g1. 138.8 +?y ex:hasGeometry ?g2. 138.9 + 138.10 +FILTER((?x != ?y) && (strdf:equals(?g1, ?g2)))} 138.11 \ No newline at end of file
139.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 139.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/EqualsTest.srx Wed Jul 17 14:18:17 2013 +0300 139.3 @@ -0,0 +1,25 @@ 139.4 +<?xml version='1.0' encoding='UTF-8'?> 139.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 139.6 + <head> 139.7 + <variable name='x'/> 139.8 + <variable name='y'/> 139.9 + </head> 139.10 + <results> 139.11 + <result> 139.12 + <binding name='y'> 139.13 + <uri>http://example.org#E</uri> 139.14 + </binding> 139.15 + <binding name='x'> 139.16 + <uri>http://example.org#D</uri> 139.17 + </binding> 139.18 + </result> 139.19 + <result> 139.20 + <binding name='y'> 139.21 + <uri>http://example.org#D</uri> 139.22 + </binding> 139.23 + <binding name='x'> 139.24 + <uri>http://example.org#E</uri> 139.25 + </binding> 139.26 + </result> 139.27 + </results> 139.28 +</sparql> 139.29 \ No newline at end of file
140.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 140.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/IntersectsTest.rq Wed Jul 17 14:18:17 2013 +0300 140.3 @@ -0,0 +1,7 @@ 140.4 +SELECT ?x ?y 140.5 +WHERE 140.6 +{ 140.7 +?x ex:hasGeometry ?g1. 140.8 +?y ex:hasGeometry ?g2. 140.9 + 140.10 +FILTER((?x != ?y) && (strdf:intersects(?g1, ?g2)))} 140.11 \ No newline at end of file
141.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 141.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/IntersectsTest.srx Wed Jul 17 14:18:17 2013 +0300 141.3 @@ -0,0 +1,217 @@ 141.4 +<?xml version='1.0' encoding='UTF-8'?> 141.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 141.6 + <head> 141.7 + <variable name='x'/> 141.8 + <variable name='y'/> 141.9 + </head> 141.10 + <results> 141.11 + <result> 141.12 + <binding name='y'> 141.13 + <uri>http://example.org#A</uri> 141.14 + </binding> 141.15 + <binding name='x'> 141.16 + <uri>http://example.org#B</uri> 141.17 + </binding> 141.18 + </result> 141.19 + <result> 141.20 + <binding name='y'> 141.21 + <uri>http://example.org#A</uri> 141.22 + </binding> 141.23 + <binding name='x'> 141.24 + <uri>http://example.org#C</uri> 141.25 + </binding> 141.26 + </result> 141.27 + <result> 141.28 + <binding name='y'> 141.29 + <uri>http://example.org#A</uri> 141.30 + </binding> 141.31 + <binding name='x'> 141.32 + <uri>http://example.org#G</uri> 141.33 + </binding> 141.34 + </result> 141.35 + <result> 141.36 + <binding name='y'> 141.37 + <uri>http://example.org#B</uri> 141.38 + </binding> 141.39 + <binding name='x'> 141.40 + <uri>http://example.org#A</uri> 141.41 + </binding> 141.42 + </result> 141.43 + <result> 141.44 + <binding name='y'> 141.45 + <uri>http://example.org#B</uri> 141.46 + </binding> 141.47 + <binding name='x'> 141.48 + <uri>http://example.org#C</uri> 141.49 + </binding> 141.50 + </result> 141.51 + <result> 141.52 + <binding name='y'> 141.53 + <uri>http://example.org#B</uri> 141.54 + </binding> 141.55 + <binding name='x'> 141.56 + <uri>http://example.org#G</uri> 141.57 + </binding> 141.58 + </result> 141.59 + <result> 141.60 + <binding name='y'> 141.61 + <uri>http://example.org#C</uri> 141.62 + </binding> 141.63 + <binding name='x'> 141.64 + <uri>http://example.org#A</uri> 141.65 + </binding> 141.66 + </result> 141.67 + <result> 141.68 + <binding name='y'> 141.69 + <uri>http://example.org#C</uri> 141.70 + </binding> 141.71 + <binding name='x'> 141.72 + <uri>http://example.org#B</uri> 141.73 + </binding> 141.74 + </result> 141.75 + <result> 141.76 + <binding name='y'> 141.77 + <uri>http://example.org#C</uri> 141.78 + </binding> 141.79 + <binding name='x'> 141.80 + <uri>http://example.org#D</uri> 141.81 + </binding> 141.82 + </result> 141.83 + <result> 141.84 + <binding name='y'> 141.85 + <uri>http://example.org#C</uri> 141.86 + </binding> 141.87 + <binding name='x'> 141.88 + <uri>http://example.org#E</uri> 141.89 + </binding> 141.90 + </result> 141.91 + <result> 141.92 + <binding name='y'> 141.93 + <uri>http://example.org#C</uri> 141.94 + </binding> 141.95 + <binding name='x'> 141.96 + <uri>http://example.org#F</uri> 141.97 + </binding> 141.98 + </result> 141.99 + <result> 141.100 + <binding name='y'> 141.101 + <uri>http://example.org#C</uri> 141.102 + </binding> 141.103 + <binding name='x'> 141.104 + <uri>http://example.org#G</uri> 141.105 + </binding> 141.106 + </result> 141.107 + <result> 141.108 + <binding name='y'> 141.109 + <uri>http://example.org#C</uri> 141.110 + </binding> 141.111 + <binding name='x'> 141.112 + <uri>http://example.org#H</uri> 141.113 + </binding> 141.114 + </result> 141.115 + <result> 141.116 + <binding name='y'> 141.117 + <uri>http://example.org#E</uri> 141.118 + </binding> 141.119 + <binding name='x'> 141.120 + <uri>http://example.org#C</uri> 141.121 + </binding> 141.122 + </result> 141.123 + <result> 141.124 + <binding name='y'> 141.125 + <uri>http://example.org#E</uri> 141.126 + </binding> 141.127 + <binding name='x'> 141.128 + <uri>http://example.org#D</uri> 141.129 + </binding> 141.130 + </result> 141.131 + <result> 141.132 + <binding name='y'> 141.133 + <uri>http://example.org#E</uri> 141.134 + </binding> 141.135 + <binding name='x'> 141.136 + <uri>http://example.org#F</uri> 141.137 + </binding> 141.138 + </result> 141.139 + <result> 141.140 + <binding name='y'> 141.141 + <uri>http://example.org#D</uri> 141.142 + </binding> 141.143 + <binding name='x'> 141.144 + <uri>http://example.org#C</uri> 141.145 + </binding> 141.146 + </result> 141.147 + <result> 141.148 + <binding name='y'> 141.149 + <uri>http://example.org#D</uri> 141.150 + </binding> 141.151 + <binding name='x'> 141.152 + <uri>http://example.org#E</uri> 141.153 + </binding> 141.154 + </result> 141.155 + <result> 141.156 + <binding name='y'> 141.157 + <uri>http://example.org#D</uri> 141.158 + </binding> 141.159 + <binding name='x'> 141.160 + <uri>http://example.org#F</uri> 141.161 + </binding> 141.162 + </result> 141.163 + <result> 141.164 + <binding name='y'> 141.165 + <uri>http://example.org#F</uri> 141.166 + </binding> 141.167 + <binding name='x'> 141.168 + <uri>http://example.org#C</uri> 141.169 + </binding> 141.170 + </result> 141.171 + <result> 141.172 + <binding name='y'> 141.173 + <uri>http://example.org#F</uri> 141.174 + </binding> 141.175 + <binding name='x'> 141.176 + <uri>http://example.org#D</uri> 141.177 + </binding> 141.178 + </result> 141.179 + <result> 141.180 + <binding name='y'> 141.181 + <uri>http://example.org#F</uri> 141.182 + </binding> 141.183 + <binding name='x'> 141.184 + <uri>http://example.org#E</uri> 141.185 + </binding> 141.186 + </result> 141.187 + <result> 141.188 + <binding name='y'> 141.189 + <uri>http://example.org#G</uri> 141.190 + </binding> 141.191 + <binding name='x'> 141.192 + <uri>http://example.org#A</uri> 141.193 + </binding> 141.194 + </result> 141.195 + <result> 141.196 + <binding name='y'> 141.197 + <uri>http://example.org#G</uri> 141.198 + </binding> 141.199 + <binding name='x'> 141.200 + <uri>http://example.org#B</uri> 141.201 + </binding> 141.202 + </result> 141.203 + <result> 141.204 + <binding name='y'> 141.205 + <uri>http://example.org#G</uri> 141.206 + </binding> 141.207 + <binding name='x'> 141.208 + <uri>http://example.org#C</uri> 141.209 + </binding> 141.210 + </result> 141.211 + <result> 141.212 + <binding name='y'> 141.213 + <uri>http://example.org#H</uri> 141.214 + </binding> 141.215 + <binding name='x'> 141.216 + <uri>http://example.org#C</uri> 141.217 + </binding> 141.218 + </result> 141.219 + </results> 141.220 +</sparql>
142.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 142.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/OverlapsTest.rq Wed Jul 17 14:18:17 2013 +0300 142.3 @@ -0,0 +1,7 @@ 142.4 +SELECT ?x ?y 142.5 +WHERE 142.6 +{ 142.7 +?x ex:hasGeometry ?g1. 142.8 +?y ex:hasGeometry ?g2. 142.9 + 142.10 +FILTER((strdf:overlaps(?g1, ?g2)))} 142.11 \ No newline at end of file
143.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 143.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/OverlapsTest.srx Wed Jul 17 14:18:17 2013 +0300 143.3 @@ -0,0 +1,25 @@ 143.4 +<?xml version='1.0' encoding='UTF-8'?> 143.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 143.6 + <head> 143.7 + <variable name='x'/> 143.8 + <variable name='y'/> 143.9 + </head> 143.10 + <results> 143.11 + <result> 143.12 + <binding name='y'> 143.13 + <uri>http://example.org#B</uri> 143.14 + </binding> 143.15 + <binding name='x'> 143.16 + <uri>http://example.org#C</uri> 143.17 + </binding> 143.18 + </result> 143.19 + <result> 143.20 + <binding name='y'> 143.21 + <uri>http://example.org#C</uri> 143.22 + </binding> 143.23 + <binding name='x'> 143.24 + <uri>http://example.org#B</uri> 143.25 + </binding> 143.26 + </result> 143.27 + </results> 143.28 +</sparql>
144.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 144.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/RelateTest.rq Wed Jul 17 14:18:17 2013 +0300 144.3 @@ -0,0 +1,7 @@ 144.4 +SELECT ?x ?y 144.5 +WHERE 144.6 +{ 144.7 +?x ex:hasGeometry ?g1. 144.8 +?y ex:hasGeometry ?g2. 144.9 + 144.10 +FILTER((?x != ?y) && (strdf:relate(?g1, ?g2, "TFFFTFFFT"^^xsd:String)))} 144.11 \ No newline at end of file
145.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 145.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/RelateTest.srx Wed Jul 17 14:18:17 2013 +0300 145.3 @@ -0,0 +1,25 @@ 145.4 +<?xml version='1.0' encoding='UTF-8'?> 145.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 145.6 + <head> 145.7 + <variable name='x'/> 145.8 + <variable name='y'/> 145.9 + </head> 145.10 + <results> 145.11 + <result> 145.12 + <binding name='y'> 145.13 + <uri>http://example.org#E</uri> 145.14 + </binding> 145.15 + <binding name='x'> 145.16 + <uri>http://example.org#D</uri> 145.17 + </binding> 145.18 + </result> 145.19 + <result> 145.20 + <binding name='y'> 145.21 + <uri>http://example.org#D</uri> 145.22 + </binding> 145.23 + <binding name='x'> 145.24 + <uri>http://example.org#E</uri> 145.25 + </binding> 145.26 + </result> 145.27 + </results> 145.28 +</sparql> 145.29 \ No newline at end of file
146.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 146.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/TopologicalRelationsTest.nt Wed Jul 17 14:18:17 2013 +0300 146.3 @@ -0,0 +1,8 @@ 146.4 +<http://example.org#A> <http://example.org#hasGeometry> "Polygon((0 0, 1 0, 1 1, 0 1, 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.5 +<http://example.org#B> <http://example.org#hasGeometry> "Polygon((0 0, 2 0, 2 2, 0 2 , 0 0))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.6 +<http://example.org#C> <http://example.org#hasGeometry> "Polygon((1 1, 3 1, 3 2, 1 2, 1 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.7 +<http://example.org#D> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.8 +<http://example.org#E> <http://example.org#hasGeometry> "Polygon((3 1, 4 1, 4 2, 3 2, 3 1))"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.9 +<http://example.org#F> <http://example.org#hasGeometry> "Linestring(3 2, 4 0)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.10 +<http://example.org#G> <http://example.org#hasGeometry> "Point(1 1)"^^<http://strdf.di.uoa.gr/ontology#WKT>. 146.11 +<http://example.org#H> <http://example.org#hasGeometry> "Polygon((2.1 1.1, 2.9 1.1, 2.9 1.9, 2.1 1.9, 2.1 1.1))"^^<http://strdf.di.uoa.gr/ontology#WKT>.
147.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 147.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/TouchesTest.rq Wed Jul 17 14:18:17 2013 +0300 147.3 @@ -0,0 +1,7 @@ 147.4 +SELECT ?x ?y 147.5 +WHERE 147.6 +{ 147.7 +?x ex:hasGeometry ?g1. 147.8 +?y ex:hasGeometry ?g2. 147.9 + 147.10 +FILTER((strdf:touches(?g1, ?g2)))} 147.11 \ No newline at end of file
148.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 148.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/TouchesTest.srx Wed Jul 17 14:18:17 2013 +0300 148.3 @@ -0,0 +1,105 @@ 148.4 +<?xml version='1.0' encoding='UTF-8'?> 148.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 148.6 + <head> 148.7 + <variable name='x'/> 148.8 + <variable name='y'/> 148.9 + </head> 148.10 + <results> 148.11 + <result> 148.12 + <binding name='y'> 148.13 + <uri>http://example.org#A</uri> 148.14 + </binding> 148.15 + <binding name='x'> 148.16 + <uri>http://example.org#C</uri> 148.17 + </binding> 148.18 + </result> 148.19 + <result> 148.20 + <binding name='y'> 148.21 + <uri>http://example.org#A</uri> 148.22 + </binding> 148.23 + <binding name='x'> 148.24 + <uri>http://example.org#G</uri> 148.25 + </binding> 148.26 + </result> 148.27 + <result> 148.28 + <binding name='y'> 148.29 + <uri>http://example.org#C</uri> 148.30 + </binding> 148.31 + <binding name='x'> 148.32 + <uri>http://example.org#A</uri> 148.33 + </binding> 148.34 + </result> 148.35 + <result> 148.36 + <binding name='y'> 148.37 + <uri>http://example.org#C</uri> 148.38 + </binding> 148.39 + <binding name='x'> 148.40 + <uri>http://example.org#G</uri> 148.41 + </binding> 148.42 + </result> 148.43 + <result> 148.44 + <binding name='y'> 148.45 + <uri>http://example.org#C</uri> 148.46 + </binding> 148.47 + <binding name='x'> 148.48 + <uri>http://example.org#D</uri> 148.49 + </binding> 148.50 + </result> 148.51 + <result> 148.52 + <binding name='y'> 148.53 + <uri>http://example.org#C</uri> 148.54 + </binding> 148.55 + <binding name='x'> 148.56 + <uri>http://example.org#E</uri> 148.57 + </binding> 148.58 + </result> 148.59 + <result> 148.60 + <binding name='y'> 148.61 + <uri>http://example.org#C</uri> 148.62 + </binding> 148.63 + <binding name='x'> 148.64 + <uri>http://example.org#F</uri> 148.65 + </binding> 148.66 + </result> 148.67 + <result> 148.68 + <binding name='y'> 148.69 + <uri>http://example.org#G</uri> 148.70 + </binding> 148.71 + <binding name='x'> 148.72 + <uri>http://example.org#A</uri> 148.73 + </binding> 148.74 + </result> 148.75 + <result> 148.76 + <binding name='y'> 148.77 + <uri>http://example.org#G</uri> 148.78 + </binding> 148.79 + <binding name='x'> 148.80 + <uri>http://example.org#C</uri> 148.81 + </binding> 148.82 + </result> 148.83 + <result> 148.84 + <binding name='y'> 148.85 + <uri>http://example.org#E</uri> 148.86 + </binding> 148.87 + <binding name='x'> 148.88 + <uri>http://example.org#C</uri> 148.89 + </binding> 148.90 + </result> 148.91 + <result> 148.92 + <binding name='y'> 148.93 + <uri>http://example.org#D</uri> 148.94 + </binding> 148.95 + <binding name='x'> 148.96 + <uri>http://example.org#C</uri> 148.97 + </binding> 148.98 + </result> 148.99 + <result> 148.100 + <binding name='y'> 148.101 + <uri>http://example.org#F</uri> 148.102 + </binding> 148.103 + <binding name='x'> 148.104 + <uri>http://example.org#C</uri> 148.105 + </binding> 148.106 + </result> 148.107 + </results> 148.108 +</sparql> 148.109 \ No newline at end of file
149.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 149.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/WithinTest.rq Wed Jul 17 14:18:17 2013 +0300 149.3 @@ -0,0 +1,7 @@ 149.4 +SELECT ?x ?y 149.5 +WHERE 149.6 +{ 149.7 +?x ex:hasGeometry ?g1. 149.8 +?y ex:hasGeometry ?g2. 149.9 + 149.10 +FILTER((?x != ?y) && (strdf:within(?g1, ?g2)))} 149.11 \ No newline at end of file
150.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 150.2 +++ b/testsuite/src/test/resources/stSPARQL/TopologicalRelationsTest/WithinTest.srx Wed Jul 17 14:18:17 2013 +0300 150.3 @@ -0,0 +1,49 @@ 150.4 +<?xml version='1.0' encoding='UTF-8'?> 150.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 150.6 + <head> 150.7 + <variable name='x'/> 150.8 + <variable name='y'/> 150.9 + </head> 150.10 + <results> 150.11 + <result> 150.12 + <binding name='y'> 150.13 + <uri>http://example.org#B</uri> 150.14 + </binding> 150.15 + <binding name='x'> 150.16 + <uri>http://example.org#A</uri> 150.17 + </binding> 150.18 + </result> 150.19 + <result> 150.20 + <binding name='y'> 150.21 + <uri>http://example.org#B</uri> 150.22 + </binding> 150.23 + <binding name='x'> 150.24 + <uri>http://example.org#G</uri> 150.25 + </binding> 150.26 + </result> 150.27 + <result> 150.28 + <binding name='y'> 150.29 + <uri>http://example.org#C</uri> 150.30 + </binding> 150.31 + <binding name='x'> 150.32 + <uri>http://example.org#H</uri> 150.33 + </binding> 150.34 + </result> 150.35 + <result> 150.36 + <binding name='y'> 150.37 + <uri>http://example.org#E</uri> 150.38 + </binding> 150.39 + <binding name='x'> 150.40 + <uri>http://example.org#D</uri> 150.41 + </binding> 150.42 + </result> 150.43 + <result> 150.44 + <binding name='y'> 150.45 + <uri>http://example.org#D</uri> 150.46 + </binding> 150.47 + <binding name='x'> 150.48 + <uri>http://example.org#E</uri> 150.49 + </binding> 150.50 + </result> 150.51 + </results> 150.52 +</sparql> 150.53 \ No newline at end of file
151.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.rq Wed Jul 17 13:39:41 2013 +0300 151.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 151.3 @@ -1,6 +0,0 @@ 151.4 -select (strdf:union(?g) as ?union) 151.5 -where 151.6 -{ 151.7 - ?x <http://example.org/ontology/hasGeometry> ?g . 151.8 - ?x rdf:type <http://example.org/ontology/b> . 151.9 -} 151.10 \ No newline at end of file
152.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnary.srx Wed Jul 17 13:39:41 2013 +0300 152.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 152.3 @@ -1,13 +0,0 @@ 152.4 -<?xml version='1.0' encoding='UTF-8'?> 152.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 152.6 - <head> 152.7 - <variable name='union'/> 152.8 - </head> 152.9 - <results> 152.10 - <result> 152.11 - <binding name='union'> 152.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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</literal> 152.13 - </binding> 152.14 - </result> 152.15 - </results> 152.16 -</sparql> 152.17 \ No newline at end of file
153.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.rq Wed Jul 17 13:39:41 2013 +0300 153.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 153.3 @@ -1,7 +0,0 @@ 153.4 -select (strdf:union(?g) as ?union) 153.5 -where 153.6 -{ 153.7 - ?x <http://example.org/ontology/hasGeometry> ?g . 153.8 - ?x rdf:type <http://example.org/ontology/b> . 153.9 -} 153.10 -group by ?x 153.11 \ No newline at end of file
154.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructUnaryGroupBy.srx Wed Jul 17 13:39:41 2013 +0300 154.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 154.3 @@ -1,19 +0,0 @@ 154.4 -<?xml version='1.0' encoding='UTF-8'?> 154.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 154.6 - <head> 154.7 - <variable name='union'/> 154.8 - </head> 154.9 - <results> 154.10 - <result> 154.11 - <binding name='union'> 154.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2));http://www.opengis.net/def/crs/EPSG/0/4326</literal> 154.13 - </binding> 154.14 - </result> 154.15 - <result> 154.16 - <binding name='union'> 154.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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</literal> 154.18 - </binding> 154.19 - </result> 154.20 - </results> 154.21 -</sparql> 154.22 -
155.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionTest.nt Wed Jul 17 13:39:41 2013 +0300 155.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 155.3 @@ -1,8 +0,0 @@ 155.4 -<http://example.org/id/Point/5531> <http://example.org/ontology/hasGeometry> "POINT(23.6423757 37.9521198)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 155.5 -<http://example.org/id/Point/5531> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> . 155.6 -<http://example.org/id/Point/5532> <http://example.org/ontology/hasGeometry> "POLYGON((-7 4.2,-7.1 4.2,-7.1 4.3,-7 4.2))"^^<http://strdf.di.uoa.gr/ontology#WKT> . 155.7 -<http://example.org/id/Point/5532> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> . 155.8 -<http://example.org/id/Point/5533> <http://example.org/ontology/hasGeometry> "POINT(21.841968 38.045047)"^^<http://strdf.di.uoa.gr/ontology#WKT> . 155.9 -<http://example.org/id/Point/5533> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/a> . 155.10 -<http://example.org/id/Point/5534> <http://example.org/ontology/hasGeometry> "POLYGON((34.80 19.37,41.74 19.37,41.74 29.64 ,34.80 29.64,34.80 19.37))"^^<http://strdf.di.uoa.gr/ontology#WKT> . 155.11 -<http://example.org/id/Point/5534> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/ontology/b> .
156.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.rq Wed Jul 17 13:39:41 2013 +0300 156.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 156.3 @@ -1,7 +0,0 @@ 156.4 -select (strdf:union(?g1, ?g2) as ?union) 156.5 -where 156.6 -{ 156.7 - ?x <http://example.org/ontology/hasGeometry> ?g1 . 156.8 - ?y <http://example.org/ontology/hasGeometry> ?g2 . 156.9 - FILTER(?x != ?y) 156.10 -} 156.11 \ No newline at end of file
157.1 --- a/testsuite/src/test/resources/untested/UnionAsConstructBinary.srx Wed Jul 17 13:39:41 2013 +0300 157.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 157.3 @@ -1,68 +0,0 @@ 157.4 -<?xml version='1.0' encoding='UTF-8'?> 157.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'> 157.6 - <head> 157.7 - <variable name='union'/> 157.8 - </head> 157.9 - <results> 157.10 - <result> 157.11 - <binding name='union'> 157.12 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal> 157.13 - </binding> 157.14 - </result> 157.15 - <result> 157.16 - <binding name='union'> 157.17 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047))</literal> 157.18 - </binding> 157.19 - </result> 157.20 - <result> 157.21 - <binding name='union'> 157.22 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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)))</literal> 157.23 - </binding> 157.24 - </result> 157.25 - <result> 157.26 - <binding name='union'> 157.27 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (23.6423757 37.9521198))</literal> 157.28 - </binding> 157.29 - </result> 157.30 - <result> 157.31 - <binding name='union'> 157.32 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (21.841968 38.045047))</literal> 157.33 - </binding> 157.34 - </result> 157.35 - <result> 157.36 - <binding name='union'> 157.37 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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)))</literal> 157.38 - </binding> 157.39 - </result> 157.40 - <result> 157.41 - <binding name='union'> 157.42 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198))</literal> 157.43 - </binding> 157.44 - </result> 157.45 - <result> 157.46 - <binding name='union'> 157.47 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal> 157.48 - </binding> 157.49 - </result> 157.50 - <result> 157.51 - <binding name='union'> 157.52 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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)))</literal> 157.53 - </binding> 157.54 - </result> 157.55 - <result> 157.56 - <binding name='union'> 157.57 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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))</literal> 157.58 - </binding> 157.59 - </result> 157.60 - <result> 157.61 - <binding name='union'> 157.62 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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)))</literal> 157.63 - </binding> 157.64 - </result> 157.65 - <result> 157.66 - <binding name='union'> 157.67 - <literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>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))</literal> 157.68 - </binding> 157.69 - </result> 157.70 - </results> 157.71 -</sparql> 157.72 \ No newline at end of file