1.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Thu Sep 06 00:43:34 2012 +0300
     1.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Thu Sep 06 00:44:45 2012 +0300
     1.3 @@ -1,360 +1,360 @@
     1.4 -<?xml version="1.0" encoding="UTF-8"?>
     1.5 -<beans  xmlns="http://www.springframework.org/schema/beans"
     1.6 -		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     1.7 -    	xsi:schemaLocation="http://www.springframework.org/schema/beans 
     1.8 -    						http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
     1.9 -		xmlns:jaxws="http://cxf.apache.org/jaxws"
    1.10 -		jaxws:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
    1.11 -
    1.12 -    <bean
    1.13 -        id="strabonBean"
    1.14 -        class="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper"
    1.15 -        destroy-method="destroy">
    1.16 -
    1.17 -        <constructor-arg type="java.lang.String" >
    1.18 -            <!-- Database name -->
    1.19 -            <value>teleios-m18</value>
    1.20 -        </constructor-arg>
    1.21 -
    1.22 -        <constructor-arg type="java.lang.String" >
    1.23 -            <!-- Username -->
    1.24 -            <value>endpoint</value>
    1.25 -        </constructor-arg>
    1.26 -
    1.27 -        <constructor-arg type="java.lang.String" >
    1.28 -            <!-- Password -->
    1.29 -	    <value>endpoint</value>
    1.30 -        </constructor-arg>
    1.31 -
    1.32 -        <constructor-arg type="int" >
    1.33 -            <!-- Port -->
    1.34 -            <value>5432</value>
    1.35 -        </constructor-arg>
    1.36 -
    1.37 -        <constructor-arg type="java.lang.String" >
    1.38 -            <!-- Database server -->
    1.39 -            <value>localhost</value>
    1.40 -        </constructor-arg>
    1.41 -
    1.42 -        <constructor-arg type="boolean" >
    1.43 -            <!-- Check for locks and remove them (in case of a crash) -->
    1.44 -            <value>true</value>
    1.45 -        </constructor-arg>
    1.46 -
    1.47 -        <constructor-arg type="java.lang.String" >
    1.48 -            <!-- Database Backend (either "postgis" or "monetdb") -->
    1.49 -            <value>postgis</value>
    1.50 -        </constructor-arg>
    1.51 -        
    1.52 -         <constructor-arg>
    1.53 -             <list>
    1.54 -	             <list>
    1.55 -	                 <!-- Bean -->
    1.56 -	                <value>Query</value> 
    1.57 -	                <!-- Format -->
    1.58 -	                <value>HTML</value>   
    1.59 -	                <!-- Label -->
    1.60 -	                <value>Query 1: Discover raw data and products</value> 
    1.61 -	                <!-- Statement -->
    1.62 -	                <value><![CDATA[# Discovering raw data and products
    1.63 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
    1.64 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
    1.65 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
    1.66 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
    1.67 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
    1.68 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
    1.69 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
    1.70 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
    1.71 -PREFIX georss: <http://www.georss.org/georss/>
    1.72 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
    1.73 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
    1.74 -PREFIX gn: <http://www.geonames.org/ontology#>
    1.75 -
    1.76 -SELECT ?filename
    1.77 -WHERE {?file rdf:type noa:ShpFile ;
    1.78 -	         noa:hasFilename ?filename ;
    1.79 -	         noa:hasAcquisitionTime ?sensingTime .
    1.80 -	 FILTER( str(?sensingTime) >= "2007-08-26T12:00:00" ) .
    1.81 -	 FILTER( str(?sensingTime) <= "2007-08-26T12:30:00" ) .
    1.82 -	 ?file noa:isDerivedFromSensor ?sensor .
    1.83 -	 FILTER( str(?sensor) = "MSG2" ) .
    1.84 -	 ?file noa:producedFromProcessingChain ?chain .
    1.85 -	 FILTER( str(?chain) = "StaticThresholds" ) . 
    1.86 -}]]></value>
    1.87 -<value>Find all shapefiles derived from sensor MSG2 between [2007-08-26T12:00:00,2007-08-26T12:30:00], using dynamic thresholds.</value>
    1.88 -	            </list>
    1.89 -	            <list>
    1.90 -	                <!-- Bean -->
    1.91 -	                <value>Query</value> 
    1.92 -	                <!-- Format -->
    1.93 -	                <value>KMZMAP</value>
    1.94 -	                <!-- Label -->
    1.95 -	                <value>Query 2: Discover Hotspots</value> 
    1.96 -	                <!-- Statement -->
    1.97 -	                <value><![CDATA[# Get all hotspots 
    1.98 -# - in Pelloponesus 
    1.99 -# - at 2007-08-24
   1.100 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.101 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.102 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.103 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.104 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.105 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.106 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.107 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.108 -PREFIX georss: <http://www.georss.org/georss/>
   1.109 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.110 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.111 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.112 -
   1.113 -SELECT ?h ?hAcqTime ?hConfidence ?hConfirmation ?hProvider ?hSensor ?hSatellite (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
   1.114 -WHERE { ?h 	rdf:type noa:Hotspot;
   1.115 -			noa:hasGeometry ?hGeo;
   1.116 -			noa:hasAcquisitionTime ?hAcqTime;
   1.117 -			noa:hasConfidence ?hConfidence;
   1.118 -			noa:isProducedBy ?hProvider;
   1.119 -			noa:hasConfirmation ?hConfirmation;
   1.120 -			noa:isDerivedFromSensor ?hSensor;
   1.121 -			noa:isDerivedFromSatellite ?hSatellite ;
   1.122 -			noa:producedFromProcessingChain ?hChain .
   1.123 -	FILTER(str(?hChain) = "StaticThresholds").
   1.124 -	FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
   1.125 -	FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
   1.126 -}]]></value>
   1.127 -<value>Find all hotspots in Pelloponesus derived from the dynamic thresholds processing chain at 2007-08-24T14:45:00.  </value>
   1.128 -	            </list>
   1.129 -				<list>
   1.130 -	                <!-- Bean -->
   1.131 -	                 <value>Update</value>
   1.132 -	                <!-- Format -->
   1.133 -	                <value>HTML</value>
   1.134 -	                <!-- Label -->
   1.135 -	                <value>Update A: Invalidate hotspots in sea</value> 
   1.136 -	                <!-- Statement -->
   1.137 -	                <value><![CDATA[# Delete hotspots that lie in sea
   1.138 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.139 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.140 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.141 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.142 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.143 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.144 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.145 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.146 -PREFIX georss: <http://www.georss.org/georss/>
   1.147 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.148 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.149 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.150 -DELETE {?h ?property ?object}
   1.151 -WHERE { ?h 	rdf:type noa:Hotspot;
   1.152 -            noa:hasAcquisitionTime ?hAcqTime;
   1.153 -            noa:producedFromProcessingChain ?hChain;
   1.154 -            noa:hasGeometry ?hGeo;
   1.155 -            ?property ?object.
   1.156 -        FILTER(str(?hChain) = "StaticThresholds").
   1.157 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)).
   1.158 -        FILTER("2007-08-24T14:45:00"^^xsd:dateTime = ?hAcqTime).
   1.159 -        OPTIONAL {
   1.160 -            ?c rdf:type noa:Coastline;
   1.161 -               noa:hasGeometry ?cGeo.
   1.162 -            FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?cGeo)).
   1.163 -            FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
   1.164 -        }
   1.165 -        FILTER(!bound(?c)). 
   1.166 -}]]></value>
   1.167 -<value>Mark as invalid all hotspots produced by the static thresholds processing chain and are acquired at 2007-08-24T14:45:00 which are located in the sea</value>
   1.168 -	            </list>
   1.169 -	            <list>
   1.170 -	                <!-- Bean -->
   1.171 -	                <value>Update</value> 
   1.172 -	                <!-- Format -->
   1.173 -	                <value>HTML</value>
   1.174 -	                <!-- Label -->
   1.175 -	                <value>Update B: Refine hotspots in sea</value>
   1.176 -	                <!-- Statement -->
   1.177 -	                <value><![CDATA[# Refine the geometry of hotspots that partially lie in sea
   1.178 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
   1.179 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
   1.180 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 
   1.181 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
   1.182 -
   1.183 -
   1.184 -INSERT { ?h noa:isDiscarded "1"^^xsd:int . 
   1.185 -	 ?valid rdf:type noa:Hotspot ;
   1.186 -		noa:hasConfidence ?conf ;
   1.187 -	        noa:hasGeometry ?dif ;
   1.188 -		noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 
   1.189 -	        noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
   1.190 -		noa:hasConfirmation noa:unknown ;
   1.191 -	        noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
   1.192 -		noa:isProducedBy noa:noa ;
   1.193 -		noa:isDerivedFromSatellite ?sat .
   1.194 -}
   1.195 -WHERE { 
   1.196 -  SELECT DISTINCT ?h ?hGeo (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf ?sat
   1.197 -  WHERE { 
   1.198 -    ?h rdf:type noa:Hotspot ; 
   1.199 -       noa:hasAcquisitionTime ?hAcqTime ; 
   1.200 -       noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
   1.201 -       noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
   1.202 -       noa:hasGeometry ?hGeo ;
   1.203 -       noa:hasConfidence ?conf ;
   1.204 -       noa:isDerivedFromSatellite ?sat .
   1.205 -    FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) .
   1.206 -    ?c rdf:type noa:Coastline ;
   1.207 -       noa:hasGeometry ?cGeo .
   1.208 -    FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
   1.209 -  }
   1.210 -  GROUP BY ?h ?hGeo ?conf ?sat
   1.211 -  HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
   1.212 -}
   1.213 -]]></value>
   1.214 -	      <value>Refine hotspots acquired at 2007-08-24T14:45:00 removing the part that lies in the sea. </value>
   1.215 -	            </list>
   1.216 -	            <list>
   1.217 -	                <!-- Bean -->
   1.218 -	                <value>Query</value> 
   1.219 -	                <!-- Format -->
   1.220 -	                <value>KMZMAP</value>
   1.221 -	                <!-- Label -->
   1.222 -	                <value>Query 3: Discover coniferous forests</value> 
   1.223 -	                <!-- Statement -->
   1.224 -	                <value><![CDATA[#Get all coniferous forests in Peloponnese
   1.225 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.226 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.227 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.228 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.229 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.230 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.231 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.232 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.233 -PREFIX georss: <http://www.georss.org/georss/>
   1.234 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.235 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.236 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.237 -
   1.238 -SELECT ?a ?aGeo
   1.239 -WHERE{ ?a rdf:type clc:Area;
   1.240 -          clc:hasLandUse ?aLandUse;
   1.241 -          noa:hasGeometry ?aGeo.
   1.242 -       ?aLandUse rdf:type ?aLandUseType.
   1.243 -       FILTER(?aLandUseType = clc:ConiferousForest).
   1.244 -       FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
   1.245 -}]]></value>
   1.246 -<value>Discover all coniferous forests using the clc ontology </value>
   1.247 -	            </list>
   1.248 -	            <list>
   1.249 -	                <!-- Bean -->
   1.250 -	                <value>Query</value> 
   1.251 -	                <!-- Format -->
   1.252 -	                <value>KMZMAP</value>
   1.253 -	                <!-- Label -->
   1.254 -	                <value>Query 4: Discover primary roads</value> 
   1.255 -	                <!-- Statement -->
   1.256 -	                <value><![CDATA[# Get all municipalities of Pelloponnese
   1.257 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.258 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.259 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.260 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.261 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.262 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.263 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.264 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.265 -PREFIX georss: <http://www.georss.org/georss/>
   1.266 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.267 -PREFIX lgdo: <http://linkedgeodata.org/lontology/>
   1.268 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.269 -
   1.270 -SELECT  ?d ?dGeo
   1.271 -WHERE { ?d rdf:type gag:Dhmos; 
   1.272 -           strdf:hasGeometry ?dGeo; 
   1.273 -           rdfs:label ?dLabel. 
   1.274 -           FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?dGeo)). 
   1.275 -}]]></value>
   1.276 -<value>Find all municipalities of Pelloponnese using kallikratis ontology </value>
   1.277 -	            </list>
   1.278 -	            <list>
   1.279 -	                <!-- Bean -->
   1.280 -	                <value>Query</value> 
   1.281 -	                <!-- Format -->
   1.282 -	                <value>KMZMAP</value>
   1.283 -	                <!-- Label -->
   1.284 -	                <value>Query 5: Get all primary roads in Pelloponnese</value> 
   1.285 -	                <!-- Statement -->
   1.286 -	                <value><![CDATA[# Get all primary roads in Pelloponnese
   1.287 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.288 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.289 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.290 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.291 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.292 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.293 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.294 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.295 -PREFIX georss: <http://www.georss.org/georss/>
   1.296 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.297 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.298 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.299 -
   1.300 -SELECT  ?r ?rGeo
   1.301 -WHERE { ?r rdf:type ?rType ;
   1.302 -           noa:hasGeometry ?rGeo .
   1.303 -        FILTER(?rType = lgdo:Primary) .
   1.304 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05,21.027 38.36))"^^strdf:WKT, ?rGeo) ). 
   1.305 -}]]></value>
   1.306 -<value>Get all primary roads in Pelloponnese using the linked geodata ontology </value>
   1.307 -	            </list>
   1.308 -	            <list>
   1.309 -	                <!-- Bean -->
   1.310 -	                <value>Query</value> 
   1.311 -	                <!-- Format -->
   1.312 -	                <value>KMZMAP</value>
   1.313 -	                <!-- Label -->
   1.314 -	                <value>Query 6: Discover hotspots</value> 
   1.315 -	                <!-- Statement -->
   1.316 -	                <value><![CDATA[# Get all hotspots 
   1.317 -# - in Pelloponesus 
   1.318 -# - at 2007-08-24
   1.319 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.320 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.321 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.322 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.323 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.324 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.325 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.326 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.327 -PREFIX georss: <http://www.georss.org/georss/>
   1.328 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.329 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.330 -PREFIX gn: <http://www.geonames.org/ontology#>
   1.331 -
   1.332 -SELECT  ?h ?hAcqTime (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
   1.333 -WHERE { ?h 	rdf:type noa:Hotspot;
   1.334 -            noa:hasGeometry ?hGeo;
   1.335 -            noa:hasAcquisitionTime ?hAcqTime;
   1.336 -            noa:producedFromProcessingChain ?hChain .
   1.337 -        FILTER(str(?hChain) = "StaticThresholds").
   1.338 -        FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
   1.339 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
   1.340 -        ?a rdf:type clc:Area;
   1.341 -           clc:hasLandUse ?aLandUse;
   1.342 -           noa:hasGeometry ?aGeo.
   1.343 -        ?aLandUse rdf:type ?aLandUseType.
   1.344 -        FILTER(?aLandUseType = clc:Forest).
   1.345 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
   1.346 -        FILTER(strdf:overlap(?aGeo, ?hGeo)) . 
   1.347 -}]]></value>
   1.348 -<value>Find all hotspots located in Pelloponnesian forests and acquired at 2007-08-24T14:45:00 using static thresholds processing chain </value>
   1.349 -	            </list>
   1.350 -<!-- 	            <list> -->
   1.351 -<!-- 	                Bean -->
   1.352 -<!-- 	                <value>Query</value>  -->
   1.353 -<!-- 	                Format -->
   1.354 -<!-- 	                <value>KMZMAP</value> -->
   1.355 -<!-- 	                Label -->
   1.356 -<!-- 	                <value></value>  -->
   1.357 -<!-- 	                Statement -->
   1.358 -<!-- 	                <value></value> -->
   1.359 -<!-- 	            </list> -->
   1.360 -            </list>
   1.361 -         </constructor-arg>
   1.362 -    </bean>
   1.363 -</beans>
   1.364 +<?xml version="1.0" encoding="UTF-8"?>
   1.365 +<beans  xmlns="http://www.springframework.org/schema/beans"
   1.366 +		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   1.367 +    	xsi:schemaLocation="http://www.springframework.org/schema/beans 
   1.368 +    						http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
   1.369 +		xmlns:jaxws="http://cxf.apache.org/jaxws"
   1.370 +		jaxws:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
   1.371 +
   1.372 +    <bean
   1.373 +        id="strabonBean"
   1.374 +        class="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper"
   1.375 +        destroy-method="destroy">
   1.376 +
   1.377 +        <constructor-arg type="java.lang.String" >
   1.378 +            <!-- Database name -->
   1.379 +            <value>teleios-m18</value>
   1.380 +        </constructor-arg>
   1.381 +
   1.382 +        <constructor-arg type="java.lang.String" >
   1.383 +            <!-- Username -->
   1.384 +            <value>endpoint</value>
   1.385 +        </constructor-arg>
   1.386 +
   1.387 +        <constructor-arg type="java.lang.String" >
   1.388 +            <!-- Password -->
   1.389 +	    <value>endpoint</value>
   1.390 +        </constructor-arg>
   1.391 +
   1.392 +        <constructor-arg type="int" >
   1.393 +            <!-- Port -->
   1.394 +            <value>5432</value>
   1.395 +        </constructor-arg>
   1.396 +
   1.397 +        <constructor-arg type="java.lang.String" >
   1.398 +            <!-- Database server -->
   1.399 +            <value>localhost</value>
   1.400 +        </constructor-arg>
   1.401 +
   1.402 +        <constructor-arg type="boolean" >
   1.403 +            <!-- Check for locks and remove them (in case of a crash) -->
   1.404 +            <value>true</value>
   1.405 +        </constructor-arg>
   1.406 +
   1.407 +        <constructor-arg type="java.lang.String" >
   1.408 +            <!-- Database Backend (either "postgis" or "monetdb") -->
   1.409 +            <value>postgis</value>
   1.410 +        </constructor-arg>
   1.411 +        
   1.412 +         <constructor-arg>
   1.413 +             <list>
   1.414 +	             <list>
   1.415 +	                 <!-- Bean -->
   1.416 +	                <value>Query</value> 
   1.417 +	                <!-- Format -->
   1.418 +	                <value>HTML</value>   
   1.419 +	                <!-- Label -->
   1.420 +	                <value>Query 1: Discover raw data and products</value> 
   1.421 +	                <!-- Statement -->
   1.422 +	                <value><![CDATA[# Discovering raw data and products
   1.423 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.424 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.425 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.426 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.427 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.428 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.429 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.430 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.431 +PREFIX georss: <http://www.georss.org/georss/>
   1.432 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.433 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.434 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.435 +
   1.436 +SELECT ?filename
   1.437 +WHERE {?file rdf:type noa:ShpFile ;
   1.438 +	         noa:hasFilename ?filename ;
   1.439 +	         noa:hasAcquisitionTime ?sensingTime .
   1.440 +	 FILTER( str(?sensingTime) >= "2007-08-26T12:00:00" ) .
   1.441 +	 FILTER( str(?sensingTime) <= "2007-08-26T12:30:00" ) .
   1.442 +	 ?file noa:isDerivedFromSensor ?sensor .
   1.443 +	 FILTER( str(?sensor) = "MSG2" ) .
   1.444 +	 ?file noa:producedFromProcessingChain ?chain .
   1.445 +	 FILTER( str(?chain) = "StaticThresholds" ) . 
   1.446 +}]]></value>
   1.447 +<value>Find all shapefiles derived from sensor MSG2 between [2007-08-26T12:00:00,2007-08-26T12:30:00], using dynamic thresholds.</value>
   1.448 +	            </list>
   1.449 +	            <list>
   1.450 +	                <!-- Bean -->
   1.451 +	                <value>Query</value> 
   1.452 +	                <!-- Format -->
   1.453 +	                <value>KMZMAP</value>
   1.454 +	                <!-- Label -->
   1.455 +	                <value>Query 2: Discover Hotspots</value> 
   1.456 +	                <!-- Statement -->
   1.457 +	                <value><![CDATA[# Get all hotspots 
   1.458 +# - in Pelloponesus 
   1.459 +# - at 2007-08-24
   1.460 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.461 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.462 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.463 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.464 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.465 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.466 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.467 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.468 +PREFIX georss: <http://www.georss.org/georss/>
   1.469 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.470 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.471 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.472 +
   1.473 +SELECT ?h ?hAcqTime ?hConfidence ?hConfirmation ?hProvider ?hSensor ?hSatellite (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
   1.474 +WHERE { ?h 	rdf:type noa:Hotspot;
   1.475 +			noa:hasGeometry ?hGeo;
   1.476 +			noa:hasAcquisitionTime ?hAcqTime;
   1.477 +			noa:hasConfidence ?hConfidence;
   1.478 +			noa:isProducedBy ?hProvider;
   1.479 +			noa:hasConfirmation ?hConfirmation;
   1.480 +			noa:isDerivedFromSensor ?hSensor;
   1.481 +			noa:isDerivedFromSatellite ?hSatellite ;
   1.482 +			noa:producedFromProcessingChain ?hChain .
   1.483 +	FILTER(str(?hChain) = "StaticThresholds").
   1.484 +	FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
   1.485 +	FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
   1.486 +}]]></value>
   1.487 +<value>Find all hotspots in Pelloponesus derived from the dynamic thresholds processing chain at 2007-08-24T14:45:00.  </value>
   1.488 +	            </list>
   1.489 +				<list>
   1.490 +	                <!-- Bean -->
   1.491 +	                 <value>Update</value>
   1.492 +	                <!-- Format -->
   1.493 +	                <value>HTML</value>
   1.494 +	                <!-- Label -->
   1.495 +	                <value>Update A: Invalidate hotspots in sea</value> 
   1.496 +	                <!-- Statement -->
   1.497 +	                <value><![CDATA[# Delete hotspots that lie in sea
   1.498 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.499 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.500 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.501 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.502 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.503 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.504 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.505 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.506 +PREFIX georss: <http://www.georss.org/georss/>
   1.507 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.508 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.509 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.510 +DELETE {?h ?property ?object}
   1.511 +WHERE { ?h 	rdf:type noa:Hotspot;
   1.512 +            noa:hasAcquisitionTime ?hAcqTime;
   1.513 +            noa:producedFromProcessingChain ?hChain;
   1.514 +            noa:hasGeometry ?hGeo;
   1.515 +            ?property ?object.
   1.516 +        FILTER(str(?hChain) = "StaticThresholds").
   1.517 +        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)).
   1.518 +        FILTER("2007-08-24T14:45:00"^^xsd:dateTime = ?hAcqTime).
   1.519 +        OPTIONAL {
   1.520 +            ?c rdf:type noa:Coastline;
   1.521 +               noa:hasGeometry ?cGeo.
   1.522 +            FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?cGeo)).
   1.523 +            FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
   1.524 +        }
   1.525 +        FILTER(!bound(?c)). 
   1.526 +}]]></value>
   1.527 +<value>Mark as invalid all hotspots produced by the static thresholds processing chain and are acquired at 2007-08-24T14:45:00 which are located in the sea</value>
   1.528 +	            </list>
   1.529 +	            <list>
   1.530 +	                <!-- Bean -->
   1.531 +	                <value>Update</value> 
   1.532 +	                <!-- Format -->
   1.533 +	                <value>HTML</value>
   1.534 +	                <!-- Label -->
   1.535 +	                <value>Update B: Refine hotspots in sea</value>
   1.536 +	                <!-- Statement -->
   1.537 +	                <value><![CDATA[# Refine the geometry of hotspots that partially lie in sea
   1.538 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
   1.539 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
   1.540 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 
   1.541 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
   1.542 +
   1.543 +
   1.544 +INSERT { ?h noa:isDiscarded "1"^^xsd:int . 
   1.545 +	 ?valid rdf:type noa:Hotspot ;
   1.546 +		noa:hasConfidence ?conf ;
   1.547 +	        noa:hasGeometry ?dif ;
   1.548 +		noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 
   1.549 +	        noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
   1.550 +		noa:hasConfirmation noa:unknown ;
   1.551 +	        noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
   1.552 +		noa:isProducedBy noa:noa ;
   1.553 +		noa:isDerivedFromSatellite ?sat .
   1.554 +}
   1.555 +WHERE { 
   1.556 +  SELECT DISTINCT ?h ?hGeo (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf ?sat
   1.557 +  WHERE { 
   1.558 +    ?h rdf:type noa:Hotspot ; 
   1.559 +       noa:hasAcquisitionTime ?hAcqTime ; 
   1.560 +       noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
   1.561 +       noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
   1.562 +       noa:hasGeometry ?hGeo ;
   1.563 +       noa:hasConfidence ?conf ;
   1.564 +       noa:isDerivedFromSatellite ?sat .
   1.565 +    FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) .
   1.566 +    ?c rdf:type noa:Coastline ;
   1.567 +       noa:hasGeometry ?cGeo .
   1.568 +    FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
   1.569 +  }
   1.570 +  GROUP BY ?h ?hGeo ?conf ?sat
   1.571 +  HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
   1.572 +}
   1.573 +]]></value>
   1.574 +	      <value>Refine hotspots acquired at 2007-08-24T14:45:00 removing the part that lies in the sea. </value>
   1.575 +	            </list>
   1.576 +	            <list>
   1.577 +	                <!-- Bean -->
   1.578 +	                <value>Query</value> 
   1.579 +	                <!-- Format -->
   1.580 +	                <value>KMZMAP</value>
   1.581 +	                <!-- Label -->
   1.582 +	                <value>Query 3: Discover coniferous forests</value> 
   1.583 +	                <!-- Statement -->
   1.584 +	                <value><![CDATA[#Get all coniferous forests in Peloponnese
   1.585 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.586 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.587 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.588 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.589 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.590 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.591 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.592 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.593 +PREFIX georss: <http://www.georss.org/georss/>
   1.594 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.595 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.596 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.597 +
   1.598 +SELECT ?a ?aGeo
   1.599 +WHERE{ ?a rdf:type clc:Area;
   1.600 +          clc:hasLandUse ?aLandUse;
   1.601 +          noa:hasGeometry ?aGeo.
   1.602 +       ?aLandUse rdf:type ?aLandUseType.
   1.603 +       FILTER(?aLandUseType = clc:ConiferousForest).
   1.604 +       FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
   1.605 +}]]></value>
   1.606 +<value>Discover all coniferous forests using the clc ontology </value>
   1.607 +	            </list>
   1.608 +	            <list>
   1.609 +	                <!-- Bean -->
   1.610 +	                <value>Query</value> 
   1.611 +	                <!-- Format -->
   1.612 +	                <value>KMZMAP</value>
   1.613 +	                <!-- Label -->
   1.614 +	                <value>Query 4: Discover primary roads</value> 
   1.615 +	                <!-- Statement -->
   1.616 +	                <value><![CDATA[# Get all municipalities of Pelloponnese
   1.617 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.618 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.619 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.620 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.621 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.622 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.623 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.624 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.625 +PREFIX georss: <http://www.georss.org/georss/>
   1.626 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.627 +PREFIX lgdo: <http://linkedgeodata.org/lontology/>
   1.628 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.629 +
   1.630 +SELECT  ?d ?dGeo
   1.631 +WHERE { ?d rdf:type gag:Dhmos; 
   1.632 +           strdf:hasGeometry ?dGeo; 
   1.633 +           rdfs:label ?dLabel. 
   1.634 +           FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?dGeo)). 
   1.635 +}]]></value>
   1.636 +<value>Find all municipalities of Pelloponnese using kallikratis ontology </value>
   1.637 +	            </list>
   1.638 +	            <list>
   1.639 +	                <!-- Bean -->
   1.640 +	                <value>Query</value> 
   1.641 +	                <!-- Format -->
   1.642 +	                <value>KMZMAP</value>
   1.643 +	                <!-- Label -->
   1.644 +	                <value>Query 5: Get all primary roads in Pelloponnese</value> 
   1.645 +	                <!-- Statement -->
   1.646 +	                <value><![CDATA[# Get all primary roads in Pelloponnese
   1.647 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.648 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.649 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.650 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.651 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.652 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.653 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.654 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.655 +PREFIX georss: <http://www.georss.org/georss/>
   1.656 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.657 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.658 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.659 +
   1.660 +SELECT  ?r ?rGeo
   1.661 +WHERE { ?r rdf:type ?rType ;
   1.662 +           noa:hasGeometry ?rGeo .
   1.663 +        FILTER(?rType = lgdo:Primary) .
   1.664 +        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05,21.027 38.36))"^^strdf:WKT, ?rGeo) ). 
   1.665 +}]]></value>
   1.666 +<value>Get all primary roads in Pelloponnese using the linked geodata ontology </value>
   1.667 +	            </list>
   1.668 +	            <list>
   1.669 +	                <!-- Bean -->
   1.670 +	                <value>Query</value> 
   1.671 +	                <!-- Format -->
   1.672 +	                <value>KMZMAP</value>
   1.673 +	                <!-- Label -->
   1.674 +	                <value>Query 6: Discover hotspots</value> 
   1.675 +	                <!-- Statement -->
   1.676 +	                <value><![CDATA[# Get all hotspots 
   1.677 +# - in Pelloponesus 
   1.678 +# - at 2007-08-24
   1.679 +PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.680 +PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
   1.681 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   1.682 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   1.683 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   1.684 +PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
   1.685 +PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
   1.686 +PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
   1.687 +PREFIX georss: <http://www.georss.org/georss/>
   1.688 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   1.689 +PREFIX lgdo: <http://linkedgeodata.org/ontology/>
   1.690 +PREFIX gn: <http://www.geonames.org/ontology#>
   1.691 +
   1.692 +SELECT  ?h ?hAcqTime (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
   1.693 +WHERE { ?h 	rdf:type noa:Hotspot;
   1.694 +            noa:hasGeometry ?hGeo;
   1.695 +            noa:hasAcquisitionTime ?hAcqTime;
   1.696 +            noa:producedFromProcessingChain ?hChain .
   1.697 +        FILTER(str(?hChain) = "StaticThresholds").
   1.698 +        FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
   1.699 +        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
   1.700 +        ?a rdf:type clc:Area;
   1.701 +           clc:hasLandUse ?aLandUse;
   1.702 +           noa:hasGeometry ?aGeo.
   1.703 +        ?aLandUse rdf:type ?aLandUseType.
   1.704 +        FILTER(?aLandUseType = clc:Forest).
   1.705 +        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
   1.706 +        FILTER(strdf:overlap(?aGeo, ?hGeo)) . 
   1.707 +}]]></value>
   1.708 +<value>Find all hotspots located in Pelloponnesian forests and acquired at 2007-08-24T14:45:00 using static thresholds processing chain </value>
   1.709 +	            </list>
   1.710 +<!-- 	            <list> -->
   1.711 +<!-- 	                Bean -->
   1.712 +<!-- 	                <value>Query</value>  -->
   1.713 +<!-- 	                Format -->
   1.714 +<!-- 	                <value>KMZMAP</value> -->
   1.715 +<!-- 	                Label -->
   1.716 +<!-- 	                <value></value>  -->
   1.717 +<!-- 	                Statement -->
   1.718 +<!-- 	                <value></value> -->
   1.719 +<!-- 	            </list> -->
   1.720 +            </list>
   1.721 +         </constructor-arg>
   1.722 +    </bean>
   1.723 +</beans>

     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Thu Sep 06 00:43:34 2012 +0300
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java	Thu Sep 06 00:44:45 2012 +0300
     2.3 @@ -1,38 +1,38 @@
     2.4 -/*
     2.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     2.6 - *
     2.7 - * Licensed under the Aduna BSD-style license.
     2.8 - */
     2.9 -package org.openrdf.query.algebra.evaluation.function.link;
    2.10 -
    2.11 -import org.openrdf.model.Value;
    2.12 -import org.openrdf.model.ValueFactory;
    2.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    2.14 -import org.openrdf.query.algebra.evaluation.function.Function;
    2.15 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    2.16 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    2.17 -
    2.18 -/**
    2.19 - * 
    2.20 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    2.21 - */
    2.22 -public class SimilarTermFunc implements Function {
    2.23 -	
    2.24 -	protected static String name = "similarTerm";
    2.25 -	
    2.26 -	@Override
    2.27 -	public String getURI() {
    2.28 -		return GeoConstants.stRDF+name;
    2.29 -	}
    2.30 -
    2.31 -    public Value evaluate(ValueFactory valueFactory, Value... args)
    2.32 -            throws ValueExprEvaluationException {
    2.33 -        if (args.length != 2) {
    2.34 -            throw new ValueExprEvaluationException("strdf:" + name
    2.35 -                    + " requires exactly 2 arguments, got " + args.length);
    2.36 -        }
    2.37 -
    2.38 -        return valueFactory.createLiteral(true);
    2.39 -    }
    2.40 -
    2.41 -}
    2.42 +/*
    2.43 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    2.44 + *
    2.45 + * Licensed under the Aduna BSD-style license.
    2.46 + */
    2.47 +package org.openrdf.query.algebra.evaluation.function.link;
    2.48 +
    2.49 +import org.openrdf.model.Value;
    2.50 +import org.openrdf.model.ValueFactory;
    2.51 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    2.52 +import org.openrdf.query.algebra.evaluation.function.Function;
    2.53 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    2.54 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    2.55 +
    2.56 +/**
    2.57 + * 
    2.58 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    2.59 + */
    2.60 +public class SimilarTermFunc implements Function {
    2.61 +	
    2.62 +	protected static String name = "similarTerm";
    2.63 +	
    2.64 +	@Override
    2.65 +	public String getURI() {
    2.66 +		return GeoConstants.stRDF+name;
    2.67 +	}
    2.68 +
    2.69 +    public Value evaluate(ValueFactory valueFactory, Value... args)
    2.70 +            throws ValueExprEvaluationException {
    2.71 +        if (args.length != 2) {
    2.72 +            throw new ValueExprEvaluationException("strdf:" + name
    2.73 +                    + " requires exactly 2 arguments, got " + args.length);
    2.74 +        }
    2.75 +
    2.76 +        return valueFactory.createLiteral(true);
    2.77 +    }
    2.78 +
    2.79 +}

     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Thu Sep 06 00:43:34 2012 +0300
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Thu Sep 06 00:44:45 2012 +0300
     3.3 @@ -1,32 +1,32 @@
     3.4 -/*
     3.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     3.6 - *
     3.7 - * Licensed under the Aduna BSD-style license.
     3.8 - */
     3.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    3.10 -
    3.11 -import org.openrdf.model.Value;
    3.12 -import org.openrdf.model.ValueFactory;
    3.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    3.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    3.15 -
    3.16 -/**
    3.17 - * This class represents a spatial function like the one defined in its superclass 
    3.18 - * {@link SpatialConstructFunc} class for the case of stSPARQL.
    3.19 - * 
    3.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    3.21 - * 
    3.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    3.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    3.24 - */
    3.25 -public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc {
    3.26 -
    3.27 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    3.28 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    3.29 -	throws ValueExprEvaluationException {
    3.30 -		return null;
    3.31 -	}
    3.32 -
    3.33 -	// charnik: made the method abstract
    3.34 -	public abstract String getURI();
    3.35 -}
    3.36 +/*
    3.37 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    3.38 + *
    3.39 + * Licensed under the Aduna BSD-style license.
    3.40 + */
    3.41 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    3.42 +
    3.43 +import org.openrdf.model.Value;
    3.44 +import org.openrdf.model.ValueFactory;
    3.45 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    3.46 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    3.47 +
    3.48 +/**
    3.49 + * This class represents a spatial function like the one defined in its superclass 
    3.50 + * {@link SpatialConstructFunc} class for the case of stSPARQL.
    3.51 + * 
    3.52 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    3.53 + * 
    3.54 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    3.55 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    3.56 + */
    3.57 +public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc {
    3.58 +
    3.59 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    3.60 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    3.61 +	throws ValueExprEvaluationException {
    3.62 +		return null;
    3.63 +	}
    3.64 +
    3.65 +	// charnik: made the method abstract
    3.66 +	public abstract String getURI();
    3.67 +}

     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Thu Sep 06 00:43:34 2012 +0300
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Thu Sep 06 00:44:45 2012 +0300
     4.3 @@ -1,32 +1,32 @@
     4.4 -/*
     4.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     4.6 - *
     4.7 - * Licensed under the Aduna BSD-style license.
     4.8 - */
     4.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    4.10 -
    4.11 -import org.openrdf.model.Value;
    4.12 -import org.openrdf.model.ValueFactory;
    4.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    4.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    4.15 -
    4.16 -/**
    4.17 - * This class represents a spatial function like the one defined in its superclass 
    4.18 - * {@link SpatialConstructFunc} class for the case of stSPARQL.
    4.19 - * 
    4.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    4.21 - * 
    4.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    4.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    4.24 - */
    4.25 -public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc {
    4.26 -
    4.27 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    4.28 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    4.29 -	throws ValueExprEvaluationException {
    4.30 -		return null;
    4.31 -	}
    4.32 -
    4.33 -	// charnik: made the method abstract
    4.34 -	public abstract String getURI();
    4.35 -}
    4.36 +/*
    4.37 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    4.38 + *
    4.39 + * Licensed under the Aduna BSD-style license.
    4.40 + */
    4.41 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    4.42 +
    4.43 +import org.openrdf.model.Value;
    4.44 +import org.openrdf.model.ValueFactory;
    4.45 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    4.46 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    4.47 +
    4.48 +/**
    4.49 + * This class represents a spatial function like the one defined in its superclass 
    4.50 + * {@link SpatialConstructFunc} class for the case of stSPARQL.
    4.51 + * 
    4.52 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological}
    4.53 + * 
    4.54 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    4.55 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    4.56 + */
    4.57 +public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc {
    4.58 +
    4.59 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    4.60 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    4.61 +	throws ValueExprEvaluationException {
    4.62 +		return null;
    4.63 +	}
    4.64 +
    4.65 +	// charnik: made the method abstract
    4.66 +	public abstract String getURI();
    4.67 +}

     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Thu Sep 06 00:43:34 2012 +0300
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Thu Sep 06 00:44:45 2012 +0300
     5.3 @@ -1,21 +1,21 @@
     5.4 -/*
     5.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     5.6 - *
     5.7 - * Licensed under the Aduna BSD-style license.
     5.8 - */
     5.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    5.10 -
    5.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    5.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    5.13 -
    5.14 -/**
    5.15 - * 
    5.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    5.17 - */
    5.18 -public class GeoSparqlRelateFunc extends GeoSparqlRelation {
    5.19 -
    5.20 -	@Override
    5.21 -	public String getURI() {
    5.22 -		return GeoConstants.geoSparqlRelate;
    5.23 -	}
    5.24 -}
    5.25 +/*
    5.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    5.27 + *
    5.28 + * Licensed under the Aduna BSD-style license.
    5.29 + */
    5.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    5.31 +
    5.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    5.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    5.34 +
    5.35 +/**
    5.36 + * 
    5.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    5.38 + */
    5.39 +public class GeoSparqlRelateFunc extends GeoSparqlRelation {
    5.40 +
    5.41 +	@Override
    5.42 +	public String getURI() {
    5.43 +		return GeoConstants.geoSparqlRelate;
    5.44 +	}
    5.45 +}

     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Thu Sep 06 00:43:34 2012 +0300
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Thu Sep 06 00:44:45 2012 +0300
     6.3 @@ -1,33 +1,33 @@
     6.4 -/*
     6.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     6.6 - *
     6.7 - * Licensed under the Aduna BSD-style license.
     6.8 - */
     6.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    6.10 -
    6.11 -import org.openrdf.model.Value;
    6.12 -import org.openrdf.model.ValueFactory;
    6.13 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    6.14 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    6.15 -
    6.16 -/**
    6.17 - * This class represents a spatial function like the one defined in its superclass 
    6.18 - * {@link SpatialRelationshipFunc} class for the case of stSPARQL.
    6.19 - * 
    6.20 - * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer}
    6.21 - * 
    6.22 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    6.23 - * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    6.24 - */
    6.25 -public abstract class GeoSparqlRelation extends SpatialRelationshipFunc {
    6.26 -
    6.27 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    6.28 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    6.29 -	throws ValueExprEvaluationException {
    6.30 -
    6.31 -		return null;
    6.32 -	}
    6.33 -
    6.34 -	// charnik: made this method (and hence the class) abstract
    6.35 -	public abstract String getURI();
    6.36 -}
    6.37 +/*
    6.38 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    6.39 + *
    6.40 + * Licensed under the Aduna BSD-style license.
    6.41 + */
    6.42 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    6.43 +
    6.44 +import org.openrdf.model.Value;
    6.45 +import org.openrdf.model.ValueFactory;
    6.46 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    6.47 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    6.48 +
    6.49 +/**
    6.50 + * This class represents a spatial function like the one defined in its superclass 
    6.51 + * {@link SpatialRelationshipFunc} class for the case of stSPARQL.
    6.52 + * 
    6.53 + * @see package {@link org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer}
    6.54 + * 
    6.55 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    6.56 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    6.57 + */
    6.58 +public abstract class GeoSparqlRelation extends SpatialRelationshipFunc {
    6.59 +
    6.60 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    6.61 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    6.62 +	throws ValueExprEvaluationException {
    6.63 +
    6.64 +		return null;
    6.65 +	}
    6.66 +
    6.67 +	// charnik: made this method (and hence the class) abstract
    6.68 +	public abstract String getURI();
    6.69 +}

     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Thu Sep 06 00:43:34 2012 +0300
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Thu Sep 06 00:44:45 2012 +0300
     7.3 @@ -1,21 +1,21 @@
     7.4 -/*
     7.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     7.6 - *
     7.7 - * Licensed under the Aduna BSD-style license.
     7.8 - */
     7.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    7.10 -
    7.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    7.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    7.13 -
    7.14 -/**
    7.15 - * 
    7.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
    7.17 - */
    7.18 -public class EgenhoferContainsFunc extends GeoSparqlRelation {
    7.19 -
    7.20 -	@Override
    7.21 -	public String getURI() {
    7.22 -		return GeoConstants.ehContains;
    7.23 -	}
    7.24 -}
    7.25 +/*
    7.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    7.27 + *
    7.28 + * Licensed under the Aduna BSD-style license.
    7.29 + */
    7.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    7.31 +
    7.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    7.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    7.34 +
    7.35 +/**
    7.36 + * 
    7.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    7.38 + */
    7.39 +public class EgenhoferContainsFunc extends GeoSparqlRelation {
    7.40 +
    7.41 +	@Override
    7.42 +	public String getURI() {
    7.43 +		return GeoConstants.ehContains;
    7.44 +	}
    7.45 +}

     8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Thu Sep 06 00:43:34 2012 +0300
     8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Thu Sep 06 00:44:45 2012 +0300
     8.3 @@ -1,19 +1,19 @@
     8.4 -/*
     8.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     8.6 - *
     8.7 - * Licensed under the Aduna BSD-style license.
     8.8 - */
     8.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    8.10 -
    8.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    8.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    8.13 -
    8.14 -
    8.15 -public class EgenhoferCoveredByFunc extends GeoSparqlRelation {
    8.16 -
    8.17 -	@Override
    8.18 -	public String getURI() {
    8.19 -		return GeoConstants.ehCoveredBy;
    8.20 -		}
    8.21 -
    8.22 -}
    8.23 +/*
    8.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    8.25 + *
    8.26 + * Licensed under the Aduna BSD-style license.
    8.27 + */
    8.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    8.29 +
    8.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    8.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    8.32 +
    8.33 +
    8.34 +public class EgenhoferCoveredByFunc extends GeoSparqlRelation {
    8.35 +
    8.36 +	@Override
    8.37 +	public String getURI() {
    8.38 +		return GeoConstants.ehCoveredBy;
    8.39 +		}
    8.40 +
    8.41 +}

     9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Thu Sep 06 00:43:34 2012 +0300
     9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Thu Sep 06 00:44:45 2012 +0300
     9.3 @@ -1,19 +1,19 @@
     9.4 -/*
     9.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     9.6 - *
     9.7 - * Licensed under the Aduna BSD-style license.
     9.8 - */
     9.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    9.10 -
    9.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    9.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    9.13 -
    9.14 -
    9.15 -public class EgenhoferCoversFunc extends GeoSparqlRelation {
    9.16 -
    9.17 -	@Override
    9.18 -	public String getURI() {
    9.19 -		return GeoConstants.ehCovers;
    9.20 -		}
    9.21 -
    9.22 -}
    9.23 +/*
    9.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    9.25 + *
    9.26 + * Licensed under the Aduna BSD-style license.
    9.27 + */
    9.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    9.29 +
    9.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
    9.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    9.32 +
    9.33 +
    9.34 +public class EgenhoferCoversFunc extends GeoSparqlRelation {
    9.35 +
    9.36 +	@Override
    9.37 +	public String getURI() {
    9.38 +		return GeoConstants.ehCovers;
    9.39 +		}
    9.40 +
    9.41 +}

    10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Thu Sep 06 00:43:34 2012 +0300
    10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Thu Sep 06 00:44:45 2012 +0300
    10.3 @@ -1,19 +1,19 @@
    10.4 -/*
    10.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    10.6 - *
    10.7 - * Licensed under the Aduna BSD-style license.
    10.8 - */
    10.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   10.10 -
   10.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   10.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   10.13 -
   10.14 -
   10.15 -public class EgenhoferDisjointFunc extends GeoSparqlRelation {
   10.16 -
   10.17 -	@Override
   10.18 -	public String getURI() {
   10.19 -		return GeoConstants.ehDisjoint;
   10.20 -		}
   10.21 -
   10.22 -}
   10.23 +/*
   10.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   10.25 + *
   10.26 + * Licensed under the Aduna BSD-style license.
   10.27 + */
   10.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   10.29 +
   10.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   10.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   10.32 +
   10.33 +
   10.34 +public class EgenhoferDisjointFunc extends GeoSparqlRelation {
   10.35 +
   10.36 +	@Override
   10.37 +	public String getURI() {
   10.38 +		return GeoConstants.ehDisjoint;
   10.39 +		}
   10.40 +
   10.41 +}

    11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    11.3 @@ -1,19 +1,19 @@
    11.4 -/*
    11.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    11.6 - *
    11.7 - * Licensed under the Aduna BSD-style license.
    11.8 - */
    11.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   11.10 -
   11.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   11.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   11.13 -
   11.14 -
   11.15 -public class EgenhoferEqualsFunc extends GeoSparqlRelation {
   11.16 -
   11.17 -	@Override
   11.18 -	public String getURI() {
   11.19 -		return GeoConstants.ehEquals;
   11.20 -		}
   11.21 -
   11.22 -}
   11.23 +/*
   11.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   11.25 + *
   11.26 + * Licensed under the Aduna BSD-style license.
   11.27 + */
   11.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   11.29 +
   11.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   11.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   11.32 +
   11.33 +
   11.34 +public class EgenhoferEqualsFunc extends GeoSparqlRelation {
   11.35 +
   11.36 +	@Override
   11.37 +	public String getURI() {
   11.38 +		return GeoConstants.ehEquals;
   11.39 +		}
   11.40 +
   11.41 +}

    12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Thu Sep 06 00:43:34 2012 +0300
    12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Thu Sep 06 00:44:45 2012 +0300
    12.3 @@ -1,19 +1,19 @@
    12.4 -/*
    12.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    12.6 - *
    12.7 - * Licensed under the Aduna BSD-style license.
    12.8 - */
    12.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   12.10 -
   12.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   12.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   12.13 -
   12.14 -
   12.15 -public class EgenhoferInsideFunc extends GeoSparqlRelation {
   12.16 -
   12.17 -	@Override
   12.18 -	public String getURI() {
   12.19 -		return GeoConstants.ehInside;
   12.20 -		}
   12.21 -
   12.22 -}
   12.23 +/*
   12.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   12.25 + *
   12.26 + * Licensed under the Aduna BSD-style license.
   12.27 + */
   12.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   12.29 +
   12.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   12.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   12.32 +
   12.33 +
   12.34 +public class EgenhoferInsideFunc extends GeoSparqlRelation {
   12.35 +
   12.36 +	@Override
   12.37 +	public String getURI() {
   12.38 +		return GeoConstants.ehInside;
   12.39 +		}
   12.40 +
   12.41 +}

    13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Thu Sep 06 00:43:34 2012 +0300
    13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Thu Sep 06 00:44:45 2012 +0300
    13.3 @@ -1,19 +1,19 @@
    13.4 -/*
    13.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    13.6 - *
    13.7 - * Licensed under the Aduna BSD-style license.
    13.8 - */
    13.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   13.10 -
   13.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   13.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   13.13 -
   13.14 -
   13.15 -public class EgenhoferMeetFunc extends GeoSparqlRelation {
   13.16 -
   13.17 -	@Override
   13.18 -	public String getURI() {
   13.19 -		return GeoConstants.ehMeet;
   13.20 -		}
   13.21 -
   13.22 -}
   13.23 +/*
   13.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   13.25 + *
   13.26 + * Licensed under the Aduna BSD-style license.
   13.27 + */
   13.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   13.29 +
   13.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   13.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   13.32 +
   13.33 +
   13.34 +public class EgenhoferMeetFunc extends GeoSparqlRelation {
   13.35 +
   13.36 +	@Override
   13.37 +	public String getURI() {
   13.38 +		return GeoConstants.ehMeet;
   13.39 +		}
   13.40 +
   13.41 +}

    14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Thu Sep 06 00:43:34 2012 +0300
    14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Thu Sep 06 00:44:45 2012 +0300
    14.3 @@ -1,19 +1,19 @@
    14.4 -/*
    14.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    14.6 - *
    14.7 - * Licensed under the Aduna BSD-style license.
    14.8 - */
    14.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   14.10 -
   14.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   14.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   14.13 -
   14.14 -
   14.15 -public class EgenhoferOverlapFunc extends GeoSparqlRelation {
   14.16 -
   14.17 -	@Override
   14.18 -	public String getURI() {
   14.19 -		return GeoConstants.ehOverlap;
   14.20 -		}
   14.21 -
   14.22 -}
   14.23 +/*
   14.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   14.25 + *
   14.26 + * Licensed under the Aduna BSD-style license.
   14.27 + */
   14.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   14.29 +
   14.30 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   14.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   14.32 +
   14.33 +
   14.34 +public class EgenhoferOverlapFunc extends GeoSparqlRelation {
   14.35 +
   14.36 +	@Override
   14.37 +	public String getURI() {
   14.38 +		return GeoConstants.ehOverlap;
   14.39 +		}
   14.40 +
   14.41 +}

    15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Thu Sep 06 00:43:34 2012 +0300
    15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Thu Sep 06 00:44:45 2012 +0300
    15.3 @@ -1,21 +1,21 @@
    15.4 -/*
    15.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    15.6 - *
    15.7 - * Licensed under the Aduna BSD-style license.
    15.8 - */
    15.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   15.10 -
   15.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   15.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   15.13 - 
   15.14 -/**
   15.15 - * 
   15.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   15.17 - */
   15.18 -public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct {
   15.19 -
   15.20 -	@Override
   15.21 -	public String getURI() {
   15.22 -		return GeoConstants.geoSparqlBoundary;
   15.23 -	}
   15.24 -}
   15.25 +/*
   15.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   15.27 + *
   15.28 + * Licensed under the Aduna BSD-style license.
   15.29 + */
   15.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   15.31 +
   15.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   15.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   15.34 + 
   15.35 +/**
   15.36 + * 
   15.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   15.38 + */
   15.39 +public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct {
   15.40 +
   15.41 +	@Override
   15.42 +	public String getURI() {
   15.43 +		return GeoConstants.geoSparqlBoundary;
   15.44 +	}
   15.45 +}

    16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Thu Sep 06 00:43:34 2012 +0300
    16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Thu Sep 06 00:44:45 2012 +0300
    16.3 @@ -1,21 +1,21 @@
    16.4 -/*
    16.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    16.6 - *
    16.7 - * Licensed under the Aduna BSD-style license.
    16.8 - */
    16.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   16.10 -
   16.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   16.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   16.13 - 
   16.14 -/**
   16.15 - * 
   16.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   16.17 - */
   16.18 -public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct {
   16.19 -
   16.20 -	@Override
   16.21 -	public String getURI() {
   16.22 -		return GeoConstants.geoSparqlBuffer;
   16.23 -	}
   16.24 -}
   16.25 +/*
   16.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   16.27 + *
   16.28 + * Licensed under the Aduna BSD-style license.
   16.29 + */
   16.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   16.31 +
   16.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   16.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   16.34 + 
   16.35 +/**
   16.36 + * 
   16.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   16.38 + */
   16.39 +public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct {
   16.40 +
   16.41 +	@Override
   16.42 +	public String getURI() {
   16.43 +		return GeoConstants.geoSparqlBuffer;
   16.44 +	}
   16.45 +}

    17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Thu Sep 06 00:43:34 2012 +0300
    17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Thu Sep 06 00:44:45 2012 +0300
    17.3 @@ -1,21 +1,21 @@
    17.4 -/*
    17.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    17.6 - *
    17.7 - * Licensed under the Aduna BSD-style license.
    17.8 - */
    17.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   17.10 -
   17.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   17.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   17.13 - 
   17.14 -/**
   17.15 - * 
   17.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   17.17 - */
   17.18 -public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct {
   17.19 -
   17.20 -	@Override
   17.21 -	public String getURI() {
   17.22 -		return GeoConstants.geoSparqlConvexHull;
   17.23 -	}
   17.24 -}
   17.25 +/*
   17.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   17.27 + *
   17.28 + * Licensed under the Aduna BSD-style license.
   17.29 + */
   17.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   17.31 +
   17.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   17.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   17.34 + 
   17.35 +/**
   17.36 + * 
   17.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   17.38 + */
   17.39 +public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct {
   17.40 +
   17.41 +	@Override
   17.42 +	public String getURI() {
   17.43 +		return GeoConstants.geoSparqlConvexHull;
   17.44 +	}
   17.45 +}

    18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Thu Sep 06 00:43:34 2012 +0300
    18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Thu Sep 06 00:44:45 2012 +0300
    18.3 @@ -1,21 +1,21 @@
    18.4 -/*
    18.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    18.6 - *
    18.7 - * Licensed under the Aduna BSD-style license.
    18.8 - */
    18.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   18.10 -
   18.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   18.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   18.13 -
   18.14 -/**
   18.15 - * 
   18.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   18.17 - */
   18.18 -public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric {
   18.19 -
   18.20 -	@Override
   18.21 -	public String getURI() {
   18.22 -		return GeoConstants.geoSparqlDistance;
   18.23 -	}
   18.24 -}
   18.25 +/*
   18.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   18.27 + *
   18.28 + * Licensed under the Aduna BSD-style license.
   18.29 + */
   18.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   18.31 +
   18.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   18.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   18.34 +
   18.35 +/**
   18.36 + * 
   18.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   18.38 + */
   18.39 +public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric {
   18.40 +
   18.41 +	@Override
   18.42 +	public String getURI() {
   18.43 +		return GeoConstants.geoSparqlDistance;
   18.44 +	}
   18.45 +}

    19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Thu Sep 06 00:43:34 2012 +0300
    19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Thu Sep 06 00:44:45 2012 +0300
    19.3 @@ -1,21 +1,21 @@
    19.4 -/*
    19.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    19.6 - *
    19.7 - * Licensed under the Aduna BSD-style license.
    19.8 - */
    19.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   19.10 -
   19.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   19.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   19.13 - 
   19.14 -/**
   19.15 - * 
   19.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   19.17 - */
   19.18 -public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct {
   19.19 -
   19.20 -	@Override
   19.21 -	public String getURI() {
   19.22 -		return GeoConstants.geoSparqlEnvelope;
   19.23 -	}
   19.24 -}
   19.25 +/*
   19.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   19.27 + *
   19.28 + * Licensed under the Aduna BSD-style license.
   19.29 + */
   19.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   19.31 +
   19.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   19.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   19.34 + 
   19.35 +/**
   19.36 + * 
   19.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   19.38 + */
   19.39 +public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct {
   19.40 +
   19.41 +	@Override
   19.42 +	public String getURI() {
   19.43 +		return GeoConstants.geoSparqlEnvelope;
   19.44 +	}
   19.45 +}

    20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Thu Sep 06 00:43:34 2012 +0300
    20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Thu Sep 06 00:44:45 2012 +0300
    20.3 @@ -1,21 +1,21 @@
    20.4 -/*
    20.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    20.6 - *
    20.7 - * Licensed under the Aduna BSD-style license.
    20.8 - */
    20.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   20.10 -
   20.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   20.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   20.13 -
   20.14 -/**
   20.15 - * 
   20.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   20.17 - */
   20.18 -public class RCC8DisconnectedFunc extends GeoSparqlRelation {
   20.19 -
   20.20 -	@Override
   20.21 -	public String getURI() {
   20.22 -		return GeoConstants.rccDisconnected;
   20.23 -	}
   20.24 -}
   20.25 +/*
   20.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   20.27 + *
   20.28 + * Licensed under the Aduna BSD-style license.
   20.29 + */
   20.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   20.31 +
   20.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   20.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   20.34 +
   20.35 +/**
   20.36 + * 
   20.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   20.38 + */
   20.39 +public class RCC8DisconnectedFunc extends GeoSparqlRelation {
   20.40 +
   20.41 +	@Override
   20.42 +	public String getURI() {
   20.43 +		return GeoConstants.rccDisconnected;
   20.44 +	}
   20.45 +}

    21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    21.3 @@ -1,21 +1,21 @@
    21.4 -/*
    21.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    21.6 - *
    21.7 - * Licensed under the Aduna BSD-style license.
    21.8 - */
    21.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   21.10 -
   21.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   21.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   21.13 -
   21.14 -/**
   21.15 - * 
   21.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   21.17 - */
   21.18 -public class RCC8EqualsFunc extends GeoSparqlRelation {
   21.19 -
   21.20 -	@Override
   21.21 -	public String getURI() {
   21.22 -		return GeoConstants.rccEquals;
   21.23 -	}
   21.24 -}
   21.25 +/*
   21.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   21.27 + *
   21.28 + * Licensed under the Aduna BSD-style license.
   21.29 + */
   21.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   21.31 +
   21.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   21.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   21.34 +
   21.35 +/**
   21.36 + * 
   21.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   21.38 + */
   21.39 +public class RCC8EqualsFunc extends GeoSparqlRelation {
   21.40 +
   21.41 +	@Override
   21.42 +	public String getURI() {
   21.43 +		return GeoConstants.rccEquals;
   21.44 +	}
   21.45 +}

    22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Thu Sep 06 00:43:34 2012 +0300
    22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Thu Sep 06 00:44:45 2012 +0300
    22.3 @@ -1,21 +1,21 @@
    22.4 -/*
    22.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    22.6 - *
    22.7 - * Licensed under the Aduna BSD-style license.
    22.8 - */
    22.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   22.10 -
   22.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   22.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   22.13 -
   22.14 -/**
   22.15 - * 
   22.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   22.17 - */
   22.18 -public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation {
   22.19 -
   22.20 -	@Override
   22.21 -	public String getURI() {
   22.22 -		return GeoConstants.rccExternallyConnected;
   22.23 -	}
   22.24 -}
   22.25 +/*
   22.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   22.27 + *
   22.28 + * Licensed under the Aduna BSD-style license.
   22.29 + */
   22.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   22.31 +
   22.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   22.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   22.34 +
   22.35 +/**
   22.36 + * 
   22.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   22.38 + */
   22.39 +public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation {
   22.40 +
   22.41 +	@Override
   22.42 +	public String getURI() {
   22.43 +		return GeoConstants.rccExternallyConnected;
   22.44 +	}
   22.45 +}

    23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Thu Sep 06 00:43:34 2012 +0300
    23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Thu Sep 06 00:44:45 2012 +0300
    23.3 @@ -1,21 +1,21 @@
    23.4 -/*
    23.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    23.6 - *
    23.7 - * Licensed under the Aduna BSD-style license.
    23.8 - */
    23.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   23.10 -
   23.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   23.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   23.13 -
   23.14 -/**
   23.15 - * 
   23.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   23.17 - */
   23.18 -public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation {
   23.19 -
   23.20 -	@Override
   23.21 -	public String getURI() {
   23.22 -		return GeoConstants.rccNonTangentialProperPart;
   23.23 -	}
   23.24 -}
   23.25 +/*
   23.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   23.27 + *
   23.28 + * Licensed under the Aduna BSD-style license.
   23.29 + */
   23.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   23.31 +
   23.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   23.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   23.34 +
   23.35 +/**
   23.36 + * 
   23.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   23.38 + */
   23.39 +public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation {
   23.40 +
   23.41 +	@Override
   23.42 +	public String getURI() {
   23.43 +		return GeoConstants.rccNonTangentialProperPart;
   23.44 +	}
   23.45 +}

    24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Thu Sep 06 00:43:34 2012 +0300
    24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Thu Sep 06 00:44:45 2012 +0300
    24.3 @@ -1,21 +1,21 @@
    24.4 -/*
    24.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    24.6 - *
    24.7 - * Licensed under the Aduna BSD-style license.
    24.8 - */
    24.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   24.10 -
   24.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   24.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   24.13 -
   24.14 -/**
   24.15 - * 
   24.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   24.17 - */
   24.18 -public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation {
   24.19 -
   24.20 -	@Override
   24.21 -	public String getURI() {
   24.22 -		return GeoConstants.rccNonTangentialProperPartInverse;
   24.23 -	}
   24.24 -}
   24.25 +/*
   24.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   24.27 + *
   24.28 + * Licensed under the Aduna BSD-style license.
   24.29 + */
   24.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   24.31 +
   24.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   24.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   24.34 +
   24.35 +/**
   24.36 + * 
   24.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   24.38 + */
   24.39 +public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation {
   24.40 +
   24.41 +	@Override
   24.42 +	public String getURI() {
   24.43 +		return GeoConstants.rccNonTangentialProperPartInverse;
   24.44 +	}
   24.45 +}

    25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Thu Sep 06 00:43:34 2012 +0300
    25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Thu Sep 06 00:44:45 2012 +0300
    25.3 @@ -1,21 +1,21 @@
    25.4 -/*
    25.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    25.6 - *
    25.7 - * Licensed under the Aduna BSD-style license.
    25.8 - */
    25.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   25.10 -
   25.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   25.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   25.13 -
   25.14 -/**
   25.15 - * 
   25.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   25.17 - */
   25.18 -public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation {
   25.19 -
   25.20 -	@Override
   25.21 -	public String getURI() {
   25.22 -		return GeoConstants.rccPartiallyOverlapping;
   25.23 -	}
   25.24 -}
   25.25 +/*
   25.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   25.27 + *
   25.28 + * Licensed under the Aduna BSD-style license.
   25.29 + */
   25.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   25.31 +
   25.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   25.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   25.34 +
   25.35 +/**
   25.36 + * 
   25.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   25.38 + */
   25.39 +public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation {
   25.40 +
   25.41 +	@Override
   25.42 +	public String getURI() {
   25.43 +		return GeoConstants.rccPartiallyOverlapping;
   25.44 +	}
   25.45 +}

    26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Thu Sep 06 00:43:34 2012 +0300
    26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Thu Sep 06 00:44:45 2012 +0300
    26.3 @@ -1,21 +1,21 @@
    26.4 -/*
    26.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    26.6 - *
    26.7 - * Licensed under the Aduna BSD-style license.
    26.8 - */
    26.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   26.10 -
   26.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   26.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   26.13 -
   26.14 -/**
   26.15 - * 
   26.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   26.17 - */
   26.18 -public class RCC8TangentialProperPartFunc extends GeoSparqlRelation {
   26.19 -
   26.20 -	@Override
   26.21 -	public String getURI() {
   26.22 -		return GeoConstants.rccTangentialProperPart;
   26.23 -	}
   26.24 -}
   26.25 +/*
   26.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   26.27 + *
   26.28 + * Licensed under the Aduna BSD-style license.
   26.29 + */
   26.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   26.31 +
   26.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   26.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   26.34 +
   26.35 +/**
   26.36 + * 
   26.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   26.38 + */
   26.39 +public class RCC8TangentialProperPartFunc extends GeoSparqlRelation {
   26.40 +
   26.41 +	@Override
   26.42 +	public String getURI() {
   26.43 +		return GeoConstants.rccTangentialProperPart;
   26.44 +	}
   26.45 +}

    27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Thu Sep 06 00:43:34 2012 +0300
    27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Thu Sep 06 00:44:45 2012 +0300
    27.3 @@ -1,21 +1,21 @@
    27.4 -/*
    27.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    27.6 - *
    27.7 - * Licensed under the Aduna BSD-style license.
    27.8 - */
    27.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   27.10 -
   27.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   27.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   27.13 -
   27.14 -/**
   27.15 - * 
   27.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   27.17 - */
   27.18 -public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation {
   27.19 -
   27.20 -	@Override
   27.21 -	public String getURI() {
   27.22 -		return GeoConstants.rccTangentialProperPartInverse;
   27.23 -	}
   27.24 -}
   27.25 +/*
   27.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   27.27 + *
   27.28 + * Licensed under the Aduna BSD-style license.
   27.29 + */
   27.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   27.31 +
   27.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   27.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   27.34 +
   27.35 +/**
   27.36 + * 
   27.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   27.38 + */
   27.39 +public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation {
   27.40 +
   27.41 +	@Override
   27.42 +	public String getURI() {
   27.43 +		return GeoConstants.rccTangentialProperPartInverse;
   27.44 +	}
   27.45 +}

    28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Thu Sep 06 00:43:34 2012 +0300
    28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Thu Sep 06 00:44:45 2012 +0300
    28.3 @@ -1,21 +1,21 @@
    28.4 -/*
    28.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    28.6 - *
    28.7 - * Licensed under the Aduna BSD-style license.
    28.8 - */
    28.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   28.10 -
   28.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   28.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   28.13 -
   28.14 -/**
   28.15 - * 
   28.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   28.17 - */
   28.18 -public class SimpleFeatureTouchesFunc extends GeoSparqlRelation {
   28.19 -
   28.20 -	@Override
   28.21 -	public String getURI() {
   28.22 -		return GeoConstants.sfTouches;
   28.23 -	}
   28.24 -}
   28.25 +/*
   28.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   28.27 + *
   28.28 + * Licensed under the Aduna BSD-style license.
   28.29 + */
   28.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   28.31 +
   28.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   28.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   28.34 +
   28.35 +/**
   28.36 + * 
   28.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   28.38 + */
   28.39 +public class SimpleFeatureTouchesFunc extends GeoSparqlRelation {
   28.40 +
   28.41 +	@Override
   28.42 +	public String getURI() {
   28.43 +		return GeoConstants.sfTouches;
   28.44 +	}
   28.45 +}

    29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    29.3 @@ -1,21 +1,21 @@
    29.4 -/*
    29.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    29.6 - *
    29.7 - * Licensed under the Aduna BSD-style license.
    29.8 - */
    29.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   29.10 -
   29.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   29.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   29.13 -
   29.14 -/**
   29.15 - * 
   29.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   29.17 - */
   29.18 -public class SimpleFeaturesContainsFunc extends GeoSparqlRelation {
   29.19 -
   29.20 -	@Override
   29.21 -	public String getURI() {
   29.22 -		return GeoConstants.sfContains;
   29.23 -	}
   29.24 -}
   29.25 +/*
   29.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   29.27 + *
   29.28 + * Licensed under the Aduna BSD-style license.
   29.29 + */
   29.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   29.31 +
   29.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   29.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   29.34 +
   29.35 +/**
   29.36 + * 
   29.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   29.38 + */
   29.39 +public class SimpleFeaturesContainsFunc extends GeoSparqlRelation {
   29.40 +
   29.41 +	@Override
   29.42 +	public String getURI() {
   29.43 +		return GeoConstants.sfContains;
   29.44 +	}
   29.45 +}

    30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Thu Sep 06 00:43:34 2012 +0300
    30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Thu Sep 06 00:44:45 2012 +0300
    30.3 @@ -1,21 +1,21 @@
    30.4 -/*
    30.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    30.6 - *
    30.7 - * Licensed under the Aduna BSD-style license.
    30.8 - */
    30.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   30.10 -
   30.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   30.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   30.13 -
   30.14 -/**
   30.15 - * 
   30.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   30.17 - */
   30.18 -public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation {
   30.19 -
   30.20 -	@Override
   30.21 -	public String getURI() {
   30.22 -		return GeoConstants.sfCrosses;
   30.23 -	}
   30.24 -}
   30.25 +/*
   30.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   30.27 + *
   30.28 + * Licensed under the Aduna BSD-style license.
   30.29 + */
   30.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   30.31 +
   30.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   30.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   30.34 +
   30.35 +/**
   30.36 + * 
   30.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   30.38 + */
   30.39 +public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation {
   30.40 +
   30.41 +	@Override
   30.42 +	public String getURI() {
   30.43 +		return GeoConstants.sfCrosses;
   30.44 +	}
   30.45 +}

    31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Thu Sep 06 00:43:34 2012 +0300
    31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Thu Sep 06 00:44:45 2012 +0300
    31.3 @@ -1,21 +1,21 @@
    31.4 -/*
    31.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    31.6 - *
    31.7 - * Licensed under the Aduna BSD-style license.
    31.8 - */
    31.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   31.10 -
   31.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   31.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   31.13 -
   31.14 -/**
   31.15 - * 
   31.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   31.17 - */
   31.18 -public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation {
   31.19 -
   31.20 -	@Override
   31.21 -	public String getURI() {
   31.22 -		return GeoConstants.sfDisjoint;
   31.23 -	}
   31.24 -}
   31.25 +/*
   31.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   31.27 + *
   31.28 + * Licensed under the Aduna BSD-style license.
   31.29 + */
   31.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   31.31 +
   31.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   31.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   31.34 +
   31.35 +/**
   31.36 + * 
   31.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   31.38 + */
   31.39 +public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation {
   31.40 +
   31.41 +	@Override
   31.42 +	public String getURI() {
   31.43 +		return GeoConstants.sfDisjoint;
   31.44 +	}
   31.45 +}

    32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    32.3 @@ -1,21 +1,21 @@
    32.4 -/*
    32.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    32.6 - *
    32.7 - * Licensed under the Aduna BSD-style license.
    32.8 - */
    32.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   32.10 -
   32.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   32.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   32.13 -
   32.14 -/**
   32.15 - * 
   32.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   32.17 - */
   32.18 -public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation {
   32.19 -
   32.20 -	@Override
   32.21 -	public String getURI() {
   32.22 -		return GeoConstants.sfEquals;
   32.23 -	}
   32.24 -}
   32.25 +/*
   32.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   32.27 + *
   32.28 + * Licensed under the Aduna BSD-style license.
   32.29 + */
   32.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   32.31 +
   32.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   32.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   32.34 +
   32.35 +/**
   32.36 + * 
   32.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   32.38 + */
   32.39 +public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation {
   32.40 +
   32.41 +	@Override
   32.42 +	public String getURI() {
   32.43 +		return GeoConstants.sfEquals;
   32.44 +	}
   32.45 +}

    33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    33.3 @@ -1,21 +1,21 @@
    33.4 -/*
    33.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    33.6 - *
    33.7 - * Licensed under the Aduna BSD-style license.
    33.8 - */
    33.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   33.10 -
   33.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   33.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   33.13 -
   33.14 -/**
   33.15 - * 
   33.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   33.17 - */
   33.18 -public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation {
   33.19 -
   33.20 -	@Override
   33.21 -	public String getURI() {
   33.22 -		return GeoConstants.sfIntersects;
   33.23 -	}
   33.24 -}
   33.25 +/*
   33.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   33.27 + *
   33.28 + * Licensed under the Aduna BSD-style license.
   33.29 + */
   33.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   33.31 +
   33.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   33.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   33.34 +
   33.35 +/**
   33.36 + * 
   33.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   33.38 + */
   33.39 +public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation {
   33.40 +
   33.41 +	@Override
   33.42 +	public String getURI() {
   33.43 +		return GeoConstants.sfIntersects;
   33.44 +	}
   33.45 +}

    34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    34.3 @@ -1,21 +1,21 @@
    34.4 -/*
    34.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    34.6 - *
    34.7 - * Licensed under the Aduna BSD-style license.
    34.8 - */
    34.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   34.10 -
   34.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   34.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   34.13 -
   34.14 -/**
   34.15 - * 
   34.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   34.17 - */
   34.18 -public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation {
   34.19 -
   34.20 -	@Override
   34.21 -	public String getURI() {
   34.22 -		return GeoConstants.sfOverlaps;
   34.23 -	}
   34.24 -}
   34.25 +/*
   34.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   34.27 + *
   34.28 + * Licensed under the Aduna BSD-style license.
   34.29 + */
   34.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   34.31 +
   34.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   34.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   34.34 +
   34.35 +/**
   34.36 + * 
   34.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   34.38 + */
   34.39 +public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation {
   34.40 +
   34.41 +	@Override
   34.42 +	public String getURI() {
   34.43 +		return GeoConstants.sfOverlaps;
   34.44 +	}
   34.45 +}

    35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Thu Sep 06 00:43:34 2012 +0300
    35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Thu Sep 06 00:44:45 2012 +0300
    35.3 @@ -1,21 +1,21 @@
    35.4 -/*
    35.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    35.6 - *
    35.7 - * Licensed under the Aduna BSD-style license.
    35.8 - */
    35.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   35.10 -
   35.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   35.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   35.13 -
   35.14 -/**
   35.15 - * 
   35.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   35.17 - */
   35.18 -public class SimpleFeaturesWithinFunc extends GeoSparqlRelation {
   35.19 -
   35.20 -	@Override
   35.21 -	public String getURI() {
   35.22 -		return GeoConstants.sfWithin;
   35.23 -	}
   35.24 -}
   35.25 +/*
   35.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   35.27 + *
   35.28 + * Licensed under the Aduna BSD-style license.
   35.29 + */
   35.30 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   35.31 +
   35.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   35.33 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   35.34 +
   35.35 +/**
   35.36 + * 
   35.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   35.38 + */
   35.39 +public class SimpleFeaturesWithinFunc extends GeoSparqlRelation {
   35.40 +
   35.41 +	@Override
   35.42 +	public String getURI() {
   35.43 +		return GeoConstants.sfWithin;
   35.44 +	}
   35.45 +}

    36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Thu Sep 06 00:43:34 2012 +0300
    36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Thu Sep 06 00:44:45 2012 +0300
    36.3 @@ -1,21 +1,21 @@
    36.4 -/*
    36.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    36.6 - *
    36.7 - * Licensed under the Aduna BSD-style license.
    36.8 - */
    36.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   36.10 -
   36.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   36.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   36.13 - 
   36.14 -/**
   36.15 - * 
   36.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   36.17 - */
   36.18 -public class BoundaryFunc extends SpatialConstructFunc {
   36.19 -
   36.20 -	@Override
   36.21 -	public String getURI() {
   36.22 -		return GeoConstants.boundary;
   36.23 -	}
   36.24 -}
   36.25 +/*
   36.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   36.27 + *
   36.28 + * Licensed under the Aduna BSD-style license.
   36.29 + */
   36.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   36.31 +
   36.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   36.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   36.34 + 
   36.35 +/**
   36.36 + * 
   36.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   36.38 + */
   36.39 +public class BoundaryFunc extends SpatialConstructFunc {
   36.40 +
   36.41 +	@Override
   36.42 +	public String getURI() {
   36.43 +		return GeoConstants.boundary;
   36.44 +	}
   36.45 +}

    37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Thu Sep 06 00:43:34 2012 +0300
    37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Thu Sep 06 00:44:45 2012 +0300
    37.3 @@ -1,20 +1,20 @@
    37.4 -/*
    37.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    37.6 - *
    37.7 - * Licensed under the Aduna BSD-style license.
    37.8 - */
    37.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   37.10 -
   37.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   37.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   37.13 - 
   37.14 -/**
   37.15 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   37.16 - */
   37.17 -public class BufferFunc extends SpatialConstructFunc {
   37.18 -
   37.19 -	@Override
   37.20 -	public String getURI() {
   37.21 -		return GeoConstants.buffer;
   37.22 -	}
   37.23 -}
   37.24 +/*
   37.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   37.26 + *
   37.27 + * Licensed under the Aduna BSD-style license.
   37.28 + */
   37.29 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   37.30 +
   37.31 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   37.32 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   37.33 + 
   37.34 +/**
   37.35 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   37.36 + */
   37.37 +public class BufferFunc extends SpatialConstructFunc {
   37.38 +
   37.39 +	@Override
   37.40 +	public String getURI() {
   37.41 +		return GeoConstants.buffer;
   37.42 +	}
   37.43 +}

    38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Thu Sep 06 00:43:34 2012 +0300
    38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Thu Sep 06 00:44:45 2012 +0300
    38.3 @@ -1,21 +1,21 @@
    38.4 -/*
    38.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    38.6 - *
    38.7 - * Licensed under the Aduna BSD-style license.
    38.8 - */
    38.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   38.10 -
   38.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   38.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   38.13 - 
   38.14 -/**
   38.15 - * 
   38.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   38.17 - */
   38.18 -public class ConvexHullFunc extends SpatialConstructFunc {
   38.19 -
   38.20 -	@Override
   38.21 -	public String getURI() {
   38.22 -		return GeoConstants.convexHull;
   38.23 -	}
   38.24 -}
   38.25 +/*
   38.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   38.27 + *
   38.28 + * Licensed under the Aduna BSD-style license.
   38.29 + */
   38.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   38.31 +
   38.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   38.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   38.34 + 
   38.35 +/**
   38.36 + * 
   38.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   38.38 + */
   38.39 +public class ConvexHullFunc extends SpatialConstructFunc {
   38.40 +
   38.41 +	@Override
   38.42 +	public String getURI() {
   38.43 +		return GeoConstants.convexHull;
   38.44 +	}
   38.45 +}

    39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Thu Sep 06 00:43:34 2012 +0300
    39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Thu Sep 06 00:44:45 2012 +0300
    39.3 @@ -1,21 +1,21 @@
    39.4 -/*
    39.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    39.6 - *
    39.7 - * Licensed under the Aduna BSD-style license.
    39.8 - */
    39.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   39.10 -
   39.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   39.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   39.13 - 
   39.14 -/**
   39.15 - * 
   39.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   39.17 - */
   39.18 -public class EnvelopeFunc extends SpatialConstructFunc {
   39.19 -
   39.20 -	@Override
   39.21 -	public String getURI() {
   39.22 -		return GeoConstants.envelope;
   39.23 -	}
   39.24 -}
   39.25 +/*
   39.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   39.27 + *
   39.28 + * Licensed under the Aduna BSD-style license.
   39.29 + */
   39.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   39.31 +
   39.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   39.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   39.34 + 
   39.35 +/**
   39.36 + * 
   39.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   39.38 + */
   39.39 +public class EnvelopeFunc extends SpatialConstructFunc {
   39.40 +
   39.41 +	@Override
   39.42 +	public String getURI() {
   39.43 +		return GeoConstants.envelope;
   39.44 +	}
   39.45 +}

    40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Thu Sep 06 00:43:34 2012 +0300
    40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Thu Sep 06 00:44:45 2012 +0300
    40.3 @@ -1,21 +1,21 @@
    40.4 -/*
    40.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    40.6 - *
    40.7 - * Licensed under the Aduna BSD-style license.
    40.8 - */
    40.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   40.10 -
   40.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   40.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   40.13 - 
   40.14 -/**
   40.15 - * 
   40.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   40.17 - */
   40.18 -public class TransformFunc extends SpatialConstructFunc {
   40.19 -
   40.20 -	@Override
   40.21 -	public String getURI() {
   40.22 -		return GeoConstants.transform;
   40.23 -	}
   40.24 -}
   40.25 +/*
   40.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   40.27 + *
   40.28 + * Licensed under the Aduna BSD-style license.
   40.29 + */
   40.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   40.31 +
   40.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   40.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   40.34 + 
   40.35 +/**
   40.36 + * 
   40.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   40.38 + */
   40.39 +public class TransformFunc extends SpatialConstructFunc {
   40.40 +
   40.41 +	@Override
   40.42 +	public String getURI() {
   40.43 +		return GeoConstants.transform;
   40.44 +	}
   40.45 +}

    41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Thu Sep 06 00:43:34 2012 +0300
    41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Thu Sep 06 00:44:45 2012 +0300
    41.3 @@ -1,22 +1,22 @@
    41.4 -/*
    41.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    41.6 - *
    41.7 - * Licensed under the Aduna BSD-style license.
    41.8 - */
    41.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   41.10 -
   41.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   41.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   41.13 - 
   41.14 -/**
   41.15 - * A spatial function computing the area of a geometry.
   41.16 - * 
   41.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   41.18 - */
   41.19 -public class AreaFunc extends SpatialMetricFunc {
   41.20 -
   41.21 -	@Override
   41.22 -	public String getURI() {
   41.23 -		return GeoConstants.area;
   41.24 -	}
   41.25 -}
   41.26 +/*
   41.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   41.28 + *
   41.29 + * Licensed under the Aduna BSD-style license.
   41.30 + */
   41.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   41.32 +
   41.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   41.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   41.35 + 
   41.36 +/**
   41.37 + * A spatial function computing the area of a geometry.
   41.38 + * 
   41.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   41.40 + */
   41.41 +public class AreaFunc extends SpatialMetricFunc {
   41.42 +
   41.43 +	@Override
   41.44 +	public String getURI() {
   41.45 +		return GeoConstants.area;
   41.46 +	}
   41.47 +}

    42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Thu Sep 06 00:43:34 2012 +0300
    42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Thu Sep 06 00:44:45 2012 +0300
    42.3 @@ -1,22 +1,22 @@
    42.4 -/*
    42.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    42.6 - *
    42.7 - * Licensed under the Aduna BSD-style license.
    42.8 - */
    42.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   42.10 -
   42.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   42.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   42.13 -
   42.14 -/**
   42.15 - * A spatial function computing the distance between two geometries.
   42.16 - * 
   42.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   42.18 - */
   42.19 -public class DistanceFunc extends SpatialMetricFunc {
   42.20 -
   42.21 -	@Override
   42.22 -	public String getURI() {
   42.23 -		return GeoConstants.distance;
   42.24 -		}
   42.25 -}
   42.26 +/*
   42.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   42.28 + *
   42.29 + * Licensed under the Aduna BSD-style license.
   42.30 + */
   42.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   42.32 +
   42.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   42.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   42.35 +
   42.36 +/**
   42.37 + * A spatial function computing the distance between two geometries.
   42.38 + * 
   42.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   42.40 + */
   42.41 +public class DistanceFunc extends SpatialMetricFunc {
   42.42 +
   42.43 +	@Override
   42.44 +	public String getURI() {
   42.45 +		return GeoConstants.distance;
   42.46 +		}
   42.47 +}

    43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Thu Sep 06 00:43:34 2012 +0300
    43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Thu Sep 06 00:44:45 2012 +0300
    43.3 @@ -1,22 +1,22 @@
    43.4 -/*
    43.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    43.6 - *
    43.7 - * Licensed under the Aduna BSD-style license.
    43.8 - */
    43.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   43.10 -
   43.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   43.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   43.13 - 
   43.14 -/**
   43.15 - * A spatial function returning a geometry as text (in WKT format).
   43.16 - * 
   43.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   43.18 - */
   43.19 -public class AsTextFunc extends SpatialPropertyFunc {
   43.20 -
   43.21 -	@Override
   43.22 -	public String getURI() {
   43.23 -		return GeoConstants.asText;
   43.24 -	}
   43.25 -}
   43.26 +/*
   43.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   43.28 + *
   43.29 + * Licensed under the Aduna BSD-style license.
   43.30 + */
   43.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   43.32 +
   43.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   43.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   43.35 + 
   43.36 +/**
   43.37 + * A spatial function returning a geometry as text (in WKT format).
   43.38 + * 
   43.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   43.40 + */
   43.41 +public class AsTextFunc extends SpatialPropertyFunc {
   43.42 +
   43.43 +	@Override
   43.44 +	public String getURI() {
   43.45 +		return GeoConstants.asText;
   43.46 +	}
   43.47 +}

    44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Thu Sep 06 00:43:34 2012 +0300
    44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Thu Sep 06 00:44:45 2012 +0300
    44.3 @@ -1,22 +1,22 @@
    44.4 -/*
    44.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    44.6 - *
    44.7 - * Licensed under the Aduna BSD-style license.
    44.8 - */
    44.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   44.10 -
   44.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   44.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   44.13 - 
   44.14 -/**
   44.15 - * A spatial function returning the dimension of a geometry.
   44.16 - * 
   44.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   44.18 - */
   44.19 -public class DimensionFunc extends SpatialPropertyFunc {
   44.20 -
   44.21 -	@Override
   44.22 -	public String getURI() {
   44.23 -		return GeoConstants.dimension;
   44.24 -	}
   44.25 -}
   44.26 +/*
   44.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   44.28 + *
   44.29 + * Licensed under the Aduna BSD-style license.
   44.30 + */
   44.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   44.32 +
   44.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   44.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   44.35 + 
   44.36 +/**
   44.37 + * A spatial function returning the dimension of a geometry.
   44.38 + * 
   44.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   44.40 + */
   44.41 +public class DimensionFunc extends SpatialPropertyFunc {
   44.42 +
   44.43 +	@Override
   44.44 +	public String getURI() {
   44.45 +		return GeoConstants.dimension;
   44.46 +	}
   44.47 +}

    45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Thu Sep 06 00:43:34 2012 +0300
    45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Thu Sep 06 00:44:45 2012 +0300
    45.3 @@ -1,22 +1,22 @@
    45.4 -/*
    45.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    45.6 - *
    45.7 - * Licensed under the Aduna BSD-style license.
    45.8 - */
    45.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   45.10 -
   45.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   45.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   45.13 - 
   45.14 -/**
   45.15 - * A spatial function returning the type of a geometry.
   45.16 - * 
   45.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   45.18 - */
   45.19 -public class GeometryTypeFunc extends SpatialPropertyFunc {
   45.20 -
   45.21 -	@Override
   45.22 -	public String getURI() {
   45.23 -		return GeoConstants.geometryType;
   45.24 -	}
   45.25 -}
   45.26 +/*
   45.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   45.28 + *
   45.29 + * Licensed under the Aduna BSD-style license.
   45.30 + */
   45.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   45.32 +
   45.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   45.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   45.35 + 
   45.36 +/**
   45.37 + * A spatial function returning the type of a geometry.
   45.38 + * 
   45.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   45.40 + */
   45.41 +public class GeometryTypeFunc extends SpatialPropertyFunc {
   45.42 +
   45.43 +	@Override
   45.44 +	public String getURI() {
   45.45 +		return GeoConstants.geometryType;
   45.46 +	}
   45.47 +}

    46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Thu Sep 06 00:43:34 2012 +0300
    46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Thu Sep 06 00:44:45 2012 +0300
    46.3 @@ -1,22 +1,22 @@
    46.4 -/*
    46.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    46.6 - *
    46.7 - * Licensed under the Aduna BSD-style license.
    46.8 - */
    46.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   46.10 -
   46.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   46.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   46.13 - 
   46.14 -/**
   46.15 - * A spatial function for testing whether a geometry is empty.
   46.16 - * 
   46.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   46.18 - */
   46.19 -public class IsEmptyFunc extends SpatialPropertyFunc {
   46.20 -
   46.21 -	@Override
   46.22 -	public String getURI() {
   46.23 -		return GeoConstants.isEmpty;
   46.24 -	}
   46.25 -}
   46.26 +/*
   46.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   46.28 + *
   46.29 + * Licensed under the Aduna BSD-style license.
   46.30 + */
   46.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   46.32 +
   46.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   46.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   46.35 + 
   46.36 +/**
   46.37 + * A spatial function for testing whether a geometry is empty.
   46.38 + * 
   46.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   46.40 + */
   46.41 +public class IsEmptyFunc extends SpatialPropertyFunc {
   46.42 +
   46.43 +	@Override
   46.44 +	public String getURI() {
   46.45 +		return GeoConstants.isEmpty;
   46.46 +	}
   46.47 +}

    47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Thu Sep 06 00:43:34 2012 +0300
    47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Thu Sep 06 00:44:45 2012 +0300
    47.3 @@ -1,22 +1,22 @@
    47.4 -/*
    47.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    47.6 - *
    47.7 - * Licensed under the Aduna BSD-style license.
    47.8 - */
    47.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   47.10 -
   47.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   47.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   47.13 - 
   47.14 -/**
   47.15 - * A spatial function for testing whether a geometry is simple.
   47.16 - * 
   47.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   47.18 - */
   47.19 -public class IsSimpleFunc extends SpatialPropertyFunc {
   47.20 -
   47.21 -	@Override
   47.22 -	public String getURI() {
   47.23 -		return GeoConstants.isSimple;
   47.24 -	}
   47.25 -}
   47.26 +/*
   47.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   47.28 + *
   47.29 + * Licensed under the Aduna BSD-style license.
   47.30 + */
   47.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   47.32 +
   47.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   47.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   47.35 + 
   47.36 +/**
   47.37 + * A spatial function for testing whether a geometry is simple.
   47.38 + * 
   47.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   47.40 + */
   47.41 +public class IsSimpleFunc extends SpatialPropertyFunc {
   47.42 +
   47.43 +	@Override
   47.44 +	public String getURI() {
   47.45 +		return GeoConstants.isSimple;
   47.46 +	}
   47.47 +}

    48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Thu Sep 06 00:43:34 2012 +0300
    48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Thu Sep 06 00:44:45 2012 +0300
    48.3 @@ -1,22 +1,22 @@
    48.4 -/*
    48.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    48.6 - *
    48.7 - * Licensed under the Aduna BSD-style license.
    48.8 - */
    48.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   48.10 -
   48.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   48.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   48.13 - 
   48.14 -/**
   48.15 - * A spatial function returning the SRID of a geometry.
   48.16 - * 
   48.17 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   48.18 - */
   48.19 -public class SridFunc extends SpatialPropertyFunc {
   48.20 -
   48.21 -	@Override
   48.22 -	public String getURI() {
   48.23 -		return GeoConstants.srid.toString(); //changed this-constant
   48.24 -	}
   48.25 -}
   48.26 +/*
   48.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   48.28 + *
   48.29 + * Licensed under the Aduna BSD-style license.
   48.30 + */
   48.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   48.32 +
   48.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   48.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   48.35 + 
   48.36 +/**
   48.37 + * A spatial function returning the SRID of a geometry.
   48.38 + * 
   48.39 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   48.40 + */
   48.41 +public class SridFunc extends SpatialPropertyFunc {
   48.42 +
   48.43 +	@Override
   48.44 +	public String getURI() {
   48.45 +		return GeoConstants.srid.toString(); //changed this-constant
   48.46 +	}
   48.47 +}

    49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Thu Sep 06 00:43:34 2012 +0300
    49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Thu Sep 06 00:44:45 2012 +0300
    49.3 @@ -1,21 +1,21 @@
    49.4 -/*
    49.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    49.6 - *
    49.7 - * Licensed under the Aduna BSD-style license.
    49.8 - */
    49.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   49.10 -
   49.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   49.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   49.13 - 
   49.14 -/**
   49.15 - * 
   49.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   49.17 - */
   49.18 -public class AboveFunc extends SpatialRelationshipFunc {
   49.19 -
   49.20 -	@Override
   49.21 -	public String getURI() {
   49.22 -		return GeoConstants.above;
   49.23 -	}
   49.24 -}
   49.25 +/*
   49.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   49.27 + *
   49.28 + * Licensed under the Aduna BSD-style license.
   49.29 + */
   49.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   49.31 +
   49.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   49.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   49.34 + 
   49.35 +/**
   49.36 + * 
   49.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   49.38 + */
   49.39 +public class AboveFunc extends SpatialRelationshipFunc {
   49.40 +
   49.41 +	@Override
   49.42 +	public String getURI() {
   49.43 +		return GeoConstants.above;
   49.44 +	}
   49.45 +}

    50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Thu Sep 06 00:43:34 2012 +0300
    50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Thu Sep 06 00:44:45 2012 +0300
    50.3 @@ -1,81 +1,81 @@
    50.4 -/*
    50.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    50.6 - *
    50.7 - * Licensed under the Aduna BSD-style license.
    50.8 - */
    50.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   50.10 -
   50.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   50.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   50.13 -
   50.14 -/**
   50.15 - * 
   50.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   50.17 - */
   50.18 -public class AnyInteractFunc extends SpatialRelationshipFunc {
   50.19 -
   50.20 -	@Override
   50.21 -	public String getURI() {
   50.22 -		return GeoConstants.anyInteract;
   50.23 -		}
   50.24 -
   50.25 -//	public Literal evaluate(ValueFactory valueFactory, Value... args)
   50.26 -//		throws ValueExprEvaluationException
   50.27 -//	{
   50.28 -//		if (args.length != 1) {
   50.29 -//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
   50.30 -//					+ args.length);
   50.31 -//		}
   50.32 -//
   50.33 -//		if (args[0] instanceof Literal) {
   50.34 -//			Literal literal = (Literal)args[0];
   50.35 -//			URI datatype = literal.getDatatype();
   50.36 -//
   50.37 -//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
   50.38 -//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
   50.39 -//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
   50.40 -//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
   50.41 -//				}
   50.42 -//			}
   50.43 -//			else if (datatype != null) {
   50.44 -//				if (datatype.equals(XMLSchema.BOOLEAN)) {
   50.45 -//					return literal;
   50.46 -//				}
   50.47 -//				else {
   50.48 -//					Boolean booleanValue = null;
   50.49 -//
   50.50 -//					try {
   50.51 -//						if (datatype.equals(XMLSchema.FLOAT)) {
   50.52 -//							float floatValue = literal.floatValue();
   50.53 -//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
   50.54 -//						}
   50.55 -//						else if (datatype.equals(XMLSchema.DOUBLE)) {
   50.56 -//							double doubleValue = literal.doubleValue();
   50.57 -//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
   50.58 -//						}
   50.59 -//						else if (datatype.equals(XMLSchema.DECIMAL)) {
   50.60 -//							BigDecimal decimalValue = literal.decimalValue();
   50.61 -//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
   50.62 -//						}
   50.63 -//						else if (datatype.equals(XMLSchema.INTEGER)) {
   50.64 -//							BigInteger integerValue = literal.integerValue();
   50.65 -//							booleanValue = !integerValue.equals(BigInteger.ZERO);
   50.66 -//						}
   50.67 -//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
   50.68 -//							booleanValue = literal.longValue() != 0L;
   50.69 -//						}
   50.70 -//					}
   50.71 -//					catch (NumberFormatException e) {
   50.72 -//						throw new ValueExprEvaluationException(e.getMessage(), e);
   50.73 -//					}
   50.74 -//
   50.75 -//					if (booleanValue != null) {
   50.76 -//						return valueFactory.createLiteral(booleanValue);
   50.77 -//					}
   50.78 -//				}
   50.79 -//			}
   50.80 -//		}
   50.81 -//
   50.82 -//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
   50.83 -//	}
   50.84 -}
   50.85 +/*
   50.86 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   50.87 + *
   50.88 + * Licensed under the Aduna BSD-style license.
   50.89 + */
   50.90 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   50.91 +
   50.92 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   50.93 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   50.94 +
   50.95 +/**
   50.96 + * 
   50.97 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   50.98 + */
   50.99 +public class AnyInteractFunc extends SpatialRelationshipFunc {
  50.100 +
  50.101 +	@Override
  50.102 +	public String getURI() {
  50.103 +		return GeoConstants.anyInteract;
  50.104 +		}
  50.105 +
  50.106 +//	public Literal evaluate(ValueFactory valueFactory, Value... args)
  50.107 +//		throws ValueExprEvaluationException
  50.108 +//	{
  50.109 +//		if (args.length != 1) {
  50.110 +//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
  50.111 +//					+ args.length);
  50.112 +//		}
  50.113 +//
  50.114 +//		if (args[0] instanceof Literal) {
  50.115 +//			Literal literal = (Literal)args[0];
  50.116 +//			URI datatype = literal.getDatatype();
  50.117 +//
  50.118 +//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
  50.119 +//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
  50.120 +//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
  50.121 +//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
  50.122 +//				}
  50.123 +//			}
  50.124 +//			else if (datatype != null) {
  50.125 +//				if (datatype.equals(XMLSchema.BOOLEAN)) {
  50.126 +//					return literal;
  50.127 +//				}
  50.128 +//				else {
  50.129 +//					Boolean booleanValue = null;
  50.130 +//
  50.131 +//					try {
  50.132 +//						if (datatype.equals(XMLSchema.FLOAT)) {
  50.133 +//							float floatValue = literal.floatValue();
  50.134 +//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
  50.135 +//						}
  50.136 +//						else if (datatype.equals(XMLSchema.DOUBLE)) {
  50.137 +//							double doubleValue = literal.doubleValue();
  50.138 +//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
  50.139 +//						}
  50.140 +//						else if (datatype.equals(XMLSchema.DECIMAL)) {
  50.141 +//							BigDecimal decimalValue = literal.decimalValue();
  50.142 +//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
  50.143 +//						}
  50.144 +//						else if (datatype.equals(XMLSchema.INTEGER)) {
  50.145 +//							BigInteger integerValue = literal.integerValue();
  50.146 +//							booleanValue = !integerValue.equals(BigInteger.ZERO);
  50.147 +//						}
  50.148 +//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
  50.149 +//							booleanValue = literal.longValue() != 0L;
  50.150 +//						}
  50.151 +//					}
  50.152 +//					catch (NumberFormatException e) {
  50.153 +//						throw new ValueExprEvaluationException(e.getMessage(), e);
  50.154 +//					}
  50.155 +//
  50.156 +//					if (booleanValue != null) {
  50.157 +//						return valueFactory.createLiteral(booleanValue);
  50.158 +//					}
  50.159 +//				}
  50.160 +//			}
  50.161 +//		}
  50.162 +//
  50.163 +//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  50.164 +//	}
  50.165 +}

    51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Thu Sep 06 00:43:34 2012 +0300
    51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Thu Sep 06 00:44:45 2012 +0300
    51.3 @@ -1,21 +1,21 @@
    51.4 -/*
    51.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    51.6 - *
    51.7 - * Licensed under the Aduna BSD-style license.
    51.8 - */
    51.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   51.10 -
   51.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   51.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   51.13 - 
   51.14 -/**
   51.15 - * 
   51.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   51.17 - */
   51.18 -public class BelowFunc extends SpatialRelationshipFunc {
   51.19 -
   51.20 -	@Override
   51.21 -	public String getURI() {
   51.22 -		return GeoConstants.below;
   51.23 -	}
   51.24 -}
   51.25 +/*
   51.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   51.27 + *
   51.28 + * Licensed under the Aduna BSD-style license.
   51.29 + */
   51.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   51.31 +
   51.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   51.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   51.34 + 
   51.35 +/**
   51.36 + * 
   51.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   51.38 + */
   51.39 +public class BelowFunc extends SpatialRelationshipFunc {
   51.40 +
   51.41 +	@Override
   51.42 +	public String getURI() {
   51.43 +		return GeoConstants.below;
   51.44 +	}
   51.45 +}

    52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    52.3 @@ -1,21 +1,21 @@
    52.4 -/*
    52.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    52.6 - *
    52.7 - * Licensed under the Aduna BSD-style license.
    52.8 - */
    52.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   52.10 -
   52.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   52.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   52.13 - 
   52.14 -/**
   52.15 - * 
   52.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   52.17 - */
   52.18 -public class ContainsFunc extends SpatialRelationshipFunc {
   52.19 -
   52.20 -	@Override
   52.21 -	public String getURI() {
   52.22 -		return GeoConstants.contains;
   52.23 -	}
   52.24 -}
   52.25 +/*
   52.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   52.27 + *
   52.28 + * Licensed under the Aduna BSD-style license.
   52.29 + */
   52.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   52.31 +
   52.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   52.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   52.34 + 
   52.35 +/**
   52.36 + * 
   52.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   52.38 + */
   52.39 +public class ContainsFunc extends SpatialRelationshipFunc {
   52.40 +
   52.41 +	@Override
   52.42 +	public String getURI() {
   52.43 +		return GeoConstants.contains;
   52.44 +	}
   52.45 +}

    53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Thu Sep 06 00:43:34 2012 +0300
    53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Thu Sep 06 00:44:45 2012 +0300
    53.3 @@ -1,21 +1,21 @@
    53.4 -/*
    53.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    53.6 - *
    53.7 - * Licensed under the Aduna BSD-style license.
    53.8 - */
    53.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   53.10 -
   53.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   53.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   53.13 - 
   53.14 -/**
   53.15 - * 
   53.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   53.17 - */
   53.18 -public class CoveredByFunc extends SpatialRelationshipFunc {
   53.19 -
   53.20 -	@Override
   53.21 -	public String getURI() {
   53.22 -		return GeoConstants.coveredBy;
   53.23 -	}
   53.24 -}
   53.25 +/*
   53.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   53.27 + *
   53.28 + * Licensed under the Aduna BSD-style license.
   53.29 + */
   53.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   53.31 +
   53.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   53.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   53.34 + 
   53.35 +/**
   53.36 + * 
   53.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   53.38 + */
   53.39 +public class CoveredByFunc extends SpatialRelationshipFunc {
   53.40 +
   53.41 +	@Override
   53.42 +	public String getURI() {
   53.43 +		return GeoConstants.coveredBy;
   53.44 +	}
   53.45 +}

    54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Thu Sep 06 00:43:34 2012 +0300
    54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Thu Sep 06 00:44:45 2012 +0300
    54.3 @@ -1,21 +1,21 @@
    54.4 -/*
    54.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    54.6 - *
    54.7 - * Licensed under the Aduna BSD-style license.
    54.8 - */
    54.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   54.10 -
   54.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   54.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   54.13 - 
   54.14 -/**
   54.15 - * 
   54.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   54.17 - */
   54.18 -public class CoversFunc extends SpatialRelationshipFunc {
   54.19 -
   54.20 -	@Override
   54.21 -	public String getURI() {
   54.22 -		return GeoConstants.covers;
   54.23 -	}
   54.24 -}
   54.25 +/*
   54.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   54.27 + *
   54.28 + * Licensed under the Aduna BSD-style license.
   54.29 + */
   54.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   54.31 +
   54.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   54.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   54.34 + 
   54.35 +/**
   54.36 + * 
   54.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   54.38 + */
   54.39 +public class CoversFunc extends SpatialRelationshipFunc {
   54.40 +
   54.41 +	@Override
   54.42 +	public String getURI() {
   54.43 +		return GeoConstants.covers;
   54.44 +	}
   54.45 +}

    55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Thu Sep 06 00:43:34 2012 +0300
    55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Thu Sep 06 00:44:45 2012 +0300
    55.3 @@ -1,21 +1,21 @@
    55.4 -/*
    55.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    55.6 - *
    55.7 - * Licensed under the Aduna BSD-style license.
    55.8 - */
    55.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   55.10 -
   55.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   55.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   55.13 - 
   55.14 -/**
   55.15 - * 
   55.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   55.17 - */
   55.18 -public class DisjointFunc extends SpatialRelationshipFunc {
   55.19 -
   55.20 -	@Override
   55.21 -	public String getURI() {
   55.22 -		return GeoConstants.disjoint;
   55.23 -	}
   55.24 -}
   55.25 +/*
   55.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   55.27 + *
   55.28 + * Licensed under the Aduna BSD-style license.
   55.29 + */
   55.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   55.31 +
   55.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   55.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   55.34 + 
   55.35 +/**
   55.36 + * 
   55.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   55.38 + */
   55.39 +public class DisjointFunc extends SpatialRelationshipFunc {
   55.40 +
   55.41 +	@Override
   55.42 +	public String getURI() {
   55.43 +		return GeoConstants.disjoint;
   55.44 +	}
   55.45 +}

    56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    56.3 @@ -1,21 +1,21 @@
    56.4 -/*
    56.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    56.6 - *
    56.7 - * Licensed under the Aduna BSD-style license.
    56.8 - */
    56.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   56.10 -
   56.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   56.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   56.13 -
   56.14 -/**
   56.15 - * 
   56.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   56.17 - */
   56.18 -public class EqualsFunc extends SpatialRelationshipFunc {
   56.19 -
   56.20 -	@Override
   56.21 -	public String getURI() {
   56.22 -		return GeoConstants.equals;
   56.23 -	}
   56.24 -}
   56.25 +/*
   56.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   56.27 + *
   56.28 + * Licensed under the Aduna BSD-style license.
   56.29 + */
   56.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   56.31 +
   56.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   56.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   56.34 +
   56.35 +/**
   56.36 + * 
   56.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   56.38 + */
   56.39 +public class EqualsFunc extends SpatialRelationshipFunc {
   56.40 +
   56.41 +	@Override
   56.42 +	public String getURI() {
   56.43 +		return GeoConstants.equals;
   56.44 +	}
   56.45 +}

    57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Thu Sep 06 00:43:34 2012 +0300
    57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Thu Sep 06 00:44:45 2012 +0300
    57.3 @@ -1,21 +1,21 @@
    57.4 -/*
    57.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    57.6 - *
    57.7 - * Licensed under the Aduna BSD-style license.
    57.8 - */
    57.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   57.10 -
   57.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   57.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   57.13 - 
   57.14 -/**
   57.15 - * 
   57.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   57.17 - */
   57.18 -public class InsideFunc extends SpatialRelationshipFunc {
   57.19 -
   57.20 -	@Override
   57.21 -	public String getURI() {
   57.22 -		return GeoConstants.inside;
   57.23 -	}
   57.24 -}
   57.25 +/*
   57.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   57.27 + *
   57.28 + * Licensed under the Aduna BSD-style license.
   57.29 + */
   57.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   57.31 +
   57.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   57.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   57.34 + 
   57.35 +/**
   57.36 + * 
   57.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   57.38 + */
   57.39 +public class InsideFunc extends SpatialRelationshipFunc {
   57.40 +
   57.41 +	@Override
   57.42 +	public String getURI() {
   57.43 +		return GeoConstants.inside;
   57.44 +	}
   57.45 +}

    58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Thu Sep 06 00:43:34 2012 +0300
    58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java	Thu Sep 06 00:44:45 2012 +0300
    58.3 @@ -1,22 +1,22 @@
    58.4 -/*
    58.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    58.6 - *
    58.7 - * Licensed under the Aduna BSD-style license.
    58.8 - */
    58.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   58.10 -
   58.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   58.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   58.13 -
   58.14 -/**
   58.15 - * 
   58.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   58.17 - */
   58.18 -public class IntersectsFunc extends SpatialRelationshipFunc {
   58.19 -
   58.20 -	@Override
   58.21 -	public String getURI() {
   58.22 -		return GeoConstants.intersects;
   58.23 -		}
   58.24 -
   58.25 -}
   58.26 +/*
   58.27 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   58.28 + *
   58.29 + * Licensed under the Aduna BSD-style license.
   58.30 + */
   58.31 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   58.32 +
   58.33 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   58.34 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   58.35 +
   58.36 +/**
   58.37 + * 
   58.38 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   58.39 + */
   58.40 +public class IntersectsFunc extends SpatialRelationshipFunc {
   58.41 +
   58.42 +	@Override
   58.43 +	public String getURI() {
   58.44 +		return GeoConstants.intersects;
   58.45 +		}
   58.46 +
   58.47 +}

    59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Thu Sep 06 00:43:34 2012 +0300
    59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Thu Sep 06 00:44:45 2012 +0300
    59.3 @@ -1,21 +1,21 @@
    59.4 -/*
    59.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    59.6 - *
    59.7 - * Licensed under the Aduna BSD-style license.
    59.8 - */
    59.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   59.10 -
   59.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   59.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   59.13 - 
   59.14 -/**
   59.15 - * 
   59.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   59.17 - */
   59.18 -public class LeftFunc extends SpatialRelationshipFunc {
   59.19 -
   59.20 -	@Override
   59.21 -	public String getURI() {
   59.22 -		return GeoConstants.left;
   59.23 -	}
   59.24 -}
   59.25 +/*
   59.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   59.27 + *
   59.28 + * Licensed under the Aduna BSD-style license.
   59.29 + */
   59.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   59.31 +
   59.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   59.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   59.34 + 
   59.35 +/**
   59.36 + * 
   59.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   59.38 + */
   59.39 +public class LeftFunc extends SpatialRelationshipFunc {
   59.40 +
   59.41 +	@Override
   59.42 +	public String getURI() {
   59.43 +		return GeoConstants.left;
   59.44 +	}
   59.45 +}

    60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Thu Sep 06 00:43:34 2012 +0300
    60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Thu Sep 06 00:44:45 2012 +0300
    60.3 @@ -1,21 +1,21 @@
    60.4 -/*
    60.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    60.6 - *
    60.7 - * Licensed under the Aduna BSD-style license.
    60.8 - */
    60.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   60.10 -
   60.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   60.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   60.13 - 
   60.14 -/**
   60.15 - * 
   60.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   60.17 - */
   60.18 -public class OverlapFunc extends SpatialRelationshipFunc {
   60.19 -
   60.20 -	@Override
   60.21 -	public String getURI() {
   60.22 -		return GeoConstants.overlap;
   60.23 -	}
   60.24 -}
   60.25 +/*
   60.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   60.27 + *
   60.28 + * Licensed under the Aduna BSD-style license.
   60.29 + */
   60.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   60.31 +
   60.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   60.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   60.34 + 
   60.35 +/**
   60.36 + * 
   60.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   60.38 + */
   60.39 +public class OverlapFunc extends SpatialRelationshipFunc {
   60.40 +
   60.41 +	@Override
   60.42 +	public String getURI() {
   60.43 +		return GeoConstants.overlap;
   60.44 +	}
   60.45 +}

    61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Thu Sep 06 00:43:34 2012 +0300
    61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Thu Sep 06 00:44:45 2012 +0300
    61.3 @@ -1,80 +1,80 @@
    61.4 -/*
    61.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    61.6 - *
    61.7 - * Licensed under the Aduna BSD-style license.
    61.8 - */
    61.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   61.10 -
   61.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   61.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   61.13 -
   61.14 -/**
   61.15 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   61.16 - */
   61.17 -public class RelateFunc extends SpatialRelationshipFunc {
   61.18 -
   61.19 -	@Override
   61.20 -	public String getURI() {
   61.21 -		return GeoConstants.relate;
   61.22 -	}
   61.23 -
   61.24 -//	public Literal evaluate(ValueFactory valueFactory, Value... args)
   61.25 -//		throws ValueExprEvaluationException
   61.26 -//	{
   61.27 -//		if (args.length != 1) {
   61.28 -//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
   61.29 -//					+ args.length);
   61.30 -//		}
   61.31 -//
   61.32 -//		if (args[0] instanceof Literal) {
   61.33 -//			Literal literal = (Literal)args[0];
   61.34 -//			URI datatype = literal.getDatatype();
   61.35 -//
   61.36 -//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
   61.37 -//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
   61.38 -//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
   61.39 -//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
   61.40 -//				}
   61.41 -//			}
   61.42 -//			else if (datatype != null) {
   61.43 -//				if (datatype.equals(XMLSchema.BOOLEAN)) {
   61.44 -//					return literal;
   61.45 -//				}
   61.46 -//				else {
   61.47 -//					Boolean booleanValue = null;
   61.48 -//
   61.49 -//					try {
   61.50 -//						if (datatype.equals(XMLSchema.FLOAT)) {
   61.51 -//							float floatValue = literal.floatValue();
   61.52 -//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
   61.53 -//						}
   61.54 -//						else if (datatype.equals(XMLSchema.DOUBLE)) {
   61.55 -//							double doubleValue = literal.doubleValue();
   61.56 -//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
   61.57 -//						}
   61.58 -//						else if (datatype.equals(XMLSchema.DECIMAL)) {
   61.59 -//							BigDecimal decimalValue = literal.decimalValue();
   61.60 -//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
   61.61 -//						}
   61.62 -//						else if (datatype.equals(XMLSchema.INTEGER)) {
   61.63 -//							BigInteger integerValue = literal.integerValue();
   61.64 -//							booleanValue = !integerValue.equals(BigInteger.ZERO);
   61.65 -//						}
   61.66 -//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
   61.67 -//							booleanValue = literal.longValue() != 0L;
   61.68 -//						}
   61.69 -//					}
   61.70 -//					catch (NumberFormatException e) {
   61.71 -//						throw new ValueExprEvaluationException(e.getMessage(), e);
   61.72 -//					}
   61.73 -//
   61.74 -//					if (booleanValue != null) {
   61.75 -//						return valueFactory.createLiteral(booleanValue);
   61.76 -//					}
   61.77 -//				}
   61.78 -//			}
   61.79 -//		}
   61.80 -//
   61.81 -//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
   61.82 -//	}
   61.83 -}
   61.84 +/*
   61.85 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   61.86 + *
   61.87 + * Licensed under the Aduna BSD-style license.
   61.88 + */
   61.89 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   61.90 +
   61.91 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   61.92 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   61.93 +
   61.94 +/**
   61.95 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   61.96 + */
   61.97 +public class RelateFunc extends SpatialRelationshipFunc {
   61.98 +
   61.99 +	@Override
  61.100 +	public String getURI() {
  61.101 +		return GeoConstants.relate;
  61.102 +	}
  61.103 +
  61.104 +//	public Literal evaluate(ValueFactory valueFactory, Value... args)
  61.105 +//		throws ValueExprEvaluationException
  61.106 +//	{
  61.107 +//		if (args.length != 1) {
  61.108 +//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
  61.109 +//					+ args.length);
  61.110 +//		}
  61.111 +//
  61.112 +//		if (args[0] instanceof Literal) {
  61.113 +//			Literal literal = (Literal)args[0];
  61.114 +//			URI datatype = literal.getDatatype();
  61.115 +//
  61.116 +//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
  61.117 +//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
  61.118 +//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
  61.119 +//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
  61.120 +//				}
  61.121 +//			}
  61.122 +//			else if (datatype != null) {
  61.123 +//				if (datatype.equals(XMLSchema.BOOLEAN)) {
  61.124 +//					return literal;
  61.125 +//				}
  61.126 +//				else {
  61.127 +//					Boolean booleanValue = null;
  61.128 +//
  61.129 +//					try {
  61.130 +//						if (datatype.equals(XMLSchema.FLOAT)) {
  61.131 +//							float floatValue = literal.floatValue();
  61.132 +//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
  61.133 +//						}
  61.134 +//						else if (datatype.equals(XMLSchema.DOUBLE)) {
  61.135 +//							double doubleValue = literal.doubleValue();
  61.136 +//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
  61.137 +//						}
  61.138 +//						else if (datatype.equals(XMLSchema.DECIMAL)) {
  61.139 +//							BigDecimal decimalValue = literal.decimalValue();
  61.140 +//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
  61.141 +//						}
  61.142 +//						else if (datatype.equals(XMLSchema.INTEGER)) {
  61.143 +//							BigInteger integerValue = literal.integerValue();
  61.144 +//							booleanValue = !integerValue.equals(BigInteger.ZERO);
  61.145 +//						}
  61.146 +//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
  61.147 +//							booleanValue = literal.longValue() != 0L;
  61.148 +//						}
  61.149 +//					}
  61.150 +//					catch (NumberFormatException e) {
  61.151 +//						throw new ValueExprEvaluationException(e.getMessage(), e);
  61.152 +//					}
  61.153 +//
  61.154 +//					if (booleanValue != null) {
  61.155 +//						return valueFactory.createLiteral(booleanValue);
  61.156 +//					}
  61.157 +//				}
  61.158 +//			}
  61.159 +//		}
  61.160 +//
  61.161 +//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  61.162 +//	}
  61.163 +}

    62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Thu Sep 06 00:43:34 2012 +0300
    62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Thu Sep 06 00:44:45 2012 +0300
    62.3 @@ -1,21 +1,21 @@
    62.4 -/*
    62.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    62.6 - *
    62.7 - * Licensed under the Aduna BSD-style license.
    62.8 - */
    62.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   62.10 -
   62.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   62.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   62.13 - 
   62.14 -/**
   62.15 - * 
   62.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   62.17 - */
   62.18 -public class RightFunc extends SpatialRelationshipFunc {
   62.19 -
   62.20 -	@Override
   62.21 -	public String getURI() {
   62.22 -		return GeoConstants.right;
   62.23 -	}
   62.24 -}
   62.25 +/*
   62.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   62.27 + *
   62.28 + * Licensed under the Aduna BSD-style license.
   62.29 + */
   62.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   62.31 +
   62.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   62.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   62.34 + 
   62.35 +/**
   62.36 + * 
   62.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   62.38 + */
   62.39 +public class RightFunc extends SpatialRelationshipFunc {
   62.40 +
   62.41 +	@Override
   62.42 +	public String getURI() {
   62.43 +		return GeoConstants.right;
   62.44 +	}
   62.45 +}

    63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Thu Sep 06 00:43:34 2012 +0300
    63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Thu Sep 06 00:44:45 2012 +0300
    63.3 @@ -1,21 +1,21 @@
    63.4 -/*
    63.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    63.6 - *
    63.7 - * Licensed under the Aduna BSD-style license.
    63.8 - */
    63.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   63.10 -
   63.11 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   63.12 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   63.13 - 
   63.14 -/**
   63.15 - * 
   63.16 - * @author Manos Karpathiotakis <mk@di.uoa.gr>
   63.17 - */
   63.18 -public class TouchFunc extends SpatialRelationshipFunc {
   63.19 -
   63.20 -	@Override
   63.21 -	public String getURI() {
   63.22 -		return GeoConstants.touch;
   63.23 -	}
   63.24 -}
   63.25 +/*
   63.26 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   63.27 + *
   63.28 + * Licensed under the Aduna BSD-style license.
   63.29 + */
   63.30 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   63.31 +
   63.32 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
   63.33 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   63.34 + 
   63.35 +/**
   63.36 + * 
   63.37 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
   63.38 + */
   63.39 +public class TouchFunc extends SpatialRelationshipFunc {
   63.40 +
   63.41 +	@Override
   63.42 +	public String getURI() {
   63.43 +		return GeoConstants.touch;
   63.44 +	}
   63.45 +}