1.1 --- a/.hgignore	Fri Apr 19 09:11:47 2013 +0300
     1.2 +++ b/.hgignore	Fri Apr 19 14:37:09 2013 +0300
     1.3 @@ -1,4 +1,5 @@
     1.4  /target$
     1.5 +target$
     1.6  \.project$
     1.7  \.settings$
     1.8  \.classpath$
     1.9 @@ -12,3 +13,4 @@
    1.10  stderr\.log
    1.11  stdout\.log
    1.12  endpoint-client/dependency-reduced-pom\.xml
    1.13 +WEB-INF/faces-config.xml

     2.1 --- a/ChangeLog	Fri Apr 19 09:11:47 2013 +0300
     2.2 +++ b/ChangeLog	Fri Apr 19 14:37:09 2013 +0300
     2.3 @@ -2,6 +2,31 @@
     2.4  
     2.5  	* Version 3.2.9 released.
     2.6  
     2.7 +	* Added support of all SPARQL result types provided by Sesame (json,
     2.8 +	xml, csv, tsv, binary). To get the respective writer, just prepend the
     2.9 +	string "SPARQL/", e.g., "SPARQL/JSON". This is to ensure that we
    2.10 +	support all SPARQL result formats of the SPARQL Protocol.
    2.11 +
    2.12 +	* Fixed a bug where a non-implemented extension function would make
    2.13 +	Strabon throw a NULL pointer exception. Now we get away with it
    2.14 +	through a warning.
    2.15 +
    2.16 +	* Strabon endpoint now publishes the URIs of the supported units of
    2.17 +	measure for use in strdf:distance and geof:distance functions of
    2.18 +	stSPARQL and GeoSPARQL, respectively. The URIs are those defined by
    2.19 +	OGC Units of Measure 1.0 specification which may be found at
    2.20 +	http://www.opengis.net/def/uom/OGC/1.0/. Strabon endpoint publishes
    2.21 +	the URIs at http://localhost:8080/endpoint/Capabilities.
    2.22 +
    2.23 +	* Created new module with name 'vocab` and artifactId
    2.24 +	'strabon-vocabulary` and moved GeoConstants.java there. Other
    2.25 +	vocabularies have been added as well, such as Simple Features, and
    2.26 +	GeoSPARQL.
    2.27 +
    2.28 +	* Strabon endpoint now publishes the URIs of the supported extension
    2.29 +	functions for stSPARQL and GeoSPARQL. One should access them by
    2.30 +	hitting the link http://localhost:8080/endpoint/Capabilities.
    2.31 +
    2.32  	* Support for parsing EPSG URIs in geometry literals with datatype
    2.33  	geo:wktLiteral.
    2.34  	(bug #33: http://bug.strabon.di.uoa.gr/ticket/33)

     3.1 --- a/README	Fri Apr 19 09:11:47 2013 +0300
     3.2 +++ b/README	Fri Apr 19 14:37:09 2013 +0300
     3.3 @@ -33,6 +33,17 @@
     3.4  extension of GeoSPARQL. 
     3.5  
     3.6  
     3.7 +Conformance to GeoSPARQL
     3.8 +========================
     3.9 +Strabon implements the `Core', the `Topology Vocabulary Extension', the
    3.10 +`Geometry Extension', the `Geometry Topology Extension', and the `RDFS Entailment
    3.11 +Extension' except for Req. 25
    3.12 +(http://www.opengis.net/spec/geosparql/1.0/req/rdfs-entailment-extension/bgp-rdfs-ent).
    3.13 +
    3.14 +With respect to GML, Strabon supports the GML Profile corresponding to Simple
    3.15 +Features, that is, GML Simple Features Profile 2.0. 
    3.16 +
    3.17 +
    3.18  Strabon Homepage
    3.19  ================
    3.20  The homepage of Strabon is at http://www.strabon.di.uoa.gr/.
    3.21 @@ -43,6 +54,84 @@
    3.22  You can find a demo of the system Strabon at http://test.strabon.di.uoa.gr/NOA/.
    3.23  
    3.24  
    3.25 +How to build and run Strabon from command line
    3.26 +==============================================
    3.27 +Assuming you have already downloaded Strabon and you are in the top-level
    3.28 +directory of Strabon, issue the following command to build it from command line:
    3.29 +
    3.30 +	$ mvn package
    3.31 +
    3.32 +The above command runs automatically the JUnit tests. To skip them pass option
    3.33 +`-DskipTests=true' to the above command. The complete command is the following:
    3.34 +
    3.35 +	$ mvn -DskipTests=true package
    3.36 +
    3.37 +In case of an error during building of Strabon and assuming that the error does
    3.38 +not come from the JUnit tests, please have a look at the `Known Issues' section
    3.39 +below. If none of the known issues of that section applies, please contact the
    3.40 +developers through the Strabon mailing-list or submit a corresponding bug
    3.41 +(see `Bugs' section below).
    3.42 +
    3.43 +After you have successfully built Strabon, you have access to the following
    3.44 +components:
    3.45 +
    3.46 +  * Strabon Endpoint
    3.47 +
    3.48 +    This is a SPARQL endpoint for Strabon. It is distributed as a war file so
    3.49 +    you may deploy it in a Tomcat container. You may find the war file under
    3.50 +    directory `endpoint/target'.
    3.51 +
    3.52 +  * Strabon Endpoint (standalone)
    3.53 +
    3.54 +    This is a SPARQL endpoint for Strabon like the above one, but it differs
    3.55 +    only in that it does not require the user to have already set up a Tomcat
    3.56 +    container. The standalone Strabon Endpoint may be run by issuing the
    3.57 +    following command:
    3.58 +
    3.59 +    	$ java -jar endpoint-exec/target/strabon-endpoint-executable-${version}.jar
    3.60 +
    3.61 +    After issuing the above command, you may access the Strabon Endpoint at
    3.62 +    the following URL: <http://localhost:8080/>.
    3.63 +
    3.64 +    Please see the page at <http://hg.strabon.di.uoa.gr/Strabon/rev/674f8f91162b>
    3.65 +    to find out other options that you may pass to the Tomcat container that
    3.66 +    will run by the above command.
    3.67 +
    3.68 +    SPECIAL NOTE: if you need to configure the connection details to the
    3.69 +    underlying database, you may do so in two ways:
    3.70 +      1. By modifying file `endpoint/WebContent/WEB-INF/connection.properties'
    3.71 +         before building Strabon and executing the above command.
    3.72 +      2. After executing the above command, by visiting the following page by a
    3.73 +         browser: <http://localhost:8080/ChangeConnection>
    3.74 +
    3.75 +  * Strabon Endpoint Client
    3.76 +
    3.77 +    This is a Java client for interacting with Strabon Endpoint or any other
    3.78 +    SPARQL endpoint. It is packaged as a jar file and may be found under
    3.79 +    directory `endpoint-client/target/' with name
    3.80 +    `strabon-endpoint-client-${version}.jar'. This jar contains any dependencies
    3.81 +    to other code, so may copy and paste it to your project and start playing
    3.82 +    with the code immediately.
    3.83 +
    3.84 +  * Strabon script
    3.85 +
    3.86 +    The `strabon' script is located under the `scripts/' directory and it is the
    3.87 +    main command-line tool for interacting with Strabon. You may use it to store
    3.88 +    RDF data with geospatial information or query/update it using one of
    3.89 +    stSPARQL or GeoSPARQL query languages.
    3.90 +
    3.91 +  * Endpoint script
    3.92 +
    3.93 +    The `endpoint' script is located under the `scripts' directory and it is the
    3.94 +    main command-line tool for interacting with a `Strabon Endpoint'. You may
    3.95 +    use it to do any operation you would like to do with the `strabon' script
    3.96 +    above, but in contrast to the `strabon' script you need to have access to a
    3.97 +    Strabon endpoint. Of course, the `Strabon Endpoint Client' component above
    3.98 +    can be used as well as a command-line tool. At the time of writing, the
    3.99 +    `Strabon Endpoint Client' component supports only querying of RDF data with
   3.100 +    geospatial information.
   3.101 +
   3.102 +
   3.103  Getting Started
   3.104  ===============
   3.105  To get started  with Strabon please have a look at the tutorial for the stRDF
   3.106 @@ -89,6 +178,107 @@
   3.107  You can see some examples in the classes gr.uoa.di.strabon.example.PostgisExample
   3.108  and gr.uoa.di.strabon.example.PostgisExample2.
   3.109  
   3.110 +	Tuning PostgreSQL
   3.111 +	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   3.112 +The default settings of Postgres are rather conservative. As a result, parameter 
   3.113 +tuning is neccessary for speeding up Postgres, therefore Strabon. If you are 
   3.114 +using Strabon to compare its performance against your implementation of 
   3.115 +stSPARQL/GeoSPARQL, you are *strongly* encouraged to contact us using the Strabon
   3.116 +Users mailing list for assistance on tuning Postgres.
   3.117 +
   3.118 +You can follow the instructions below for tuning a Postgres server running on an 
   3.119 +Ubuntu machine that is dedicated to PostgreSQL and Strabon.
   3.120 +
   3.121 +1. Append the following text at the end of postgresql.conf. 
   3.122 +*Uncomment* the appropriate lines.
   3.123 +
   3.124 +### RAM
   3.125 +## 4 GB of RAM
   3.126 +#shared_buffers       =  3GB
   3.127 +#effective_cache_size =  3GB
   3.128 +#maintenance_work_mem =  1GB
   3.129 +#work_mem             =  2GB
   3.130 +## 8 GB of RAM
   3.131 +#shared_buffers       =  5GB
   3.132 +#effective_cache_size =  6GB
   3.133 +#maintenance_work_mem =  2GB
   3.134 +#work_mem             =  5GB
   3.135 +## 16 GB of RAM
   3.136 +#shared_buffers       = 10GB
   3.137 +#effective_cache_size = 14GB
   3.138 +#maintenance_work_mem =  4GB
   3.139 +#work_mem             = 10GB
   3.140 +## 24 GB of RAM
   3.141 +#shared_buffers       = 16GB 
   3.142 +#effective_cache_size = 22GB 
   3.143 +#maintenance_work_mem =  6GB 
   3.144 +#work_mem             = 15GB
   3.145 +## 48 GB of RAM
   3.146 +#shared_buffers       = 32GB
   3.147 +#effective_cache_size = 46GB
   3.148 +#maintenance_work_mem =  8GB
   3.149 +#work_mem             = 30GB
   3.150 +## 64 GB of RAM
   3.151 +# contact us to find out!
   3.152 +### HD
   3.153 +## RAID with ordinary 7.200 disks
   3.154 +#random_page_cost = 3.5 #3.0-3.5
   3.155 +## High-End NAS/SAN
   3.156 +#random_page_cost = 2 #1.5-2.5
   3.157 +## Amazon EBS/Heroku
   3.158 +#random_page_cost = 1.3 #1.1-2.0
   3.159 +## SSD array
   3.160 +#random_page_cost = 2.0 #1.5-2.5
   3.161 +### Misc
   3.162 +default_statistics_target    = 10000 
   3.163 +constraint_exclusion         = on 
   3.164 +checkpoint_completion_target = 0.9 
   3.165 +wal_buffers                  = 32MB 
   3.166 +checkpoint_segments          = 64 
   3.167 +### Connections
   3.168 +max_connections              = 10
   3.169 +
   3.170 +2. Append the following lines at the end of /etc/sysctl.conf
   3.171 +*Uncomment* the appropriate lines.
   3.172 +
   3.173 +## 4 GB of RAM
   3.174 +#kernel.shmmax = 3758096384
   3.175 +#kernel.shmall = 3758096384
   3.176 +#kernel.shmmni = 4096
   3.177 +## 8 GB of RAM
   3.178 +#kernel.shmmax = 5905580032
   3.179 +#kernel.shmall = 5905580032
   3.180 +#kernel.shmmni = 4096
   3.181 +## 16 GB of RAM
   3.182 +#kernel.shmmax = 11274289152
   3.183 +#kernel.shmall = 11274289152
   3.184 +#kernel.shmmni = 4096
   3.185 +## 24 GB of RAM
   3.186 +#kernel.shmmax = 17716740096
   3.187 +#kernel.shmall = 17716740096
   3.188 +#kernel.shmmni = 4096
   3.189 +## 48 GB of RAM
   3.190 +#kernel.shmmax = 35433480192
   3.191 +#kernel.shmall = 35433480192
   3.192 +#kernel.shmmni = 4224
   3.193 +## 64 GB of RAM
   3.194 +# contact us to find out!
   3.195 +
   3.196 +3. Apply all changes by executing
   3.197 +
   3.198 +$ sudo sysctl -p
   3.199 +$ sudo /etc/init.d/postgresql restart
   3.200 +
   3.201 +4. Prepare for the next run by issuing the command 
   3.202 +
   3.203 +$ sudo -u postgres psql -c 'VACUUM ANALYZE;' db
   3.204 +
   3.205 +or 
   3.206 +
   3.207 +$ psql -c 'VACUUM ANALYZE;' db
   3.208 +
   3.209 +where db is the name of the Postgres database that Strabon will use.
   3.210 +
   3.211  
   3.212  Developer Guide
   3.213  ~~~~~~~~~~~~~~~
   3.214 @@ -115,8 +305,45 @@
   3.215     project, download any dependencies and build the project. 
   3.216  
   3.217  
   3.218 -	Storing stRDF graphs and evaluating stSPARQL queries
   3.219 -	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   3.220 +Tester Guide
   3.221 +~~~~~~~~~~~~
   3.222 +Assuming again that you are familiar with Maven and Junit these are the steps
   3.223 +you need to follow to test the functionality of Strabon:
   3.224 +
   3.225 +
   3.226 +* Using Eclipse
   3.227 +
   3.228 +	If you want to create a new test:
   3.229 +
   3.230 +	1. Import Strabon into Eclipse as explained in the Developer Guide.
   3.231 +	2. Go to strabon-testsuite project.
   3.232 +	3. Create a new folder (Recommended folder name: <test's name>) and place inside the following files:
   3.233 +		3.1. An ntriples or nquads file with the test dataset (with .nt or .nq extension).
   3.234 +		3.2. Pairs of files with sparql test queries and expected test results in xml format.
   3.235 +			 Notice that each pair must have the same name and .rq extension for the queryFile and .srx extension for the resultsFile.
   3.236 +	4. Create a test class that extends TemplateTest class.
   3.237 +	5. If you have followed the recommendations the test is ready. If you have different names for your
   3.238 +	files, insert them explicitly in the constructor of TemplateTest class (super class).
   3.239 +	
   3.240 +	If you want to run a test:
   3.241 +	
   3.242 +	1. Right-click on the test class.
   3.243 +	2. Select "Run as JUnit Test".
   3.244 +	3. Database properties are retrieved from database.properties file. If you want, you can change a property
   3.245 +	"on the fly" with an environment variable.
   3.246 +
   3.247 +	
   3.248 +* Command Line
   3.249 +	
   3.250 +	If you want to run all the tests:
   3.251 +	
   3.252 +	1. Go to Strabon directory (root directory of all the subprojects).
   3.253 +	2. Run "mvn test".
   3.254 +	3. Optionally you can pass an environment variable with "-DvariableName=variableValue".
   3.255 +
   3.256 +
   3.257 +Storing stRDF graphs and evaluating stSPARQL queries
   3.258 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   3.259  You can see some examples in the classes
   3.260  eu.earthobservatory.runtime.postgis.StoreOp and
   3.261  eu.earthobservatory.runtime.postgis.QueryOp.
   3.262 @@ -216,10 +443,17 @@
   3.263  
   3.264  Mailing-list
   3.265  ============
   3.266 -Currently, there is only a developers mailing-list, Strabon-devel, for support
   3.267 -and other questions concerning Strabon. To subscribe to the mailing-list, please
   3.268 -visit page http://cgi.di.uoa.gr/~mailman/listinfo/strabon-devel. To post e-mails
   3.269 -to Strabon-devel mailing-list, write to Strabon-devel@di.uoa.gr.
   3.270 +Currently, we maintain the following mailing lists:
   3.271 +
   3.272 +* Strabon-users, is used as a communication channel for Strabon users.
   3.273 +To subscribe to the mailing-list, please visit page 
   3.274 +http://cgi.di.uoa.gr/~mailman/listinfo/strabon-users. To post e-mails
   3.275 +to Strabon-users mailing-list, write to strabon-users@di.uoa.gr.
   3.276 +
   3.277 +* Strabon-devel, is used as a communication channel with the developers
   3.278 +of Strabon. To subscribe to the mailing-list, please visit page 
   3.279 +http://cgi.di.uoa.gr/~mailman/listinfo/strabon-devel. To post e-mails
   3.280 +to Strabon-devel mailing-list, write to strabon-devel@di.uoa.gr.
   3.281  
   3.282  
   3.283  Bugs
   3.284 @@ -250,6 +484,10 @@
   3.285  
   3.286     	$ mvn clean package -Dshade.skip
   3.287  
   3.288 + * When using MonetDB as a backend, the following source code of MonetDB must be 
   3.289 +   used:
   3.290 +	https://hg.strabon.di.uoa.gr/MonetDB/   
   3.291 +
   3.292  
   3.293  License
   3.294  =======

     4.1 --- a/endpoint-client/pom.xml	Fri Apr 19 09:11:47 2013 +0300
     4.2 +++ b/endpoint-client/pom.xml	Fri Apr 19 14:37:09 2013 +0300
     4.3 @@ -37,6 +37,12 @@
     4.4  			<artifactId>junit</artifactId>
     4.5  			<scope>test</scope>
     4.6  		</dependency>
     4.7 +		<dependency>
     4.8 +			<groupId>org.openrdf.sesame</groupId>
     4.9 +			<artifactId>
    4.10 +				sesame-queryresultio-spatial-sparqlkml
    4.11 +			</artifactId>
    4.12 +		</dependency>
    4.13  	</dependencies>
    4.14  
    4.15  	<build>

     5.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/EndpointResult.java	Fri Apr 19 09:11:47 2013 +0300
     5.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/EndpointResult.java	Fri Apr 19 14:37:09 2013 +0300
     5.3 @@ -13,23 +13,27 @@
     5.4   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
     5.5   *
     5.6   */
     5.7 -public interface EndpointResult {
     5.8 +public class EndpointResult {
     5.9  
    5.10 -	/**
    5.11 -	 * Returns the HTTP status code as returned by the endpoint.
    5.12 -	 * @return
    5.13 -	 */
    5.14 -	public int getStatusCode();
    5.15 +	private int statusCode;
    5.16 +	private String statusText;
    5.17 +	private String response;
    5.18  	
    5.19 -	/**
    5.20 -	 * Returns the status text corresponding to the status code.
    5.21 -	 * @return
    5.22 -	 */
    5.23 -	public String getStatusText();
    5.24 +	public EndpointResult(int statusCode, String statusLine, String response) {
    5.25 +		this.statusCode = statusCode;
    5.26 +		this.statusText = statusLine;
    5.27 +		this.response = response;
    5.28 +	}
    5.29  	
    5.30 -	/**
    5.31 -	 * Returns the response of the endpoint.
    5.32 -	 * @return
    5.33 -	 */
    5.34 -	public String getResponse();
    5.35 +	public int getStatusCode() {
    5.36 +		return statusCode;
    5.37 +	}
    5.38 +
    5.39 +	public String getStatusText() {
    5.40 +		return statusText;
    5.41 +	}
    5.42 +
    5.43 +	public String getResponse() {
    5.44 +		return response;
    5.45 +	}
    5.46  }

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/HTTPClient.java	Fri Apr 19 14:37:09 2013 +0300
     6.3 @@ -0,0 +1,112 @@
     6.4 +/**
     6.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     6.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     6.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     6.8 + *
     6.9 + * Copyright (C) 2012, Pyravlos Team
    6.10 + *
    6.11 + * http://www.strabon.di.uoa.gr/
    6.12 + */
    6.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
    6.14 +
    6.15 +import org.apache.http.client.HttpClient;
    6.16 +import org.apache.http.conn.ClientConnectionManager;
    6.17 +import org.apache.http.impl.client.DefaultHttpClient;
    6.18 +import org.apache.http.impl.conn.PoolingClientConnectionManager;
    6.19 +
    6.20 +/**
    6.21 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    6.22 + *
    6.23 + */
    6.24 +public abstract class HTTPClient {
    6.25 +
    6.26 +	/**
    6.27 +	 * The host on which the endpoint is located.
    6.28 +	 */
    6.29 +	protected String host;
    6.30 +	
    6.31 +	/**
    6.32 +	 * The port of the host.
    6.33 +	 */
    6.34 +	protected int port;
    6.35 +	
    6.36 +	/**
    6.37 +	 * The name of the endpoint.
    6.38 +	 * 
    6.39 +	 * This is useful for {@link SPARQLEndpoint} instances that are usually
    6.40 +	 * deployed in a tomcat container as web applications.
    6.41 +	 */
    6.42 +	protected String endpointName;
    6.43 +	
    6.44 +	/**
    6.45 +	 * The username to be used in case the endpoint requires authentication.
    6.46 +	 */
    6.47 +	protected String user;
    6.48 +	
    6.49 +	/**
    6.50 +	 * The password to be used in case the endpoint requires authentication.
    6.51 +	 */
    6.52 +	protected String password;
    6.53 +	
    6.54 +	/**
    6.55 +	 * The connection manager that manages sharing of connections to endpoints
    6.56 +	 * among several threads.
    6.57 +	 */
    6.58 +	private ClientConnectionManager connectionManager;
    6.59 +	
    6.60 +	/**
    6.61 +	 * The HttpClient to be used for connecting to an endpoint.
    6.62 +	 */
    6.63 +	protected HttpClient hc;
    6.64 +	
    6.65 +	public HTTPClient(String host, int port) {
    6.66 +		this(host, port, "/");
    6.67 +	}
    6.68 +	
    6.69 +	public HTTPClient(String host, int port, String endpointName) {
    6.70 +		this.host = host;
    6.71 +		this.port = port;
    6.72 +		
    6.73 +		this.endpointName = (endpointName == null ? "":endpointName);
    6.74 +		
    6.75 +		// create a connection manager for allowing the users of this class use threads
    6.76 +		connectionManager = new PoolingClientConnectionManager();
    6.77 +		
    6.78 +		// create an HttpClient instance that establishes connections based on the connection manager
    6.79 +		hc = new DefaultHttpClient(connectionManager);
    6.80 +	}
    6.81 +		
    6.82 +	public String getHost() {
    6.83 +		return host;
    6.84 +	}
    6.85 +	
    6.86 +	public int getPort() {
    6.87 +		return port;
    6.88 +	}
    6.89 +	
    6.90 +	public void setUser(String user) {
    6.91 +		this.user = user;
    6.92 +	}
    6.93 +	
    6.94 +	public void setPassword(String pass) {
    6.95 +		this.password = pass;
    6.96 +	}
    6.97 +	
    6.98 +	public String getUser() {
    6.99 +		return user;
   6.100 +	}
   6.101 +	
   6.102 +	public String getPassword() {
   6.103 +		return password;
   6.104 +	}
   6.105 +	
   6.106 +	/**
   6.107 +	 * Returns a URL (actually a {@link String}) for establishing connections
   6.108 +	 * to an endpoint based on the information given to the constructor. 
   6.109 +	 * 
   6.110 +	 * @return
   6.111 +	 */
   6.112 +	protected String getConnectionURL() {
   6.113 +		return "http://" + host + ":" + port + "/" + endpointName; 
   6.114 +	}
   6.115 +}

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Fri Apr 19 14:37:09 2013 +0300
     7.3 @@ -0,0 +1,230 @@
     7.4 +/**
     7.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     7.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     7.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     7.8 + *
     7.9 + * Copyright (C) 2012, Pyravlos Team
    7.10 + *
    7.11 + * http://www.strabon.di.uoa.gr/
    7.12 + */
    7.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
    7.14 +
    7.15 +import java.io.BufferedReader;
    7.16 +import java.io.IOException;
    7.17 +import java.io.InputStream;
    7.18 +import java.io.InputStreamReader;
    7.19 +import java.net.URL;
    7.20 +import java.nio.charset.Charset;
    7.21 +import java.util.ArrayList;
    7.22 +import java.util.List;
    7.23 +
    7.24 +import org.apache.http.HttpEntity;
    7.25 +import org.apache.http.HttpResponse;
    7.26 +import org.apache.http.NameValuePair;
    7.27 +import org.apache.http.client.entity.UrlEncodedFormEntity;
    7.28 +import org.apache.http.client.methods.HttpPost;
    7.29 +import org.apache.http.message.BasicNameValuePair;
    7.30 +import org.openrdf.query.resultio.TupleQueryResultFormat;
    7.31 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
    7.32 +import org.openrdf.rio.RDFFormat;
    7.33 +
    7.34 +/**
    7.35 + * This class is the implementation of a java client for accessing
    7.36 + * SPARQLEndpoint instances.
    7.37 + * 
    7.38 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    7.39 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr.
    7.40 + */
    7.41 +public class SPARQLEndpoint extends HTTPClient{
    7.42 +
    7.43 +	public SPARQLEndpoint(String host, int port) {
    7.44 +		super(host, port);
    7.45 +	}
    7.46 +	
    7.47 +	public SPARQLEndpoint(String host, int port, String endpointName) {
    7.48 +		super(host, port, endpointName);
    7.49 +	}
    7.50 +
    7.51 +	
    7.52 +	/**
    7.53 +	 * Executes a SPARQL query on the Endpoint and get the results
    7.54 +	 * in the format specified by stSPARQLQueryResultFormat, which is
    7.55 +	 * an instance of class (or a subclass) {@link TupleQueryResultFormat}.   
    7.56 +	 * 
    7.57 +	 * @param sparqlQuery
    7.58 +	 * @param format
    7.59 +	 * @return
    7.60 +	 * @throws IOException
    7.61 +	 */
    7.62 +	public EndpointResult query(String sparqlQuery, stSPARQLQueryResultFormat format) throws IOException {
    7.63 +		assert(format != null);
    7.64 +		
    7.65 +		// create a post method to execute
    7.66 +		HttpPost method = new HttpPost(getConnectionURL());
    7.67 +		
    7.68 +		// set the query parameter
    7.69 +		List<NameValuePair> params = new ArrayList<NameValuePair>();
    7.70 +		params.add(new BasicNameValuePair("query", sparqlQuery));
    7.71 +		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
    7.72 +		method.setEntity(encodedEntity);
    7.73 +		
    7.74 +		// set the content type
    7.75 +		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
    7.76 +		
    7.77 +		// set the accept format
    7.78 +		method.addHeader("Accept", format.getDefaultMIMEType());
    7.79 +		
    7.80 +		try {
    7.81 +			// response that will be filled next
    7.82 +			String responseBody = "";
    7.83 +			
    7.84 +			// execute the method
    7.85 +			HttpResponse response = hc.execute(method);
    7.86 +			int statusCode = response.getStatusLine().getStatusCode();
    7.87 +			
    7.88 +			// If the response does not enclose an entity, there is no need
    7.89 +			// to worry about connection release
    7.90 +			HttpEntity entity = response.getEntity();
    7.91 +			if (entity != null) {
    7.92 +				InputStream instream = entity.getContent();
    7.93 +				try {
    7.94 +
    7.95 +					BufferedReader reader = new BufferedReader(new InputStreamReader(instream));
    7.96 +					StringBuffer strBuf = new StringBuffer();
    7.97 +					
    7.98 +					// do something useful with the response
    7.99 +					String nextLine;
   7.100 +					while ((nextLine = reader.readLine()) != null) {
   7.101 +						strBuf.append(nextLine + "\n");
   7.102 +					}
   7.103 +					
   7.104 +					// remove last newline character
   7.105 +					if (strBuf.length() > 0) {
   7.106 +						strBuf.setLength(strBuf.length() - 1);
   7.107 +					}
   7.108 +					
   7.109 +					responseBody = strBuf.toString();
   7.110 +
   7.111 +				} catch (IOException ex) {
   7.112 +					// In case of an IOException the connection will be released
   7.113 +					// back to the connection manager automatically
   7.114 +					throw ex;
   7.115 +
   7.116 +				} catch (RuntimeException ex) {
   7.117 +					// In case of an unexpected exception you may want to abort
   7.118 +					// the HTTP request in order to shut down the underlying
   7.119 +					// connection and release it back to the connection manager.
   7.120 +					method.abort();
   7.121 +					throw ex;
   7.122 +
   7.123 +				} finally {
   7.124 +					// Closing the input stream will trigger connection release
   7.125 +					instream.close();
   7.126 +				}
   7.127 +			}
   7.128 +			 
   7.129 +			return new EndpointResult(statusCode, response.getStatusLine().getReasonPhrase(), responseBody);
   7.130 +
   7.131 +		} catch (IOException e) {
   7.132 +			throw e;
   7.133 +			
   7.134 +		} finally {
   7.135 +			// release the connection.
   7.136 +			method.releaseConnection();
   7.137 +		}
   7.138 +	}
   7.139 +
   7.140 +	/**
   7.141 +	 * Stores the RDF <code>data</code> which are in the RDF format
   7.142 +	 * <code>format</code> in the named graph specified by the URL
   7.143 +	 * <code>namedGraph</code>.
   7.144 +	 * 
   7.145 +	 * @param data 
   7.146 +	 * @param format
   7.147 +	 * @param namedGraph
   7.148 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
   7.149 +	 */
   7.150 +	
   7.151 +	public boolean store(String data, RDFFormat format, URL namedGraph) {
   7.152 +		throw new UnsupportedOperationException();
   7.153 +	}
   7.154 +
   7.155 +	/**
   7.156 +	 * Stores the RDF data located at <code>data</code> which are in the
   7.157 +	 * RDF format <code>format</code> in the named graph specified by the
   7.158 +	 * URL <code>namedGraph</code>.
   7.159 +	 * 
   7.160 +	 * @param data
   7.161 +	 * @param format
   7.162 +	 * @param namedGraph
   7.163 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
   7.164 +	 */
   7.165 +
   7.166 +	public boolean store(URL data, RDFFormat format, URL namedGraph) {
   7.167 +		throw new UnsupportedOperationException();
   7.168 +	}
   7.169 +
   7.170 +	/**
   7.171 +	 * Executes the SPARQL Update query specified in <code>sparqlUpdate</code>.
   7.172 +	 * 
   7.173 +	 * @param sparqlUpdate
   7.174 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
   7.175 +	 */
   7.176 +
   7.177 +	public boolean update(String sparqlUpdate) {
   7.178 +		throw new UnsupportedOperationException();
   7.179 +	}
   7.180 +
   7.181 +	public EndpointResult describe(String sparqlDescribe) {
   7.182 +		throw new UnsupportedOperationException();
   7.183 +	}
   7.184 +
   7.185 +	public EndpointResult construct(String sparqlConstruct) {
   7.186 +		throw new UnsupportedOperationException();
   7.187 +	}
   7.188 +	
   7.189 +	public EndpointResult ask(String sparqlAsk) {
   7.190 +		throw new UnsupportedOperationException();
   7.191 +	}
   7.192 +	
   7.193 +	
   7.194 +	public static void main(String args[]) {
   7.195 +		if (args.length < 4) {
   7.196 +			System.err.println("Usage: eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint <HOST> <PORT> <APPNAME> [<FORMAT>]");
   7.197 +			System.err.println("       where <HOST>       is the hostname of the Strabon Endpoint");
   7.198 +			System.err.println("             <PORT>       is the port to connect to on the host");
   7.199 +			System.err.println("             <APPNAME>    is the application name of Strabon Endpoint as deployed in the Tomcat container");
   7.200 +			System.err.println("             <QUERY>      is the query to execute on the endpoint");
   7.201 +			System.err.println("             [<FORMAT>]   is the format of your results. Should be one of XML (default), KML, KMZ, GeoJSON, TSV, or HTML.");
   7.202 +			System.exit(1);
   7.203 +		}
   7.204 +		
   7.205 +		String host = args[0];
   7.206 +		Integer port = new Integer(args[1]);
   7.207 +		String appName = args[2];
   7.208 +		String query = args[3];
   7.209 +		String format = "";
   7.210 +		
   7.211 +		if (args.length == 5) {
   7.212 +			format = args[4];
   7.213 +			
   7.214 +		} else {
   7.215 +			format = "XML";
   7.216 +		}
   7.217 +		
   7.218 +		SPARQLEndpoint endpoint = new SPARQLEndpoint(host, port, appName);
   7.219 +		
   7.220 +		try {
   7.221 +			EndpointResult result = endpoint.query(query, (stSPARQLQueryResultFormat) stSPARQLQueryResultFormat.valueOf(format));
   7.222 +			
   7.223 +			System.out.println("Status code: " + result.getStatusCode());
   7.224 +			System.out.println("Status text: " + result.getStatusText());
   7.225 +			System.out.println("<----- Result ----->");
   7.226 +			System.out.println(result.getResponse().replaceAll("\n", "\n\t"));
   7.227 +			System.out.println("<----- Result ----->");
   7.228 +			
   7.229 +		} catch (IOException e) {
   7.230 +			e.printStackTrace();
   7.231 +		}
   7.232 +	}
   7.233 +}

     8.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SpatialEndpoint.java	Fri Apr 19 09:11:47 2013 +0300
     8.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SpatialEndpoint.java	Fri Apr 19 14:37:09 2013 +0300
     8.3 @@ -3,36 +3,73 @@
     8.4   * License, v. 2.0. If a copy of the MPL was not distributed with this
     8.5   * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     8.6   *
     8.7 - * Copyright (C) 2012, Pyravlos Team
     8.8 + * Copyright (C) 2012, 2013, Pyravlos Team
     8.9   *
    8.10   * http://www.strabon.di.uoa.gr/
    8.11   */
    8.12  package eu.earthobservatory.org.StrabonEndpoint.client;
    8.13  
    8.14 +import java.io.ByteArrayInputStream;
    8.15 +import java.io.ByteArrayOutputStream;
    8.16  import java.io.IOException;
    8.17 -import java.net.URL;
    8.18 +import java.io.InputStream;
    8.19 +import java.util.Vector;
    8.20  
    8.21 +import org.openrdf.query.QueryEvaluationException;
    8.22 +import org.openrdf.query.TupleQueryResult;
    8.23 +import org.openrdf.query.TupleQueryResultHandlerException;
    8.24 +import org.openrdf.query.resultio.QueryResultIO;
    8.25 +import org.openrdf.query.resultio.QueryResultParseException;
    8.26 +import org.openrdf.query.resultio.TupleQueryResultFormat;
    8.27 +import org.openrdf.query.resultio.UnsupportedQueryResultFormatException;
    8.28  import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
    8.29 -import org.openrdf.rio.RDFFormat;
    8.30 +import org.openrdf.query.resultio.sparqlkml.stSPARQLResultsKMLWriter;
    8.31  
    8.32  /**
    8.33 - * Every SPARQL endpoint that supports storing and querying of
    8.34 - * spatial RDF data should implement the {@link SpatialEndpoint}
    8.35 - * interface. 
    8.36 + * SpatialEndpoint is a SPARQLEndpoint which can store and 
    8.37 + * query for spatial data. It also supports KML format for 
    8.38 + * this kind of data.
    8.39   * 
    8.40   * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    8.41 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
    8.42   */
    8.43 -public interface SpatialEndpoint {
    8.44 +public class SpatialEndpoint extends SPARQLEndpoint {
    8.45 +	
    8.46 +	public SpatialEndpoint(String host, int port) {
    8.47 +		super(host, port);
    8.48 +	}
    8.49 +	
    8.50 +	public SpatialEndpoint(String host, int port, String endpointName) {
    8.51 +		super(host, port, endpointName);
    8.52 +	}
    8.53 +	
    8.54 +	public EndpointResult queryForKML(String sparqlQuery) throws IOException, QueryResultParseException, TupleQueryResultHandlerException, UnsupportedQueryResultFormatException, QueryEvaluationException{
    8.55 +		
    8.56 +		EndpointResult xmlResult = query(sparqlQuery, stSPARQLQueryResultFormat.XML);
    8.57 +		
    8.58 +		if (xmlResult.getStatusCode() != 200) {
    8.59 +			throw new RuntimeException("Failed : HTTP error code : " + xmlResult.getStatusCode() + " " + xmlResult.getStatusText());
    8.60 +		}
    8.61 +		
    8.62 +		String xml = xmlResult.getResponse();
    8.63 +		
    8.64 +		InputStream inputStream = new ByteArrayInputStream(xml.getBytes("UTF-8"));  
    8.65 +		TupleQueryResult results = QueryResultIO.parse(inputStream, TupleQueryResultFormat.SPARQL);
    8.66 +		
    8.67 +		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
    8.68 +		stSPARQLResultsKMLWriter kmlWriter = new stSPARQLResultsKMLWriter(outputStream);
    8.69 +			
    8.70 +		kmlWriter.startQueryResult(new Vector<String>());
    8.71 +					
    8.72 +		while(results.hasNext()){
    8.73 +		
    8.74 +				kmlWriter.handleSolution(results.next());
    8.75 +		}	
    8.76 +					
    8.77 +		kmlWriter.endQueryResult();
    8.78 +			
    8.79 +		EndpointResult kmlResult = new EndpointResult(xmlResult.getStatusCode(), xmlResult.getStatusText(), outputStream.toString());
    8.80 +		return kmlResult;
    8.81 +	}
    8.82  
    8.83 -	public EndpointResult query(String sparqlQuery, stSPARQLQueryResultFormat format) throws IOException;
    8.84 -	
    8.85 -	public boolean store(String data, RDFFormat format);
    8.86 -	
    8.87 -	public boolean store(URL data, RDFFormat format);
    8.88 -	
    8.89 -	public boolean update(String sparqlUpdate);
    8.90 -	
    8.91 -	public EndpointResult describe(String sparqlDescribe);
    8.92 -	
    8.93 -	public EndpointResult construct(String sparqlConstruct);
    8.94  }

     9.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SpatialEndpointImpl.java	Fri Apr 19 09:11:47 2013 +0300
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,112 +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) 2012, Pyravlos Team
    9.10 - *
    9.11 - * http://www.strabon.di.uoa.gr/
    9.12 - */
    9.13 -package eu.earthobservatory.org.StrabonEndpoint.client;
    9.14 -
    9.15 -import org.apache.http.client.HttpClient;
    9.16 -import org.apache.http.conn.ClientConnectionManager;
    9.17 -import org.apache.http.impl.client.DefaultHttpClient;
    9.18 -import org.apache.http.impl.conn.PoolingClientConnectionManager;
    9.19 -
    9.20 -/**
    9.21 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    9.22 - *
    9.23 - */
    9.24 -public abstract class SpatialEndpointImpl implements SpatialEndpoint {
    9.25 -
    9.26 -	/**
    9.27 -	 * The host on which the endpoint is located.
    9.28 -	 */
    9.29 -	protected String host;
    9.30 -	
    9.31 -	/**
    9.32 -	 * The port of the host.
    9.33 -	 */
    9.34 -	protected int port;
    9.35 -	
    9.36 -	/**
    9.37 -	 * The name of the endpoint.
    9.38 -	 * 
    9.39 -	 * This is useful for {@link StrabonEndpoint} instances that are usually
    9.40 -	 * deployed in a tomcat container as web applications.
    9.41 -	 */
    9.42 -	protected String endpointName;
    9.43 -	
    9.44 -	/**
    9.45 -	 * The username to be used in case the endpoint requires authentication.
    9.46 -	 */
    9.47 -	protected String user;
    9.48 -	
    9.49 -	/**
    9.50 -	 * The password to be used in case the endpoint requires authentication.
    9.51 -	 */
    9.52 -	protected String password;
    9.53 -	
    9.54 -	/**
    9.55 -	 * The connection manager that manages sharing of connections to endpoints
    9.56 -	 * among several threads.
    9.57 -	 */
    9.58 -	private ClientConnectionManager connectionManager;
    9.59 -	
    9.60 -	/**
    9.61 -	 * The HttpClient to be used for connecting to an endpoint.
    9.62 -	 */
    9.63 -	protected HttpClient hc;
    9.64 -	
    9.65 -	public SpatialEndpointImpl(String host, int port) {
    9.66 -		this(host, port, "/");
    9.67 -	}
    9.68 -	
    9.69 -	public SpatialEndpointImpl(String host, int port, String endpointName) {
    9.70 -		this.host = host;
    9.71 -		this.port = port;
    9.72 -		
    9.73 -		this.endpointName = (endpointName == null ? "":endpointName);
    9.74 -		
    9.75 -		// create a connection manager for allowing the users of this class use threads
    9.76 -		connectionManager = new PoolingClientConnectionManager();
    9.77 -		
    9.78 -		// create an HttpClient instance that establishes connections based on the connection manager
    9.79 -		hc = new DefaultHttpClient(connectionManager);
    9.80 -	}
    9.81 -		
    9.82 -	public String getHost() {
    9.83 -		return host;
    9.84 -	}
    9.85 -	
    9.86 -	public int getPort() {
    9.87 -		return port;
    9.88 -	}
    9.89 -	
    9.90 -	public void setUser(String user) {
    9.91 -		this.user = user;
    9.92 -	}
    9.93 -	
    9.94 -	public void setPassword(String pass) {
    9.95 -		this.password = pass;
    9.96 -	}
    9.97 -	
    9.98 -	public String getUser() {
    9.99 -		return user;
   9.100 -	}
   9.101 -	
   9.102 -	public String getPassword() {
   9.103 -		return password;
   9.104 -	}
   9.105 -	
   9.106 -	/**
   9.107 -	 * Returns a URL (actually a {@link String}) for establishing connections
   9.108 -	 * to an endpoint based on the information given to the constructor. 
   9.109 -	 * 
   9.110 -	 * @return
   9.111 -	 */
   9.112 -	protected String getConnectionURL() {
   9.113 -		return "http://" + host + ":" + port + "/" + endpointName; 
   9.114 -	}
   9.115 -}

    10.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/StrabonEndpoint.java	Fri Apr 19 09:11:47 2013 +0300
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,189 +0,0 @@
    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) 2012, Pyravlos Team
   10.10 - *
   10.11 - * http://www.strabon.di.uoa.gr/
   10.12 - */
   10.13 -package eu.earthobservatory.org.StrabonEndpoint.client;
   10.14 -
   10.15 -import java.io.BufferedReader;
   10.16 -import java.io.IOException;
   10.17 -import java.io.InputStream;
   10.18 -import java.io.InputStreamReader;
   10.19 -import java.net.URL;
   10.20 -import java.nio.charset.Charset;
   10.21 -import java.util.ArrayList;
   10.22 -import java.util.List;
   10.23 -
   10.24 -import org.apache.http.HttpEntity;
   10.25 -import org.apache.http.HttpResponse;
   10.26 -import org.apache.http.NameValuePair;
   10.27 -import org.apache.http.client.entity.UrlEncodedFormEntity;
   10.28 -import org.apache.http.client.methods.HttpPost;
   10.29 -import org.apache.http.message.BasicNameValuePair;
   10.30 -import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   10.31 -import org.openrdf.rio.RDFFormat;
   10.32 -
   10.33 -/**
   10.34 - * This class is the implementation of a java client for accessing
   10.35 - * StrabonEndpoint instances.
   10.36 - * 
   10.37 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   10.38 - */
   10.39 -public class StrabonEndpoint extends SpatialEndpointImpl {
   10.40 -
   10.41 -	public StrabonEndpoint(String host, int port) {
   10.42 -		super(host, port);
   10.43 -	}
   10.44 -	
   10.45 -	public StrabonEndpoint(String host, int port, String endpointName) {
   10.46 -		super(host, port, endpointName);
   10.47 -	}
   10.48 -
   10.49 -	@Override
   10.50 -	public EndpointResult query(String sparqlQuery, stSPARQLQueryResultFormat format) throws IOException {
   10.51 -		assert(format != null);
   10.52 -		
   10.53 -		// create a post method to execute
   10.54 -		HttpPost method = new HttpPost(getConnectionURL() + "/Query");
   10.55 -		
   10.56 -		// set the query parameter
   10.57 -		List<NameValuePair> params = new ArrayList<NameValuePair>();
   10.58 -		params.add(new BasicNameValuePair("query", sparqlQuery));
   10.59 -		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
   10.60 -		method.setEntity(encodedEntity);
   10.61 -		
   10.62 -		// set the content type
   10.63 -		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
   10.64 -		
   10.65 -		// set the accept format
   10.66 -		method.addHeader("Accept", format.getDefaultMIMEType());
   10.67 -		
   10.68 -		try {
   10.69 -			// response that will be filled next
   10.70 -			String responseBody = "";
   10.71 -			
   10.72 -			// execute the method
   10.73 -			HttpResponse response = hc.execute(method);
   10.74 -			int statusCode = response.getStatusLine().getStatusCode();
   10.75 -			
   10.76 -			// If the response does not enclose an entity, there is no need
   10.77 -			// to worry about connection release
   10.78 -			HttpEntity entity = response.getEntity();
   10.79 -			if (entity != null) {
   10.80 -				InputStream instream = entity.getContent();
   10.81 -				try {
   10.82 -
   10.83 -					BufferedReader reader = new BufferedReader(new InputStreamReader(instream));
   10.84 -					StringBuffer strBuf = new StringBuffer();
   10.85 -					
   10.86 -					// do something useful with the response
   10.87 -					String nextLine;
   10.88 -					while ((nextLine = reader.readLine()) != null) {
   10.89 -						strBuf.append(nextLine + "\n");
   10.90 -					}
   10.91 -					
   10.92 -					// remove last newline character
   10.93 -					if (strBuf.length() > 0) {
   10.94 -						strBuf.setLength(strBuf.length() - 1);
   10.95 -					}
   10.96 -					
   10.97 -					responseBody = strBuf.toString();
   10.98 -
   10.99 -				} catch (IOException ex) {
  10.100 -					// In case of an IOException the connection will be released
  10.101 -					// back to the connection manager automatically
  10.102 -					throw ex;
  10.103 -
  10.104 -				} catch (RuntimeException ex) {
  10.105 -					// In case of an unexpected exception you may want to abort
  10.106 -					// the HTTP request in order to shut down the underlying
  10.107 -					// connection and release it back to the connection manager.
  10.108 -					method.abort();
  10.109 -					throw ex;
  10.110 -
  10.111 -				} finally {
  10.112 -					// Closing the input stream will trigger connection release
  10.113 -					instream.close();
  10.114 -				}
  10.115 -			}
  10.116 -			 
  10.117 -			return new StrabonEndpointResult(statusCode, response.getStatusLine().getReasonPhrase(), responseBody);
  10.118 -
  10.119 -		} catch (IOException e) {
  10.120 -			throw e;
  10.121 -			
  10.122 -		} finally {
  10.123 -			// release the connection.
  10.124 -			method.releaseConnection();
  10.125 -		}
  10.126 -	}
  10.127 -
  10.128 -	@Override
  10.129 -	public boolean store(String data, RDFFormat format) {
  10.130 -		return false;
  10.131 -	}
  10.132 -
  10.133 -	@Override
  10.134 -	public boolean store(URL data, RDFFormat format) {
  10.135 -		return false;
  10.136 -	}
  10.137 -
  10.138 -	@Override
  10.139 -	public boolean update(String sparqlUpdate) {
  10.140 -		return false;
  10.141 -	}
  10.142 -
  10.143 -	@Override
  10.144 -	public EndpointResult describe(String sparqlDescribe) {
  10.145 -		return null;
  10.146 -	}
  10.147 -
  10.148 -	@Override
  10.149 -	public EndpointResult construct(String sparqlConstruct) {
  10.150 -		return null;
  10.151 -	}
  10.152 -	
  10.153 -	public static void main(String args[]) {
  10.154 -		if (args.length < 4) {
  10.155 -			System.err.println("Usage: eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint <HOST> <PORT> <APPNAME> [<FORMAT>]");
  10.156 -			System.err.println("       where <HOST>       is the hostname of the Strabon Endpoint");
  10.157 -			System.err.println("             <PORT>       is the port to connect to on the host");
  10.158 -			System.err.println("             <APPNAME>    is the application name of Strabon Endpoint as deployed in the Tomcat container");
  10.159 -			System.err.println("             <QUERY>      is the query to execute on the endpoint");
  10.160 -			System.err.println("             [<FORMAT>]   is the format of your results. Should be one of XML (default), KML, KMZ, GeoJSON, TSV, or HTML.");
  10.161 -			System.exit(1);
  10.162 -		}
  10.163 -		
  10.164 -		String host = args[0];
  10.165 -		Integer port = new Integer(args[1]);
  10.166 -		String appName = args[2];
  10.167 -		String query = args[3];
  10.168 -		String format = "";
  10.169 -		
  10.170 -		if (args.length == 5) {
  10.171 -			format = args[4];
  10.172 -			
  10.173 -		} else {
  10.174 -			format = "XML";
  10.175 -		}
  10.176 -		
  10.177 -		StrabonEndpoint endpoint = new StrabonEndpoint(host, port, appName);
  10.178 -		
  10.179 -		try {
  10.180 -			EndpointResult result = endpoint.query(query, stSPARQLQueryResultFormat.valueOf(format));
  10.181 -			
  10.182 -			System.out.println("Status code: " + result.getStatusCode());
  10.183 -			System.out.println("Status text: " + result.getStatusText());
  10.184 -			System.out.println("<----- Result ----->");
  10.185 -			System.out.println(result.getResponse().replaceAll("\n", "\n\t"));
  10.186 -			System.out.println("<----- Result ----->");
  10.187 -			
  10.188 -		} catch (IOException e) {
  10.189 -			e.printStackTrace();
  10.190 -		}
  10.191 -	}
  10.192 -}

    11.1 --- a/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/StrabonEndpointResult.java	Fri Apr 19 09:11:47 2013 +0300
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,42 +0,0 @@
    11.4 -/**
    11.5 - * This Source Code Form is subject to the terms of the Mozilla Public
    11.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
    11.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    11.8 - * 
    11.9 - * Copyright (C) 2012, Pyravlos Team
   11.10 - * 
   11.11 - * http://www.strabon.di.uoa.gr/
   11.12 - */
   11.13 -package eu.earthobservatory.org.StrabonEndpoint.client;
   11.14 -
   11.15 -/**
   11.16 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   11.17 - *
   11.18 - */
   11.19 -public class StrabonEndpointResult implements EndpointResult {
   11.20 -
   11.21 -	private int statusCode;
   11.22 -	private String statusText;
   11.23 -	private String response;
   11.24 -	
   11.25 -	public StrabonEndpointResult(int statusCode, String statusLine, String response) {
   11.26 -		this.statusCode = statusCode;
   11.27 -		this.statusText = statusLine;
   11.28 -		this.response = response;
   11.29 -	}
   11.30 -	
   11.31 -	@Override
   11.32 -	public int getStatusCode() {
   11.33 -		return statusCode;
   11.34 -	}
   11.35 -
   11.36 -	@Override
   11.37 -	public String getStatusText() {
   11.38 -		return statusText;
   11.39 -	}
   11.40 -
   11.41 -	@Override
   11.42 -	public String getResponse() {
   11.43 -		return response;
   11.44 -	}
   11.45 -}

    12.1 --- a/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestLimit.java	Fri Apr 19 09:11:47 2013 +0300
    12.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestLimit.java	Fri Apr 19 14:37:09 2013 +0300
    12.3 @@ -1,109 +1,109 @@
    12.4 -/**
    12.5 - * This Source Code Form is subject to the terms of the Mozilla Public
    12.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
    12.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    12.8 - * 
    12.9 - * Copyright (C) 2012, Pyravlos Team
   12.10 - * 
   12.11 - * http://www.strabon.di.uoa.gr/
   12.12 - */
   12.13 -package eu.earthobservatory.org.StrabonEndpoint.client;
   12.14 -
   12.15 -
   12.16 -import static org.junit.Assert.assertTrue;
   12.17 -
   12.18 -import java.io.IOException;
   12.19 -import org.junit.Before;
   12.20 -import org.junit.Test;
   12.21 -import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   12.22 -
   12.23 -/**
   12.24 - * @author Stella Giannakopoulou <sgian@di.uoa.gr>
   12.25 - *
   12.26 - */
   12.27 -public class TestLimit {
   12.28 -
   12.29 -	private StrabonEndpoint endpoint; 
   12.30 -	private String [] testQueries;
   12.31 -	private stSPARQLQueryResultFormat format;			
   12.32 -	
   12.33 -	@Before
   12.34 -	public void init() {
   12.35 -		
   12.36 -		// initialize endpoint		
   12.37 -		endpoint = new StrabonEndpoint("localhost", 8080, "strabon-endpoint");		
   12.38 -		testQueries = new String[6];
   12.39 -		
   12.40 -		 // set queries
   12.41 -		 testQueries[0] = "SELECT *\n" +
   12.42 -				"WHERE\n"+							
   12.43 -				"{\n"+
   12.44 -				"	?x ?y ?z\n" +
   12.45 -				"}\n" +
   12.46 -				"limit 3";	
   12.47 -		 
   12.48 -		 testQueries[1] = "SELECT *\n" +
   12.49 -					"WHERE\n"+							
   12.50 -					"{\n"+
   12.51 -					"	?x ?limit 5\n" +
   12.52 -					"}\n" +
   12.53 -					"limit 3";
   12.54 -		 
   12.55 -		 testQueries[2] = "SELECT *\n" +
   12.56 -					"WHERE\n"+							
   12.57 -					"{\n"+
   12.58 -					"	?x ?limit 5\n" +
   12.59 -					"}\n" +
   12.60 -					"limit 3\n" +
   12.61 -					"offset 4";
   12.62 -		 
   12.63 -		 testQueries[3] = "SELECT *\n" +
   12.64 -					"WHERE\n"+							
   12.65 -					"{\n"+
   12.66 -					"	?x ?y ?z\n" +
   12.67 -					"}\n" +
   12.68 -					"limit 3000";
   12.69 -		 
   12.70 -		 testQueries[4] = "SELECT *\n" +
   12.71 -					"WHERE\n"+							
   12.72 -					"{\n"+
   12.73 -					"	?x ?y ?z\n" +
   12.74 -					"}\n" +
   12.75 -					"offset 5" +
   12.76 -					"limit 3000";
   12.77 -		 
   12.78 -		 testQueries[5] = "SELECT *\n" +
   12.79 -					"WHERE\n"+							
   12.80 -					"{\n"+
   12.81 -					"	?x ?z 5\n" +
   12.82 -					"}\n" +
   12.83 -					"limit3000\n" +
   12.84 -					"offset 2";
   12.85 -		
   12.86 -		// format does not matter for the test
   12.87 -		format = stSPARQLQueryResultFormat.HTML;								
   12.88 -	}
   12.89 -	
   12.90 -	/**
   12.91 -	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   12.92 -	 */
   12.93 -	@Test
   12.94 -	public void testQuery() {				
   12.95 -				 
   12.96 -		for (String query : testQueries) {			
   12.97 -			try {
   12.98 -				EndpointResult response = endpoint.query(query, format);
   12.99 -				
  12.100 -				if (response.getStatusCode() != 200) {
  12.101 -					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
  12.102 -					
  12.103 -				}
  12.104 -				
  12.105 -				assertTrue(response.getStatusCode() == 200);
  12.106 -
  12.107 -			} catch (IOException e) {
  12.108 -				e.printStackTrace();
  12.109 -			}					
  12.110 -		}
  12.111 -	}	
  12.112 -}
  12.113 +///**
  12.114 +// * This Source Code Form is subject to the terms of the Mozilla Public
  12.115 +// * License, v. 2.0. If a copy of the MPL was not distributed with this
  12.116 +// * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  12.117 +// * 
  12.118 +// * Copyright (C) 2012, Pyravlos Team
  12.119 +// * 
  12.120 +// * http://www.strabon.di.uoa.gr/
  12.121 +// */
  12.122 +//package eu.earthobservatory.org.StrabonEndpoint.client;
  12.123 +//
  12.124 +//
  12.125 +//import static org.junit.Assert.assertTrue;
  12.126 +//
  12.127 +//import java.io.IOException;
  12.128 +//import org.junit.Before;
  12.129 +//import org.junit.Test;
  12.130 +//import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
  12.131 +//
  12.132 +///**
  12.133 +// * @author Stella Giannakopoulou <sgian@di.uoa.gr>
  12.134 +// *
  12.135 +// */
  12.136 +//public class TestLimit {
  12.137 +//
  12.138 +//	private SPARQLEndpoint endpoint; 
  12.139 +//	private String [] testQueries;
  12.140 +//	private stSPARQLQueryResultFormat format;			
  12.141 +//	
  12.142 +//	@Before
  12.143 +//	public void init() {
  12.144 +//		
  12.145 +//		// initialize endpoint		
  12.146 +//		endpoint = new SPARQLEndpoint("localhost", 8080, "strabon-endpoint/Query");		
  12.147 +//		testQueries = new String[6];
  12.148 +//		
  12.149 +//		 // set queries
  12.150 +//		 testQueries[0] = "SELECT *\n" +
  12.151 +//				"WHERE\n"+							
  12.152 +//				"{\n"+
  12.153 +//				"	?x ?y ?z\n" +
  12.154 +//				"}\n" +
  12.155 +//				"limit 3";	
  12.156 +//		 
  12.157 +//		 testQueries[1] = "SELECT *\n" +
  12.158 +//					"WHERE\n"+							
  12.159 +//					"{\n"+
  12.160 +//					"	?x ?limit 5\n" +
  12.161 +//					"}\n" +
  12.162 +//					"limit 3";
  12.163 +//		 
  12.164 +//		 testQueries[2] = "SELECT *\n" +
  12.165 +//					"WHERE\n"+							
  12.166 +//					"{\n"+
  12.167 +//					"	?x ?limit 5\n" +
  12.168 +//					"}\n" +
  12.169 +//					"limit 3\n" +
  12.170 +//					"offset 4";
  12.171 +//		 
  12.172 +//		 testQueries[3] = "SELECT *\n" +
  12.173 +//					"WHERE\n"+							
  12.174 +//					"{\n"+
  12.175 +//					"	?x ?y ?z\n" +
  12.176 +//					"}\n" +
  12.177 +//					"limit 3000";
  12.178 +//		 
  12.179 +//		 testQueries[4] = "SELECT *\n" +
  12.180 +//					"WHERE\n"+							
  12.181 +//					"{\n"+
  12.182 +//					"	?x ?y ?z\n" +
  12.183 +//					"}\n" +
  12.184 +//					"offset 5" +
  12.185 +//					"limit 3000";
  12.186 +//		 
  12.187 +//		 testQueries[5] = "SELECT *\n" +
  12.188 +//					"WHERE\n"+							
  12.189 +//					"{\n"+
  12.190 +//					"	?x ?z 5\n" +
  12.191 +//					"}\n" +
  12.192 +//					"limit3000\n" +
  12.193 +//					"offset 2";
  12.194 +//		
  12.195 +//		// format does not matter for the test
  12.196 +//		format = stSPARQLQueryResultFormat.HTML;								
  12.197 +//	}
  12.198 +//	
  12.199 +//	/**
  12.200 +//	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
  12.201 +//	 */
  12.202 +//	@Test
  12.203 +//	public void testQuery() {				
  12.204 +//				 
  12.205 +//		for (String query : testQueries) {			
  12.206 +//			try {
  12.207 +//				EndpointResult response = endpoint.query(query, format);
  12.208 +//				
  12.209 +//				if (response.getStatusCode() != 200) {
  12.210 +//					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
  12.211 +//					
  12.212 +//				}
  12.213 +//				
  12.214 +//				assertTrue(response.getStatusCode() == 200);
  12.215 +//
  12.216 +//			} catch (IOException e) {
  12.217 +//				e.printStackTrace();
  12.218 +//			}					
  12.219 +//		}
  12.220 +//	}	
  12.221 +//}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithParliament.java	Fri Apr 19 14:37:09 2013 +0300
    13.3 @@ -0,0 +1,75 @@
    13.4 +///* This Source Code Form is subject to the terms of the Mozilla Public
    13.5 +// * License, v. 2.0. If a copy of the MPL was not distributed with this
    13.6 +// * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    13.7 +// * 
    13.8 +// * Copyright (C) 2013, Pyravlos Team
    13.9 +// * 
   13.10 +// * http://www.strabon.di.uoa.gr/
   13.11 +// */
   13.12 +//package eu.earthobservatory.org.StrabonEndpoint.client;
   13.13 +//
   13.14 +//import static org.junit.Assert.assertTrue;
   13.15 +//
   13.16 +//import java.io.IOException;
   13.17 +//
   13.18 +//import org.junit.Before;
   13.19 +//import org.junit.Test;
   13.20 +//import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   13.21 +//
   13.22 +///**
   13.23 +// * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   13.24 +// *
   13.25 +// */
   13.26 +//
   13.27 +//public class TestSPARQLEndpointWithParliament {
   13.28 +//
   13.29 +//	private SPARQLEndpoint endpoint; 
   13.30 +//	private String query;
   13.31 +//	
   13.32 +//	@Before
   13.33 +//	public void init() {
   13.34 +//		// initialize endpoint
   13.35 +//		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "parliament/sparql");
   13.36 +//		
   13.37 +//		// set query
   13.38 +//		query = "PREFIX ex: <http://example.org/> \n" +
   13.39 +//				"SELECT ?k ?g WHERE {\n" +
   13.40 +//				" ex:pol1 ?k ?g\n" +
   13.41 +//				"}" +
   13.42 +//				"\nLIMIT 1";
   13.43 +//				
   13.44 +//	}
   13.45 +//	
   13.46 +//	/**
   13.47 +//	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   13.48 +//	 */
   13.49 +//	@Test
   13.50 +//	public void testQuery() {
   13.51 +//			try {
   13.52 +//				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.XML);
   13.53 +//				
   13.54 +//				System.out.println(response.getResponse());
   13.55 +//				
   13.56 +//				if (response.getStatusCode() != 200) {
   13.57 +//					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   13.58 +//					
   13.59 +//				}
   13.60 +//				
   13.61 +//				assertTrue(response.getStatusCode() == 200);
   13.62 +//				
   13.63 +//			} catch (IOException e) {
   13.64 +//				e.printStackTrace();
   13.65 +//			}
   13.66 +//			
   13.67 +//	}
   13.68 +//	
   13.69 +//	/**
   13.70 +//	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   13.71 +//	 * returns an IOException when it should do so.
   13.72 +//	 */
   13.73 +//	@Test(expected= IOException.class)
   13.74 +//	public void testIOException() throws Exception {
   13.75 +//		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   13.76 +//		ep.query(query, stSPARQLQueryResultFormat.XML);
   13.77 +//	}
   13.78 +//}

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithStrabon.java	Fri Apr 19 14:37:09 2013 +0300
    14.3 @@ -0,0 +1,91 @@
    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) 2012, Pyravlos Team
   14.10 + * 
   14.11 + * http://www.strabon.di.uoa.gr/
   14.12 + */
   14.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   14.14 +
   14.15 +import static org.junit.Assert.assertTrue;
   14.16 +
   14.17 +import java.io.IOException;
   14.18 +import java.util.Vector;
   14.19 +
   14.20 +import org.junit.Before;
   14.21 +import org.junit.Test;
   14.22 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   14.23 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   14.24 +
   14.25 +/**
   14.26 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   14.27 + *
   14.28 + */
   14.29 +public class TestSPARQLEndpointWithStrabon {
   14.30 +
   14.31 +	private SPARQLEndpoint endpoint; 
   14.32 +	private String query;
   14.33 +	private Vector<stSPARQLQueryResultFormat> formats = new Vector<stSPARQLQueryResultFormat>();
   14.34 +	
   14.35 +	@Before
   14.36 +	public void init() {
   14.37 +		// initialize endpoint
   14.38 +		endpoint = new SPARQLEndpoint("geo.linkedopendata.gr", 9090, "gag-endpoint/Query");
   14.39 +		
   14.40 +		// set query
   14.41 +		query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> " +
   14.42 +				"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> " +
   14.43 +				"PREFIX gag: <http://geo.linkedopendata.gr/gag/ontology/> " +
   14.44 +
   14.45 +				"SELECT ?geometry " +
   14.46 +				"WHERE {" +
   14.47 +
   14.48 +  				"	?m rdf:type gag:Δήμος . " +
   14.49 +  				"	?m rdfs:label \"ΔΗΜΟΣ ΑΘΗΝΑΙΩΝ\" . " +
   14.50 +  				"	?m gag:έχει_γεωμετρία ?geometry. " +
   14.51 +				" } "  ;
   14.52 +		
   14.53 +		// initialized formats
   14.54 +		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   14.55 +				if (format instanceof stSPARQLQueryResultFormat) {
   14.56 +					formats.add((stSPARQLQueryResultFormat) format);
   14.57 +				}
   14.58 +		}
   14.59 +				
   14.60 +	}
   14.61 +	
   14.62 +	/**
   14.63 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   14.64 +	 */
   14.65 +	@Test
   14.66 +	public void testQuery() {
   14.67 +		for (stSPARQLQueryResultFormat format : formats) {
   14.68 +			try {
   14.69 +				EndpointResult response = endpoint.query(query, format);
   14.70 +				
   14.71 +				if (response.getStatusCode() != 200) {
   14.72 +					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   14.73 +					
   14.74 +				}
   14.75 +				
   14.76 +				assertTrue(response.getStatusCode() == 200);
   14.77 +
   14.78 +			} catch (IOException e) {
   14.79 +				e.printStackTrace();
   14.80 +			}
   14.81 +			
   14.82 +		}
   14.83 +	}
   14.84 +	
   14.85 +	/**
   14.86 +	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   14.87 +	 * returns an IOException when it should do so.
   14.88 +	 */
   14.89 +	@Test(expected= IOException.class)
   14.90 +	public void testIOException() throws Exception {
   14.91 +		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   14.92 +		ep.query(query, formats.get(0));
   14.93 +	}
   14.94 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithVirtuoso.java	Fri Apr 19 14:37:09 2013 +0300
    15.3 @@ -0,0 +1,88 @@
    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) 2013, Pyravlos Team
   15.10 + * 
   15.11 + * http://www.strabon.di.uoa.gr/
   15.12 + */
   15.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   15.14 +
   15.15 +import static org.junit.Assert.assertTrue;
   15.16 +
   15.17 +import java.io.IOException;
   15.18 +import java.util.Vector;
   15.19 +
   15.20 +import org.junit.Before;
   15.21 +import org.junit.Test;
   15.22 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   15.23 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   15.24 +
   15.25 +/**
   15.26 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   15.27 + *
   15.28 + */
   15.29 +
   15.30 +//Virtuso endpoint also needs to be tested for all formats included in stSPARQLQueryResultFormat
   15.31 +//because some of them are not supported
   15.32 +public class TestSPARQLEndpointWithVirtuoso {
   15.33 +
   15.34 +	private SPARQLEndpoint endpoint; 
   15.35 +	private String query;
   15.36 +	private Vector<stSPARQLQueryResultFormat> formats = new Vector<stSPARQLQueryResultFormat>();
   15.37 +	
   15.38 +	@Before
   15.39 +	public void init() {
   15.40 +		// initialize endpoint
   15.41 +		endpoint = new SPARQLEndpoint("dbpedia.org", 8890, "sparql");
   15.42 +		
   15.43 +		// set query
   15.44 +		query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n" +
   15.45 +				"SELECT ?x ?y WHERE {\n" +
   15.46 +				" ?x rdf:type ?y\n" +
   15.47 +				"}" +
   15.48 +				"\nLIMIT 10";
   15.49 +		
   15.50 +		// initialized formats
   15.51 +		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   15.52 +				if (format instanceof stSPARQLQueryResultFormat) {
   15.53 +					formats.add((stSPARQLQueryResultFormat) format);
   15.54 +				}
   15.55 +		}
   15.56 +				
   15.57 +	}
   15.58 +	
   15.59 +	/**
   15.60 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   15.61 +	 */
   15.62 +	@Test
   15.63 +	public void testQuery() {
   15.64 +			try {
   15.65 +				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.XML);
   15.66 +				
   15.67 +				//System.out.println(response.getResponse());
   15.68 +				
   15.69 +				if (response.getStatusCode() != 200) {
   15.70 +					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   15.71 +					
   15.72 +				}
   15.73 +				
   15.74 +				assertTrue(response.getStatusCode() == 200);
   15.75 +				
   15.76 +			} catch (IOException e) {
   15.77 +				e.printStackTrace();
   15.78 +			}
   15.79 +			
   15.80 +	}
   15.81 +	
   15.82 +	/**
   15.83 +	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   15.84 +	 * returns an IOException when it should do so.
   15.85 +	 */
   15.86 +	@Test(expected= IOException.class)
   15.87 +	public void testIOException() throws Exception {
   15.88 +		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   15.89 +		ep.query(query, formats.get(0));
   15.90 +	}
   15.91 +}

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSpatialEndpoint.java	Fri Apr 19 14:37:09 2013 +0300
    16.3 @@ -0,0 +1,82 @@
    16.4 +/* This Source Code Form is subject to the terms of the Mozilla Public
    16.5 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    16.6 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    16.7 + * 
    16.8 + * Copyright (C) 2013, Pyravlos Team
    16.9 + * 
   16.10 + * http://www.strabon.di.uoa.gr/
   16.11 + */
   16.12 +package eu.earthobservatory.org.StrabonEndpoint.client;
   16.13 +
   16.14 +import static org.junit.Assert.assertTrue;
   16.15 +
   16.16 +import java.io.IOException;
   16.17 +
   16.18 +import org.junit.Before;
   16.19 +import org.junit.Test;
   16.20 +import org.openrdf.query.QueryEvaluationException;
   16.21 +import org.openrdf.query.TupleQueryResultHandlerException;
   16.22 +import org.openrdf.query.resultio.QueryResultParseException;
   16.23 +import org.openrdf.query.resultio.UnsupportedQueryResultFormatException;
   16.24 +
   16.25 +/**
   16.26 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   16.27 + *
   16.28 + */
   16.29 +
   16.30 +public class TestSpatialEndpoint {
   16.31 +
   16.32 +	private SpatialEndpoint endpoint;
   16.33 +	private String query;
   16.34 +	
   16.35 +	@Before
   16.36 +	public void init() {
   16.37 +		// initialize endpoint
   16.38 +		endpoint = new SpatialEndpoint("geo.linkedopendata.gr", 9090, "corine-endpoint/Query");
   16.39 +		
   16.40 +		// set query
   16.41 +		query = "PREFIX corine: <http://geo.linkedopendata.gr/corine/ontology#> \n"+
   16.42 +				"SELECT ?geometry \n" +
   16.43 +				 "WHERE {\n " + 
   16.44 +				 "  ?area corine:hasLandUse corine:burntAreas . \n" +
   16.45 +				 "  ?area corine:hasGeometry ?geometry .  } \n" +
   16.46 +				 "LIMIT 2" ;              
   16.47 +	}
   16.48 +	
   16.49 +	/**
   16.50 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SpatialEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   16.51 +	 * @throws TupleQueryResultHandlerException 
   16.52 +	 */
   16.53 +	@Test
   16.54 +	public void testQuery() {
   16.55 +			try {
   16.56 +					EndpointResult response;
   16.57 +				
   16.58 +					response = endpoint.queryForKML(query); 
   16.59 +					
   16.60 +					//System.out.println("KML format:");
   16.61 +					//System.out.println(response.getResponse());
   16.62 +					
   16.63 +					if (response.getStatusCode() != 200) {
   16.64 +						System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   16.65 +						
   16.66 +					}
   16.67 +					
   16.68 +					assertTrue(response.getStatusCode() == 200);	
   16.69 +				
   16.70 +				}catch (QueryResultParseException e) {
   16.71 +					e.printStackTrace();
   16.72 +				} catch (UnsupportedQueryResultFormatException e) {
   16.73 +					e.printStackTrace();
   16.74 +				}
   16.75 +				catch (TupleQueryResultHandlerException e) {
   16.76 +					e.printStackTrace();
   16.77 +				}
   16.78 +				catch (IOException e) {
   16.79 +					e.printStackTrace();
   16.80 +				} catch (QueryEvaluationException e) {
   16.81 +					e.printStackTrace();
   16.82 +				}
   16.83 +			
   16.84 +	}
   16.85 +}

    17.1 --- a/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestStrabonEndpoint.java	Fri Apr 19 09:11:47 2013 +0300
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,85 +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) 2012, Pyravlos Team
   17.10 - * 
   17.11 - * http://www.strabon.di.uoa.gr/
   17.12 - */
   17.13 -package eu.earthobservatory.org.StrabonEndpoint.client;
   17.14 -
   17.15 -import static org.junit.Assert.assertTrue;
   17.16 -
   17.17 -import java.io.IOException;
   17.18 -import java.util.Vector;
   17.19 -
   17.20 -import org.junit.Before;
   17.21 -import org.junit.Test;
   17.22 -import org.openrdf.query.resultio.TupleQueryResultFormat;
   17.23 -import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   17.24 -
   17.25 -/**
   17.26 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   17.27 - *
   17.28 - */
   17.29 -public class TestStrabonEndpoint {
   17.30 -
   17.31 -	private StrabonEndpoint endpoint; 
   17.32 -	private String query;
   17.33 -	private Vector<stSPARQLQueryResultFormat> formats = new Vector<stSPARQLQueryResultFormat>();
   17.34 -	
   17.35 -	@Before
   17.36 -	public void init() {
   17.37 -		// initialize endpoint
   17.38 -		endpoint = new StrabonEndpoint("test.strabon.di.uoa.gr", 80, "DLR");
   17.39 -		
   17.40 -		// set query
   17.41 -		query = "PREFIX teleios:<http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>\n" +
   17.42 -				"SELECT ?s ?g WHERE {\n" +
   17.43 -				"	?s teleios:hasGeometry ?g\n" +
   17.44 -				"}" +
   17.45 -				"\nLIMIT 1";
   17.46 -		
   17.47 -		// initialized formats
   17.48 -		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   17.49 -				if (format instanceof stSPARQLQueryResultFormat) {
   17.50 -					formats.add((stSPARQLQueryResultFormat) format);
   17.51 -				}
   17.52 -		}
   17.53 -				
   17.54 -	}
   17.55 -	
   17.56 -	/**
   17.57 -	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   17.58 -	 */
   17.59 -	@Test
   17.60 -	public void testQuery() {
   17.61 -		for (stSPARQLQueryResultFormat format : formats) {
   17.62 -			try {
   17.63 -				EndpointResult response = endpoint.query(query, format);
   17.64 -				
   17.65 -				if (response.getStatusCode() != 200) {
   17.66 -					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   17.67 -					
   17.68 -				}
   17.69 -				
   17.70 -				assertTrue(response.getStatusCode() == 200);
   17.71 -
   17.72 -			} catch (IOException e) {
   17.73 -				e.printStackTrace();
   17.74 -			}
   17.75 -			
   17.76 -		}
   17.77 -	}
   17.78 -	
   17.79 -	/**
   17.80 -	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   17.81 -	 * returns an IOException when it should do so.
   17.82 -	 */
   17.83 -	@Test(expected= IOException.class)
   17.84 -	public void testIOException() throws Exception {
   17.85 -		StrabonEndpoint ep = new StrabonEndpoint("blabla.dgr", 80, "bla");
   17.86 -		ep.query(query, formats.get(0));
   17.87 -	}
   17.88 -}

    18.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Fri Apr 19 09:11:47 2013 +0300
    18.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Fri Apr 19 14:37:09 2013 +0300
    18.3 @@ -19,7 +19,7 @@
    18.4  		<!-- true : AutoDiscoveryCapabilities -->
    18.5  		<!-- false: EndpointCapabilities -->
    18.6  		<constructor-arg type="boolean">
    18.7 -            <value>true</value>
    18.8 +            <value>false</value>
    18.9          </constructor-arg>
   18.10  	</bean>
   18.11  	

    19.1 --- a/endpoint/pom.xml	Fri Apr 19 09:11:47 2013 +0300
    19.2 +++ b/endpoint/pom.xml	Fri Apr 19 14:37:09 2013 +0300
    19.3 @@ -26,6 +26,11 @@
    19.4  
    19.5  		<dependency>
    19.6  			<groupId>eu.earthobservatory</groupId>
    19.7 +			<artifactId>strabon-vocabulary</artifactId>
    19.8 +		</dependency>
    19.9 +
   19.10 +		<dependency>
   19.11 +			<groupId>eu.earthobservatory</groupId>
   19.12  			<artifactId>strabon-runtime</artifactId>
   19.13  			<type>jar</type>
   19.14  			<scope>compile</scope>
   19.15 @@ -97,28 +102,6 @@
   19.16  			</exclusions>
   19.17  		</dependency>
   19.18  
   19.19 -		<!--
   19.20 -		<dependency>
   19.21 -			<groupId>org.apache.cxf</groupId>
   19.22 -			<artifactId>cxf-rt-frontend-jaxws</artifactId>
   19.23 -		</dependency>
   19.24 -
   19.25 -		<dependency>
   19.26 -			<groupId>org.apache.cxf</groupId>
   19.27 -			<artifactId>cxf-rt-transports-http</artifactId>
   19.28 -		</dependency>
   19.29 -
   19.30 -		<dependency>
   19.31 -			<groupId>org.apache.cxf</groupId>
   19.32 -			<artifactId>cxf-rt-transports-http-jetty</artifactId>
   19.33 -			<exclusions>
   19.34 -				<exclusion>
   19.35 -					<artifactId>slf4j-jdk14</artifactId>
   19.36 -					<groupId>org.slf4j</groupId>
   19.37 -				</exclusion>
   19.38 -			</exclusions>
   19.39 -		</dependency>
   19.40 -		-->
   19.41  		<dependency>
   19.42  			<groupId>commons-validator</groupId>
   19.43  			<artifactId>commons-validator</artifactId>
   19.44 @@ -126,6 +109,22 @@
   19.45  	</dependencies>
   19.46  
   19.47  	<build>
   19.48 +		<resources>
   19.49 +			<resource>
   19.50 +				<directory>src/main/resources</directory>
   19.51 +				<filtering>true</filtering>
   19.52 +				<includes>
   19.53 +					<include>**/version.properties</include>
   19.54 +				</includes>
   19.55 +			</resource>
   19.56 +			<resource>
   19.57 +				<directory>src/main/resources</directory>
   19.58 +				<filtering>false</filtering>
   19.59 +				<excludes>
   19.60 +					<exclude>**/version.properties</exclude>
   19.61 +				</excludes>
   19.62 +			</resource>
   19.63 +		</resources>
   19.64  		<plugins>
   19.65  			<plugin>
   19.66  				<groupId>org.apache.maven.plugins</groupId>

    20.1 --- a/endpoint/src/log4j.properties	Fri Apr 19 09:11:47 2013 +0300
    20.2 +++ b/endpoint/src/log4j.properties	Fri Apr 19 14:37:09 2013 +0300
    20.3 @@ -5,7 +5,7 @@
    20.4  # Console Appender
    20.5  log4j.appender.CA=org.apache.log4j.ConsoleAppender
    20.6  log4j.appender.CA.layout=org.apache.log4j.PatternLayout
    20.7 -log4j.appender.CA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
    20.8 +log4j.appender.CA.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
    20.9  
   20.10  # File Appender
   20.11  #log4j.appender.FA=org.apache.log4j.FileAppender

    21.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/BrowseBean.java	Fri Apr 19 09:11:47 2013 +0300
    21.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/BrowseBean.java	Fri Apr 19 14:37:09 2013 +0300
    21.3 @@ -23,6 +23,7 @@
    21.4  import javax.servlet.http.HttpServletResponse;
    21.5  
    21.6  import org.apache.commons.lang.StringEscapeUtils;
    21.7 +import org.openrdf.query.resultio.TupleQueryResultFormat;
    21.8  import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
    21.9  import org.slf4j.Logger;
   21.10  import org.slf4j.LoggerFactory;
   21.11 @@ -179,7 +180,7 @@
   21.12  		String format = request.getParameter("format");
   21.13  		
   21.14  		// get stSPARQLQueryResultFormat from given format name
   21.15 -		stSPARQLQueryResultFormat queryResultFormat = stSPARQLQueryResultFormat.valueOf(format);
   21.16 +		TupleQueryResultFormat queryResultFormat = stSPARQLQueryResultFormat.valueOf(format);
   21.17  
   21.18  		if (query == null || format == null || queryResultFormat == null) {
   21.19  			dispatcher = request.getRequestDispatcher("browse.jsp");

    22.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/Common.java	Fri Apr 19 09:11:47 2013 +0300
    22.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/Common.java	Fri Apr 19 14:37:09 2013 +0300
    22.3 @@ -65,7 +65,7 @@
    22.4  	/**
    22.5  	 * Keeps the registered and available stSPARQL Query Results Formats.
    22.6  	 */
    22.7 -	public static final List<stSPARQLQueryResultFormat> registeredQueryResultsFormats = new ArrayList<stSPARQLQueryResultFormat>();
    22.8 +	public static final List<TupleQueryResultFormat> registeredQueryResultsFormats = new ArrayList<TupleQueryResultFormat>();
    22.9  	
   22.10  	/**
   22.11  	 * Keeps the name of the registered and available stSPARQL Query Results Formats.
   22.12 @@ -76,10 +76,10 @@
   22.13  	// initialize registered and available stSPARQL query results formats
   22.14  	static {
   22.15  		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   22.16 -			if (format instanceof stSPARQLQueryResultFormat) {
   22.17 -				registeredQueryResultsFormats.add((stSPARQLQueryResultFormat) format);
   22.18 +			//if (format instanceof stSPARQLQueryResultFormat) {
   22.19 +				registeredQueryResultsFormats.add(format);
   22.20  				registeredQueryResultsFormatNames.add(format.getName());
   22.21 -			}
   22.22 +			//}
   22.23  		}
   22.24  	}
   22.25  	

    23.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Fri Apr 19 09:11:47 2013 +0300
    23.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/QueryBean.java	Fri Apr 19 14:37:09 2013 +0300
    23.3 @@ -30,6 +30,7 @@
    23.4  
    23.5  import org.apache.commons.io.FileUtils;
    23.6  import org.apache.commons.lang.StringEscapeUtils;
    23.7 +import org.openrdf.query.resultio.TupleQueryResultFormat;
    23.8  import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
    23.9  import org.slf4j.Logger;
   23.10  import org.slf4j.LoggerFactory;
   23.11 @@ -221,7 +222,7 @@
   23.12  			String maxLimit = request.getParameter("maxLimit");
   23.13  			
   23.14  			// get stSPARQLQueryResultFormat from given format name
   23.15 -			stSPARQLQueryResultFormat queryResultFormat = stSPARQLQueryResultFormat.valueOf(format);
   23.16 +			TupleQueryResultFormat queryResultFormat = stSPARQLQueryResultFormat.valueOf(format);
   23.17  			
   23.18  			if (query == null || format == null || queryResultFormat == null) {
   23.19  				dispatcher = request.getRequestDispatcher("query.jsp");

    24.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/AutoDiscoveryCapabilities.java	Fri Apr 19 09:11:47 2013 +0300
    24.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/AutoDiscoveryCapabilities.java	Fri Apr 19 14:37:09 2013 +0300
    24.3 @@ -10,6 +10,7 @@
    24.4  package eu.earthobservatory.org.StrabonEndpoint.capabilities;
    24.5  
    24.6  import java.io.IOException;
    24.7 +import java.util.List;
    24.8  
    24.9  import org.apache.commons.httpclient.HttpClient;
   24.10  import org.apache.commons.httpclient.methods.PostMethod;
   24.11 @@ -245,4 +246,28 @@
   24.12  	private String getConnectionURL() {
   24.13  		return "http://" + host + ":" + port + "/" + appName;
   24.14  	}
   24.15 +
   24.16 +	/* (non-Javadoc)
   24.17 +	 * @see eu.earthobservatory.org.StrabonEndpoint.capabilities.Capabilities#getstSPARQLSpatialExtensionFunctions()
   24.18 +	 */
   24.19 +	@Override
   24.20 +	public List<String> getstSPARQLSpatialExtensionFunctions() {
   24.21 +		return null;
   24.22 +	}
   24.23 +
   24.24 +	/* (non-Javadoc)
   24.25 +	 * @see eu.earthobservatory.org.StrabonEndpoint.capabilities.Capabilities#getGeoSPARQLSpatialExtensionFunctions()
   24.26 +	 */
   24.27 +	@Override
   24.28 +	public List<String> getGeoSPARQLSpatialExtensionFunctions() {
   24.29 +		return null;
   24.30 +	}
   24.31 +
   24.32 +	/* (non-Javadoc)
   24.33 +	 * @see eu.earthobservatory.org.StrabonEndpoint.capabilities.Capabilities#getUnitsOfMeasure()
   24.34 +	 */
   24.35 +	@Override
   24.36 +	public List<String> getUnitsOfMeasure() {
   24.37 +		return null;
   24.38 +	}
   24.39  }

    25.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/Capabilities.java	Fri Apr 19 09:11:47 2013 +0300
    25.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/Capabilities.java	Fri Apr 19 14:37:09 2013 +0300
    25.3 @@ -9,6 +9,8 @@
    25.4   */
    25.5  package eu.earthobservatory.org.StrabonEndpoint.capabilities;
    25.6  
    25.7 +import java.util.List;
    25.8 +
    25.9  
   25.10  /**
   25.11   * Interface that exposes the capabilities of a Strabon Endpoint.
   25.12 @@ -87,6 +89,34 @@
   25.13  	public boolean supportsConnectionModification();
   25.14  	
   25.15  	/**
   25.16 +	 * Return a list of URIs corresponding to the spatial extension
   25.17 +	 * functions that stSPARQL supports.
   25.18 +	 * 
   25.19 +	 * @return
   25.20 +	 */
   25.21 +	public List<String> getstSPARQLSpatialExtensionFunctions();
   25.22 +	
   25.23 +	// TODO
   25.24 +	//public List<String> getstSPARQLTemporalExtensionFunctions();
   25.25 +	
   25.26 +	/**
   25.27 +	 * Return a list of URIs corresponding to the spatial extension
   25.28 +	 * functions that GeoSPARQL supports.
   25.29 +	 * 
   25.30 +	 * @return
   25.31 +	 */
   25.32 +	public List<String> getGeoSPARQLSpatialExtensionFunctions();
   25.33 +	
   25.34 +	/**
   25.35 +	 * Return a list of URIs corresponding to the units of measure
   25.36 +	 * that can be used in an extension function requiring such an
   25.37 +	 * argument.
   25.38 +	 * 
   25.39 +	 * @return
   25.40 +	 */
   25.41 +	public List<String> getUnitsOfMeasure();
   25.42 +	
   25.43 +	/**
   25.44  	 * Returns a {@link RequestCapabilities} instance containing
   25.45  	 * the details for how one can query the Query service of the
   25.46  	 * endpoint.

    26.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/CapabilitiesBean.java	Fri Apr 19 09:11:47 2013 +0300
    26.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/CapabilitiesBean.java	Fri Apr 19 14:37:09 2013 +0300
    26.3 @@ -124,16 +124,49 @@
    26.4  		
    26.5  		RequestCapabilities reCap = caps.getQueryCapabilities();
    26.6  		
    26.7 -		for (Parameter param : reCap.getParametersObject().getParameters()) {
    26.8 -			out.println("Supports parameter  : " + param.getName());
    26.9 -			
   26.10 -			if (param.getAcceptedValues().size() > 0) {
   26.11 -				out.println("    Accepted values : ");
   26.12 -				for (String acceptedValue : param.getAcceptedValues()) {
   26.13 -					out.println("\t\t      " + acceptedValue);
   26.14 +		if (reCap.getParametersObject() != null) {
   26.15 +			for (Parameter param : reCap.getParametersObject().getParameters()) {
   26.16 +				out.println("Supports parameter  : " + param.getName());
   26.17 +				
   26.18 +				if (param.getAcceptedValues().size() > 0) {
   26.19 +					out.println("    Accepted values : ");
   26.20 +					for (String acceptedValue : param.getAcceptedValues()) {
   26.21 +						out.println("\t\t      " + acceptedValue);
   26.22 +					}
   26.23  				}
   26.24  			}
   26.25  		}
   26.26 +		
   26.27 +		// print supported spatial extension functions for stSPARQL
   26.28 +		if (caps.getstSPARQLSpatialExtensionFunctions() != null) {
   26.29 +			out.println("stSPARQL Extension Functions");
   26.30 +			out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
   26.31 +			for(String extFunc : caps.getstSPARQLSpatialExtensionFunctions()) {
   26.32 +				out.println(extFunc);
   26.33 +			}
   26.34 +		}
   26.35 +		
   26.36 +		out.println();
   26.37 +		
   26.38 +		// print supported spatial extension functions for GeoSPARQL
   26.39 +		if (caps.getGeoSPARQLSpatialExtensionFunctions() != null) {
   26.40 +			out.println("GeoSPARQL Extension Functions");
   26.41 +			out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
   26.42 +			for(String extFunc : caps.getGeoSPARQLSpatialExtensionFunctions()) {
   26.43 +				out.println(extFunc);
   26.44 +			}
   26.45 +		}
   26.46 +		
   26.47 +		out.println();
   26.48 +		
   26.49 +		// print supported units of measure
   26.50 +		if (caps.getUnitsOfMeasure() != null) {
   26.51 +			out.println("Supported Units of Measure (OGC)");
   26.52 +			out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
   26.53 +			for(String uom : caps.getUnitsOfMeasure()) {
   26.54 +				out.println(uom);
   26.55 +			}
   26.56 +		}
   26.57  	}
   26.58  	
   26.59  	private String getYesNo(boolean val) {

    27.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java	Fri Apr 19 09:11:47 2013 +0300
    27.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java	Fri Apr 19 14:37:09 2013 +0300
    27.3 @@ -9,6 +9,17 @@
    27.4   */
    27.5  package eu.earthobservatory.org.StrabonEndpoint.capabilities;
    27.6  
    27.7 +import java.io.IOException;
    27.8 +import java.io.InputStream;
    27.9 +import java.util.List;
   27.10 +import java.util.Properties;
   27.11 +
   27.12 +import org.slf4j.Logger;
   27.13 +import org.slf4j.LoggerFactory;
   27.14 +
   27.15 +import eu.earthobservatory.constants.GeoConstants;
   27.16 +import eu.earthobservatory.constants.OGCConstants;
   27.17 +
   27.18  
   27.19  /**
   27.20   * This class implements the {@link Capabilities} interface and
   27.21 @@ -19,9 +30,34 @@
   27.22   */
   27.23  public class EndpointCapabilities implements Capabilities {
   27.24  
   27.25 +	private static Logger logger = LoggerFactory.getLogger(eu.earthobservatory.org.StrabonEndpoint.capabilities.EndpointCapabilities.class);
   27.26 +	
   27.27 +	private static final String VERSION_PROPERTIES_FILE = "/version.properties";
   27.28 +	private static final Properties PROPERTIES = new Properties();
   27.29 +
   27.30 +	private static String VERSION;
   27.31 +	
   27.32 +	// load the properties file to get the version
   27.33 +	static {
   27.34 +		InputStream vin = Capabilities.class.getResourceAsStream(VERSION_PROPERTIES_FILE);
   27.35 +		if (vin != null) {
   27.36 +			try {
   27.37 +				PROPERTIES.load(vin);
   27.38 +				vin.close();
   27.39 +				
   27.40 +			} catch (IOException e) {
   27.41 +				logger.error("[StrabonEndpoint.EndpointCapabilities] Error during reading of {} file.", VERSION_PROPERTIES_FILE, e);
   27.42 +			}
   27.43 +		} else {
   27.44 +			logger.warn("[StrabonEndpoint.EndpointCapabilities] Could not read version file.");
   27.45 +		}
   27.46 +		
   27.47 +		VERSION = PROPERTIES.getProperty("version");
   27.48 +	}
   27.49 +	
   27.50  	@Override
   27.51  	public String getVersion() {
   27.52 -		return "3.2.4-SNAPSHOT";
   27.53 +		return VERSION;
   27.54  	}
   27.55  	
   27.56  	@Override
   27.57 @@ -88,4 +124,25 @@
   27.58  	public RequestCapabilities getConnectionCapabilities() {
   27.59  		return ConnectionBeanCapabilities.getInstance();
   27.60  	}
   27.61 +
   27.62 +	/* (non-Javadoc)
   27.63 +	 * @see eu.earthobservatory.org.StrabonEndpoint.capabilities.Capabilities#getstSPARQLSpatialExtensionFunctions()
   27.64 +	 */
   27.65 +	@Override
   27.66 +	public List<String> getstSPARQLSpatialExtensionFunctions() {
   27.67 +		return GeoConstants.STSPARQLSpatialExtFunc;
   27.68 +	}
   27.69 +
   27.70 +	/* (non-Javadoc)
   27.71 +	 * @see eu.earthobservatory.org.StrabonEndpoint.capabilities.Capabilities#getGeoSPARQLSpatialExtensionFunctions()
   27.72 +	 */
   27.73 +	@Override
   27.74 +	public List<String> getGeoSPARQLSpatialExtensionFunctions() {
   27.75 +		return GeoConstants.GEOSPARQLExtFunc;
   27.76 +	}
   27.77 +
   27.78 +	@Override
   27.79 +	public List<String> getUnitsOfMeasure() {
   27.80 +		return OGCConstants.supportedUnitsOfMeasure;
   27.81 +	}
   27.82  }

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/endpoint/src/main/resources/version.properties	Fri Apr 19 14:37:09 2013 +0300
    28.3 @@ -0,0 +1,1 @@
    28.4 +version=${project.version}

    29.1 --- a/evaluation/pom.xml	Fri Apr 19 09:11:47 2013 +0300
    29.2 +++ b/evaluation/pom.xml	Fri Apr 19 14:37:09 2013 +0300
    29.3 @@ -15,6 +15,12 @@
    29.4  	<packaging>jar</packaging>
    29.5  
    29.6  	<dependencies>
    29.7 +	
    29.8 +		<dependency>
    29.9 +			<groupId>eu.earthobservatory</groupId>
   29.10 +			<artifactId>strabon-vocabulary</artifactId>
   29.11 +		</dependency>
   29.12 +			
   29.13  		<dependency>
   29.14  			<groupId>org.openrdf.sesame</groupId>
   29.15  			<artifactId>sesame-queryalgebra-evaluation</artifactId>

    30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/datetime/stsparql/metric/DiffDateTime.java	Fri Apr 19 09:11:47 2013 +0300
    30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/datetime/stsparql/metric/DiffDateTime.java	Fri Apr 19 14:37:09 2013 +0300
    30.3 @@ -9,15 +9,9 @@
    30.4   */
    30.5  package org.openrdf.query.algebra.evaluation.function.datetime.stsparql.metric;
    30.6  
    30.7 -import java.text.SimpleDateFormat;
    30.8 -import java.util.Calendar;
    30.9 -import java.util.GregorianCalendar;
   30.10 +import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc;
   30.11  
   30.12 -import org.openrdf.model.Value;
   30.13 -import org.openrdf.model.ValueFactory;
   30.14 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   30.15 -import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc;
   30.16 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   30.17 +import eu.earthobservatory.constants.GeoConstants;
   30.18  
   30.19  /**
   30.20   * Addition for datetime metric functions

    31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Fri Apr 19 09:11:47 2013 +0300
    31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Fri Apr 19 14:37:09 2013 +0300
    31.3 @@ -13,7 +13,8 @@
    31.4  import org.openrdf.model.ValueFactory;
    31.5  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    31.6  import org.openrdf.query.algebra.evaluation.function.Function;
    31.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    31.8 +
    31.9 +import eu.earthobservatory.constants.GeoConstants;
   31.10  
   31.11  /**
   31.12   * 

    32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/AbstractWKT.java	Fri Apr 19 09:11:47 2013 +0300
    32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/AbstractWKT.java	Fri Apr 19 14:37:09 2013 +0300
    32.3 @@ -14,6 +14,8 @@
    32.4  import org.slf4j.Logger;
    32.5  import org.slf4j.LoggerFactory;
    32.6  
    32.7 +import eu.earthobservatory.constants.GeoConstants;
    32.8 +
    32.9  
   32.10  /**
   32.11   * This class generalizes WKT literal values that can be given according

    33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java	Fri Apr 19 09:11:47 2013 +0300
    33.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.3 @@ -1,301 +0,0 @@
    33.4 -/**
    33.5 - * This Source Code Form is subject to the terms of the Mozilla Public
    33.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this
    33.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    33.8 - * 
    33.9 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team
   33.10 - * 
   33.11 - * http://www.strabon.di.uoa.gr/
   33.12 - */
   33.13 -package org.openrdf.query.algebra.evaluation.function.spatial;
   33.14 -
   33.15 -/**
   33.16 - * This class is a placeholder for various constants around geometries. These
   33.17 - * constants range from URIs of namespaces, functions, representations, etc.,
   33.18 - * to other constants, such as the default spatial reference system (SRID) that
   33.19 - * is assumed in Strabon.
   33.20 - * 
   33.21 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   33.22 - * @author Kostis Kyzirakos <kkyzir@di.uoa.gr>
   33.23 - * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   33.24 - */
   33.25 -public class GeoConstants {
   33.26 -	/**																		*
   33.27 -	 *  						Namespaces									*
   33.28 -	 * 																		*/
   33.29 -	
   33.30 -	/**
   33.31 -	 * The namespace for stRDF data model
   33.32 -	 */
   33.33 -	public static final String stRDF					= "http://strdf.di.uoa.gr/ontology#";
   33.34 -	
   33.35 -	/**
   33.36 -	 * The namespace for the RDFi framework
   33.37 -	 */
   33.38 -	public static final String rdfi						= "http://rdfi.di.uoa.gr/ontology#";
   33.39 -	
   33.40 -	
   33.41 -	/**																*
   33.42 -	 *  GeoSPARQL	Version 1.0.1	Document#  11-052r4 			*
   33.43 -	 *	http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip	*/
   33.44 -	
   33.45 -	/**
   33.46 -	 * The namespace for GeoSPARQL ontology
   33.47 -	 */
   33.48 -	public static final String GEO						= "http://www.opengis.net/ont/geosparql#";
   33.49 -	
   33.50 -	/**
   33.51 -	 * The namespace for geometry functions declared by GeoSPARQL
   33.52 -	 */
   33.53 -	public static final String GEOF						= "http://www.opengis.net/def/function/geosparql/";
   33.54 -	
   33.55 -	/**
   33.56 -	 * The namespace for the ontology of simple features
   33.57 -	 */
   33.58 -	public static final String SF						= "http://www.opengis.net/ont/sf#";
   33.59 -	
   33.60 -	/**
   33.61 -	 * 
   33.62 -	 * The namespace of GML.
   33.63 -	 * 
   33.64 -	 * Initially, it was set to "http://www.opengis.net/def/geometryType/OGC-GML/3.2/".
   33.65 -	 * Afterwards, it was set to "http://www.opengis.net/gml/3.2/" in order to be compliant
   33.66 -	 * with GML version 3.3, as defined by OGC in the document with title
   33.67 -	 * <tt>"OGC® Geography Markup Language (GML) — Extended schemas and encoding rules"</tt>
   33.68 -	 * ({@link https://portal.opengeospatial.org/files/?artifact_id=46568}). However, none
   33.69 -	 * of these work with the parser provided by JTS, which assumes that the namespace for
   33.70 -	 * GML should be only "http://www.opengis.net/gml" and nothing else. In every other case,
   33.71 -	 * an exception is thrown by the GML parser.
   33.72 -	 * 
   33.73 -	 * 
   33.74 -	 * @see {@link org.openrdf.query.algebra.evaluation.util.JTSWrapper.GMLReader}, {@link GMLReader}
   33.75 -	 */
   33.76 -	public static final String GML_OGC					= "http://www.opengis.net/gml";
   33.77 -	
   33.78 -	
   33.79 -	
   33.80 -	
   33.81 -	/**																		*
   33.82 -	 *  						URIs										*
   33.83 -	 * 																		*/
   33.84 -	
   33.85 -	/**																*
   33.86 -	 *  GeoSPARQL	Version 1.0.1	Document#  11-052r4 			*
   33.87 -	 *	http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip	*/
   33.88 -
   33.89 -	/** The following GeoSPARQL classes and properties are       
   33.90 -	 *  commented out because they are not currently used.			
   33.91 - 	 */
   33.92 -	
   33.93 -	/**
   33.94 -	 * The URIs for GeoSPARQL classes
   33.95 -	 */
   33.96 -/*	public static final String SpatialObject			=  GEO + "SpatialObject";
   33.97 -	public static final String Geometry				    =  GEO + "Geometry";
   33.98 -	public static final String Feauture					=  GEO + "Feature";
   33.99 -*/	
  33.100 -		
  33.101 -	/**
  33.102 -	 * The URIs for GeoSPARQL properties
  33.103 -	 */
  33.104 -/*	public static final String hasGeometry_OGC				=  GEO + "hasGeometry";
  33.105 -	public static final String defaultGeometry_OGC			=  GEO + "defaultGeometry";
  33.106 -	public static final String dimension_OGC				=  GEO + "dimension";
  33.107 -	public static final String coordinateDimension_OGC		=  GEO + "coordinateDimension";
  33.108 -	public static final String spatialDimension_OGC		    =  GEO + "spatialDimension";
  33.109 -	public static final String isEmpty_OGC					=  GEO + "isEmpty";
  33.110 -	public static final String isSimple_OGC					=  GEO + "isSimple";
  33.111 -	public static final String asWKT_OGC					=  GEO + "asWKT";
  33.112 -	public static final String asGML_OGC					=  GEO + "asGML";
  33.113 -*/
  33.114 -	
  33.115 -	
  33.116 -	/**																		*
  33.117 -	 *  						URIs for datatypes							*
  33.118 -	 * 																		*/
  33.119 -	
  33.120 -	
  33.121 -	/**
  33.122 -	 * The URI for the datatype SemiLinearPointSet
  33.123 -	 * (linear constraint-based representation of geometries)
  33.124 -	 */
  33.125 -	public static final String stRDFSemiLinearPointset	= stRDF + "SemiLinearPointSet";
  33.126 -	
  33.127 -	
  33.128 -	/**
  33.129 -	 * The URI for the datatype Well-Known Text (WKT)
  33.130 -	 */
  33.131 -	public static final String WKT 						= stRDF + "WKT";
  33.132 -
  33.133 -	/**
  33.134 -	 * The URI for the datatype Geography Markup Language (GML) as it defined
  33.135 -	 * in the model stRDF and query language stSPARQL
  33.136 -	 */
  33.137 -	public static final String GML						= stRDF + "GML";
  33.138 -	
  33.139 -	/**
  33.140 -	 * The URI for the datatype wktLiteral
  33.141 -	 */
  33.142 -	public static final String WKTLITERAL				=  GEO + "wktLiteral";
  33.143 -	
  33.144 -	/**
  33.145 -	 * The URI for the datatype gmlLiteral
  33.146 -	 */
  33.147 -	public static final String GMLLITERAL				=  GEO + "gmlLiteral";
  33.148 -	
  33.149 -	
  33.150 -	
  33.151 -	
  33.152 -	/**																		*
  33.153 -	 *  						Extended functions 							*
  33.154 -	 *  							stSPARQL								*
  33.155 -	 * 																		*/
  33.156 -	// Spatial Relationships
  33.157 -	public static final String equals 			= stRDF + "equals";
  33.158 -	public static final String disjoint 		= stRDF + "disjoint";
  33.159 -	public static final String intersects 		= stRDF + "intersects";
  33.160 -	public static final String touches 			= stRDF + "touches";
  33.161 -	public static final String within 			= stRDF + "within";
  33.162 -	public static final String contains 		= stRDF + "contains";
  33.163 -	public static final String overlaps 		= stRDF + "overlaps";
  33.164 -	public static final String crosses 			= stRDF + "crosses";
  33.165 -	
  33.166 -	// The generic relate function
  33.167 -	public static final String relate 			= stRDF + "relate";
  33.168 -	
  33.169 -	// Topological Relationships utilizing mbb
  33.170 -	public static final String mbbIntersects	= stRDF + "mbbIntersects";
  33.171 -	public static final String mbbContains 		= stRDF + "mbbContains";
  33.172 -	public static final String mbbEquals 		= stRDF + "mbbEquals";
  33.173 -	public static final String mbbWithin 		= stRDF + "mbbWithin";
  33.174 -	
  33.175 -	// Directional functions
  33.176 -	public static final String left 			= stRDF + "left";
  33.177 -	public static final String right			= stRDF + "right";
  33.178 -	public static final String above 			= stRDF + "above";
  33.179 -	public static final String below			= stRDF + "below";
  33.180 -
  33.181 -	// Spatial Constructs
  33.182 -	public static final String union 			= stRDF + "union";
  33.183 -	public static final String buffer 			= stRDF + "buffer";
  33.184 -	public static final String envelope 		= stRDF + "envelope";
  33.185 -	public static final String convexHull		= stRDF + "convexHull";
  33.186 -	public static final String boundary 		= stRDF + "boundary";
  33.187 -	public static final String intersection 	= stRDF + "intersection";
  33.188 -	public static final String difference 		= stRDF + "difference";
  33.189 -	public static final String symDifference	= stRDF + "symDifference";
  33.190 -	public static final String transform 		= stRDF + "transform";
  33.191 -	
  33.192 -	// Spatial Metric Functions
  33.193 -	public static final String distance 		= stRDF + "distance";
  33.194 -	public static final String area 			= stRDF + "area";
  33.195 -
  33.196 -	// Spatial Properties
  33.197 -	public static final String dimension 		= stRDF + "dimension";
  33.198 -	public static final String geometryType 	= stRDF + "geometryType";
  33.199 -	public static final String asText 			= stRDF + "asText";
  33.200 -	public static final String asGML 			= stRDF + "asGML";
  33.201 -	public static final String srid 			= stRDF + "srid";
  33.202 -	public static final String isEmpty 			= stRDF + "isEmpty";
  33.203 -	public static final String isSimple 		= stRDF + "isSimple";
  33.204 -
  33.205 -	// Spatial Aggregate Functions
  33.206 -	public static final String extent 			= stRDF + "extent";
  33.207 -	
  33.208 -	/**
  33.209 -	 * WGS 84 latitude-longitude (EPSG:4326)
  33.210 -	 */
  33.211 -	public static final String WGS84_LAT_LON	= "http://www.opengis.net/def/crs/EPSG/0/4326";
  33.212 -	
  33.213 -	/**
  33.214 -	 * WGS 84 longitude-longitude
  33.215 -	 * (used as the default CRS for GeoSPARQL geometries)
  33.216 -	 */
  33.217 -	public static final String WGS84_LON_LAT	= "http://www.opengis.net/def/crs/OGC/1.3/CRS84";
  33.218 -
  33.219 -	/**
  33.220 -	 * EPSG:4326
  33.221 -	 */
  33.222 -	public static final Integer WGS84_LAT_LON_SRID = 4326;
  33.223 -	
  33.224 -	/**
  33.225 -	 * EPSG:3857 (not sure whether this is correct for WGS84_LON_LAT)
  33.226 -	 * http://spatialreference.org/ref/sr-org/7483/
  33.227 -	 */
  33.228 -	public static final Integer WGS84_LON_LAT_SRID = 3857;
  33.229 -
  33.230 -	/**
  33.231 -	 * Default SRID (WGS84 latitude-longitude)
  33.232 -	 */
  33.233 -	public static final Integer defaultSRID 	= WGS84_LAT_LON_SRID;
  33.234 -	
  33.235 -	/**																		*
  33.236 -	 *  						Extended functions 							*
  33.237 -	 *  							GeoSPARQL								*
  33.238 -	 * 																		*/	
  33.239 -	// Non-topological
  33.240 -	public static final String geoSparqlDistance 				= GEOF + "distance"; //3 arguments
  33.241 -	public static final String geoSparqlBuffer 					= GEOF + "buffer"; //3 arguments
  33.242 -	public static final String geoSparqlConvexHull 				= GEOF + "convexHull";
  33.243 -	public static final String geoSparqlIntersection 			= GEOF + "intersection";
  33.244 -	public static final String geoSparqlUnion 					= GEOF + "union";
  33.245 -	public static final String geoSparqlDifference 				= GEOF + "difference";
  33.246 -	public static final String geoSparqlSymmetricDifference 	= GEOF + "symmetricDifference";
  33.247 -	public static final String geoSparqlEnvelope 				= GEOF + "envelope";
  33.248 -	public static final String geoSparqlBoundary 				= GEOF + "boundary";
  33.249 -
  33.250 -	// Simple Features - 8 functions - all with 2 arguments + boolean
  33.251 -	public static final String sfEquals 						= GEOF + "sfEquals";
  33.252 -	public static final String sfDisjoint 						= GEOF + "sfDisjoint";
  33.253 -	public static final String sfIntersects 					= GEOF + "sfIntersects";
  33.254 -	public static final String sfTouches 						= GEOF + "sfTouches";
  33.255 -	public static final String sfCrosses 						= GEOF + "sfCrosses";
  33.256 -	public static final String sfWithin 						= GEOF + "sfWithin";
  33.257 -	public static final String sfContains 						= GEOF + "sfContains";
  33.258 -	public static final String sfOverlaps 						= GEOF + "sfOverlaps";
  33.259 -
  33.260 -	// Egenhofer - 8 functions - all with 2 arguments + boolean
  33.261 -	public static final String ehEquals 						= GEOF + "ehEquals";
  33.262 -	public static final String ehDisjoint 						= GEOF + "ehDisjoint";
  33.263 -	public static final String ehMeet 							= GEOF + "ehMeet";
  33.264 -	public static final String ehOverlap 						= GEOF + "ehOverlap";
  33.265 -	public static final String ehCovers 						= GEOF + "ehCovers";
  33.266 -	public static final String ehCoveredBy 						= GEOF + "ehCoveredBy";
  33.267 -	public static final String ehInside 						= GEOF + "ehInside";
  33.268 -	public static final String ehContains 						= GEOF + "ehContains";
  33.269 -
  33.270 -	// RCC8 - 8 functions - all with 2 arguments + boolean
  33.271 -	public static final String rccEquals 						 = GEOF + "rcc8eq";
  33.272 -	public static final String rccDisconnected 					 = GEOF + "rcc8dc";
  33.273 -	public static final String rccExternallyConnected 			 = GEOF + "rcc8ec";
  33.274 -	public static final String rccPartiallyOverlapping 			 = GEOF + "rcc8po";
  33.275 -	public static final String rccTangentialProperPartInverse 	 = GEOF + "rcc8tppi";
  33.276 -	public static final String rccTangentialProperPart 			 = GEOF + "rcc8tpp";
  33.277 -	public static final String rccNonTangentialProperPart 		 = GEOF + "rcc8ntpp";
  33.278 -	public static final String rccNonTangentialProperPartInverse = GEOF + "rcc8ntppi";
  33.279 -	
  33.280 -	// The generic relate function
  33.281 -	public static final String geoSparqlRelate 					 = GEOF + "relate";
  33.282 -
  33.283 -	/**
  33.284 -	 * Addition for datetime metric functions
  33.285 -	 * 
  33.286 -	 * @author George Garbis <ggarbis@di.uoa.gr>
  33.287 -	 * 
  33.288 -	 */
  33.289 -	public static final String diffDateTime = "http://strdf.di.uoa.gr/extensions/ontology#diffDateTime";
  33.290 -	/** End of addition **/
  33.291 -
  33.292 -
  33.293 -	/**
  33.294 -	 * RCC-8 relations for the RDFi framework
  33.295 -	 */
  33.296 -	public static final String rdfiDC						= rdfi + "DC";
  33.297 -	public static final String rdfiEC						= rdfi + "EC";
  33.298 -	public static final String rdfiPO						= rdfi + "PO";
  33.299 -	public static final String rdfiNTPP						= rdfi + "NTPP";
  33.300 -	public static final String rdfiNTPPi					= rdfi + "NTPPi";
  33.301 -	public static final String rdfiTPP						= rdfi + "TPP";
  33.302 -	public static final String rdfiTPPi						= rdfi + "TPPi";
  33.303 -	public static final String rdfiEQ						= rdfi + "EQ";
  33.304 -}

    34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialPropertyFunc.java	Fri Apr 19 09:11:47 2013 +0300
    34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/SpatialPropertyFunc.java	Fri Apr 19 14:37:09 2013 +0300
    34.3 @@ -20,6 +20,7 @@
    34.4   * and so on), its type (Polygon, Point, etc.), SRID, etc.
    34.5   * 
    34.6   * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property}
    34.7 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.property}
    34.8   * 
    34.9   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   34.10   * @author Charalampos Nikolaou <charnik@di.uoa.gr>

    35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Fri Apr 19 09:11:47 2013 +0300
    35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Fri Apr 19 14:37:09 2013 +0300
    35.3 @@ -190,7 +190,7 @@
    35.4  		this.geometry = new StrabonPolyhedron(geo, algorithm, MAX_POINTS).geometry;
    35.5  	}
    35.6  
    35.7 -	@SuppressWarnings("unused")
    35.8 +	// unused
    35.9  	public StrabonPolyhedron(Geometry geo, int algorithm, int maxPoints) throws Exception {		
   35.10  		if (geo.isEmpty()) {
   35.11  			this.geometry = geo;
   35.12 @@ -843,6 +843,7 @@
   35.13  		return this.geometry.getNumPoints();
   35.14  	}
   35.15  
   35.16 +	@SuppressWarnings("unused")
   35.17  	private static String FindGeoType(Geometry geo) {
   35.18  		return 
   35.19  				Point.class.isInstance(geo) ? "Point" :

    36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java	Fri Apr 19 09:11:47 2013 +0300
    36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java	Fri Apr 19 14:37:09 2013 +0300
    36.3 @@ -12,6 +12,8 @@
    36.4  import org.slf4j.Logger;
    36.5  import org.slf4j.LoggerFactory;
    36.6  
    36.7 +import eu.earthobservatory.constants.GeoConstants;
    36.8 +
    36.9  
   36.10  /**
   36.11   * 

    37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Fri Apr 19 09:11:47 2013 +0300
    37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Fri Apr 19 14:37:09 2013 +0300
    37.3 @@ -9,9 +9,10 @@
    37.4   */
    37.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    37.6  
    37.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    37.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    37.9  
   37.10 +import eu.earthobservatory.constants.GeoConstants;
   37.11 +
   37.12  /**
   37.13   * 
   37.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    38.3 @@ -9,9 +9,10 @@
    38.4   */
    38.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    38.6  
    38.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    38.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    38.9  
   38.10 +import eu.earthobservatory.constants.GeoConstants;
   38.11 +
   38.12  /**
   38.13   * 
   38.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Fri Apr 19 09:11:47 2013 +0300
    39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Fri Apr 19 14:37:09 2013 +0300
    39.3 @@ -9,9 +9,10 @@
    39.4   */
    39.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    39.6  
    39.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    39.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    39.9  
   39.10 +import eu.earthobservatory.constants.GeoConstants;
   39.11 +
   39.12  
   39.13  public class EgenhoferCoveredByFunc extends GeoSparqlRelation {
   39.14  

    40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Fri Apr 19 09:11:47 2013 +0300
    40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Fri Apr 19 14:37:09 2013 +0300
    40.3 @@ -9,9 +9,10 @@
    40.4   */
    40.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    40.6  
    40.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    40.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    40.9  
   40.10 +import eu.earthobservatory.constants.GeoConstants;
   40.11 +
   40.12  
   40.13  public class EgenhoferCoversFunc extends GeoSparqlRelation {
   40.14  

    41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Fri Apr 19 09:11:47 2013 +0300
    41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Fri Apr 19 14:37:09 2013 +0300
    41.3 @@ -9,9 +9,10 @@
    41.4   */
    41.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    41.6  
    41.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    41.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    41.9  
   41.10 +import eu.earthobservatory.constants.GeoConstants;
   41.11 +
   41.12  
   41.13  public class EgenhoferDisjointFunc extends GeoSparqlRelation {
   41.14  

    42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    42.3 @@ -9,9 +9,10 @@
    42.4   */
    42.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    42.6  
    42.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    42.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    42.9  
   42.10 +import eu.earthobservatory.constants.GeoConstants;
   42.11 +
   42.12  
   42.13  public class EgenhoferEqualsFunc extends GeoSparqlRelation {
   42.14  

    43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Fri Apr 19 09:11:47 2013 +0300
    43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Fri Apr 19 14:37:09 2013 +0300
    43.3 @@ -9,9 +9,10 @@
    43.4   */
    43.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    43.6  
    43.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    43.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    43.9  
   43.10 +import eu.earthobservatory.constants.GeoConstants;
   43.11 +
   43.12  
   43.13  public class EgenhoferInsideFunc extends GeoSparqlRelation {
   43.14  

    44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Fri Apr 19 09:11:47 2013 +0300
    44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Fri Apr 19 14:37:09 2013 +0300
    44.3 @@ -9,9 +9,10 @@
    44.4   */
    44.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    44.6  
    44.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    44.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    44.9  
   44.10 +import eu.earthobservatory.constants.GeoConstants;
   44.11 +
   44.12  
   44.13  public class EgenhoferMeetFunc extends GeoSparqlRelation {
   44.14  

    45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Fri Apr 19 09:11:47 2013 +0300
    45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Fri Apr 19 14:37:09 2013 +0300
    45.3 @@ -9,9 +9,10 @@
    45.4   */
    45.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    45.6  
    45.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    45.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    45.9  
   45.10 +import eu.earthobservatory.constants.GeoConstants;
   45.11 +
   45.12  
   45.13  public class EgenhoferOverlapFunc extends GeoSparqlRelation {
   45.14  

    46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Fri Apr 19 09:11:47 2013 +0300
    46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Fri Apr 19 14:37:09 2013 +0300
    46.3 @@ -9,8 +9,9 @@
    46.4   */
    46.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    46.6  
    46.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    46.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    46.9 +
   46.10 +import eu.earthobservatory.constants.GeoConstants;
   46.11   
   46.12  /**
   46.13   * 

    47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Fri Apr 19 09:11:47 2013 +0300
    47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Fri Apr 19 14:37:09 2013 +0300
    47.3 @@ -9,8 +9,9 @@
    47.4   */
    47.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    47.6  
    47.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    47.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    47.9 +
   47.10 +import eu.earthobservatory.constants.GeoConstants;
   47.11   
   47.12  /**
   47.13   * 

    48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Fri Apr 19 09:11:47 2013 +0300
    48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Fri Apr 19 14:37:09 2013 +0300
    48.3 @@ -9,8 +9,9 @@
    48.4   */
    48.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    48.6  
    48.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    48.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    48.9 +
   48.10 +import eu.earthobservatory.constants.GeoConstants;
   48.11   
   48.12  /**
   48.13   * 

    49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    49.3 @@ -9,9 +9,10 @@
    49.4   */
    49.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    49.6  
    49.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    49.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    49.9  
   49.10 +import eu.earthobservatory.constants.GeoConstants;
   49.11 +
   49.12  /**
   49.13   * 
   49.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    50.3 @@ -9,9 +9,10 @@
    50.4   */
    50.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    50.6  
    50.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    50.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
    50.9  
   50.10 +import eu.earthobservatory.constants.GeoConstants;
   50.11 +
   50.12  /**
   50.13   * 
   50.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Fri Apr 19 09:11:47 2013 +0300
    51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Fri Apr 19 14:37:09 2013 +0300
    51.3 @@ -9,8 +9,9 @@
    51.4   */
    51.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    51.6  
    51.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    51.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    51.9 +
   51.10 +import eu.earthobservatory.constants.GeoConstants;
   51.11   
   51.12  /**
   51.13   * 

    52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java	Fri Apr 19 09:11:47 2013 +0300
    52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java	Fri Apr 19 14:37:09 2013 +0300
    52.3 @@ -9,9 +9,10 @@
    52.4   */
    52.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    52.6  
    52.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    52.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    52.9  
   52.10 +import eu.earthobservatory.constants.GeoConstants;
   52.11 +
   52.12  /**
   52.13   * 
   52.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    53.3 @@ -9,9 +9,10 @@
    53.4   */
    53.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    53.6  
    53.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    53.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    53.9  
   53.10 +import eu.earthobservatory.constants.GeoConstants;
   53.11 +
   53.12  /**
   53.13   * 
   53.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java	Fri Apr 19 09:11:47 2013 +0300
    54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java	Fri Apr 19 14:37:09 2013 +0300
    54.3 @@ -9,9 +9,10 @@
    54.4   */
    54.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
    54.6  
    54.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    54.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
    54.9  
   54.10 +import eu.earthobservatory.constants.GeoConstants;
   54.11 +
   54.12  /**
   54.13   * 
   54.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    55.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/property/GeoSparqlGetSRIDFunc.java	Fri Apr 19 14:37:09 2013 +0300
    55.3 @@ -0,0 +1,29 @@
    55.4 +/**
    55.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    55.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    55.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    55.8 + * 
    55.9 + * Copyright (C) 2013, Pyravlos Team
   55.10 + * 
   55.11 + * http://www.strabon.di.uoa.gr/
   55.12 + */
   55.13 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.property;
   55.14 +
   55.15 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   55.16 +
   55.17 +import eu.earthobservatory.constants.GeoConstants;
   55.18 +
   55.19 +/**
   55.20 + * Implementation of the <code>geof:getSRID(geom: ogc:geomLiteral): xsd:anyURI</code> 
   55.21 + * function of GeoSPARQL.
   55.22 + * 
   55.23 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   55.24 + *
   55.25 + */
   55.26 +public class GeoSparqlGetSRIDFunc extends SpatialPropertyFunc {
   55.27 +
   55.28 +	@Override
   55.29 +	public String getURI() {
   55.30 +		return GeoConstants.geoSparqlGetSRID;
   55.31 +	}
   55.32 +}

    56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Fri Apr 19 09:11:47 2013 +0300
    56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Fri Apr 19 14:37:09 2013 +0300
    56.3 @@ -9,9 +9,10 @@
    56.4   */
    56.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    56.6  
    56.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    56.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    56.9  
   56.10 +import eu.earthobservatory.constants.GeoConstants;
   56.11 +
   56.12  /**
   56.13   * 
   56.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    57.3 @@ -9,9 +9,10 @@
    57.4   */
    57.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    57.6  
    57.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    57.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    57.9  
   57.10 +import eu.earthobservatory.constants.GeoConstants;
   57.11 +
   57.12  /**
   57.13   * 
   57.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Fri Apr 19 09:11:47 2013 +0300
    58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Fri Apr 19 14:37:09 2013 +0300
    58.3 @@ -9,9 +9,10 @@
    58.4   */
    58.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    58.6  
    58.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    58.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    58.9  
   58.10 +import eu.earthobservatory.constants.GeoConstants;
   58.11 +
   58.12  /**
   58.13   * 
   58.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Fri Apr 19 09:11:47 2013 +0300
    59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Fri Apr 19 14:37:09 2013 +0300
    59.3 @@ -9,9 +9,10 @@
    59.4   */
    59.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    59.6  
    59.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    59.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    59.9  
   59.10 +import eu.earthobservatory.constants.GeoConstants;
   59.11 +
   59.12  /**
   59.13   * 
   59.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Fri Apr 19 09:11:47 2013 +0300
    60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Fri Apr 19 14:37:09 2013 +0300
    60.3 @@ -9,9 +9,10 @@
    60.4   */
    60.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    60.6  
    60.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    60.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    60.9  
   60.10 +import eu.earthobservatory.constants.GeoConstants;
   60.11 +
   60.12  /**
   60.13   * 
   60.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Fri Apr 19 09:11:47 2013 +0300
    61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Fri Apr 19 14:37:09 2013 +0300
    61.3 @@ -9,9 +9,10 @@
    61.4   */
    61.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    61.6  
    61.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    61.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    61.9  
   61.10 +import eu.earthobservatory.constants.GeoConstants;
   61.11 +
   61.12  /**
   61.13   * 
   61.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Fri Apr 19 09:11:47 2013 +0300
    62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Fri Apr 19 14:37:09 2013 +0300
    62.3 @@ -9,9 +9,10 @@
    62.4   */
    62.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    62.6  
    62.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    62.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    62.9  
   62.10 +import eu.earthobservatory.constants.GeoConstants;
   62.11 +
   62.12  /**
   62.13   * 
   62.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Fri Apr 19 09:11:47 2013 +0300
    63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Fri Apr 19 14:37:09 2013 +0300
    63.3 @@ -9,9 +9,10 @@
    63.4   */
    63.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
    63.6  
    63.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    63.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    63.9  
   63.10 +import eu.earthobservatory.constants.GeoConstants;
   63.11 +
   63.12  /**
   63.13   * 
   63.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    64.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Fri Apr 19 09:11:47 2013 +0300
    64.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Fri Apr 19 14:37:09 2013 +0300
    64.3 @@ -9,9 +9,10 @@
    64.4   */
    64.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    64.6  
    64.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    64.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    64.9  
   64.10 +import eu.earthobservatory.constants.GeoConstants;
   64.11 +
   64.12  /**
   64.13   * 
   64.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    65.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    65.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    65.3 @@ -9,9 +9,10 @@
    65.4   */
    65.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    65.6  
    65.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    65.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    65.9  
   65.10 +import eu.earthobservatory.constants.GeoConstants;
   65.11 +
   65.12  /**
   65.13   * 
   65.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    66.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Fri Apr 19 09:11:47 2013 +0300
    66.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Fri Apr 19 14:37:09 2013 +0300
    66.3 @@ -9,9 +9,10 @@
    66.4   */
    66.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    66.6  
    66.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    66.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    66.9  
   66.10 +import eu.earthobservatory.constants.GeoConstants;
   66.11 +
   66.12  /**
   66.13   * 
   66.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    67.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Fri Apr 19 09:11:47 2013 +0300
    67.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Fri Apr 19 14:37:09 2013 +0300
    67.3 @@ -9,9 +9,10 @@
    67.4   */
    67.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    67.6  
    67.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    67.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    67.9  
   67.10 +import eu.earthobservatory.constants.GeoConstants;
   67.11 +
   67.12  /**
   67.13   * 
   67.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    68.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    68.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    68.3 @@ -9,9 +9,10 @@
    68.4   */
    68.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    68.6  
    68.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    68.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    68.9  
   68.10 +import eu.earthobservatory.constants.GeoConstants;
   68.11 +
   68.12  /**
   68.13   * 
   68.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    69.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    69.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    69.3 @@ -9,9 +9,10 @@
    69.4   */
    69.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    69.6  
    69.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    69.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    69.9  
   69.10 +import eu.earthobservatory.constants.GeoConstants;
   69.11 +
   69.12  /**
   69.13   * 
   69.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    70.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    70.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    70.3 @@ -9,9 +9,10 @@
    70.4   */
    70.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    70.6  
    70.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    70.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    70.9  
   70.10 +import eu.earthobservatory.constants.GeoConstants;
   70.11 +
   70.12  /**
   70.13   * 
   70.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    71.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Fri Apr 19 09:11:47 2013 +0300
    71.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Fri Apr 19 14:37:09 2013 +0300
    71.3 @@ -9,9 +9,10 @@
    71.4   */
    71.5  package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
    71.6  
    71.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    71.8  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    71.9  
   71.10 +import eu.earthobservatory.constants.GeoConstants;
   71.11 +
   71.12  /**
   71.13   * 
   71.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>

    72.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/DateTimeDiff.java	Fri Apr 19 09:11:47 2013 +0300
    72.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/DateTimeDiff.java	Fri Apr 19 14:37:09 2013 +0300
    72.3 @@ -17,7 +17,8 @@
    72.4  import org.openrdf.model.ValueFactory;
    72.5  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    72.6  import org.openrdf.query.algebra.evaluation.function.Function;
    72.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    72.8 +
    72.9 +import eu.earthobservatory.constants.GeoConstants;
   72.10  
   72.11  /**
   72.12   * @author Garmpis Georgios <ggarbis@di.uoa.gr>

    73.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Fri Apr 19 09:11:47 2013 +0300
    73.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java	Fri Apr 19 14:37:09 2013 +0300
    73.3 @@ -9,9 +9,10 @@
    73.4   */
    73.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate;
    73.6  
    73.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    73.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    73.9  
   73.10 +import eu.earthobservatory.constants.GeoConstants;
   73.11 +
   73.12  /**
   73.13   * 
   73.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   73.15 @@ -20,6 +21,6 @@
   73.16  
   73.17  	@Override
   73.18  	public String getURI() {
   73.19 -		return GeoConstants.extent;
   73.20 +		return GeoConstants.stSPARQLextent;
   73.21  	}
   73.22  }

    74.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Fri Apr 19 09:11:47 2013 +0300
    74.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Fri Apr 19 14:37:09 2013 +0300
    74.3 @@ -9,8 +9,9 @@
    74.4   */
    74.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    74.6  
    74.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    74.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    74.9 +
   74.10 +import eu.earthobservatory.constants.GeoConstants;
   74.11   
   74.12  /**
   74.13   * 
   74.14 @@ -20,6 +21,6 @@
   74.15  
   74.16  	@Override
   74.17  	public String getURI() {
   74.18 -		return GeoConstants.boundary;
   74.19 +		return GeoConstants.stSPARQLboundary;
   74.20  	}
   74.21  }

    75.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Fri Apr 19 09:11:47 2013 +0300
    75.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Fri Apr 19 14:37:09 2013 +0300
    75.3 @@ -9,8 +9,9 @@
    75.4   */
    75.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    75.6  
    75.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    75.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    75.9 +
   75.10 +import eu.earthobservatory.constants.GeoConstants;
   75.11   
   75.12  /**
   75.13   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   75.14 @@ -19,6 +20,6 @@
   75.15  
   75.16  	@Override
   75.17  	public String getURI() {
   75.18 -		return GeoConstants.buffer;
   75.19 +		return GeoConstants.stSPARQLbuffer;
   75.20  	}
   75.21  }

    76.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Fri Apr 19 09:11:47 2013 +0300
    76.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Fri Apr 19 14:37:09 2013 +0300
    76.3 @@ -9,8 +9,9 @@
    76.4   */
    76.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    76.6  
    76.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    76.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    76.9 +
   76.10 +import eu.earthobservatory.constants.GeoConstants;
   76.11   
   76.12  /**
   76.13   * 
   76.14 @@ -20,6 +21,6 @@
   76.15  
   76.16  	@Override
   76.17  	public String getURI() {
   76.18 -		return GeoConstants.convexHull;
   76.19 +		return GeoConstants.stSPARQLconvexHull;
   76.20  	}
   76.21  }

    77.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    77.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    77.3 @@ -9,9 +9,10 @@
    77.4   */
    77.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    77.6  
    77.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    77.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    77.9  
   77.10 +import eu.earthobservatory.constants.GeoConstants;
   77.11 +
   77.12  /**
   77.13   * 
   77.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   77.15 @@ -20,6 +21,6 @@
   77.16  
   77.17  	@Override
   77.18  	public String getURI() {
   77.19 -		return GeoConstants.difference;
   77.20 +		return GeoConstants.stSPARQLdifference;
   77.21  	}
   77.22  }

    78.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Fri Apr 19 09:11:47 2013 +0300
    78.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Fri Apr 19 14:37:09 2013 +0300
    78.3 @@ -9,8 +9,9 @@
    78.4   */
    78.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    78.6  
    78.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    78.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    78.9 +
   78.10 +import eu.earthobservatory.constants.GeoConstants;
   78.11   
   78.12  /**
   78.13   * 
   78.14 @@ -20,6 +21,6 @@
   78.15  
   78.16  	@Override
   78.17  	public String getURI() {
   78.18 -		return GeoConstants.envelope;
   78.19 +		return GeoConstants.stSPARQLenvelope;
   78.20  	}
   78.21  }

    79.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Fri Apr 19 09:11:47 2013 +0300
    79.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java	Fri Apr 19 14:37:09 2013 +0300
    79.3 @@ -9,9 +9,10 @@
    79.4   */
    79.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    79.6  
    79.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    79.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    79.9  
   79.10 +import eu.earthobservatory.constants.GeoConstants;
   79.11 +
   79.12  /**
   79.13   * 
   79.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   79.15 @@ -20,6 +21,6 @@
   79.16  
   79.17  	@Override
   79.18  	public String getURI() {
   79.19 -		return GeoConstants.intersection;
   79.20 +		return GeoConstants.stSPARQLintersection;
   79.21  	}
   79.22  }

    80.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    80.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    80.3 @@ -9,9 +9,10 @@
    80.4   */
    80.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    80.6  
    80.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    80.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    80.9  
   80.10 +import eu.earthobservatory.constants.GeoConstants;
   80.11 +
   80.12  /**
   80.13   * 
   80.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   80.15 @@ -20,6 +21,6 @@
   80.16  
   80.17  	@Override
   80.18  	public String getURI() {
   80.19 -		return GeoConstants.symDifference;
   80.20 +		return GeoConstants.stSPARQLsymDifference;
   80.21  	}
   80.22  }

    81.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Fri Apr 19 09:11:47 2013 +0300
    81.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Fri Apr 19 14:37:09 2013 +0300
    81.3 @@ -9,8 +9,9 @@
    81.4   */
    81.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    81.6  
    81.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    81.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    81.9 +
   81.10 +import eu.earthobservatory.constants.GeoConstants;
   81.11   
   81.12  /**
   81.13   * 
   81.14 @@ -20,6 +21,6 @@
   81.15  
   81.16  	@Override
   81.17  	public String getURI() {
   81.18 -		return GeoConstants.transform;
   81.19 +		return GeoConstants.stSPARQLtransform;
   81.20  	}
   81.21  }

    82.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Fri Apr 19 09:11:47 2013 +0300
    82.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java	Fri Apr 19 14:37:09 2013 +0300
    82.3 @@ -9,9 +9,10 @@
    82.4   */
    82.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
    82.6  
    82.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    82.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    82.9  
   82.10 +import eu.earthobservatory.constants.GeoConstants;
   82.11 +
   82.12  /**
   82.13   * 
   82.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   82.15 @@ -20,6 +21,6 @@
   82.16  
   82.17  	@Override
   82.18  	public String getURI() {
   82.19 -		return GeoConstants.union;
   82.20 +		return GeoConstants.stSPARQLunion;
   82.21  	}
   82.22  }

    83.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Fri Apr 19 09:11:47 2013 +0300
    83.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Fri Apr 19 14:37:09 2013 +0300
    83.3 @@ -9,8 +9,9 @@
    83.4   */
    83.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
    83.6  
    83.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    83.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
    83.9 +
   83.10 +import eu.earthobservatory.constants.GeoConstants;
   83.11   
   83.12  /**
   83.13   * A spatial function computing the area of a geometry.
   83.14 @@ -21,6 +22,6 @@
   83.15  
   83.16  	@Override
   83.17  	public String getURI() {
   83.18 -		return GeoConstants.area;
   83.19 +		return GeoConstants.stSPARQLarea;
   83.20  	}
   83.21  }

    84.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Fri Apr 19 09:11:47 2013 +0300
    84.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Fri Apr 19 14:37:09 2013 +0300
    84.3 @@ -9,9 +9,10 @@
    84.4   */
    84.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
    84.6  
    84.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    84.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
    84.9  
   84.10 +import eu.earthobservatory.constants.GeoConstants;
   84.11 +
   84.12  /**
   84.13   * A spatial function computing the distance between two geometries.
   84.14   * 
   84.15 @@ -21,6 +22,6 @@
   84.16  
   84.17  	@Override
   84.18  	public String getURI() {
   84.19 -		return GeoConstants.distance;
   84.20 +		return GeoConstants.stSPARQLdistance;
   84.21  	}
   84.22  }

    85.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java	Fri Apr 19 09:11:47 2013 +0300
    85.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java	Fri Apr 19 14:37:09 2013 +0300
    85.3 @@ -9,9 +9,10 @@
    85.4   */
    85.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    85.6  
    85.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    85.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    85.9  
   85.10 +import eu.earthobservatory.constants.GeoConstants;
   85.11 +
   85.12  /**
   85.13   * A spatial function returning a geometry in GML encoding.
   85.14   * 
   85.15 @@ -21,6 +22,6 @@
   85.16  
   85.17  	@Override
   85.18  	public String getURI() {
   85.19 -		return GeoConstants.asGML;
   85.20 +		return GeoConstants.stSPARQLasGML;
   85.21  	}
   85.22  }

    86.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Fri Apr 19 09:11:47 2013 +0300
    86.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Fri Apr 19 14:37:09 2013 +0300
    86.3 @@ -9,8 +9,9 @@
    86.4   */
    86.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    86.6  
    86.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    86.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    86.9 +
   86.10 +import eu.earthobservatory.constants.GeoConstants;
   86.11   
   86.12  /**
   86.13   * A spatial function returning a geometry as text (in WKT format).
   86.14 @@ -21,6 +22,6 @@
   86.15  
   86.16  	@Override
   86.17  	public String getURI() {
   86.18 -		return GeoConstants.asText;
   86.19 +		return GeoConstants.stSPARQLasText;
   86.20  	}
   86.21  }

    87.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Fri Apr 19 09:11:47 2013 +0300
    87.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Fri Apr 19 14:37:09 2013 +0300
    87.3 @@ -9,8 +9,9 @@
    87.4   */
    87.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    87.6  
    87.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    87.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    87.9 +
   87.10 +import eu.earthobservatory.constants.GeoConstants;
   87.11   
   87.12  /**
   87.13   * A spatial function returning the dimension of a geometry.
   87.14 @@ -21,6 +22,6 @@
   87.15  
   87.16  	@Override
   87.17  	public String getURI() {
   87.18 -		return GeoConstants.dimension;
   87.19 +		return GeoConstants.stSPARQLdimension;
   87.20  	}
   87.21  }

    88.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Fri Apr 19 09:11:47 2013 +0300
    88.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Fri Apr 19 14:37:09 2013 +0300
    88.3 @@ -9,8 +9,9 @@
    88.4   */
    88.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    88.6  
    88.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    88.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    88.9 +
   88.10 +import eu.earthobservatory.constants.GeoConstants;
   88.11   
   88.12  /**
   88.13   * A spatial function returning the type of a geometry.
   88.14 @@ -21,6 +22,6 @@
   88.15  
   88.16  	@Override
   88.17  	public String getURI() {
   88.18 -		return GeoConstants.geometryType;
   88.19 +		return GeoConstants.stSPARQLgeometryType;
   88.20  	}
   88.21  }

    89.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Fri Apr 19 09:11:47 2013 +0300
    89.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Fri Apr 19 14:37:09 2013 +0300
    89.3 @@ -9,8 +9,9 @@
    89.4   */
    89.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    89.6  
    89.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    89.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    89.9 +
   89.10 +import eu.earthobservatory.constants.GeoConstants;
   89.11   
   89.12  /**
   89.13   * A spatial function for testing whether a geometry is empty.
   89.14 @@ -21,6 +22,6 @@
   89.15  
   89.16  	@Override
   89.17  	public String getURI() {
   89.18 -		return GeoConstants.isEmpty;
   89.19 +		return GeoConstants.stSPARQLisEmpty;
   89.20  	}
   89.21  }

    90.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Fri Apr 19 09:11:47 2013 +0300
    90.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Fri Apr 19 14:37:09 2013 +0300
    90.3 @@ -9,8 +9,9 @@
    90.4   */
    90.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    90.6  
    90.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    90.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    90.9 +
   90.10 +import eu.earthobservatory.constants.GeoConstants;
   90.11   
   90.12  /**
   90.13   * A spatial function for testing whether a geometry is simple.
   90.14 @@ -21,6 +22,6 @@
   90.15  
   90.16  	@Override
   90.17  	public String getURI() {
   90.18 -		return GeoConstants.isSimple;
   90.19 +		return GeoConstants.stSPARQLisSimple;
   90.20  	}
   90.21  }

    91.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Fri Apr 19 09:11:47 2013 +0300
    91.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Fri Apr 19 14:37:09 2013 +0300
    91.3 @@ -9,8 +9,9 @@
    91.4   */
    91.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
    91.6  
    91.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    91.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
    91.9 +
   91.10 +import eu.earthobservatory.constants.GeoConstants;
   91.11   
   91.12  /**
   91.13   * A spatial function returning the SRID of a geometry.
   91.14 @@ -21,6 +22,6 @@
   91.15  
   91.16  	@Override
   91.17  	public String getURI() {
   91.18 -		return GeoConstants.srid.toString(); //changed this-constant
   91.19 +		return GeoConstants.stSPARQLsrid; //changed this-constant
   91.20  	}
   91.21  }

    92.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Fri Apr 19 09:11:47 2013 +0300
    92.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Fri Apr 19 14:37:09 2013 +0300
    92.3 @@ -9,8 +9,9 @@
    92.4   */
    92.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    92.6  
    92.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    92.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    92.9 +
   92.10 +import eu.earthobservatory.constants.GeoConstants;
   92.11   
   92.12  /**
   92.13   * 
   92.14 @@ -20,6 +21,6 @@
   92.15  
   92.16  	@Override
   92.17  	public String getURI() {
   92.18 -		return GeoConstants.above;
   92.19 +		return GeoConstants.stSPARQLabove;
   92.20  	}
   92.21  }

    93.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Fri Apr 19 09:11:47 2013 +0300
    93.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Fri Apr 19 14:37:09 2013 +0300
    93.3 @@ -9,8 +9,9 @@
    93.4   */
    93.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    93.6  
    93.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    93.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    93.9 +
   93.10 +import eu.earthobservatory.constants.GeoConstants;
   93.11   
   93.12  /**
   93.13   * 
   93.14 @@ -20,6 +21,6 @@
   93.15  
   93.16  	@Override
   93.17  	public String getURI() {
   93.18 -		return GeoConstants.below;
   93.19 +		return GeoConstants.stSPARQLbelow;
   93.20  	}
   93.21  }

    94.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    94.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    94.3 @@ -9,8 +9,9 @@
    94.4   */
    94.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    94.6  
    94.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    94.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    94.9 +
   94.10 +import eu.earthobservatory.constants.GeoConstants;
   94.11   
   94.12  /**
   94.13   * 
   94.14 @@ -20,6 +21,6 @@
   94.15  
   94.16  	@Override
   94.17  	public String getURI() {
   94.18 -		return GeoConstants.contains;
   94.19 +		return GeoConstants.stSPARQLcontains;
   94.20  	}
   94.21  }

    95.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java	Fri Apr 19 09:11:47 2013 +0300
    95.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java	Fri Apr 19 14:37:09 2013 +0300
    95.3 @@ -9,8 +9,9 @@
    95.4   */
    95.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    95.6  
    95.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    95.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    95.9 +
   95.10 +import eu.earthobservatory.constants.GeoConstants;
   95.11   
   95.12  /**
   95.13   * 
   95.14 @@ -20,6 +21,6 @@
   95.15  
   95.16  	@Override
   95.17  	public String getURI() {
   95.18 -		return GeoConstants.crosses;
   95.19 +		return GeoConstants.stSPARQLcrosses;
   95.20  	}
   95.21  }

    96.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Fri Apr 19 09:11:47 2013 +0300
    96.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Fri Apr 19 14:37:09 2013 +0300
    96.3 @@ -9,8 +9,9 @@
    96.4   */
    96.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    96.6  
    96.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    96.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    96.9 +
   96.10 +import eu.earthobservatory.constants.GeoConstants;
   96.11   
   96.12  /**
   96.13   * 
   96.14 @@ -20,6 +21,6 @@
   96.15  
   96.16  	@Override
   96.17  	public String getURI() {
   96.18 -		return GeoConstants.disjoint;
   96.19 +		return GeoConstants.stSPARQLdisjoint;
   96.20  	}
   96.21  }

    97.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    97.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    97.3 @@ -9,9 +9,10 @@
    97.4   */
    97.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    97.6  
    97.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    97.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    97.9  
   97.10 +import eu.earthobservatory.constants.GeoConstants;
   97.11 +
   97.12  /**
   97.13   * 
   97.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   97.15 @@ -20,6 +21,6 @@
   97.16  
   97.17  	@Override
   97.18  	public String getURI() {
   97.19 -		return GeoConstants.equals;
   97.20 +		return GeoConstants.stSPARQLequals;
   97.21  	}
   97.22  }

    98.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Fri Apr 19 09:11:47 2013 +0300
    98.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Fri Apr 19 14:37:09 2013 +0300
    98.3 @@ -9,9 +9,10 @@
    98.4   */
    98.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    98.6  
    98.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    98.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    98.9  
   98.10 +import eu.earthobservatory.constants.GeoConstants;
   98.11 +
   98.12  /**
   98.13   * 
   98.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
   98.15 @@ -20,7 +21,7 @@
   98.16  
   98.17  	@Override
   98.18  	public String getURI() {
   98.19 -		return GeoConstants.intersects;
   98.20 +		return GeoConstants.stSPARQLintersects;
   98.21  		}
   98.22  
   98.23  }

    99.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Fri Apr 19 09:11:47 2013 +0300
    99.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Fri Apr 19 14:37:09 2013 +0300
    99.3 @@ -9,8 +9,9 @@
    99.4   */
    99.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
    99.6  
    99.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    99.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    99.9 +
   99.10 +import eu.earthobservatory.constants.GeoConstants;
   99.11   
   99.12  /**
   99.13   * 
   99.14 @@ -20,6 +21,6 @@
   99.15  
   99.16  	@Override
   99.17  	public String getURI() {
   99.18 -		return GeoConstants.left;
   99.19 +		return GeoConstants.stSPARQLleft;
   99.20  	}
   99.21  }

   100.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java	Fri Apr 19 09:11:47 2013 +0300
   100.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java	Fri Apr 19 14:37:09 2013 +0300
   100.3 @@ -9,8 +9,9 @@
   100.4   */
   100.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   100.6  
   100.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   100.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   100.9 +
  100.10 +import eu.earthobservatory.constants.GeoConstants;
  100.11   
  100.12  /**
  100.13   * 
  100.14 @@ -20,6 +21,6 @@
  100.15  
  100.16  	@Override
  100.17  	public String getURI() {
  100.18 -		return GeoConstants.overlaps;
  100.19 +		return GeoConstants.stSPARQLoverlaps;
  100.20  	}
  100.21  }

   101.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Fri Apr 19 09:11:47 2013 +0300
   101.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Fri Apr 19 14:37:09 2013 +0300
   101.3 @@ -9,9 +9,10 @@
   101.4   */
   101.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   101.6  
   101.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   101.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   101.9  
  101.10 +import eu.earthobservatory.constants.GeoConstants;
  101.11 +
  101.12  /**
  101.13   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  101.14   */
  101.15 @@ -19,7 +20,7 @@
  101.16  
  101.17  	@Override
  101.18  	public String getURI() {
  101.19 -		return GeoConstants.relate;
  101.20 +		return GeoConstants.stSPARQLrelate;
  101.21  	}
  101.22  
  101.23  //	public Literal evaluate(ValueFactory valueFactory, Value... args)

   102.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Fri Apr 19 09:11:47 2013 +0300
   102.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Fri Apr 19 14:37:09 2013 +0300
   102.3 @@ -9,8 +9,9 @@
   102.4   */
   102.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   102.6  
   102.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   102.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   102.9 +
  102.10 +import eu.earthobservatory.constants.GeoConstants;
  102.11   
  102.12  /**
  102.13   * 
  102.14 @@ -20,6 +21,6 @@
  102.15  
  102.16  	@Override
  102.17  	public String getURI() {
  102.18 -		return GeoConstants.right;
  102.19 +		return GeoConstants.stSPARQLright;
  102.20  	}
  102.21  }

   103.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java	Fri Apr 19 09:11:47 2013 +0300
   103.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java	Fri Apr 19 14:37:09 2013 +0300
   103.3 @@ -9,8 +9,9 @@
   103.4   */
   103.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   103.6  
   103.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   103.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   103.9 +
  103.10 +import eu.earthobservatory.constants.GeoConstants;
  103.11   
  103.12  /**
  103.13   * 
  103.14 @@ -20,6 +21,6 @@
  103.15  
  103.16  	@Override
  103.17  	public String getURI() {
  103.18 -		return GeoConstants.touches;
  103.19 +		return GeoConstants.stSPARQLtouches;
  103.20  	}
  103.21  }

   104.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java	Fri Apr 19 09:11:47 2013 +0300
   104.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java	Fri Apr 19 14:37:09 2013 +0300
   104.3 @@ -9,8 +9,9 @@
   104.4   */
   104.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   104.6  
   104.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   104.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   104.9 +
  104.10 +import eu.earthobservatory.constants.GeoConstants;
  104.11   
  104.12  /**
  104.13   * 
  104.14 @@ -20,6 +21,6 @@
  104.15  
  104.16  	@Override
  104.17  	public String getURI() {
  104.18 -		return GeoConstants.within;
  104.19 +		return GeoConstants.stSPARQLwithin;
  104.20  	}
  104.21  }

   105.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java	Fri Apr 19 09:11:47 2013 +0300
   105.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java	Fri Apr 19 14:37:09 2013 +0300
   105.3 @@ -9,9 +9,10 @@
   105.4   */
   105.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb;
   105.6  
   105.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   105.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   105.9  
  105.10 +import eu.earthobservatory.constants.GeoConstants;
  105.11 +
  105.12  /**
  105.13   * 
  105.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  105.15 @@ -20,7 +21,7 @@
  105.16  
  105.17  	@Override
  105.18  	public String getURI() {
  105.19 -		return GeoConstants.mbbContains;
  105.20 +		return GeoConstants.stSPARQLmbbContains;
  105.21  	}
  105.22  
  105.23  }

   106.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java	Fri Apr 19 09:11:47 2013 +0300
   106.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java	Fri Apr 19 14:37:09 2013 +0300
   106.3 @@ -9,9 +9,10 @@
   106.4   */
   106.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb;
   106.6  
   106.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   106.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   106.9  
  106.10 +import eu.earthobservatory.constants.GeoConstants;
  106.11 +
  106.12  /**
  106.13   * 
  106.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  106.15 @@ -20,7 +21,7 @@
  106.16  
  106.17  	@Override
  106.18  	public String getURI() {
  106.19 -		return GeoConstants.mbbEquals;
  106.20 +		return GeoConstants.stSPARQLmbbEquals;
  106.21  	}
  106.22  
  106.23  }

   107.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java	Fri Apr 19 09:11:47 2013 +0300
   107.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java	Fri Apr 19 14:37:09 2013 +0300
   107.3 @@ -9,9 +9,10 @@
   107.4   */
   107.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb;
   107.6  
   107.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   107.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   107.9  
  107.10 +import eu.earthobservatory.constants.GeoConstants;
  107.11 +
  107.12  /**
  107.13   * 
  107.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  107.15 @@ -20,7 +21,7 @@
  107.16  
  107.17  	@Override
  107.18  	public String getURI() {
  107.19 -		return GeoConstants.mbbIntersects;
  107.20 +		return GeoConstants.stSPARQLmbbIntersects;
  107.21  	}
  107.22  
  107.23  }

   108.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java	Fri Apr 19 09:11:47 2013 +0300
   108.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java	Fri Apr 19 14:37:09 2013 +0300
   108.3 @@ -9,9 +9,10 @@
   108.4   */
   108.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb;
   108.6  
   108.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   108.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   108.9  
  108.10 +import eu.earthobservatory.constants.GeoConstants;
  108.11 +
  108.12  /**
  108.13   * 
  108.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  108.15 @@ -20,7 +21,7 @@
  108.16  
  108.17  	@Override
  108.18  	public String getURI() {
  108.19 -		return GeoConstants.mbbWithin;
  108.20 +		return GeoConstants.stSPARQLmbbWithin;
  108.21  	}
  108.22  
  108.23  }

   109.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Fri Apr 19 09:11:47 2013 +0300
   109.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Fri Apr 19 14:37:09 2013 +0300
   109.3 @@ -52,7 +52,6 @@
   109.4  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   109.5  import org.openrdf.query.algebra.evaluation.function.Function;
   109.6  import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
   109.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   109.8  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   109.9  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc;
  109.10  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc;
  109.11 @@ -72,6 +71,8 @@
  109.12  
  109.13  import com.vividsolutions.jts.geom.Geometry;
  109.14  
  109.15 +import eu.earthobservatory.constants.GeoConstants;
  109.16 +
  109.17  /**
  109.18   * 
  109.19   * @author Manos Karpathiotakis <mk@di.uoa.gr>

   110.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java	Fri Apr 19 09:11:47 2013 +0300
   110.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java	Fri Apr 19 14:37:09 2013 +0300
   110.3 @@ -21,10 +21,11 @@
   110.4  import org.openrdf.query.algebra.Var;
   110.5  import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
   110.6  import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   110.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   110.8  import org.slf4j.Logger;
   110.9  import org.slf4j.LoggerFactory;
  110.10  
  110.11 +import eu.earthobservatory.constants.GeoConstants;
  110.12 +
  110.13  /**
  110.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  110.15   */
  110.16 @@ -55,7 +56,7 @@
  110.17  				if(element.getExpr() instanceof FunctionCall)
  110.18  				{
  110.19  					FunctionCall fc = (FunctionCall) element.getExpr();
  110.20 -					if(fc.getURI().equals(GeoConstants.envelope) && fc.getArgs().size()==2)
  110.21 +					if(fc.getURI().equals(GeoConstants.stSPARQLenvelope) && fc.getArgs().size()==2)
  110.22  					{
  110.23  						mbbFlag = true;
  110.24  						FunctionCall expr = (FunctionCall) element.getExpr();

   111.1 --- a/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Fri Apr 19 09:11:47 2013 +0300
   111.2 +++ b/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Fri Apr 19 14:37:09 2013 +0300
   111.3 @@ -33,8 +33,8 @@
   111.4  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc
   111.5  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc
   111.6  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc
   111.7 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc
   111.8  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc
   111.9 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc
  111.10  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc
  111.11  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.GeometryTypeFunc
  111.12  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc
  111.13 @@ -53,6 +53,7 @@
  111.14  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlIntersectionFunc
  111.15  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlSymmetricDifferenceFunc
  111.16  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlUnionFunc
  111.17 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.property.GeoSparqlGetSRIDFunc
  111.18  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc
  111.19  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferContainsFunc
  111.20  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoveredByFunc

   112.1 --- a/generaldb/pom.xml	Fri Apr 19 09:11:47 2013 +0300
   112.2 +++ b/generaldb/pom.xml	Fri Apr 19 14:37:09 2013 +0300
   112.3 @@ -78,6 +78,13 @@
   112.4  			<artifactId>postgresql</artifactId>
   112.5  			<scope>provided</scope>
   112.6  		</dependency>
   112.7 +		
   112.8 +		<dependency>
   112.9 +			<groupId>monetdb</groupId>
  112.10 +			<artifactId>jdbcclient</artifactId>
  112.11 +			<scope>provided</scope>
  112.12 +		</dependency>
  112.13 +		
  112.14   		
  112.15  		<dependency>
  112.16  			<groupId>junit</groupId>

   113.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBConnection.java	Fri Apr 19 09:11:47 2013 +0300
   113.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBConnection.java	Fri Apr 19 14:37:09 2013 +0300
   113.3 @@ -1,7 +1,11 @@
   113.4 -/*
   113.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   113.6 - *
   113.7 - * Licensed under the Aduna BSD-style license.
   113.8 +/**
   113.9 + * This Source Code Form is subject to the terms of the Mozilla Public
  113.10 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  113.11 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  113.12 + * 
  113.13 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
  113.14 + * 
  113.15 + * http://www.strabon.di.uoa.gr/
  113.16   */
  113.17  package org.openrdf.sail.generaldb;
  113.18  
  113.19 @@ -41,7 +45,7 @@
  113.20   * Coordinates the triple store, namespace manager, optimizer, and evaluation
  113.21   * strategy into the {@link SailConnection} interface.
  113.22   * 
  113.23 - * @author James Leigh
  113.24 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
  113.25   * 
  113.26   */
  113.27  public class GeneralDBConnection extends SailConnectionBase {
  113.28 @@ -112,7 +116,6 @@
  113.29  		throws SailException
  113.30  	{
  113.31  		removeStatementsInternal(null, null, null, contexts);
  113.32 -		//XXX our code
  113.33  //		triples.clearGeoValues();
  113.34  	}
  113.35  

   114.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBConnectionFactory.java	Fri Apr 19 09:11:47 2013 +0300
   114.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBConnectionFactory.java	Fri Apr 19 14:37:09 2013 +0300
   114.3 @@ -5,45 +5,39 @@
   114.4   */
   114.5  package org.openrdf.sail.generaldb;
   114.6  
   114.7 -import static java.sql.Connection.TRANSACTION_READ_COMMITTED;
   114.8 +import info.aduna.concurrent.locks.ExclusiveLockManager;
   114.9 +import info.aduna.concurrent.locks.Lock;
  114.10  
  114.11  import java.sql.Connection;
  114.12  import java.sql.SQLException;
  114.13  
  114.14  import javax.sql.DataSource;
  114.15  
  114.16 -import info.aduna.concurrent.locks.ExclusiveLockManager;
  114.17 -import info.aduna.concurrent.locks.Lock;
  114.18 -
  114.19  import org.openrdf.model.impl.ValueFactoryImpl;
  114.20  import org.openrdf.sail.SailConnection;
  114.21  import org.openrdf.sail.SailException;
  114.22 -import org.openrdf.sail.helpers.DefaultSailChangedEvent;
  114.23 -import org.openrdf.sail.generaldb.evaluation.GeneralDBEvaluationFactory;
  114.24  import org.openrdf.sail.generaldb.evaluation.GeneralDBQueryBuilderFactory;
  114.25 -import org.openrdf.sail.generaldb.optimizers.GeneralDBQueryOptimizer;
  114.26 -import org.openrdf.sail.generaldb.optimizers.GeneralDBSelectQueryOptimizerFactory;
  114.27 -import org.openrdf.sail.rdbms.exceptions.RdbmsException;
  114.28  import org.openrdf.sail.generaldb.managers.BNodeManager;
  114.29  import org.openrdf.sail.generaldb.managers.HashManager;
  114.30  import org.openrdf.sail.generaldb.managers.LiteralManager;
  114.31 -import org.openrdf.sail.rdbms.managers.NamespaceManager;
  114.32  import org.openrdf.sail.generaldb.managers.PredicateManager;
  114.33  import org.openrdf.sail.generaldb.managers.TransTableManager;
  114.34 -import org.openrdf.sail.generaldb.managers.TripleManager;
  114.35  import org.openrdf.sail.generaldb.managers.TripleTableManager;
  114.36  import org.openrdf.sail.generaldb.managers.UriManager;
  114.37 +import org.openrdf.sail.generaldb.optimizers.GeneralDBQueryOptimizer;
  114.38 +import org.openrdf.sail.generaldb.optimizers.GeneralDBSelectQueryOptimizerFactory;
  114.39  import org.openrdf.sail.generaldb.schema.BNodeTable;
  114.40  import org.openrdf.sail.generaldb.schema.HashTable;
  114.41  import org.openrdf.sail.generaldb.schema.IdSequence;
  114.42  import org.openrdf.sail.generaldb.schema.IntegerIdSequence;
  114.43  import org.openrdf.sail.generaldb.schema.LiteralTable;
  114.44  import org.openrdf.sail.generaldb.schema.LongIdSequence;
  114.45 +import org.openrdf.sail.generaldb.schema.URITable;
  114.46 +import org.openrdf.sail.generaldb.schema.ValueTableFactory;
  114.47 +import org.openrdf.sail.rdbms.exceptions.RdbmsException;
  114.48 +import org.openrdf.sail.rdbms.managers.NamespaceManager;
  114.49  import org.openrdf.sail.rdbms.schema.NamespacesTable;
  114.50  import org.openrdf.sail.rdbms.schema.TableFactory;
  114.51 -import org.openrdf.sail.generaldb.schema.URITable;
  114.52 -import org.openrdf.sail.generaldb.schema.ValueTableFactory;
  114.53 -import org.openrdf.sail.rdbms.util.DatabaseLockManager;
  114.54  import org.openrdf.sail.rdbms.util.Tracer;
  114.55  
  114.56  /**
  114.57 @@ -185,6 +179,7 @@
  114.58  			literalManager = new LiteralManager();
  114.59  			ValueTableFactory tables = createValueTableFactory();
  114.60  			tables.setSequenced(sequenced);
  114.61 +			
  114.62  			if (sequenced) {
  114.63  				ids = new IntegerIdSequence();
  114.64  				tables.setIdSequence(ids);
  114.65 @@ -200,11 +195,14 @@
  114.66  				hashManager.setUriManager(uriManager);
  114.67  				hashManager.setIdSequence(ids);
  114.68  				hashManager.init();
  114.69 +				
  114.70  			} else {
  114.71  				ids = new LongIdSequence();
  114.72  				ids.init();
  114.73  				tables.setIdSequence(ids);
  114.74 +				
  114.75  			}
  114.76 +			
  114.77  			namespaces = new NamespaceManager();
  114.78  			namespaces.setConnection(resourceInserts);
  114.79  			NamespacesTable nsTable = tables.createNamespacesTable(nsAndTableIndexes);
  114.80 @@ -239,11 +237,15 @@
  114.81  			tripleTableManager.setMaxNumberOfTripleTables(maxTripleTables);
  114.82  			tripleTableManager.setIndexingTriples(triplesIndexed);
  114.83  			tripleTableManager.initialize();
  114.84 +			
  114.85  			if (triplesIndexed) {
  114.86  				tripleTableManager.createTripleIndexes();
  114.87 +				
  114.88  			} else {
  114.89  				tripleTableManager.dropTripleIndexes();
  114.90 +				
  114.91  			}
  114.92 +			
  114.93  			bnodeManager.setTable(bnodeTable);
  114.94  			bnodeManager.init();
  114.95  			vf.setBNodeManager(bnodeManager);
  114.96 @@ -252,6 +254,7 @@
  114.97  			literalManager.init();
  114.98  			vf.setLiteralManager(literalManager);
  114.99  			vf.setPredicateManager(predicateManager);
 114.100 +			
 114.101  		} catch (SQLException e) {
 114.102  			throw new RdbmsException(e);
 114.103  		}

   115.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBProvider.java	Fri Apr 19 09:11:47 2013 +0300
   115.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBProvider.java	Fri Apr 19 14:37:09 2013 +0300
   115.3 @@ -1,18 +1,19 @@
   115.4 -/*
   115.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   115.6 - *
   115.7 - * Licensed under the Aduna BSD-style license.
   115.8 +/**
   115.9 + * This Source Code Form is subject to the terms of the Mozilla Public
  115.10 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  115.11 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  115.12 + * 
  115.13 + * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
  115.14 + * 
  115.15 + * http://www.strabon.di.uoa.gr/
  115.16   */
  115.17  package org.openrdf.sail.generaldb;
  115.18 -
  115.19 -import org.openrdf.sail.rdbms.RdbmsProvider;
  115.20 -
  115.21   
  115.22  /**
  115.23   * Checks the database product name and version to be compatible with this
  115.24   * Sesame store.
  115.25   * 
  115.26 - * @author James Leigh
  115.27 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
  115.28   * 
  115.29   */
  115.30  public abstract class GeneralDBProvider  {

   116.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBTripleRepository.java	Fri Apr 19 09:11:47 2013 +0300
   116.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBTripleRepository.java	Fri Apr 19 14:37:09 2013 +0300
   116.3 @@ -493,6 +493,7 @@
   116.4  	
   116.5  	/**
   116.6  	 * @author Manos Karpathiotatis <mk@di.uoa.gr>
   116.7 +	 * 
   116.8  	 * @throws RdbmsException
   116.9  	 */
  116.10  	public void clearGeoValues() throws RdbmsException

   117.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Fri Apr 19 09:11:47 2013 +0300
   117.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java	Fri Apr 19 14:37:09 2013 +0300
   117.3 @@ -21,7 +21,6 @@
   117.4  import org.openrdf.model.impl.LiteralImpl;
   117.5  import org.openrdf.model.impl.URIImpl;
   117.6  import org.openrdf.model.impl.ValueFactoryBase;
   117.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   117.8  import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   117.9  import org.openrdf.sail.generaldb.managers.BNodeManager;
  117.10  import org.openrdf.sail.generaldb.managers.LiteralManager;
  117.11 @@ -42,6 +41,8 @@
  117.12  
  117.13  import com.vividsolutions.jts.io.ParseException;
  117.14  
  117.15 +import eu.earthobservatory.constants.GeoConstants;
  117.16 +
  117.17  /**
  117.18   * Provides basic value creation both for traditional values as well as values
  117.19   * with an internal id. {@link RdbmsValue}s behaviour similar to the default

   118.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java	Fri Apr 19 09:11:47 2013 +0300
   118.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java	Fri Apr 19 14:37:09 2013 +0300
   118.3 @@ -9,17 +9,16 @@
   118.4  import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   118.5  import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   118.6  
   118.7 -public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructBinary{
   118.8 +public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructTriple {
   118.9  
  118.10 -	public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  118.11 -		super(left, right);
  118.12 +	public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third)
  118.13 +	{
  118.14 +		super(left, right, third);
  118.15  	}
  118.16  
  118.17  	@Override
  118.18 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
  118.19 -		throws X
  118.20 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) throws X
  118.21  	{
  118.22  		visitor.meet(this);
  118.23  	}
  118.24 -
  118.25  }
  118.26 \ No newline at end of file

   119.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java	Fri Apr 19 09:11:47 2013 +0300
   119.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java	Fri Apr 19 14:37:09 2013 +0300
   119.3 @@ -9,17 +9,16 @@
   119.4  import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   119.5  import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   119.6  
   119.7 -public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricBinary {
   119.8 -
   119.9 -	public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  119.10 -		super(left, right);
  119.11 +public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricTriple
  119.12 +{
  119.13 +	public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third)
  119.14 +	{
  119.15 +		super(left, right, third);
  119.16  	}
  119.17  
  119.18  	@Override
  119.19 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
  119.20 -		throws X
  119.21 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) throws X
  119.22  	{
  119.23  		visitor.meet(this);
  119.24  	}
  119.25 -
  119.26  }
  119.27 \ No newline at end of file

   120.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   120.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructTriple.java	Fri Apr 19 14:37:09 2013 +0300
   120.3 @@ -0,0 +1,23 @@
   120.4 +/*
   120.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   120.6 + *
   120.7 + * Licensed under the Aduna BSD-style license.
   120.8 + */
   120.9 +package org.openrdf.sail.generaldb.algebra;
  120.10 +
  120.11 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  120.12 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  120.13 +import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator;
  120.14 +
  120.15 +public class GeneralDBSqlSpatialConstructTriple extends TripleGeneralDBOperator {
  120.16 +	public GeneralDBSqlSpatialConstructTriple(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) 
  120.17 +	{
  120.18 +		super(left, right, third);
  120.19 +	}
  120.20 +
  120.21 +	@Override
  120.22 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) throws X
  120.23 +	{
  120.24 +		visitor.meet(this);
  120.25 +	}
  120.26 +}

   121.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   121.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricTriple.java	Fri Apr 19 14:37:09 2013 +0300
   121.3 @@ -0,0 +1,25 @@
   121.4 +/*
   121.5 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   121.6 + *
   121.7 + * Licensed under the Aduna BSD-style license.
   121.8 + */
   121.9 +package org.openrdf.sail.generaldb.algebra;
  121.10 +
  121.11 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  121.12 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  121.13 +import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator;
  121.14 +
  121.15 +public class GeneralDBSqlSpatialMetricTriple extends TripleGeneralDBOperator
  121.16 +{
  121.17 +	public GeneralDBSqlSpatialMetricTriple(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) 
  121.18 +	{
  121.19 +		super(left, right, third);
  121.20 +	}
  121.21 +
  121.22 +	@Override
  121.23 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor) throws X
  121.24 +	{
  121.25 +		visitor.meet(this);
  121.26 +	}
  121.27 +	
  121.28 +}

   122.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java	Fri Apr 19 09:11:47 2013 +0300
   122.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java	Fri Apr 19 14:37:09 2013 +0300
   122.3 @@ -110,9 +110,11 @@
   122.4  import org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlPeriodUnion;
   122.5  import org.openrdf.sail.generaldb.algebra.temporal.GeneralDBSqlStarts;
   122.6  import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException;
   122.7 +
   122.8  /**
   122.9   * Support method to create SQL expressions.
  122.10   * 
  122.11 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
  122.12   * @author James Leigh
  122.13   * @author Manos Karpathiotakis <mk@di.uoa.gr>
  122.14   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
  122.15 @@ -290,12 +292,6 @@
  122.16  		// no constructor
  122.17  	}
  122.18  
  122.19 -	/**
  122.20 -	 * my addition
  122.21 -	 * FIXME  
  122.22 -	 * 
  122.23 -	 */
  122.24 -
  122.25  	//XXX Spatial Relationship Functions - all 9 of them - stSPARQL++	
  122.26  	public static GeneralDBSqlExpr equalsGeo(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.27  		return new GeneralDBSqlEqualsSpatial(left, right);
  122.28 @@ -440,9 +436,9 @@
  122.29  		return new GeneralDBSqlGeoUnion(left, right);
  122.30  	}
  122.31  
  122.32 -	public static GeneralDBSqlExpr geoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.33 +	public static GeneralDBSqlExpr geoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) {
  122.34  
  122.35 -		return new GeneralDBSqlGeoBuffer(left, right);
  122.36 +		return new GeneralDBSqlGeoBuffer(left, right, third);
  122.37  	}
  122.38  	
  122.39  	public static GeneralDBSqlExpr geoTransform(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.40 @@ -506,29 +502,23 @@
  122.41  	
  122.42  	//XXX Spatial Metric Functions
  122.43  	public static GeneralDBSqlExpr geoArea(GeneralDBSqlExpr expr) {
  122.44 -
  122.45  		return new GeneralDBSqlGeoArea(expr);
  122.46  	}
  122.47  	
  122.48 -	public static GeneralDBSqlExpr geoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.49 -
  122.50 -		return new GeneralDBSqlGeoDistance(left, right);
  122.51 +	public static GeneralDBSqlExpr geoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) {
  122.52 +		return new GeneralDBSqlGeoDistance(left, right,third);
  122.53  	}
  122.54  	
  122.55 -
  122.56  	//XXX Spatial Property Functions
  122.57  	public static GeneralDBSqlExpr dimension(GeneralDBSqlExpr expr) {
  122.58 -
  122.59  		return new GeneralDBSqlGeoDimension(expr);
  122.60  	}
  122.61  
  122.62  	public static GeneralDBSqlExpr geometryType(GeneralDBSqlExpr expr) {
  122.63 -
  122.64  		return new GeneralDBSqlGeoGeometryType(expr);
  122.65  	}
  122.66  	
  122.67  	public static GeneralDBSqlExpr asText(GeneralDBSqlExpr expr) {
  122.68 -
  122.69  		return new GeneralDBSqlGeoAsText(expr);
  122.70  	}
  122.71  	
  122.72 @@ -537,23 +527,19 @@
  122.73  	}
  122.74  
  122.75  	public static GeneralDBSqlExpr srid(GeneralDBSqlExpr expr) {
  122.76 -
  122.77  		return new GeneralDBSqlGeoSrid(expr);
  122.78  	}
  122.79  	
  122.80  	public static GeneralDBSqlExpr isEmpty(GeneralDBSqlExpr expr) {
  122.81 -
  122.82  		return new GeneralDBSqlGeoIsEmpty(expr);
  122.83  	}
  122.84  
  122.85  	public static GeneralDBSqlExpr isSimple(GeneralDBSqlExpr expr) {
  122.86 -
  122.87  		return new GeneralDBSqlGeoIsSimple(expr);
  122.88  	}
  122.89  	
  122.90  
  122.91 -
  122.92 -	//XXX GeoSPARQL - Spatial Relations
  122.93 +	// GeoSPARQL - Spatial Relations
  122.94  	//Simple Features
  122.95  	public static GeneralDBSqlExpr sfContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.96  		return new GeneralDBSqlSF_Contains(left, right);
  122.97 @@ -652,10 +638,4 @@
  122.98  	public static GeneralDBSqlExpr ehOverlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.99  		return new GeneralDBSqlEgenhofer_Overlap(left, right);
 122.100  	}
 122.101 -
 122.102 -
 122.103 -	/**
 122.104 -	 * end of my addition
 122.105 -	 */
 122.106 -
 122.107  }

   123.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Apr 19 09:11:47 2013 +0300
   123.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Apr 19 14:37:09 2013 +0300
   123.3 @@ -5,7 +5,88 @@
   123.4   */
   123.5  package org.openrdf.sail.generaldb.algebra.factories;
   123.6  
   123.7 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.*;
   123.8 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.above;
   123.9 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.abs;
  123.10 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.and;
  123.11 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asGML;
  123.12 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asText;
  123.13 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.below;
  123.14 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.cmp;
  123.15 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.concat;
  123.16 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.contains;
  123.17 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.crosses;
  123.18 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.diffDateTime;
  123.19 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.dimension;
  123.20 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.disjoint;
  123.21 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehContains;
  123.22 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCoveredBy;
  123.23 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCovers;
  123.24 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehDisjoint;
  123.25 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehEquals;
  123.26 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehInside;
  123.27 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehMeet;
  123.28 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehOverlap;
  123.29 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eq;
  123.30 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqComparingNull;
  123.31 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqIfNotNull;
  123.32 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.equalsGeo;
  123.33 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoArea;
  123.34 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBoundary;
  123.35 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBuffer;
  123.36 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoConvexHull;
  123.37 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDifference;
  123.38 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDistance;
  123.39 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoEnvelope;
  123.40 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoIntersection;
  123.41 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoSymDifference;
  123.42 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoTransform;
  123.43 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoUnion;
  123.44 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geometryType;
  123.45 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.gt;
  123.46 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.intersects;
  123.47 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isEmpty;
  123.48 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNotNull;
  123.49 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNull;
  123.50 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isSimple;
  123.51 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.left;
  123.52 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.like;
  123.53 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.lowercase;
  123.54 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbContains;
  123.55 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbEqualsGeo;
  123.56 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbIntersects;
  123.57 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbWithin;
  123.58 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.neq;
  123.59 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.not;
  123.60 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.num;
  123.61 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.or;
  123.62 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.overlaps;
  123.63 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccDisconnected;
  123.64 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccEquals;
  123.65 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccExternallyConnected;
  123.66 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPart;
  123.67 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPartInverse;
  123.68 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccPartiallyOverlapping;
  123.69 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPart;
  123.70 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPartInverse;
  123.71 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.regex;
  123.72 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.relate;
  123.73 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.right;
  123.74 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfContains;
  123.75 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfCrosses;
  123.76 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfDisjoint;
  123.77 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfEquals;
  123.78 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfIntersects;
  123.79 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfOverlaps;
  123.80 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfTouches;
  123.81 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfWithin;
  123.82 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.simple;
  123.83 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sqlNull;
  123.84 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.srid;
  123.85 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.str;
  123.86 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sub;
  123.87 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.touches;
  123.88 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.unsupported;
  123.89 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.within;
  123.90  
  123.91  import org.openrdf.model.Literal;
  123.92  import org.openrdf.model.Value;
  123.93 @@ -31,9 +112,7 @@
  123.94  import org.openrdf.query.algebra.Var;
  123.95  import org.openrdf.query.algebra.evaluation.function.Function;
  123.96  import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
  123.97 -import org.openrdf.query.algebra.evaluation.function.link.AddDateTimeFunc;
  123.98  import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc;
  123.99 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
 123.100  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
 123.101  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
 123.102  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
 123.103 @@ -43,6 +122,7 @@
 123.104  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc;
 123.105  import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc;
 123.106  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc;
 123.107 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc;
 123.108  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc;
 123.109  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc;
 123.110  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc;
 123.111 @@ -78,6 +158,10 @@
 123.112  import org.openrdf.sail.generaldb.algebra.GeneralDBTrueValue;
 123.113  import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
 123.114  import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException;
 123.115 +import org.slf4j.Logger;
 123.116 +import org.slf4j.LoggerFactory;
 123.117 +
 123.118 +import eu.earthobservatory.constants.GeoConstants;
 123.119  
 123.120  /**
 123.121   * Boolean SQL expression factory. This factory can convert a number of core
 123.122 @@ -88,6 +172,8 @@
 123.123   */
 123.124  public class GeneralDBBooleanExprFactory extends QueryModelVisitorBase<UnsupportedRdbmsOperatorException> {
 123.125  
 123.126 +	private static final Logger logger = LoggerFactory.getLogger(org.openrdf.sail.generaldb.algebra.factories.GeneralDBBooleanExprFactory.class);
 123.127 +	
 123.128  	private static final double HR14 = 14 * 60 * 60 * 1000;
 123.129  
 123.130  	protected GeneralDBSqlExpr result;
 123.131 @@ -201,7 +287,7 @@
 123.132  			/***/
 123.133  			else //spatial property
 123.134  			{
 123.135 -				System.out.println("SPATIAL PROPERTY!!!");
 123.136 +				//System.out.println("SPATIAL PROPERTY!!!");
 123.137  				rightSql = spatialPropertyFunction((FunctionCall) right, function);
 123.138  				rightIsSpatial = true;
 123.139  			}
 123.140 @@ -216,10 +302,6 @@
 123.141  			}
 123.142  		}
 123.143  
 123.144 -		/**
 123.145 -		 * 
 123.146 -		 */
 123.147 -
 123.148  		switch (op) {
 123.149  		case EQ:
 123.150  			if( (!rightIsSpatial && !rightIsDateTime) && (!leftIsSpatial && !leftIsDateTime) )
 123.151 @@ -317,38 +399,33 @@
 123.152  	}
 123.153  
 123.154  	@Override
 123.155 -	public void meet(IsBNode node)
 123.156 -			throws UnsupportedRdbmsOperatorException
 123.157 -			{
 123.158 +	public void meet(IsBNode node) throws UnsupportedRdbmsOperatorException
 123.159 +	{
 123.160  		result = isNotNull(sql.createBNodeExpr(node.getArg()));
 123.161 -			}
 123.162 +	}
 123.163  
 123.164  	@Override
 123.165 -	public void meet(IsLiteral node)
 123.166 -			throws UnsupportedRdbmsOperatorException
 123.167 -			{
 123.168 +	public void meet(IsLiteral node) throws UnsupportedRdbmsOperatorException
 123.169 +	{
 123.170  		result = isNotNull(sql.createLabelExpr(node.getArg()));
 123.171 -			}
 123.172 +	}
 123.173  
 123.174  	@Override
 123.175 -	public void meet(IsResource node)
 123.176 -			throws UnsupportedRdbmsOperatorException
 123.177 -			{
 123.178 +	public void meet(IsResource node) throws UnsupportedRdbmsOperatorException
 123.179 +	{
 123.180  		GeneralDBSqlExpr isBNode = isNotNull(sql.createBNodeExpr(node.getArg()));
 123.181  		result = or(isBNode, isNotNull(sql.createUriExpr(node.getArg())));
 123.182 -			}
 123.183 +	}
 123.184  
 123.185  	@Override
 123.186 -	public void meet(IsURI node)
 123.187 -			throws UnsupportedRdbmsOperatorException
 123.188 -			{
 123.189 +	public void meet(IsURI node) throws UnsupportedRdbmsOperatorException
 123.190 +	{
 123.191  		result = isNotNull(sql.createUriExpr(node.getArg()));
 123.192 -			}
 123.193 +	}
 123.194  
 123.195  	@Override
 123.196 -	public void meet(LangMatches node)
 123.197 -			throws UnsupportedRdbmsOperatorException
 123.198 -			{
 123.199 +	public void meet(LangMatches node) throws UnsupportedRdbmsOperatorException
 123.200 +	{
 123.201  		ValueExpr left = node.getLeftArg();
 123.202  		ValueExpr right = node.getRightArg();
 123.203  		GeneralDBSqlCase sqlCase = new GeneralDBSqlCase();
 123.204 @@ -356,39 +433,36 @@
 123.205  		GeneralDBSqlExpr pattern = concat(lowercase(label(right)), str("%"));
 123.206  		sqlCase.when(new GeneralDBTrueValue(), like(label(left), pattern));
 123.207  		result = sqlCase;
 123.208 -			}
 123.209 +	}
 123.210  
 123.211  	@Override
 123.212 -	public void meet(Not node)
 123.213 -			throws UnsupportedRdbmsOperatorException
 123.214 -			{
 123.215 +	public void meet(Not node) throws UnsupportedRdbmsOperatorException
 123.216 +	{
 123.217  		result = not(bool(node.getArg()));
 123.218 -			}
 123.219 +	}
 123.220  
 123.221  	@Override
 123.222 -	public void meet(Or node)
 123.223 -			throws UnsupportedRdbmsOperatorException
 123.224 -			{
 123.225 +	public void meet(Or node) throws UnsupportedRdbmsOperatorException
 123.226 +	{
 123.227  		result = or(bool(node.getLeftArg()), bool(node.getRightArg()));
 123.228 -			}
 123.229 +	}
 123.230  
 123.231  	@Override
 123.232 -	public void meet(Regex node)
 123.233 -			throws UnsupportedRdbmsOperatorException
 123.234 -			{
 123.235 +	public void meet(Regex node) throws UnsupportedRdbmsOperatorException
 123.236 +	{
 123.237  		result = regex(label(node.getArg()), label(node.getPatternArg()), label(node.getFlagsArg()));
 123.238 -			}
 123.239 +	}
 123.240  
 123.241  	@Override
 123.242 -	public void meet(SameTerm node)
 123.243 -			throws UnsupportedRdbmsOperatorException
 123.244 -			{
 123.245 +	public void meet(SameTerm node) throws UnsupportedRdbmsOperatorException
 123.246 +	{
 123.247  		ValueExpr left = node.getLeftArg();
 123.248  		ValueExpr right = node.getRightArg();
 123.249  		boolean leftIsVar = left instanceof Var;
 123.250  		boolean rightIsVar = right instanceof Var;
 123.251  		boolean leftIsConst = left instanceof ValueConstant;
 123.252  		boolean rightIsConst = right instanceof ValueConstant;
 123.253 +		
 123.254  		if (leftIsVar && rightIsVar) {
 123.255  			result = eq(new GeneralDBRefIdColumn((Var)left), new GeneralDBRefIdColumn((Var)right));
 123.256  		}
 123.257 @@ -405,132 +479,116 @@
 123.258  			GeneralDBSqlExpr literals = and(langs, and(datatype, labels));
 123.259  			result = and(bnodes, and(uris, literals));
 123.260  		}
 123.261 -			}
 123.262 +	}
 123.263  
 123.264  	@Override
 123.265 -	public void meet(ValueConstant vc)
 123.266 -			throws UnsupportedRdbmsOperatorException
 123.267 -			{
 123.268 +	public void meet(ValueConstant vc) throws UnsupportedRdbmsOperatorException
 123.269 +	{
 123.270  		result = valueOf(vc.getValue());
 123.271 -			}
 123.272 +	}
 123.273  
 123.274  	@Override
 123.275 -	public void meet(Var var)
 123.276 -			throws UnsupportedRdbmsOperatorException
 123.277 -			{
 123.278 +	public void meet(Var var) throws UnsupportedRdbmsOperatorException
 123.279 +	{
 123.280  		if (var.getValue() == null) {
 123.281  			result = effectiveBooleanValue(var);
 123.282  		}
 123.283  		else {
 123.284  			result = valueOf(var.getValue());
 123.285  		}
 123.286 -			}
 123.287 +	}
 123.288  
 123.289  	public void setSqlExprFactory(GeneralDBSqlExprFactory sql) {
 123.290  		this.sql = sql;
 123.291  	}
 123.292  
 123.293 -	protected GeneralDBSqlExpr bNode(ValueExpr arg)
 123.294 -			throws UnsupportedRdbmsOperatorException
 123.295 -			{
 123.296 +	protected GeneralDBSqlExpr bNode(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.297 +	{
 123.298  		return sql.createBNodeExpr(arg);
 123.299 -			}
 123.300 +	}
 123.301  
 123.302 -	protected GeneralDBSqlExpr bool(ValueExpr arg)
 123.303 -			throws UnsupportedRdbmsOperatorException
 123.304 -			{
 123.305 +	protected GeneralDBSqlExpr bool(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.306 +	{
 123.307  		return sql.createBooleanExpr(arg);
 123.308 -			}
 123.309 +	}
 123.310  
 123.311 -	protected GeneralDBSqlExpr label(ValueExpr arg)
 123.312 -			throws UnsupportedRdbmsOperatorException
 123.313 -			{
 123.314 +	protected GeneralDBSqlExpr label(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.315 +	{
 123.316  		return sql.createLabelExpr(arg);
 123.317 -			}
 123.318 +	}
 123.319  
 123.320 -	protected GeneralDBSqlExpr lang(ValueExpr arg)
 123.321 -			throws UnsupportedRdbmsOperatorException
 123.322 -			{
 123.323 +	protected GeneralDBSqlExpr lang(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.324 +	{
 123.325  		return sql.createLanguageExpr(arg);
 123.326 -			}
 123.327 +	}
 123.328  
 123.329 -	protected GeneralDBSqlExpr hash(ValueExpr arg)
 123.330 -			throws UnsupportedRdbmsOperatorException
 123.331 -			{
 123.332 +	protected GeneralDBSqlExpr hash(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.333 +	{
 123.334  		return sql.createHashExpr(arg);
 123.335 -			}
 123.336 +	}
 123.337  
 123.338  	@Override
 123.339 -	protected void meetNode(QueryModelNode arg)
 123.340 -			throws UnsupportedRdbmsOperatorException
 123.341 -			{
 123.342 +	protected void meetNode(QueryModelNode arg) throws UnsupportedRdbmsOperatorException
 123.343 +	{
 123.344  		if (arg instanceof ValueExpr) {
 123.345  			result = effectiveBooleanValue((ValueExpr)arg);
 123.346  		}
 123.347  		else {
 123.348  			throw unsupported(arg);
 123.349  		}
 123.350 -			}
 123.351 +	}
 123.352  
 123.353 -	protected GeneralDBSqlExpr numeric(ValueExpr arg)
 123.354 -			throws UnsupportedRdbmsOperatorException
 123.355 -			{
 123.356 +	protected GeneralDBSqlExpr numeric(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.357 +	{
 123.358  		return sql.createNumericExpr(arg);
 123.359 -			}
 123.360 +	}
 123.361  
 123.362 -	protected GeneralDBSqlExpr time(ValueExpr arg)
 123.363 -			throws UnsupportedRdbmsOperatorException
 123.364 -			{
 123.365 +	protected GeneralDBSqlExpr time(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.366 +	{
 123.367  		return sql.createTimeExpr(arg);
 123.368 -			}
 123.369 +	}
 123.370  
 123.371 -	protected GeneralDBSqlExpr type(ValueExpr arg)
 123.372 -			throws UnsupportedRdbmsOperatorException
 123.373 -			{
 123.374 +	protected GeneralDBSqlExpr type(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.375 +	{
 123.376  		return sql.createDatatypeExpr(arg);
 123.377 -			}
 123.378 +	}
 123.379  
 123.380 -	protected GeneralDBSqlExpr uri(ValueExpr arg)
 123.381 -			throws UnsupportedRdbmsOperatorException
 123.382 -			{
 123.383 +	protected GeneralDBSqlExpr uri(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.384 +	{
 123.385  		return sql.createUriExpr(arg);
 123.386 -			}
 123.387 +	}
 123.388  
 123.389 -	protected GeneralDBSqlExpr zoned(ValueExpr arg)
 123.390 -			throws UnsupportedRdbmsOperatorException
 123.391 -			{
 123.392 +	protected GeneralDBSqlExpr zoned(ValueExpr arg) throws UnsupportedRdbmsOperatorException
 123.393 +	{
 123.394  		return sql.createZonedExpr(arg);
 123.395 -			}
 123.396 +	}
 123.397  
 123.398 -	private GeneralDBSqlExpr effectiveBooleanValue(ValueExpr v)
 123.399 -			throws UnsupportedRdbmsOperatorException
 123.400 -			{
 123.401 +	private GeneralDBSqlExpr effectiveBooleanValue(ValueExpr v) throws UnsupportedRdbmsOperatorException
 123.402 +	{
 123.403  		String bool = XMLSchema.BOOLEAN.stringValue();
 123.404  		GeneralDBSqlCase sqlCase = new GeneralDBSqlCase();
 123.405  		sqlCase.when(eq(type(v), str(bool)), eq(label(v), str("true")));
 123.406  		sqlCase.when(simple(type(v)), not(eq(label(v), str(""))));
 123.407  		sqlCase.when(isNotNull(numeric(v)), not(eq(numeric(v), num(0))));
 123.408  		return sqlCase;
 123.409 -			}
 123.410 +	}
 123.411  
 123.412 -	private GeneralDBSqlExpr equal(ValueExpr left, ValueExpr right)
 123.413 -			throws UnsupportedRdbmsOperatorException
 123.414 -			{
 123.415 +	private GeneralDBSqlExpr equal(ValueExpr left, ValueExpr right) throws UnsupportedRdbmsOperatorException
 123.416 +	{
 123.417  		GeneralDBSqlExpr bnodes = eq(bNode(left), bNode(right));
 123.418  		GeneralDBSqlExpr uris = eq(uri(left), uri(right));
 123.419  		GeneralDBSqlCase scase = new GeneralDBSqlCase();
 123.420  		scase.when(or(isNotNull(bNode(left)), isNotNull(bNode(right))), bnodes);
 123.421  		scase.when(or(isNotNull(uri(left)), isNotNull(uri(right))), uris);
 123.422  		return literalEqual(left, right, scase);
 123.423 -			}
 123.424 +	}
 123.425  
 123.426  	private boolean isTerm(ValueExpr node) {
 123.427  		return node instanceof Var || node instanceof ValueConstant;
 123.428  	}
 123.429  
 123.430 -	private GeneralDBSqlExpr literalEqual(ValueExpr left, ValueExpr right, GeneralDBSqlCase scase)
 123.431 -			throws UnsupportedRdbmsOperatorException
 123.432 -			{
 123.433 +	private GeneralDBSqlExpr literalEqual(ValueExpr left, ValueExpr right, GeneralDBSqlCase scase) throws UnsupportedRdbmsOperatorException
 123.434 +	{
 123.435  		GeneralDBSqlExpr labels = eq(label(left), label(right));
 123.436  		GeneralDBSqlExpr langs = and(eqIfNotNull(lang(left), lang(right)), labels.clone());
 123.437  		GeneralDBSqlExpr numeric = eq(numeric(left), numeric(right));
 123.438 @@ -546,18 +604,17 @@
 123.439  		scase.when(comparable, time);
 123.440  		scase.when(and(eq(type(left), type(right)), labels.clone()), new GeneralDBTrueValue());
 123.441  		return scase;
 123.442 -			}
 123.443 +	}
 123.444  
 123.445 -	private GeneralDBSqlExpr termsEqual(ValueExpr left, ValueExpr right)
 123.446 -			throws UnsupportedRdbmsOperatorException
 123.447 -			{
 123.448 +	private GeneralDBSqlExpr termsEqual(ValueExpr left, ValueExpr right) throws UnsupportedRdbmsOperatorException
 123.449 +	{
 123.450  		GeneralDBSqlExpr bnodes = eqIfNotNull(bNode(left), bNode(right));
 123.451  		GeneralDBSqlExpr uris = eqIfNotNull(uri(left), uri(right));
 123.452  		GeneralDBSqlCase scase = new GeneralDBSqlCase();
 123.453  		scase.when(or(isNotNull(bNode(left)), isNotNull(bNode(right))), bnodes);
 123.454  		scase.when(or(isNotNull(uri(left)), isNotNull(uri(right))), uris);
 123.455  		return literalEqual(left, right, scase);
 123.456 -			}
 123.457 +	}
 123.458  
 123.459  	private GeneralDBSqlExpr valueOf(Value value) {
 123.460  		if (value instanceof Literal) {
 123.461 @@ -570,18 +627,18 @@
 123.462  	}
 123.463  
 123.464  	/**
 123.465 -	 * FIXME spatials
 123.466 +	 * Spatials
 123.467  	 */
 123.468  	@Override
 123.469 -	public void meet(FunctionCall functionCall)
 123.470 -			throws UnsupportedRdbmsOperatorException
 123.471 -			{
 123.472 +	public void meet(FunctionCall functionCall) throws UnsupportedRdbmsOperatorException
 123.473 +	{
 123.474  		Function function = FunctionRegistry.getInstance().get(functionCall.getURI());
 123.475  
 123.476  		if(function instanceof SpatialConstructFunc)
 123.477  		{
 123.478  			GeneralDBSqlExpr leftArg = null;
 123.479  			GeneralDBSqlExpr rightArg = null;
 123.480 +			GeneralDBSqlExpr thirdArg = null;
 123.481  
 123.482  			ValueExpr left = functionCall.getArgs().get(0);
 123.483  
 123.484 @@ -610,12 +667,12 @@
 123.485  				}
 123.486  				else
 123.487  				{
 123.488 -					if(function.getURI().equals(GeoConstants.buffer))
 123.489 +					if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
 123.490  					{
 123.491  						//Be it a Var or a Value Constant, 'numeric' is the way to go
 123.492  						rightArg = numeric(right);
 123.493  					}
 123.494 -					else if(function.getURI().equals(GeoConstants.transform))
 123.495 +					else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
 123.496  					{
 123.497  						//Another special case -> Second argument of this function is a URI
 123.498  						rightArg = uri(right);
 123.499 @@ -627,9 +684,11 @@
 123.500  						rightArg = label(right);
 123.501  					}
 123.502  				}
 123.503 +				if(function instanceof BufferFunc)
 123.504 +					thirdArg = uri(functionCall.getArgs().get(2));
 123.505  			}
 123.506  
 123.507 -			result = spatialConstructPicker(function, leftArg, rightArg);
 123.508 +			result = spatialConstructPicker(function, leftArg, rightArg, thirdArg);
 123.509  
 123.510  		}
 123.511  		else if(function instanceof SpatialRelationshipFunc)
 123.512 @@ -691,9 +750,9 @@
 123.513  		else if(function instanceof SpatialMetricFunc) 
 123.514  			//Argument # depending on the function selected
 123.515  		{
 123.516 -			//TODO
 123.517  			GeneralDBSqlExpr leftArg = null;
 123.518  			GeneralDBSqlExpr rightArg = null;
 123.519 +			GeneralDBSqlExpr thirdArg = null;
 123.520  
 123.521  			ValueExpr left = functionCall.getArgs().get(0);
 123.522  
 123.523 @@ -706,7 +765,7 @@
 123.524  				leftArg = label(left);
 123.525  			}
 123.526  
 123.527 -			//These two functions only have one argument!!
 123.528 +			//Area function has only one argument!!
 123.529  			if(!(function instanceof AreaFunc))
 123.530  			{
 123.531  				ValueExpr right = functionCall.getArgs().get(1);
 123.532 @@ -719,9 +778,10 @@
 123.533  				{
 123.534  					rightArg = label(right);
 123.535  				}
 123.536 +				thirdArg = uri(functionCall.getArgs().get(2));
 123.537  			}
 123.538  
 123.539 -			result = spatialMetricPicker(function, leftArg, rightArg);
 123.540 +			result = spatialMetricPicker(function, leftArg, rightArg, thirdArg);
 123.541  		}
 123.542  		else if(function instanceof TemporalRelationFunc)
 123.543  		{
 123.544 @@ -756,8 +816,7 @@
 123.545  		{
 123.546  			meetNode(functionCall);
 123.547  		}
 123.548 -
 123.549 -			}
 123.550 +	}
 123.551  
 123.552  	/**
 123.553  	 * Addition for datetime metric functions
 123.554 @@ -774,8 +833,6 @@
 123.555  		}
 123.556  		return null;
 123.557  	}
 123.558 -
 123.559 -	/***/
 123.560  	
 123.561  	public GeneralDBSqlExpr spatialFunction(FunctionCall functionCall) throws UnsupportedRdbmsOperatorException
 123.562  	{
 123.563 @@ -885,7 +942,6 @@
 123.564  		ValueExpr left = functionCall.getArgs().get(0);
 123.565  		ValueExpr right = functionCall.getArgs().get(1);
 123.566  
 123.567 -
 123.568  		GeneralDBSqlExpr leftArg = null;
 123.569  		GeneralDBSqlExpr rightArg = null;
 123.570  		GeneralDBSqlExpr thirdArg = null;
 123.571 @@ -924,10 +980,10 @@
 123.572  	{
 123.573  		GeneralDBSqlExpr leftArg = null;
 123.574  		GeneralDBSqlExpr rightArg = null;
 123.575 +		GeneralDBSqlExpr thirdArg = null;
 123.576  
 123.577  		ValueExpr left = functionCall.getArgs().get(0);
 123.578  
 123.579 -
 123.580  		if(left instanceof FunctionCall)
 123.581  		{
 123.582  			leftArg = spatialFunction((FunctionCall) left);
 123.583 @@ -937,9 +993,6 @@
 123.584  			leftArg = label(left);
 123.585  		}
 123.586  
 123.587 -
 123.588 -
 123.589 -
 123.590  		if(!(function instanceof EnvelopeFunc) 
 123.591  				&& !(function instanceof ConvexHullFunc) 
 123.592  				&& !(function instanceof BoundaryFunc)
 123.593 @@ -955,12 +1008,12 @@
 123.594  			}
 123.595  			else
 123.596  			{
 123.597 -				if(function.getURI().equals(GeoConstants.buffer))
 123.598 +				if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
 123.599  				{
 123.600  					//Be it a Var or a Value Constant, 'numeric' is the way to go
 123.601  					rightArg = numeric(right);
 123.602  				}
 123.603 -				else if(function.getURI().equals(GeoConstants.transform))
 123.604 +				else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
 123.605  				{
 123.606  					//Another special case -> Second argument of this function is a URI
 123.607  					rightArg = uri(right);
 123.608 @@ -972,9 +1025,11 @@
 123.609  					rightArg = label(right);
 123.610  				}
 123.611  			}
 123.612 +			if(function instanceof BufferFunc)
 123.613 +				thirdArg = uri(functionCall.getArgs().get(2));
 123.614  		}
 123.615  
 123.616 -		return spatialConstructPicker(function, leftArg, rightArg);
 123.617 +		return spatialConstructPicker(function, leftArg, rightArg, thirdArg);
 123.618  
 123.619  	}
 123.620  
 123.621 @@ -1015,12 +1070,11 @@
 123.622  
 123.623  	}
 123.624  
 123.625 -	/***/
 123.626 -	
 123.627  	GeneralDBSqlExpr spatialMetricFunction(FunctionCall functionCall, Function function) throws UnsupportedRdbmsOperatorException
 123.628  	{
 123.629  		GeneralDBSqlExpr leftArg = null;
 123.630  		GeneralDBSqlExpr rightArg = null;
 123.631 +		GeneralDBSqlExpr thirdArg = null;
 123.632  
 123.633  		ValueExpr left = functionCall.getArgs().get(0);
 123.634  
 123.635 @@ -1034,8 +1088,6 @@
 123.636  			leftArg = label(left);
 123.637  		}
 123.638  
 123.639 -
 123.640 -
 123.641  		if(!(function instanceof AreaFunc))
 123.642  		{
 123.643  			ValueExpr right = functionCall.getArgs().get(1);
 123.644 @@ -1047,9 +1099,10 @@
 123.645  			{
 123.646  				rightArg = label(right);
 123.647  			}
 123.648 +			thirdArg = uri(functionCall.getArgs().get(2));
 123.649  		}
 123.650  
 123.651 -		return spatialMetricPicker(function, leftArg, rightArg);
 123.652 +		return spatialMetricPicker(function, leftArg, rightArg, thirdArg);
 123.653  
 123.654  	}
 123.655  
 123.656 @@ -1168,73 +1221,73 @@
 123.657  			GeneralDBSqlExpr thirdArg)
 123.658  	{
 123.659  		//XXX stSPARQL		
 123.660 -		if(function.getURI().equals(GeoConstants.equals))
 123.661 +		if(function.getURI().equals(GeoConstants.stSPARQLequals))
 123.662  		{
 123.663  			return equalsGeo(leftArg,rightArg);
 123.664  		}
 123.665 -		else if(function.getURI().equals(GeoConstants.disjoint))
 123.666 +		else if(function.getURI().equals(GeoConstants.stSPARQLdisjoint))
 123.667  		{
 123.668  			return disjoint(leftArg,rightArg);
 123.669  		}
 123.670 -		else if(function.getURI().equals(GeoConstants.intersects))
 123.671 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersects))
 123.672  		{
 123.673  			return intersects(leftArg,rightArg);
 123.674  		}
 123.675 -		else if(function.getURI().equals(GeoConstants.touches))
 123.676 +		else if(function.getURI().equals(GeoConstants.stSPARQLtouches))
 123.677  		{
 123.678  			return touches(leftArg,rightArg);
 123.679  		}
 123.680 -		else if(function.getURI().equals(GeoConstants.crosses))
 123.681 +		else if(function.getURI().equals(GeoConstants.stSPARQLcrosses))
 123.682  		{
 123.683  			return crosses(leftArg,rightArg);
 123.684  		}
 123.685 -		else if(function.getURI().equals(GeoConstants.within))
 123.686 +		else if(function.getURI().equals(GeoConstants.stSPARQLwithin))
 123.687  		{
 123.688  			return within(leftArg,rightArg);
 123.689  		}
 123.690 -		else if(function.getURI().equals(GeoConstants.contains))
 123.691 +		else if(function.getURI().equals(GeoConstants.stSPARQLcontains))
 123.692  		{
 123.693  			return contains(leftArg,rightArg);
 123.694  		}		
 123.695 -		else if(function.getURI().equals(GeoConstants.overlaps))
 123.696 +		else if(function.getURI().equals(GeoConstants.stSPARQLoverlaps))
 123.697  		{
 123.698  			return overlaps(leftArg,rightArg);
 123.699  		}		
 123.700 -		else if(function.getURI().equals(GeoConstants.relate))
 123.701 +		else if(function.getURI().equals(GeoConstants.stSPARQLrelate))
 123.702  		{
 123.703  			return relate(leftArg,rightArg,thirdArg);
 123.704  		}
 123.705  		// directional
 123.706 -		else if(function.getURI().equals(GeoConstants.left))
 123.707 +		else if(function.getURI().equals(GeoConstants.stSPARQLleft))
 123.708  		{
 123.709  			return left(leftArg,rightArg);
 123.710  		}
 123.711 -		else if(function.getURI().equals(GeoConstants.right))
 123.712 +		else if(function.getURI().equals(GeoConstants.stSPARQLright))
 123.713  		{
 123.714  			return right(leftArg,rightArg);
 123.715  		}
 123.716 -		else if(function.getURI().equals(GeoConstants.above))
 123.717 +		else if(function.getURI().equals(GeoConstants.stSPARQLabove))
 123.718  		{
 123.719  			return above(leftArg,rightArg);
 123.720  		}
 123.721 -		else if(function.getURI().equals(GeoConstants.below))
 123.722 +		else if(function.getURI().equals(GeoConstants.stSPARQLbelow))
 123.723  		{
 123.724  			return below(leftArg,rightArg);
 123.725  		}
 123.726  		// mbb
 123.727 -		else if(function.getURI().equals(GeoConstants.mbbIntersects))
 123.728 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbIntersects))
 123.729  		{
 123.730  			return mbbIntersects(leftArg,rightArg);
 123.731  		}
 123.732 -		else if(function.getURI().equals(GeoConstants.mbbWithin))
 123.733 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbWithin))
 123.734  		{
 123.735  			return mbbWithin(leftArg,rightArg);
 123.736  		}
 123.737 -		else if(function.getURI().equals(GeoConstants.mbbContains))
 123.738 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbContains))
 123.739  		{
 123.740  			return mbbContains(leftArg,rightArg);
 123.741  		}
 123.742 -		else if(function.getURI().equals(GeoConstants.mbbEquals))
 123.743 +		else if(function.getURI().equals(GeoConstants.stSPARQLmbbEquals))
 123.744  		{
 123.745  			return mbbEqualsGeo(leftArg,rightArg);
 123.746  		}
 123.747 @@ -1375,46 +1428,47 @@
 123.748  		{
 123.749  			return relate(leftArg,rightArg,thirdArg);
 123.750  		}
 123.751 -		//Should never reach this place
 123.752 +		
 123.753 +		logger.error("[Strabon.spatialRelationshipPicker] No appropriate SQL expression was generated for extension function {}. This is probably a bug.", function.getURI());
 123.754  		return null;
 123.755  	}
 123.756  
 123.757  
 123.758 -	GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg)
 123.759 +	GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg, GeneralDBSqlExpr thirdArg)
 123.760  	{
 123.761 -		if(function.getURI().equals(GeoConstants.union))
 123.762 +		if(function.getURI().equals(GeoConstants.stSPARQLunion))
 123.763  		{
 123.764  			return geoUnion(leftArg, rightArg);
 123.765  		}
 123.766 -		else if(function.getURI().equals(GeoConstants.buffer))
 123.767 +		else if(function.getURI().equals(GeoConstants.stSPARQLbuffer))
 123.768  		{
 123.769 -			return geoBuffer(leftArg,rightArg);
 123.770 +			return geoBuffer(leftArg, rightArg, thirdArg);
 123.771  		}
 123.772 -		else if(function.getURI().equals(GeoConstants.transform))
 123.773 +		else if(function.getURI().equals(GeoConstants.stSPARQLtransform))
 123.774  		{
 123.775  			return geoTransform(leftArg,rightArg);
 123.776  		}
 123.777 -		else if(function.getURI().equals(GeoConstants.envelope))
 123.778 +		else if(function.getURI().equals(GeoConstants.stSPARQLenvelope))
 123.779  		{
 123.780  			return geoEnvelope(leftArg);
 123.781  		}
 123.782 -		else if(function.getURI().equals(GeoConstants.convexHull))
 123.783 +		else if(function.getURI().equals(GeoConstants.stSPARQLconvexHull))
 123.784  		{
 123.785  			return geoConvexHull(leftArg);
 123.786  		}
 123.787 -		else if(function.getURI().equals(GeoConstants.boundary))
 123.788 +		else if(function.getURI().equals(GeoConstants.stSPARQLboundary))
 123.789  		{
 123.790  			return geoBoundary(leftArg);
 123.791  		}
 123.792 -		else if(function.getURI().equals(GeoConstants.intersection))
 123.793 +		else if(function.getURI().equals(GeoConstants.stSPARQLintersection))
 123.794  		{
 123.795  			return geoIntersection(leftArg, rightArg);
 123.796  		}
 123.797 -		else if(function.getURI().equals(GeoConstants.difference))
 123.798 +		else if(function.getURI().equals(GeoConstants.stSPARQLdifference))
 123.799  		{
 123.800  			return geoDifference(leftArg, rightArg);
 123.801  		}
 123.802 -		else if(function.getURI().equals(GeoConstants.symDifference))
 123.803 +		else if(function.getURI().equals(GeoConstants.stSPARQLsymDifference))
 123.804  		{
 123.805  			return geoSymDifference(leftArg, rightArg);
 123.806  		}
 123.807 @@ -1449,7 +1503,7 @@
 123.808  			return geoBoundary(leftArg);
 123.809  		}
 123.810  
 123.811 -		//Should never reach this place
 123.812 +		logger.error("[Strabon.spatialConstructPicker] No appropriate SQL expression was generated for extension function {}. This is probably a bug.", function.getURI());
 123.813  		return null;
 123.814  	}
 123.815  
 123.816 @@ -1458,7 +1512,6 @@
 123.817  	 * @author George Garbis <ggarbis@di.uoa.gr>
 123.818  	 * 
 123.819  	 */
 123.820 -	
 123.821  	GeneralDBSqlExpr dateTimeMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg)
 123.822  	{
 123.823  		if(function.getURI().equals(GeoConstants.diffDateTime))
 123.824 @@ -1466,60 +1519,60 @@
 123.825  			return diffDateTime(leftArg, rightArg);
 123.826  		}
 123.827  
 123.828 -		//Should never reach this place
 123.829 +		logger.error("[Strabon.dateTimeMetricPicker] No appropriate SQL expression was generated for extension function {}. This is probably a bug.", function.getURI());
 123.830  		return null;
 123.831  	}
 123.832  	
 123.833 -	/***/
 123.834 -	
 123.835  	//TODO more to be added here probably
 123.836 -	GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg)
 123.837 +	GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg, GeneralDBSqlExpr thirdArg)
 123.838  	{
 123.839 -		if(function.getURI().equals(GeoConstants.distance))
 123.840 +		if(function.getURI().equals(GeoConstants.stSPARQLdistance))
 123.841  		{
 123.842 -			return geoDistance(leftArg, rightArg);
 123.843 +			return geoDistance(leftArg, rightArg, thirdArg);
 123.844  		}
 123.845 -		else if(function.getURI().equals(GeoConstants.area))
 123.846 +		else if(function.getURI().equals(GeoConstants.stSPARQLarea))
 123.847  		{
 123.848  			return geoArea(leftArg);
 123.849  		}
 123.850  		//GeoSPARQL's distance must be added at this place
 123.851  
 123.852 -		//Should never reach this place
 123.853 +		logger.error("[Strabon.spatialMetricPicker] No appropriate SQL expression was generated for extension function {}. This is probably a bug.", function.getURI());
 123.854  		return null;
 123.855  	}
 123.856  
 123.857 -	GeneralDBSqlExpr spatialPropertyPicker(Function function,GeneralDBSqlExpr arg)
 123.858 +	GeneralDBSqlExpr spatialPropertyPicker(Function function, GeneralDBSqlExpr arg)
 123.859  	{
 123.860 -		if(function.getURI().equals(GeoConstants.dimension))
 123.861 +		if(function.getURI().equals(GeoConstants.stSPARQLdimension))
 123.862  		{
 123.863  			return dimension(arg);
 123.864  		}
 123.865 -		else if(function.getURI().equals(GeoConstants.geometryType))
 123.866 +		else if(function.getURI().equals(GeoConstants.stSPARQLgeometryType))
 123.867  		{
 123.868  			return geometryType(arg);
 123.869  		}
 123.870 -		else if(function.getURI().equals(GeoConstants.asText))
 123.871 +		else if(function.getURI().equals(GeoConstants.stSPARQLasText))
 123.872  		{
 123.873  			return asText(arg);
 123.874  		}
 123.875 -		else if(function.getURI().equals(GeoConstants.srid))
 123.876 +		else if(function.getURI().equals(GeoConstants.stSPARQLsrid) ||
 123.877 +				function.getURI().equals(GeoConstants.geoSparqlGetSRID))
 123.878  		{
 123.879  			return srid(arg);
 123.880  		}
 123.881 -		else if(function.getURI().equals(GeoConstants.isEmpty))
 123.882 +		else if(function.getURI().equals(GeoConstants.stSPARQLisEmpty))
 123.883  		{
 123.884  			return isEmpty(arg);
 123.885  		}
 123.886 -		else if(function.getURI().equals(GeoConstants.isSimple))
 123.887 +		else if(function.getURI().equals(GeoConstants.stSPARQLisSimple))
 123.888  		{
 123.889  			return isSimple(arg);
 123.890  
 123.891 -		} else if (function.getURI().equals(GeoConstants.asGML)) {
 123.892 +		} else if (function.getURI().equals(GeoConstants.stSPARQLasGML)) {
 123.893  			return asGML(arg);
 123.894  		}
 123.895  
 123.896 -		//Should never reach this place
 123.897 +		logger.error("[Strabon.GeneralDBBooleanExprFactory] No appropriate SQL expression was generated for extension function {}. This is probably a bug.", function.getURI());
 123.898 +		
 123.899  		return null;
 123.900  	}
 123.901