Strabon
changeset 965:69a0a785ef8f
added new "constants" module with artifactId "spatial-temporal-constants" and moved GeoConstants there
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/constants/pom.xml Tue Apr 02 13:27:01 2013 +0300 1.3 @@ -0,0 +1,97 @@ 1.4 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 1.5 + 1.6 + <modelVersion>4.0.0</modelVersion> 1.7 + 1.8 + <parent> 1.9 + <groupId>eu.earthobservatory</groupId> 1.10 + <artifactId>strabon</artifactId> 1.11 + <version>3.2.9-SNAPSHOT</version> 1.12 + </parent> 1.13 + 1.14 + <artifactId>spatial-temporal-constants</artifactId> 1.15 + 1.16 + <name>Strabon: Spatial and Temporal Constants</name> 1.17 + <description>Spatial and Temporal Constants for Strabon</description> 1.18 + <packaging>jar</packaging> 1.19 + 1.20 + <build> 1.21 + <pluginManagement> 1.22 + <plugins> 1.23 + <plugin> 1.24 + <groupId>org.eclipse.m2e</groupId> 1.25 + <artifactId>lifecycle-mapping</artifactId> 1.26 + <version>1.0.0</version> 1.27 + <configuration> 1.28 + <lifecycleMappingMetadata> 1.29 + <pluginExecutions> 1.30 + <pluginExecution> 1.31 + <pluginExecutionFilter> 1.32 + <groupId>org.apache.maven.plugins</groupId> 1.33 + <artifactId>maven-dependency-plugin</artifactId> 1.34 + <versionRange>[2.3,)</versionRange> 1.35 + <goals> 1.36 + <goal>copy-dependencies</goal> 1.37 + </goals> 1.38 + </pluginExecutionFilter> 1.39 + <action> 1.40 + <ignore /> 1.41 + </action> 1.42 + </pluginExecution> 1.43 + </pluginExecutions> 1.44 + </lifecycleMappingMetadata> 1.45 + </configuration> 1.46 + </plugin> 1.47 + </plugins> 1.48 + </pluginManagement> 1.49 + 1.50 + <plugins> 1.51 + <plugin> 1.52 + <groupId>org.apache.maven.plugins</groupId> 1.53 + <artifactId>maven-compiler-plugin</artifactId> 1.54 + <version>2.3.2</version> 1.55 + <configuration> 1.56 + <source>1.6</source> 1.57 + <target>1.6</target> 1.58 + <encoding>utf8</encoding> 1.59 + </configuration> 1.60 + </plugin> 1.61 + <plugin> 1.62 + <groupId>org.apache.maven.plugins</groupId> 1.63 + <artifactId>maven-dependency-plugin</artifactId> 1.64 + <version>2.4</version> 1.65 + <executions> 1.66 + <execution> 1.67 + <id>copy-dependencies</id> 1.68 + <phase>package</phase> 1.69 + <goals> 1.70 + <goal>copy-dependencies</goal> 1.71 + </goals> 1.72 + <configuration> 1.73 + <outputDirectory>${project.build.directory}</outputDirectory> 1.74 + <overWriteReleases>false</overWriteReleases> 1.75 + <overWriteSnapshots>false</overWriteSnapshots> 1.76 + <overWriteIfNewer>true</overWriteIfNewer> 1.77 + </configuration> 1.78 + </execution> 1.79 + </executions> 1.80 + </plugin> 1.81 + 1.82 + <plugin> 1.83 + <groupId>org.apache.maven.plugins</groupId> 1.84 + <artifactId>maven-jar-plugin</artifactId> 1.85 + <version>2.4</version> 1.86 + <configuration> 1.87 + <skipIfEmpty>true</skipIfEmpty> 1.88 + </configuration> 1.89 + <executions> 1.90 + <execution> 1.91 + <goals> 1.92 + <goal>test-jar</goal> 1.93 + </goals> 1.94 + </execution> 1.95 + </executions> 1.96 + </plugin> 1.97 + </plugins> 1.98 + </build> 1.99 +</project> 1.100 +
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/constants/src/main/java/eu/earthobservatory/constants/GeoConstants.java Tue Apr 02 13:27:01 2013 +0300 2.3 @@ -0,0 +1,344 @@ 2.4 +/** 2.5 + * This Source Code Form is subject to the terms of the Mozilla Public 2.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this 2.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. 2.8 + * 2.9 + * Copyright (C) 2010, 2011, 2012, Pyravlos Team 2.10 + * 2.11 + * http://www.strabon.di.uoa.gr/ 2.12 + */ 2.13 +package eu.earthobservatory.constants; 2.14 + 2.15 +import java.lang.reflect.Field; 2.16 +import java.util.ArrayList; 2.17 +import java.util.List; 2.18 + 2.19 +/** 2.20 + * This class is a placeholder for various constants around geometries. These 2.21 + * constants range from URIs of namespaces, functions, representations, etc., 2.22 + * to other constants, such as the default spatial reference system (SRID) that 2.23 + * is assumed in Strabon. 2.24 + * 2.25 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 2.26 + * @author Kostis Kyzirakos <kkyzir@di.uoa.gr> 2.27 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr> 2.28 + */ 2.29 +public class GeoConstants { 2.30 + /** * 2.31 + * Namespaces * 2.32 + * */ 2.33 + 2.34 + /** 2.35 + * The namespace for stRDF data model 2.36 + */ 2.37 + public static final String stRDF = "http://strdf.di.uoa.gr/ontology#"; 2.38 + 2.39 + /** 2.40 + * The namespace for the RDFi framework 2.41 + */ 2.42 + public static final String rdfi = "http://rdfi.di.uoa.gr/ontology#"; 2.43 + 2.44 + 2.45 + /** * 2.46 + * GeoSPARQL Version 1.0.1 Document# 11-052r4 * 2.47 + * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip */ 2.48 + 2.49 + /** 2.50 + * The namespace for GeoSPARQL ontology 2.51 + */ 2.52 + public static final String GEO = "http://www.opengis.net/ont/geosparql#"; 2.53 + 2.54 + /** 2.55 + * The namespace for geometry functions declared by GeoSPARQL 2.56 + */ 2.57 + public static final String GEOF = "http://www.opengis.net/def/function/geosparql/"; 2.58 + 2.59 + /** 2.60 + * The namespace for the ontology of simple features 2.61 + */ 2.62 + public static final String SF = "http://www.opengis.net/ont/sf#"; 2.63 + 2.64 + /** 2.65 + * 2.66 + * The namespace of GML. 2.67 + * 2.68 + * Initially, it was set to "http://www.opengis.net/def/geometryType/OGC-GML/3.2/". 2.69 + * Afterwards, it was set to "http://www.opengis.net/gml/3.2/" in order to be compliant 2.70 + * with GML version 3.3, as defined by OGC in the document with title 2.71 + * <tt>"OGC® Geography Markup Language (GML) — Extended schemas and encoding rules"</tt> 2.72 + * ({@link https://portal.opengeospatial.org/files/?artifact_id=46568}). However, none 2.73 + * of these work with the parser provided by JTS, which assumes that the namespace for 2.74 + * GML should be only "http://www.opengis.net/gml" and nothing else. In every other case, 2.75 + * an exception is thrown by the GML parser. 2.76 + * 2.77 + * 2.78 + * @see {@link org.openrdf.query.algebra.evaluation.util.JTSWrapper.GMLReader}, {@link GMLReader} 2.79 + */ 2.80 + public static final String GML_OGC = "http://www.opengis.net/gml"; 2.81 + 2.82 + 2.83 + 2.84 + 2.85 + /** * 2.86 + * URIs * 2.87 + * */ 2.88 + 2.89 + /** * 2.90 + * GeoSPARQL Version 1.0.1 Document# 11-052r4 * 2.91 + * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip */ 2.92 + 2.93 + /** The following GeoSPARQL classes and properties are 2.94 + * commented out because they are not currently used. 2.95 + */ 2.96 + 2.97 + /** 2.98 + * The URIs for GeoSPARQL classes 2.99 + */ 2.100 +/* public static final String SpatialObject = GEO + "SpatialObject"; 2.101 + public static final String Geometry = GEO + "Geometry"; 2.102 + public static final String Feauture = GEO + "Feature"; 2.103 +*/ 2.104 + 2.105 + /** 2.106 + * The URIs for GeoSPARQL properties 2.107 + */ 2.108 +/* public static final String hasGeometry_OGC = GEO + "hasGeometry"; 2.109 + public static final String defaultGeometry_OGC = GEO + "defaultGeometry"; 2.110 + public static final String dimension_OGC = GEO + "dimension"; 2.111 + public static final String coordinateDimension_OGC = GEO + "coordinateDimension"; 2.112 + public static final String spatialDimension_OGC = GEO + "spatialDimension"; 2.113 + public static final String isEmpty_OGC = GEO + "isEmpty"; 2.114 + public static final String isSimple_OGC = GEO + "isSimple"; 2.115 + public static final String asWKT_OGC = GEO + "asWKT"; 2.116 + public static final String asGML_OGC = GEO + "asGML"; 2.117 +*/ 2.118 + 2.119 + 2.120 + /** * 2.121 + * URIs for datatypes * 2.122 + * */ 2.123 + 2.124 + 2.125 + /** 2.126 + * The URI for the datatype SemiLinearPointSet 2.127 + * (linear constraint-based representation of geometries) 2.128 + */ 2.129 + public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 2.130 + 2.131 + 2.132 + /** 2.133 + * The URI for the datatype Well-Known Text (WKT) 2.134 + */ 2.135 + public static final String WKT = stRDF + "WKT"; 2.136 + 2.137 + /** 2.138 + * The URI for the datatype Geography Markup Language (GML) as it defined 2.139 + * in the model stRDF and query language stSPARQL 2.140 + */ 2.141 + public static final String GML = stRDF + "GML"; 2.142 + 2.143 + /** 2.144 + * The URI for the datatype wktLiteral 2.145 + */ 2.146 + public static final String WKTLITERAL = GEO + "wktLiteral"; 2.147 + 2.148 + /** 2.149 + * The URI for the datatype gmlLiteral 2.150 + */ 2.151 + public static final String GMLLITERAL = GEO + "gmlLiteral"; 2.152 + 2.153 + /** * 2.154 + * Extended functions * 2.155 + * stSPARQL * 2.156 + * */ 2.157 + // Spatial Relationships 2.158 + public static final String stSPARQLequals = stRDF + "equals"; 2.159 + public static final String stSPARQLdisjoint = stRDF + "disjoint"; 2.160 + public static final String stSPARQLintersects = stRDF + "intersects"; 2.161 + public static final String stSPARQLtouches = stRDF + "touches"; 2.162 + public static final String stSPARQLwithin = stRDF + "within"; 2.163 + public static final String stSPARQLcontains = stRDF + "contains"; 2.164 + public static final String stSPARQLoverlaps = stRDF + "overlaps"; 2.165 + public static final String stSPARQLcrosses = stRDF + "crosses"; 2.166 + 2.167 + // The generic relate function 2.168 + public static final String stSPARQLrelate = stRDF + "relate"; 2.169 + 2.170 + // Topological Relationships utilizing mbb 2.171 + public static final String stSPARQLmbbIntersects = stRDF + "mbbIntersects"; 2.172 + public static final String stSPARQLmbbContains = stRDF + "mbbContains"; 2.173 + public static final String stSPARQLmbbEquals = stRDF + "mbbEquals"; 2.174 + public static final String stSPARQLmbbWithin = stRDF + "mbbWithin"; 2.175 + 2.176 + // Directional functions 2.177 + public static final String stSPARQLleft = stRDF + "left"; 2.178 + public static final String stSPARQLright = stRDF + "right"; 2.179 + public static final String stSPARQLabove = stRDF + "above"; 2.180 + public static final String stSPARQLbelow = stRDF + "below"; 2.181 + 2.182 + // Spatial Constructs 2.183 + public static final String stSPARQLunion = stRDF + "union"; 2.184 + public static final String stSPARQLbuffer = stRDF + "buffer"; 2.185 + public static final String stSPARQLenvelope = stRDF + "envelope"; 2.186 + public static final String stSPARQLconvexHull = stRDF + "convexHull"; 2.187 + public static final String stSPARQLboundary = stRDF + "boundary"; 2.188 + public static final String stSPARQLintersection = stRDF + "intersection"; 2.189 + public static final String stSPARQLdifference = stRDF + "difference"; 2.190 + public static final String stSPARQLsymDifference = stRDF + "symDifference"; 2.191 + public static final String stSPARQLtransform = stRDF + "transform"; 2.192 + 2.193 + // Spatial Metric Functions 2.194 + public static final String stSPARQLdistance = stRDF + "distance"; 2.195 + public static final String stSPARQLarea = stRDF + "area"; 2.196 + 2.197 + // Spatial Properties 2.198 + public static final String stSPARQLdimension = stRDF + "dimension"; 2.199 + public static final String stSPARQLgeometryType = stRDF + "geometryType"; 2.200 + public static final String stSPARQLasText = stRDF + "asText"; 2.201 + public static final String stSPARQLasGML = stRDF + "asGML"; 2.202 + public static final String stSPARQLsrid = stRDF + "srid"; 2.203 + public static final String stSPARQLisEmpty = stRDF + "isEmpty"; 2.204 + public static final String stSPARQLisSimple = stRDF + "isSimple"; 2.205 + 2.206 + // Spatial Aggregate Functions 2.207 + public static final String stSPARQLextent = stRDF + "extent"; 2.208 + 2.209 + /** 2.210 + * WGS 84 latitude-longitude (EPSG:4326) 2.211 + */ 2.212 + public static final String WGS84_LAT_LON = "http://www.opengis.net/def/crs/EPSG/0/4326"; 2.213 + 2.214 + /** 2.215 + * WGS 84 longitude-longitude 2.216 + * (used as the default CRS for GeoSPARQL geometries) 2.217 + */ 2.218 + public static final String WGS84_LON_LAT = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"; 2.219 + 2.220 + /** 2.221 + * EPSG:4326 2.222 + */ 2.223 + public static final Integer WGS84_LAT_LON_SRID = 4326; 2.224 + 2.225 + /** 2.226 + * EPSG:3857 (not sure whether this is correct for WGS84_LON_LAT) 2.227 + * http://spatialreference.org/ref/sr-org/7483/ 2.228 + */ 2.229 + public static final Integer WGS84_LON_LAT_SRID = 3857; 2.230 + 2.231 + /** 2.232 + * Default SRID (WGS84 latitude-longitude) 2.233 + */ 2.234 + public static final Integer defaultSRID = WGS84_LAT_LON_SRID; 2.235 + 2.236 + /** * 2.237 + * Extended functions * 2.238 + * GeoSPARQL * 2.239 + * */ 2.240 + // Non-topological 2.241 + public static final String geoSparqlDistance = GEOF + "distance"; //3 arguments 2.242 + public static final String geoSparqlBuffer = GEOF + "buffer"; //3 arguments 2.243 + public static final String geoSparqlConvexHull = GEOF + "convexHull"; 2.244 + public static final String geoSparqlIntersection = GEOF + "intersection"; 2.245 + public static final String geoSparqlUnion = GEOF + "union"; 2.246 + public static final String geoSparqlDifference = GEOF + "difference"; 2.247 + public static final String geoSparqlSymmetricDifference = GEOF + "symmetricDifference"; 2.248 + public static final String geoSparqlEnvelope = GEOF + "envelope"; 2.249 + public static final String geoSparqlBoundary = GEOF + "boundary"; 2.250 + 2.251 + // Simple Features - 8 functions - all with 2 arguments + boolean 2.252 + public static final String sfEquals = GEOF + "sfEquals"; 2.253 + public static final String sfDisjoint = GEOF + "sfDisjoint"; 2.254 + public static final String sfIntersects = GEOF + "sfIntersects"; 2.255 + public static final String sfTouches = GEOF + "sfTouches"; 2.256 + public static final String sfCrosses = GEOF + "sfCrosses"; 2.257 + public static final String sfWithin = GEOF + "sfWithin"; 2.258 + public static final String sfContains = GEOF + "sfContains"; 2.259 + public static final String sfOverlaps = GEOF + "sfOverlaps"; 2.260 + 2.261 + // Egenhofer - 8 functions - all with 2 arguments + boolean 2.262 + public static final String ehEquals = GEOF + "ehEquals"; 2.263 + public static final String ehDisjoint = GEOF + "ehDisjoint"; 2.264 + public static final String ehMeet = GEOF + "ehMeet"; 2.265 + public static final String ehOverlap = GEOF + "ehOverlap"; 2.266 + public static final String ehCovers = GEOF + "ehCovers"; 2.267 + public static final String ehCoveredBy = GEOF + "ehCoveredBy"; 2.268 + public static final String ehInside = GEOF + "ehInside"; 2.269 + public static final String ehContains = GEOF + "ehContains"; 2.270 + 2.271 + // RCC8 - 8 functions - all with 2 arguments + boolean 2.272 + public static final String rccEquals = GEOF + "rcc8eq"; 2.273 + public static final String rccDisconnected = GEOF + "rcc8dc"; 2.274 + public static final String rccExternallyConnected = GEOF + "rcc8ec"; 2.275 + public static final String rccPartiallyOverlapping = GEOF + "rcc8po"; 2.276 + public static final String rccTangentialProperPartInverse = GEOF + "rcc8tppi"; 2.277 + public static final String rccTangentialProperPart = GEOF + "rcc8tpp"; 2.278 + public static final String rccNonTangentialProperPart = GEOF + "rcc8ntpp"; 2.279 + public static final String rccNonTangentialProperPartInverse = GEOF + "rcc8ntppi"; 2.280 + 2.281 + // The generic relate function 2.282 + public static final String geoSparqlRelate = GEOF + "relate"; 2.283 + 2.284 + /** 2.285 + * Addition for datetime metric functions 2.286 + * 2.287 + * @author George Garbis <ggarbis@di.uoa.gr> 2.288 + * 2.289 + */ 2.290 + public static final String diffDateTime = "http://strdf.di.uoa.gr/extensions/ontology#diffDateTime"; 2.291 + /** End of addition **/ 2.292 + 2.293 + /** 2.294 + * RCC-8 relations for the RDFi framework 2.295 + */ 2.296 + public static final String rdfiDC = rdfi + "DC"; 2.297 + public static final String rdfiEC = rdfi + "EC"; 2.298 + public static final String rdfiPO = rdfi + "PO"; 2.299 + public static final String rdfiNTPP = rdfi + "NTPP"; 2.300 + public static final String rdfiNTPPi = rdfi + "NTPPi"; 2.301 + public static final String rdfiTPP = rdfi + "TPP"; 2.302 + public static final String rdfiTPPi = rdfi + "TPPi"; 2.303 + public static final String rdfiEQ = rdfi + "EQ"; 2.304 + 2.305 + /** 2.306 + * List of stSPARQL spatial extension functions 2.307 + */ 2.308 + public static final List<String> STSPARQLSpatialExtFunc = new ArrayList<String>(); 2.309 + 2.310 + /** 2.311 + * List of stSPARQL temporal extension functions 2.312 + */ 2.313 + //public static final List<String> stSPARQLTemporalExtFunc = new ArrayList<String>(); 2.314 + 2.315 + /** 2.316 + * List of GeoSPARQL extension functions 2.317 + */ 2.318 + public static final List<String> GEOSPARQLExtFunc = new ArrayList<String>(); 2.319 + 2.320 + // declare spatial and temporal extension functions 2.321 + static { 2.322 + Class<GeoConstants> geoConstants = GeoConstants.class; 2.323 + 2.324 + try { 2.325 + Field[] field = geoConstants.getDeclaredFields(); 2.326 + 2.327 + for (int i = 0; i < field.length; i++) { 2.328 + // stSPARQL 2.329 + if (field[i].getName().startsWith("stSPARQL")) { 2.330 + STSPARQLSpatialExtFunc.add((String) field[i].get(null)); 2.331 + 2.332 + } else if (field[i].getName().startsWith("geoSparql") || 2.333 + field[i].getName().startsWith("sf") || 2.334 + field[i].getName().startsWith("eh") || 2.335 + field[i].getName().startsWith("rcc")) { // GeoSPARQL 2.336 + GEOSPARQLExtFunc.add((String) field[i].get(null)); 2.337 + } 2.338 + } 2.339 + } catch (SecurityException e) { 2.340 + // suppress exception; it should not reach here 2.341 + } catch (IllegalArgumentException e) { 2.342 + // suppress exception; it should not reach here 2.343 + } catch (IllegalAccessException e) { 2.344 + // suppress exception; it should not reach here 2.345 + } 2.346 + } 2.347 +}
3.1 --- a/endpoint/pom.xml Tue Apr 02 13:25:45 2013 +0300 3.2 +++ b/endpoint/pom.xml Tue Apr 02 13:27:01 2013 +0300 3.3 @@ -26,6 +26,11 @@ 3.4 3.5 <dependency> 3.6 <groupId>eu.earthobservatory</groupId> 3.7 + <artifactId>spatial-temporal-constants</artifactId> 3.8 + </dependency> 3.9 + 3.10 + <dependency> 3.11 + <groupId>eu.earthobservatory</groupId> 3.12 <artifactId>strabon-runtime</artifactId> 3.13 <type>jar</type> 3.14 <scope>compile</scope> 3.15 @@ -97,28 +102,6 @@ 3.16 </exclusions> 3.17 </dependency> 3.18 3.19 - <!-- 3.20 - <dependency> 3.21 - <groupId>org.apache.cxf</groupId> 3.22 - <artifactId>cxf-rt-frontend-jaxws</artifactId> 3.23 - </dependency> 3.24 - 3.25 - <dependency> 3.26 - <groupId>org.apache.cxf</groupId> 3.27 - <artifactId>cxf-rt-transports-http</artifactId> 3.28 - </dependency> 3.29 - 3.30 - <dependency> 3.31 - <groupId>org.apache.cxf</groupId> 3.32 - <artifactId>cxf-rt-transports-http-jetty</artifactId> 3.33 - <exclusions> 3.34 - <exclusion> 3.35 - <artifactId>slf4j-jdk14</artifactId> 3.36 - <groupId>org.slf4j</groupId> 3.37 - </exclusion> 3.38 - </exclusions> 3.39 - </dependency> 3.40 - --> 3.41 <dependency> 3.42 <groupId>commons-validator</groupId> 3.43 <artifactId>commons-validator</artifactId>
4.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java Tue Apr 02 13:25:45 2013 +0300 4.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/capabilities/EndpointCapabilities.java Tue Apr 02 13:27:01 2013 +0300 4.3 @@ -14,10 +14,11 @@ 4.4 import java.util.List; 4.5 import java.util.Properties; 4.6 4.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 4.8 import org.slf4j.Logger; 4.9 import org.slf4j.LoggerFactory; 4.10 4.11 +import eu.earthobservatory.constants.GeoConstants; 4.12 + 4.13 4.14 /** 4.15 * This class implements the {@link Capabilities} interface and
5.1 --- a/evaluation/pom.xml Tue Apr 02 13:25:45 2013 +0300 5.2 +++ b/evaluation/pom.xml Tue Apr 02 13:27:01 2013 +0300 5.3 @@ -15,6 +15,12 @@ 5.4 <packaging>jar</packaging> 5.5 5.6 <dependencies> 5.7 + 5.8 + <dependency> 5.9 + <groupId>eu.earthobservatory</groupId> 5.10 + <artifactId>spatial-temporal-constants</artifactId> 5.11 + </dependency> 5.12 + 5.13 <dependency> 5.14 <groupId>org.openrdf.sesame</groupId> 5.15 <artifactId>sesame-queryalgebra-evaluation</artifactId>
6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/datetime/stsparql/metric/DiffDateTime.java Tue Apr 02 13:25:45 2013 +0300 6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/datetime/stsparql/metric/DiffDateTime.java Tue Apr 02 13:27:01 2013 +0300 6.3 @@ -9,15 +9,9 @@ 6.4 */ 6.5 package org.openrdf.query.algebra.evaluation.function.datetime.stsparql.metric; 6.6 6.7 -import java.text.SimpleDateFormat; 6.8 -import java.util.Calendar; 6.9 -import java.util.GregorianCalendar; 6.10 +import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc; 6.11 6.12 -import org.openrdf.model.Value; 6.13 -import org.openrdf.model.ValueFactory; 6.14 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 6.15 -import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc; 6.16 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 6.17 +import eu.earthobservatory.constants.GeoConstants; 6.18 6.19 /** 6.20 * Addition for datetime metric functions
7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Tue Apr 02 13:25:45 2013 +0300 7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Tue Apr 02 13:27:01 2013 +0300 7.3 @@ -13,7 +13,8 @@ 7.4 import org.openrdf.model.ValueFactory; 7.5 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 7.6 import org.openrdf.query.algebra.evaluation.function.Function; 7.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 7.8 + 7.9 +import eu.earthobservatory.constants.GeoConstants; 7.10 7.11 /** 7.12 *
8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/AbstractWKT.java Tue Apr 02 13:25:45 2013 +0300 8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/AbstractWKT.java Tue Apr 02 13:27:01 2013 +0300 8.3 @@ -14,6 +14,8 @@ 8.4 import org.slf4j.Logger; 8.5 import org.slf4j.LoggerFactory; 8.6 8.7 +import eu.earthobservatory.constants.GeoConstants; 8.8 + 8.9 8.10 /** 8.11 * This class generalizes WKT literal values that can be given according
9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Tue Apr 02 13:25:45 2013 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,346 +0,0 @@ 9.4 -/** 9.5 - * This Source Code Form is subject to the terms of the Mozilla Public 9.6 - * License, v. 2.0. If a copy of the MPL was not distributed with this 9.7 - * file, You can obtain one at http://mozilla.org/MPL/2.0/. 9.8 - * 9.9 - * Copyright (C) 2010, 2011, 2012, Pyravlos Team 9.10 - * 9.11 - * http://www.strabon.di.uoa.gr/ 9.12 - */ 9.13 -package org.openrdf.query.algebra.evaluation.function.spatial; 9.14 - 9.15 -import java.lang.reflect.Field; 9.16 -import java.util.ArrayList; 9.17 -import java.util.List; 9.18 - 9.19 -import com.vividsolutions.jts.io.gml2.GMLReader; 9.20 - 9.21 -/** 9.22 - * This class is a placeholder for various constants around geometries. These 9.23 - * constants range from URIs of namespaces, functions, representations, etc., 9.24 - * to other constants, such as the default spatial reference system (SRID) that 9.25 - * is assumed in Strabon. 9.26 - * 9.27 - * @author Charalampos Nikolaou <charnik@di.uoa.gr> 9.28 - * @author Kostis Kyzirakos <kkyzir@di.uoa.gr> 9.29 - * @author Kallirroi Dogani <kallirroi@di.uoa.gr> 9.30 - */ 9.31 -public class GeoConstants { 9.32 - /** * 9.33 - * Namespaces * 9.34 - * */ 9.35 - 9.36 - /** 9.37 - * The namespace for stRDF data model 9.38 - */ 9.39 - public static final String stRDF = "http://strdf.di.uoa.gr/ontology#"; 9.40 - 9.41 - /** 9.42 - * The namespace for the RDFi framework 9.43 - */ 9.44 - public static final String rdfi = "http://rdfi.di.uoa.gr/ontology#"; 9.45 - 9.46 - 9.47 - /** * 9.48 - * GeoSPARQL Version 1.0.1 Document# 11-052r4 * 9.49 - * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip */ 9.50 - 9.51 - /** 9.52 - * The namespace for GeoSPARQL ontology 9.53 - */ 9.54 - public static final String GEO = "http://www.opengis.net/ont/geosparql#"; 9.55 - 9.56 - /** 9.57 - * The namespace for geometry functions declared by GeoSPARQL 9.58 - */ 9.59 - public static final String GEOF = "http://www.opengis.net/def/function/geosparql/"; 9.60 - 9.61 - /** 9.62 - * The namespace for the ontology of simple features 9.63 - */ 9.64 - public static final String SF = "http://www.opengis.net/ont/sf#"; 9.65 - 9.66 - /** 9.67 - * 9.68 - * The namespace of GML. 9.69 - * 9.70 - * Initially, it was set to "http://www.opengis.net/def/geometryType/OGC-GML/3.2/". 9.71 - * Afterwards, it was set to "http://www.opengis.net/gml/3.2/" in order to be compliant 9.72 - * with GML version 3.3, as defined by OGC in the document with title 9.73 - * <tt>"OGC® Geography Markup Language (GML) — Extended schemas and encoding rules"</tt> 9.74 - * ({@link https://portal.opengeospatial.org/files/?artifact_id=46568}). However, none 9.75 - * of these work with the parser provided by JTS, which assumes that the namespace for 9.76 - * GML should be only "http://www.opengis.net/gml" and nothing else. In every other case, 9.77 - * an exception is thrown by the GML parser. 9.78 - * 9.79 - * 9.80 - * @see {@link org.openrdf.query.algebra.evaluation.util.JTSWrapper.GMLReader}, {@link GMLReader} 9.81 - */ 9.82 - public static final String GML_OGC = "http://www.opengis.net/gml"; 9.83 - 9.84 - 9.85 - 9.86 - 9.87 - /** * 9.88 - * URIs * 9.89 - * */ 9.90 - 9.91 - /** * 9.92 - * GeoSPARQL Version 1.0.1 Document# 11-052r4 * 9.93 - * http://schemas.opengis.net/geosparql/geosparql-1_0_1.zip */ 9.94 - 9.95 - /** The following GeoSPARQL classes and properties are 9.96 - * commented out because they are not currently used. 9.97 - */ 9.98 - 9.99 - /** 9.100 - * The URIs for GeoSPARQL classes 9.101 - */ 9.102 -/* public static final String SpatialObject = GEO + "SpatialObject"; 9.103 - public static final String Geometry = GEO + "Geometry"; 9.104 - public static final String Feauture = GEO + "Feature"; 9.105 -*/ 9.106 - 9.107 - /** 9.108 - * The URIs for GeoSPARQL properties 9.109 - */ 9.110 -/* public static final String hasGeometry_OGC = GEO + "hasGeometry"; 9.111 - public static final String defaultGeometry_OGC = GEO + "defaultGeometry"; 9.112 - public static final String dimension_OGC = GEO + "dimension"; 9.113 - public static final String coordinateDimension_OGC = GEO + "coordinateDimension"; 9.114 - public static final String spatialDimension_OGC = GEO + "spatialDimension"; 9.115 - public static final String isEmpty_OGC = GEO + "isEmpty"; 9.116 - public static final String isSimple_OGC = GEO + "isSimple"; 9.117 - public static final String asWKT_OGC = GEO + "asWKT"; 9.118 - public static final String asGML_OGC = GEO + "asGML"; 9.119 -*/ 9.120 - 9.121 - 9.122 - /** * 9.123 - * URIs for datatypes * 9.124 - * */ 9.125 - 9.126 - 9.127 - /** 9.128 - * The URI for the datatype SemiLinearPointSet 9.129 - * (linear constraint-based representation of geometries) 9.130 - */ 9.131 - public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 9.132 - 9.133 - 9.134 - /** 9.135 - * The URI for the datatype Well-Known Text (WKT) 9.136 - */ 9.137 - public static final String WKT = stRDF + "WKT"; 9.138 - 9.139 - /** 9.140 - * The URI for the datatype Geography Markup Language (GML) as it defined 9.141 - * in the model stRDF and query language stSPARQL 9.142 - */ 9.143 - public static final String GML = stRDF + "GML"; 9.144 - 9.145 - /** 9.146 - * The URI for the datatype wktLiteral 9.147 - */ 9.148 - public static final String WKTLITERAL = GEO + "wktLiteral"; 9.149 - 9.150 - /** 9.151 - * The URI for the datatype gmlLiteral 9.152 - */ 9.153 - public static final String GMLLITERAL = GEO + "gmlLiteral"; 9.154 - 9.155 - /** * 9.156 - * Extended functions * 9.157 - * stSPARQL * 9.158 - * */ 9.159 - // Spatial Relationships 9.160 - public static final String stSPARQLequals = stRDF + "equals"; 9.161 - public static final String stSPARQLdisjoint = stRDF + "disjoint"; 9.162 - public static final String stSPARQLintersects = stRDF + "intersects"; 9.163 - public static final String stSPARQLtouches = stRDF + "touches"; 9.164 - public static final String stSPARQLwithin = stRDF + "within"; 9.165 - public static final String stSPARQLcontains = stRDF + "contains"; 9.166 - public static final String stSPARQLoverlaps = stRDF + "overlaps"; 9.167 - public static final String stSPARQLcrosses = stRDF + "crosses"; 9.168 - 9.169 - // The generic relate function 9.170 - public static final String stSPARQLrelate = stRDF + "relate"; 9.171 - 9.172 - // Topological Relationships utilizing mbb 9.173 - public static final String stSPARQLmbbIntersects = stRDF + "mbbIntersects"; 9.174 - public static final String stSPARQLmbbContains = stRDF + "mbbContains"; 9.175 - public static final String stSPARQLmbbEquals = stRDF + "mbbEquals"; 9.176 - public static final String stSPARQLmbbWithin = stRDF + "mbbWithin"; 9.177 - 9.178 - // Directional functions 9.179 - public static final String stSPARQLleft = stRDF + "left"; 9.180 - public static final String stSPARQLright = stRDF + "right"; 9.181 - public static final String stSPARQLabove = stRDF + "above"; 9.182 - public static final String stSPARQLbelow = stRDF + "below"; 9.183 - 9.184 - // Spatial Constructs 9.185 - public static final String stSPARQLunion = stRDF + "union"; 9.186 - public static final String stSPARQLbuffer = stRDF + "buffer"; 9.187 - public static final String stSPARQLenvelope = stRDF + "envelope"; 9.188 - public static final String stSPARQLconvexHull = stRDF + "convexHull"; 9.189 - public static final String stSPARQLboundary = stRDF + "boundary"; 9.190 - public static final String stSPARQLintersection = stRDF + "intersection"; 9.191 - public static final String stSPARQLdifference = stRDF + "difference"; 9.192 - public static final String stSPARQLsymDifference = stRDF + "symDifference"; 9.193 - public static final String stSPARQLtransform = stRDF + "transform"; 9.194 - 9.195 - // Spatial Metric Functions 9.196 - public static final String stSPARQLdistance = stRDF + "distance"; 9.197 - public static final String stSPARQLarea = stRDF + "area"; 9.198 - 9.199 - // Spatial Properties 9.200 - public static final String stSPARQLdimension = stRDF + "dimension"; 9.201 - public static final String stSPARQLgeometryType = stRDF + "geometryType"; 9.202 - public static final String stSPARQLasText = stRDF + "asText"; 9.203 - public static final String stSPARQLasGML = stRDF + "asGML"; 9.204 - public static final String stSPARQLsrid = stRDF + "srid"; 9.205 - public static final String stSPARQLisEmpty = stRDF + "isEmpty"; 9.206 - public static final String stSPARQLisSimple = stRDF + "isSimple"; 9.207 - 9.208 - // Spatial Aggregate Functions 9.209 - public static final String stSPARQLextent = stRDF + "extent"; 9.210 - 9.211 - /** 9.212 - * WGS 84 latitude-longitude (EPSG:4326) 9.213 - */ 9.214 - public static final String WGS84_LAT_LON = "http://www.opengis.net/def/crs/EPSG/0/4326"; 9.215 - 9.216 - /** 9.217 - * WGS 84 longitude-longitude 9.218 - * (used as the default CRS for GeoSPARQL geometries) 9.219 - */ 9.220 - public static final String WGS84_LON_LAT = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"; 9.221 - 9.222 - /** 9.223 - * EPSG:4326 9.224 - */ 9.225 - public static final Integer WGS84_LAT_LON_SRID = 4326; 9.226 - 9.227 - /** 9.228 - * EPSG:3857 (not sure whether this is correct for WGS84_LON_LAT) 9.229 - * http://spatialreference.org/ref/sr-org/7483/ 9.230 - */ 9.231 - public static final Integer WGS84_LON_LAT_SRID = 3857; 9.232 - 9.233 - /** 9.234 - * Default SRID (WGS84 latitude-longitude) 9.235 - */ 9.236 - public static final Integer defaultSRID = WGS84_LAT_LON_SRID; 9.237 - 9.238 - /** * 9.239 - * Extended functions * 9.240 - * GeoSPARQL * 9.241 - * */ 9.242 - // Non-topological 9.243 - public static final String geoSparqlDistance = GEOF + "distance"; //3 arguments 9.244 - public static final String geoSparqlBuffer = GEOF + "buffer"; //3 arguments 9.245 - public static final String geoSparqlConvexHull = GEOF + "convexHull"; 9.246 - public static final String geoSparqlIntersection = GEOF + "intersection"; 9.247 - public static final String geoSparqlUnion = GEOF + "union"; 9.248 - public static final String geoSparqlDifference = GEOF + "difference"; 9.249 - public static final String geoSparqlSymmetricDifference = GEOF + "symmetricDifference"; 9.250 - public static final String geoSparqlEnvelope = GEOF + "envelope"; 9.251 - public static final String geoSparqlBoundary = GEOF + "boundary"; 9.252 - 9.253 - // Simple Features - 8 functions - all with 2 arguments + boolean 9.254 - public static final String sfEquals = GEOF + "sfEquals"; 9.255 - public static final String sfDisjoint = GEOF + "sfDisjoint"; 9.256 - public static final String sfIntersects = GEOF + "sfIntersects"; 9.257 - public static final String sfTouches = GEOF + "sfTouches"; 9.258 - public static final String sfCrosses = GEOF + "sfCrosses"; 9.259 - public static final String sfWithin = GEOF + "sfWithin"; 9.260 - public static final String sfContains = GEOF + "sfContains"; 9.261 - public static final String sfOverlaps = GEOF + "sfOverlaps"; 9.262 - 9.263 - // Egenhofer - 8 functions - all with 2 arguments + boolean 9.264 - public static final String ehEquals = GEOF + "ehEquals"; 9.265 - public static final String ehDisjoint = GEOF + "ehDisjoint"; 9.266 - public static final String ehMeet = GEOF + "ehMeet"; 9.267 - public static final String ehOverlap = GEOF + "ehOverlap"; 9.268 - public static final String ehCovers = GEOF + "ehCovers"; 9.269 - public static final String ehCoveredBy = GEOF + "ehCoveredBy"; 9.270 - public static final String ehInside = GEOF + "ehInside"; 9.271 - public static final String ehContains = GEOF + "ehContains"; 9.272 - 9.273 - // RCC8 - 8 functions - all with 2 arguments + boolean 9.274 - public static final String rccEquals = GEOF + "rcc8eq"; 9.275 - public static final String rccDisconnected = GEOF + "rcc8dc"; 9.276 - public static final String rccExternallyConnected = GEOF + "rcc8ec"; 9.277 - public static final String rccPartiallyOverlapping = GEOF + "rcc8po"; 9.278 - public static final String rccTangentialProperPartInverse = GEOF + "rcc8tppi"; 9.279 - public static final String rccTangentialProperPart = GEOF + "rcc8tpp"; 9.280 - public static final String rccNonTangentialProperPart = GEOF + "rcc8ntpp"; 9.281 - public static final String rccNonTangentialProperPartInverse = GEOF + "rcc8ntppi"; 9.282 - 9.283 - // The generic relate function 9.284 - public static final String geoSparqlRelate = GEOF + "relate"; 9.285 - 9.286 - /** 9.287 - * Addition for datetime metric functions 9.288 - * 9.289 - * @author George Garbis <ggarbis@di.uoa.gr> 9.290 - * 9.291 - */ 9.292 - public static final String diffDateTime = "http://strdf.di.uoa.gr/extensions/ontology#diffDateTime"; 9.293 - /** End of addition **/ 9.294 - 9.295 - /** 9.296 - * RCC-8 relations for the RDFi framework 9.297 - */ 9.298 - public static final String rdfiDC = rdfi + "DC"; 9.299 - public static final String rdfiEC = rdfi + "EC"; 9.300 - public static final String rdfiPO = rdfi + "PO"; 9.301 - public static final String rdfiNTPP = rdfi + "NTPP"; 9.302 - public static final String rdfiNTPPi = rdfi + "NTPPi"; 9.303 - public static final String rdfiTPP = rdfi + "TPP"; 9.304 - public static final String rdfiTPPi = rdfi + "TPPi"; 9.305 - public static final String rdfiEQ = rdfi + "EQ"; 9.306 - 9.307 - /** 9.308 - * List of stSPARQL spatial extension functions 9.309 - */ 9.310 - public static final List<String> STSPARQLSpatialExtFunc = new ArrayList<String>(); 9.311 - 9.312 - /** 9.313 - * List of stSPARQL temporal extension functions 9.314 - */ 9.315 - //public static final List<String> stSPARQLTemporalExtFunc = new ArrayList<String>(); 9.316 - 9.317 - /** 9.318 - * List of GeoSPARQL extension functions 9.319 - */ 9.320 - public static final List<String> GEOSPARQLExtFunc = new ArrayList<String>(); 9.321 - 9.322 - // declare spatial and temporal extension functions 9.323 - static { 9.324 - Class<GeoConstants> geoConstants = GeoConstants.class; 9.325 - 9.326 - try { 9.327 - Field[] field = geoConstants.getDeclaredFields(); 9.328 - 9.329 - for (int i = 0; i < field.length; i++) { 9.330 - // stSPARQL 9.331 - if (field[i].getName().startsWith("stSPARQL")) { 9.332 - STSPARQLSpatialExtFunc.add((String) field[i].get(null)); 9.333 - 9.334 - } else if (field[i].getName().startsWith("geoSparql") || 9.335 - field[i].getName().startsWith("sf") || 9.336 - field[i].getName().startsWith("eh") || 9.337 - field[i].getName().startsWith("rcc")) { // GeoSPARQL 9.338 - GEOSPARQLExtFunc.add((String) field[i].get(null)); 9.339 - } 9.340 - } 9.341 - } catch (SecurityException e) { 9.342 - // suppress exception; it should not reach here 9.343 - } catch (IllegalArgumentException e) { 9.344 - // suppress exception; it should not reach here 9.345 - } catch (IllegalAccessException e) { 9.346 - // suppress exception; it should not reach here 9.347 - } 9.348 - } 9.349 -}
10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java Tue Apr 02 13:25:45 2013 +0300 10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java Tue Apr 02 13:27:01 2013 +0300 10.3 @@ -12,6 +12,8 @@ 10.4 import org.slf4j.Logger; 10.5 import org.slf4j.LoggerFactory; 10.6 10.7 +import eu.earthobservatory.constants.GeoConstants; 10.8 + 10.9 10.10 /** 10.11 *
11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Tue Apr 02 13:25:45 2013 +0300 11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Tue Apr 02 13:27:01 2013 +0300 11.3 @@ -9,9 +9,10 @@ 11.4 */ 11.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 11.6 11.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 11.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 11.9 11.10 +import eu.earthobservatory.constants.GeoConstants; 11.11 + 11.12 /** 11.13 * 11.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Tue Apr 02 13:25:45 2013 +0300 12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Tue Apr 02 13:27:01 2013 +0300 12.3 @@ -9,9 +9,10 @@ 12.4 */ 12.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 12.6 12.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 12.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 12.9 12.10 +import eu.earthobservatory.constants.GeoConstants; 12.11 + 12.12 /** 12.13 * 12.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Tue Apr 02 13:25:45 2013 +0300 13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Tue Apr 02 13:27:01 2013 +0300 13.3 @@ -9,9 +9,10 @@ 13.4 */ 13.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 13.6 13.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 13.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 13.9 13.10 +import eu.earthobservatory.constants.GeoConstants; 13.11 + 13.12 13.13 public class EgenhoferCoveredByFunc extends GeoSparqlRelation { 13.14
14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Tue Apr 02 13:25:45 2013 +0300 14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Tue Apr 02 13:27:01 2013 +0300 14.3 @@ -9,9 +9,10 @@ 14.4 */ 14.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 14.6 14.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 14.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 14.9 14.10 +import eu.earthobservatory.constants.GeoConstants; 14.11 + 14.12 14.13 public class EgenhoferCoversFunc extends GeoSparqlRelation { 14.14
15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Tue Apr 02 13:25:45 2013 +0300 15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Tue Apr 02 13:27:01 2013 +0300 15.3 @@ -9,9 +9,10 @@ 15.4 */ 15.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 15.6 15.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 15.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 15.9 15.10 +import eu.earthobservatory.constants.GeoConstants; 15.11 + 15.12 15.13 public class EgenhoferDisjointFunc extends GeoSparqlRelation { 15.14
16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Tue Apr 02 13:25:45 2013 +0300 16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Tue Apr 02 13:27:01 2013 +0300 16.3 @@ -9,9 +9,10 @@ 16.4 */ 16.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 16.6 16.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 16.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 16.9 16.10 +import eu.earthobservatory.constants.GeoConstants; 16.11 + 16.12 16.13 public class EgenhoferEqualsFunc extends GeoSparqlRelation { 16.14
17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Tue Apr 02 13:25:45 2013 +0300 17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Tue Apr 02 13:27:01 2013 +0300 17.3 @@ -9,9 +9,10 @@ 17.4 */ 17.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 17.6 17.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 17.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 17.9 17.10 +import eu.earthobservatory.constants.GeoConstants; 17.11 + 17.12 17.13 public class EgenhoferInsideFunc extends GeoSparqlRelation { 17.14
18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Tue Apr 02 13:25:45 2013 +0300 18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Tue Apr 02 13:27:01 2013 +0300 18.3 @@ -9,9 +9,10 @@ 18.4 */ 18.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 18.6 18.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 18.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 18.9 18.10 +import eu.earthobservatory.constants.GeoConstants; 18.11 + 18.12 18.13 public class EgenhoferMeetFunc extends GeoSparqlRelation { 18.14
19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Tue Apr 02 13:25:45 2013 +0300 19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Tue Apr 02 13:27:01 2013 +0300 19.3 @@ -9,9 +9,10 @@ 19.4 */ 19.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 19.6 19.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 19.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 19.9 19.10 +import eu.earthobservatory.constants.GeoConstants; 19.11 + 19.12 19.13 public class EgenhoferOverlapFunc extends GeoSparqlRelation { 19.14
20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Tue Apr 02 13:25:45 2013 +0300 20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Tue Apr 02 13:27:01 2013 +0300 20.3 @@ -9,8 +9,9 @@ 20.4 */ 20.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 20.6 20.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 20.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 20.9 + 20.10 +import eu.earthobservatory.constants.GeoConstants; 20.11 20.12 /** 20.13 *
21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Tue Apr 02 13:25:45 2013 +0300 21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Tue Apr 02 13:27:01 2013 +0300 21.3 @@ -9,8 +9,9 @@ 21.4 */ 21.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 21.6 21.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 21.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 21.9 + 21.10 +import eu.earthobservatory.constants.GeoConstants; 21.11 21.12 /** 21.13 *
22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Tue Apr 02 13:25:45 2013 +0300 22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Tue Apr 02 13:27:01 2013 +0300 22.3 @@ -9,8 +9,9 @@ 22.4 */ 22.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 22.6 22.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 22.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 22.9 + 22.10 +import eu.earthobservatory.constants.GeoConstants; 22.11 22.12 /** 22.13 *
23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java Tue Apr 02 13:25:45 2013 +0300 23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java Tue Apr 02 13:27:01 2013 +0300 23.3 @@ -9,9 +9,10 @@ 23.4 */ 23.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 23.6 23.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 23.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 23.9 23.10 +import eu.earthobservatory.constants.GeoConstants; 23.11 + 23.12 /** 23.13 * 23.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Tue Apr 02 13:25:45 2013 +0300 24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Tue Apr 02 13:27:01 2013 +0300 24.3 @@ -9,9 +9,10 @@ 24.4 */ 24.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 24.6 24.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 24.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric; 24.9 24.10 +import eu.earthobservatory.constants.GeoConstants; 24.11 + 24.12 /** 24.13 * 24.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Tue Apr 02 13:25:45 2013 +0300 25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Tue Apr 02 13:27:01 2013 +0300 25.3 @@ -9,8 +9,9 @@ 25.4 */ 25.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 25.6 25.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 25.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 25.9 + 25.10 +import eu.earthobservatory.constants.GeoConstants; 25.11 25.12 /** 25.13 *
26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java Tue Apr 02 13:25:45 2013 +0300 26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java Tue Apr 02 13:27:01 2013 +0300 26.3 @@ -9,9 +9,10 @@ 26.4 */ 26.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 26.6 26.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 26.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 26.9 26.10 +import eu.earthobservatory.constants.GeoConstants; 26.11 + 26.12 /** 26.13 * 26.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java Tue Apr 02 13:25:45 2013 +0300 27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java Tue Apr 02 13:27:01 2013 +0300 27.3 @@ -9,9 +9,10 @@ 27.4 */ 27.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 27.6 27.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 27.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 27.9 27.10 +import eu.earthobservatory.constants.GeoConstants; 27.11 + 27.12 /** 27.13 * 27.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java Tue Apr 02 13:25:45 2013 +0300 28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java Tue Apr 02 13:27:01 2013 +0300 28.3 @@ -9,9 +9,10 @@ 28.4 */ 28.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 28.6 28.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 28.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 28.9 28.10 +import eu.earthobservatory.constants.GeoConstants; 28.11 + 28.12 /** 28.13 * 28.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Tue Apr 02 13:25:45 2013 +0300 29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Tue Apr 02 13:27:01 2013 +0300 29.3 @@ -9,9 +9,10 @@ 29.4 */ 29.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 29.6 29.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 29.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 29.9 29.10 +import eu.earthobservatory.constants.GeoConstants; 29.11 + 29.12 /** 29.13 * 29.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Tue Apr 02 13:25:45 2013 +0300 30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Tue Apr 02 13:27:01 2013 +0300 30.3 @@ -9,9 +9,10 @@ 30.4 */ 30.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 30.6 30.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 30.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 30.9 30.10 +import eu.earthobservatory.constants.GeoConstants; 30.11 + 30.12 /** 30.13 * 30.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Tue Apr 02 13:25:45 2013 +0300 31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Tue Apr 02 13:27:01 2013 +0300 31.3 @@ -9,9 +9,10 @@ 31.4 */ 31.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 31.6 31.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 31.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 31.9 31.10 +import eu.earthobservatory.constants.GeoConstants; 31.11 + 31.12 /** 31.13 * 31.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Tue Apr 02 13:25:45 2013 +0300 32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Tue Apr 02 13:27:01 2013 +0300 32.3 @@ -9,9 +9,10 @@ 32.4 */ 32.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 32.6 32.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 32.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 32.9 32.10 +import eu.earthobservatory.constants.GeoConstants; 32.11 + 32.12 /** 32.13 * 32.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Tue Apr 02 13:25:45 2013 +0300 33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Tue Apr 02 13:27:01 2013 +0300 33.3 @@ -9,9 +9,10 @@ 33.4 */ 33.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 33.6 33.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 33.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 33.9 33.10 +import eu.earthobservatory.constants.GeoConstants; 33.11 + 33.12 /** 33.13 * 33.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Tue Apr 02 13:25:45 2013 +0300 34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Tue Apr 02 13:27:01 2013 +0300 34.3 @@ -9,9 +9,10 @@ 34.4 */ 34.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 34.6 34.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 34.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 34.9 34.10 +import eu.earthobservatory.constants.GeoConstants; 34.11 + 34.12 /** 34.13 * 34.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Tue Apr 02 13:25:45 2013 +0300 35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Tue Apr 02 13:27:01 2013 +0300 35.3 @@ -9,9 +9,10 @@ 35.4 */ 35.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 35.6 35.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 35.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 35.9 35.10 +import eu.earthobservatory.constants.GeoConstants; 35.11 + 35.12 /** 35.13 * 35.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Tue Apr 02 13:25:45 2013 +0300 36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Tue Apr 02 13:27:01 2013 +0300 36.3 @@ -9,9 +9,10 @@ 36.4 */ 36.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 36.6 36.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 36.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 36.9 36.10 +import eu.earthobservatory.constants.GeoConstants; 36.11 + 36.12 /** 36.13 * 36.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Tue Apr 02 13:25:45 2013 +0300 37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Tue Apr 02 13:27:01 2013 +0300 37.3 @@ -9,9 +9,10 @@ 37.4 */ 37.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 37.6 37.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 37.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 37.9 37.10 +import eu.earthobservatory.constants.GeoConstants; 37.11 + 37.12 /** 37.13 * 37.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Tue Apr 02 13:25:45 2013 +0300 38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Tue Apr 02 13:27:01 2013 +0300 38.3 @@ -9,9 +9,10 @@ 38.4 */ 38.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 38.6 38.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 38.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 38.9 38.10 +import eu.earthobservatory.constants.GeoConstants; 38.11 + 38.12 /** 38.13 * 38.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Tue Apr 02 13:25:45 2013 +0300 39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Tue Apr 02 13:27:01 2013 +0300 39.3 @@ -9,9 +9,10 @@ 39.4 */ 39.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 39.6 39.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 39.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 39.9 39.10 +import eu.earthobservatory.constants.GeoConstants; 39.11 + 39.12 /** 39.13 * 39.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Tue Apr 02 13:25:45 2013 +0300 40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Tue Apr 02 13:27:01 2013 +0300 40.3 @@ -9,9 +9,10 @@ 40.4 */ 40.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 40.6 40.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 40.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 40.9 40.10 +import eu.earthobservatory.constants.GeoConstants; 40.11 + 40.12 /** 40.13 * 40.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Tue Apr 02 13:25:45 2013 +0300 41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Tue Apr 02 13:27:01 2013 +0300 41.3 @@ -9,9 +9,10 @@ 41.4 */ 41.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 41.6 41.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 41.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 41.9 41.10 +import eu.earthobservatory.constants.GeoConstants; 41.11 + 41.12 /** 41.13 * 41.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Tue Apr 02 13:25:45 2013 +0300 42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Tue Apr 02 13:27:01 2013 +0300 42.3 @@ -9,9 +9,10 @@ 42.4 */ 42.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 42.6 42.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 42.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 42.9 42.10 +import eu.earthobservatory.constants.GeoConstants; 42.11 + 42.12 /** 42.13 * 42.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Tue Apr 02 13:25:45 2013 +0300 43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Tue Apr 02 13:27:01 2013 +0300 43.3 @@ -9,9 +9,10 @@ 43.4 */ 43.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 43.6 43.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 43.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 43.9 43.10 +import eu.earthobservatory.constants.GeoConstants; 43.11 + 43.12 /** 43.13 * 43.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Tue Apr 02 13:25:45 2013 +0300 44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Tue Apr 02 13:27:01 2013 +0300 44.3 @@ -9,9 +9,10 @@ 44.4 */ 44.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 44.6 44.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 44.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 44.9 44.10 +import eu.earthobservatory.constants.GeoConstants; 44.11 + 44.12 /** 44.13 * 44.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/DateTimeDiff.java Tue Apr 02 13:25:45 2013 +0300 45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/DateTimeDiff.java Tue Apr 02 13:27:01 2013 +0300 45.3 @@ -17,7 +17,8 @@ 45.4 import org.openrdf.model.ValueFactory; 45.5 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 45.6 import org.openrdf.query.algebra.evaluation.function.Function; 45.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 45.8 + 45.9 +import eu.earthobservatory.constants.GeoConstants; 45.10 45.11 /** 45.12 * @author Garmpis Georgios <ggarbis@di.uoa.gr>
46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java Tue Apr 02 13:25:45 2013 +0300 46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java Tue Apr 02 13:27:01 2013 +0300 46.3 @@ -9,9 +9,10 @@ 46.4 */ 46.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate; 46.6 46.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 46.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 46.9 46.10 +import eu.earthobservatory.constants.GeoConstants; 46.11 + 46.12 /** 46.13 * 46.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Tue Apr 02 13:25:45 2013 +0300 47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Tue Apr 02 13:27:01 2013 +0300 47.3 @@ -9,8 +9,9 @@ 47.4 */ 47.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 47.6 47.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 47.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 47.9 + 47.10 +import eu.earthobservatory.constants.GeoConstants; 47.11 47.12 /** 47.13 *
48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Tue Apr 02 13:25:45 2013 +0300 48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Tue Apr 02 13:27:01 2013 +0300 48.3 @@ -9,8 +9,9 @@ 48.4 */ 48.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 48.6 48.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 48.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 48.9 + 48.10 +import eu.earthobservatory.constants.GeoConstants; 48.11 48.12 /** 48.13 * @author Manos Karpathiotakis <mk@di.uoa.gr>
49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Tue Apr 02 13:25:45 2013 +0300 49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Tue Apr 02 13:27:01 2013 +0300 49.3 @@ -9,8 +9,9 @@ 49.4 */ 49.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 49.6 49.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 49.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 49.9 + 49.10 +import eu.earthobservatory.constants.GeoConstants; 49.11 49.12 /** 49.13 *
50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java Tue Apr 02 13:25:45 2013 +0300 50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java Tue Apr 02 13:27:01 2013 +0300 50.3 @@ -9,9 +9,10 @@ 50.4 */ 50.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 50.6 50.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 50.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 50.9 50.10 +import eu.earthobservatory.constants.GeoConstants; 50.11 + 50.12 /** 50.13 * 50.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Tue Apr 02 13:25:45 2013 +0300 51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Tue Apr 02 13:27:01 2013 +0300 51.3 @@ -9,8 +9,9 @@ 51.4 */ 51.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 51.6 51.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 51.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 51.9 + 51.10 +import eu.earthobservatory.constants.GeoConstants; 51.11 51.12 /** 51.13 *
52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java Tue Apr 02 13:25:45 2013 +0300 52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java Tue Apr 02 13:27:01 2013 +0300 52.3 @@ -9,9 +9,10 @@ 52.4 */ 52.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 52.6 52.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 52.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 52.9 52.10 +import eu.earthobservatory.constants.GeoConstants; 52.11 + 52.12 /** 52.13 * 52.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java Tue Apr 02 13:25:45 2013 +0300 53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java Tue Apr 02 13:27:01 2013 +0300 53.3 @@ -9,9 +9,10 @@ 53.4 */ 53.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 53.6 53.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 53.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 53.9 53.10 +import eu.earthobservatory.constants.GeoConstants; 53.11 + 53.12 /** 53.13 * 53.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Tue Apr 02 13:25:45 2013 +0300 54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Tue Apr 02 13:27:01 2013 +0300 54.3 @@ -9,8 +9,9 @@ 54.4 */ 54.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 54.6 54.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 54.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 54.9 + 54.10 +import eu.earthobservatory.constants.GeoConstants; 54.11 54.12 /** 54.13 *
55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java Tue Apr 02 13:25:45 2013 +0300 55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java Tue Apr 02 13:27:01 2013 +0300 55.3 @@ -9,9 +9,10 @@ 55.4 */ 55.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 55.6 55.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 55.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 55.9 55.10 +import eu.earthobservatory.constants.GeoConstants; 55.11 + 55.12 /** 55.13 * 55.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Tue Apr 02 13:25:45 2013 +0300 56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Tue Apr 02 13:27:01 2013 +0300 56.3 @@ -9,8 +9,9 @@ 56.4 */ 56.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 56.6 56.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 56.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 56.9 + 56.10 +import eu.earthobservatory.constants.GeoConstants; 56.11 56.12 /** 56.13 * A spatial function computing the area of a geometry.
57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Tue Apr 02 13:25:45 2013 +0300 57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Tue Apr 02 13:27:01 2013 +0300 57.3 @@ -9,9 +9,10 @@ 57.4 */ 57.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 57.6 57.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 57.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 57.9 57.10 +import eu.earthobservatory.constants.GeoConstants; 57.11 + 57.12 /** 57.13 * A spatial function computing the distance between two geometries. 57.14 *
58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java Tue Apr 02 13:25:45 2013 +0300 58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java Tue Apr 02 13:27:01 2013 +0300 58.3 @@ -9,9 +9,10 @@ 58.4 */ 58.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 58.6 58.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 58.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 58.9 58.10 +import eu.earthobservatory.constants.GeoConstants; 58.11 + 58.12 /** 58.13 * A spatial function returning a geometry in GML encoding. 58.14 *
59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Tue Apr 02 13:25:45 2013 +0300 59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Tue Apr 02 13:27:01 2013 +0300 59.3 @@ -9,8 +9,9 @@ 59.4 */ 59.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 59.6 59.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 59.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 59.9 + 59.10 +import eu.earthobservatory.constants.GeoConstants; 59.11 59.12 /** 59.13 * A spatial function returning a geometry as text (in WKT format).
60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Tue Apr 02 13:25:45 2013 +0300 60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Tue Apr 02 13:27:01 2013 +0300 60.3 @@ -9,8 +9,9 @@ 60.4 */ 60.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 60.6 60.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 60.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 60.9 + 60.10 +import eu.earthobservatory.constants.GeoConstants; 60.11 60.12 /** 60.13 * A spatial function returning the dimension of a geometry.
61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Tue Apr 02 13:25:45 2013 +0300 61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Tue Apr 02 13:27:01 2013 +0300 61.3 @@ -9,8 +9,9 @@ 61.4 */ 61.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 61.6 61.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 61.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 61.9 + 61.10 +import eu.earthobservatory.constants.GeoConstants; 61.11 61.12 /** 61.13 * A spatial function returning the type of a geometry.
62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Tue Apr 02 13:25:45 2013 +0300 62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Tue Apr 02 13:27:01 2013 +0300 62.3 @@ -9,8 +9,9 @@ 62.4 */ 62.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 62.6 62.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 62.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 62.9 + 62.10 +import eu.earthobservatory.constants.GeoConstants; 62.11 62.12 /** 62.13 * A spatial function for testing whether a geometry is empty.
63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Tue Apr 02 13:25:45 2013 +0300 63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Tue Apr 02 13:27:01 2013 +0300 63.3 @@ -9,8 +9,9 @@ 63.4 */ 63.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 63.6 63.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 63.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 63.9 + 63.10 +import eu.earthobservatory.constants.GeoConstants; 63.11 63.12 /** 63.13 * A spatial function for testing whether a geometry is simple.
64.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Tue Apr 02 13:25:45 2013 +0300 64.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Tue Apr 02 13:27:01 2013 +0300 64.3 @@ -9,8 +9,9 @@ 64.4 */ 64.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 64.6 64.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 64.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 64.9 + 64.10 +import eu.earthobservatory.constants.GeoConstants; 64.11 64.12 /** 64.13 * A spatial function returning the SRID of a geometry.
65.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Tue Apr 02 13:25:45 2013 +0300 65.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Tue Apr 02 13:27:01 2013 +0300 65.3 @@ -9,8 +9,9 @@ 65.4 */ 65.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 65.6 65.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 65.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 65.9 + 65.10 +import eu.earthobservatory.constants.GeoConstants; 65.11 65.12 /** 65.13 *
66.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Tue Apr 02 13:25:45 2013 +0300 66.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Tue Apr 02 13:27:01 2013 +0300 66.3 @@ -9,8 +9,9 @@ 66.4 */ 66.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 66.6 66.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 66.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 66.9 + 66.10 +import eu.earthobservatory.constants.GeoConstants; 66.11 66.12 /** 66.13 *
67.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Tue Apr 02 13:25:45 2013 +0300 67.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Tue Apr 02 13:27:01 2013 +0300 67.3 @@ -9,8 +9,9 @@ 67.4 */ 67.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 67.6 67.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 67.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 67.9 + 67.10 +import eu.earthobservatory.constants.GeoConstants; 67.11 67.12 /** 67.13 *
68.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java Tue Apr 02 13:25:45 2013 +0300 68.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CrossesFunc.java Tue Apr 02 13:27:01 2013 +0300 68.3 @@ -9,8 +9,9 @@ 68.4 */ 68.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 68.6 68.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 68.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 68.9 + 68.10 +import eu.earthobservatory.constants.GeoConstants; 68.11 68.12 /** 68.13 *
69.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Tue Apr 02 13:25:45 2013 +0300 69.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Tue Apr 02 13:27:01 2013 +0300 69.3 @@ -9,8 +9,9 @@ 69.4 */ 69.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 69.6 69.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 69.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 69.9 + 69.10 +import eu.earthobservatory.constants.GeoConstants; 69.11 69.12 /** 69.13 *
70.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Tue Apr 02 13:25:45 2013 +0300 70.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Tue Apr 02 13:27:01 2013 +0300 70.3 @@ -9,9 +9,10 @@ 70.4 */ 70.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 70.6 70.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 70.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 70.9 70.10 +import eu.earthobservatory.constants.GeoConstants; 70.11 + 70.12 /** 70.13 * 70.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
71.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java Tue Apr 02 13:25:45 2013 +0300 71.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/IntersectsFunc.java Tue Apr 02 13:27:01 2013 +0300 71.3 @@ -9,9 +9,10 @@ 71.4 */ 71.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 71.6 71.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 71.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 71.9 71.10 +import eu.earthobservatory.constants.GeoConstants; 71.11 + 71.12 /** 71.13 * 71.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
72.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Tue Apr 02 13:25:45 2013 +0300 72.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Tue Apr 02 13:27:01 2013 +0300 72.3 @@ -9,8 +9,9 @@ 72.4 */ 72.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 72.6 72.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 72.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 72.9 + 72.10 +import eu.earthobservatory.constants.GeoConstants; 72.11 72.12 /** 72.13 *
73.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java Tue Apr 02 13:25:45 2013 +0300 73.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapsFunc.java Tue Apr 02 13:27:01 2013 +0300 73.3 @@ -9,8 +9,9 @@ 73.4 */ 73.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 73.6 73.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 73.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 73.9 + 73.10 +import eu.earthobservatory.constants.GeoConstants; 73.11 73.12 /** 73.13 *
74.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Tue Apr 02 13:25:45 2013 +0300 74.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Tue Apr 02 13:27:01 2013 +0300 74.3 @@ -9,9 +9,10 @@ 74.4 */ 74.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 74.6 74.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 74.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 74.9 74.10 +import eu.earthobservatory.constants.GeoConstants; 74.11 + 74.12 /** 74.13 * @author Manos Karpathiotakis <mk@di.uoa.gr> 74.14 */
75.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Tue Apr 02 13:25:45 2013 +0300 75.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Tue Apr 02 13:27:01 2013 +0300 75.3 @@ -9,8 +9,9 @@ 75.4 */ 75.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 75.6 75.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 75.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 75.9 + 75.10 +import eu.earthobservatory.constants.GeoConstants; 75.11 75.12 /** 75.13 *
76.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java Tue Apr 02 13:25:45 2013 +0300 76.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchesFunc.java Tue Apr 02 13:27:01 2013 +0300 76.3 @@ -9,8 +9,9 @@ 76.4 */ 76.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 76.6 76.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 76.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 76.9 + 76.10 +import eu.earthobservatory.constants.GeoConstants; 76.11 76.12 /** 76.13 *
77.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java Tue Apr 02 13:25:45 2013 +0300 77.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/WithinFunc.java Tue Apr 02 13:27:01 2013 +0300 77.3 @@ -9,8 +9,9 @@ 77.4 */ 77.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 77.6 77.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 77.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 77.9 + 77.10 +import eu.earthobservatory.constants.GeoConstants; 77.11 77.12 /** 77.13 *
78.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java Tue Apr 02 13:25:45 2013 +0300 78.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbContainsFunc.java Tue Apr 02 13:27:01 2013 +0300 78.3 @@ -9,9 +9,10 @@ 78.4 */ 78.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 78.6 78.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 78.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 78.9 78.10 +import eu.earthobservatory.constants.GeoConstants; 78.11 + 78.12 /** 78.13 * 78.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
79.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java Tue Apr 02 13:25:45 2013 +0300 79.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbEqualsFunc.java Tue Apr 02 13:27:01 2013 +0300 79.3 @@ -9,9 +9,10 @@ 79.4 */ 79.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 79.6 79.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 79.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 79.9 79.10 +import eu.earthobservatory.constants.GeoConstants; 79.11 + 79.12 /** 79.13 * 79.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
80.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Tue Apr 02 13:25:45 2013 +0300 80.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbIntersectsFunc.java Tue Apr 02 13:27:01 2013 +0300 80.3 @@ -9,9 +9,10 @@ 80.4 */ 80.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 80.6 80.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 80.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 80.9 80.10 +import eu.earthobservatory.constants.GeoConstants; 80.11 + 80.12 /** 80.13 * 80.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
81.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java Tue Apr 02 13:25:45 2013 +0300 81.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/mbb/MbbWithinFunc.java Tue Apr 02 13:27:01 2013 +0300 81.3 @@ -9,9 +9,10 @@ 81.4 */ 81.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb; 81.6 81.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 81.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 81.9 81.10 +import eu.earthobservatory.constants.GeoConstants; 81.11 + 81.12 /** 81.13 * 81.14 * @author Manos Karpathiotakis <mk@di.uoa.gr>
82.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Tue Apr 02 13:25:45 2013 +0300 82.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Tue Apr 02 13:27:01 2013 +0300 82.3 @@ -52,7 +52,6 @@ 82.4 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 82.5 import org.openrdf.query.algebra.evaluation.function.Function; 82.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 82.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 82.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 82.9 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc; 82.10 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc; 82.11 @@ -72,6 +71,8 @@ 82.12 82.13 import com.vividsolutions.jts.geom.Geometry; 82.14 82.15 +import eu.earthobservatory.constants.GeoConstants; 82.16 + 82.17 /** 82.18 * 82.19 * @author Manos Karpathiotakis <mk@di.uoa.gr>
83.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java Tue Apr 02 13:25:45 2013 +0300 83.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java Tue Apr 02 13:27:01 2013 +0300 83.3 @@ -21,10 +21,11 @@ 83.4 import org.openrdf.query.algebra.Var; 83.5 import org.openrdf.query.algebra.evaluation.EvaluationStrategy; 83.6 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 83.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 83.8 import org.slf4j.Logger; 83.9 import org.slf4j.LoggerFactory; 83.10 83.11 +import eu.earthobservatory.constants.GeoConstants; 83.12 + 83.13 /** 83.14 * @author Manos Karpathiotakis <mk@di.uoa.gr> 83.15 */
84.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java Tue Apr 02 13:25:45 2013 +0300 84.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java Tue Apr 02 13:27:01 2013 +0300 84.3 @@ -21,7 +21,6 @@ 84.4 import org.openrdf.model.impl.LiteralImpl; 84.5 import org.openrdf.model.impl.URIImpl; 84.6 import org.openrdf.model.impl.ValueFactoryBase; 84.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 84.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 84.9 import org.openrdf.sail.generaldb.managers.BNodeManager; 84.10 import org.openrdf.sail.generaldb.managers.LiteralManager; 84.11 @@ -42,6 +41,8 @@ 84.12 84.13 import com.vividsolutions.jts.io.ParseException; 84.14 84.15 +import eu.earthobservatory.constants.GeoConstants; 84.16 + 84.17 /** 84.18 * Provides basic value creation both for traditional values as well as values 84.19 * with an internal id. {@link RdbmsValue}s behaviour similar to the default
85.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Apr 02 13:25:45 2013 +0300 85.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Apr 02 13:27:01 2013 +0300 85.3 @@ -113,7 +113,6 @@ 85.4 import org.openrdf.query.algebra.evaluation.function.Function; 85.5 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 85.6 import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc; 85.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 85.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 85.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 85.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 85.11 @@ -137,6 +136,8 @@ 85.12 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 85.13 import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 85.14 85.15 +import eu.earthobservatory.constants.GeoConstants; 85.16 + 85.17 /** 85.18 * Boolean SQL expression factory. This factory can convert a number of core 85.19 * algebra nodes into an SQL expression.
86.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java Tue Apr 02 13:25:45 2013 +0300 86.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java Tue Apr 02 13:27:01 2013 +0300 86.3 @@ -43,7 +43,6 @@ 86.4 import org.openrdf.query.algebra.evaluation.function.Function; 86.5 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 86.6 import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc; 86.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 86.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 86.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 86.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 86.11 @@ -63,6 +62,8 @@ 86.12 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 86.13 import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 86.14 86.15 +import eu.earthobservatory.constants.GeoConstants; 86.16 + 86.17 /** 86.18 * Creates an SQL expression of a literal's numeric value. 86.19 *
87.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Apr 02 13:25:45 2013 +0300 87.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Apr 02 13:27:01 2013 +0300 87.3 @@ -38,7 +38,6 @@ 87.4 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 87.5 import org.openrdf.query.algebra.evaluation.function.Function; 87.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 87.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 87.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 87.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 87.10 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 87.11 @@ -106,6 +105,8 @@ 87.12 87.13 import com.vividsolutions.jts.geom.Geometry; 87.14 87.15 +import eu.earthobservatory.constants.GeoConstants; 87.16 + 87.17 /** 87.18 * Extends the default strategy by accepting {@link GeneralDBSelectQuery} and evaluating 87.19 * them on a database.
88.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java Tue Apr 02 13:25:45 2013 +0300 88.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java Tue Apr 02 13:27:01 2013 +0300 88.3 @@ -15,7 +15,6 @@ 88.4 import org.openrdf.query.BindingSet; 88.5 import org.openrdf.query.QueryEvaluationException; 88.6 import org.openrdf.query.algebra.evaluation.QueryBindingSet; 88.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 88.8 import org.openrdf.sail.generaldb.GeneralDBSpatialFuncInfo; 88.9 import org.openrdf.sail.generaldb.GeneralDBValueFactory; 88.10 import org.openrdf.sail.generaldb.algebra.GeneralDBColumnVar; 88.11 @@ -26,6 +25,8 @@ 88.12 import org.openrdf.sail.rdbms.model.RdbmsResource; 88.13 import org.openrdf.sail.rdbms.model.RdbmsValue; 88.14 88.15 +import eu.earthobservatory.constants.GeoConstants; 88.16 + 88.17 /** 88.18 * Converts a {@link ResultSet} into a {@link BindingSet} in an iteration. 88.19 *
89.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Tue Apr 02 13:25:45 2013 +0300 89.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Tue Apr 02 13:27:01 2013 +0300 89.3 @@ -3,12 +3,13 @@ 89.4 import java.io.IOException; 89.5 89.6 import org.openrdf.model.URI; 89.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 89.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 89.9 import org.openrdf.sail.rdbms.model.RdbmsValue; 89.10 89.11 import com.vividsolutions.jts.io.ParseException; 89.12 89.13 +import eu.earthobservatory.constants.GeoConstants; 89.14 + 89.15 /** 89.16 * 89.17 * @author Manos Karpathiotakis <mk@di.uoa.gr>
90.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/XMLGSDatatypeUtil.java Tue Apr 02 13:25:45 2013 +0300 90.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/XMLGSDatatypeUtil.java Tue Apr 02 13:27:01 2013 +0300 90.3 @@ -17,7 +17,8 @@ 90.4 import org.openrdf.model.vocabulary.XMLSchema; 90.5 90.6 import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 90.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 90.8 + 90.9 +import eu.earthobservatory.constants.GeoConstants; 90.10 90.11 90.12
91.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java Tue Apr 02 13:25:45 2013 +0300 91.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java Tue Apr 02 13:27:01 2013 +0300 91.3 @@ -62,7 +62,6 @@ 91.4 import org.openrdf.query.algebra.evaluation.function.Function; 91.5 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 91.6 import org.openrdf.query.algebra.evaluation.function.spatial.DateTimeMetricFunc; 91.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 91.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 91.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 91.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 91.11 @@ -99,6 +98,8 @@ 91.12 import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 91.13 import org.openrdf.sail.rdbms.model.RdbmsResource; 91.14 91.15 +import eu.earthobservatory.constants.GeoConstants; 91.16 + 91.17 /** 91.18 * Rewrites the core algebra model with a relation optimised model, using SQL. 91.19 *
92.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java Tue Apr 02 13:25:45 2013 +0300 92.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java Tue Apr 02 13:27:01 2013 +0300 92.3 @@ -7,9 +7,10 @@ 92.4 92.5 import java.sql.SQLException; 92.6 92.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 92.8 import org.openrdf.sail.generaldb.GeneralDBSqlTable; 92.9 92.10 +import eu.earthobservatory.constants.GeoConstants; 92.11 + 92.12 /** 92.13 * 92.14 * @author George Garbis <ggarbis@di.uoa.gr>
93.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java Tue Apr 02 13:25:45 2013 +0300 93.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java Tue Apr 02 13:27:01 2013 +0300 93.3 @@ -11,10 +11,11 @@ 93.4 import java.sql.SQLException; 93.5 93.6 import org.openrdf.query.BindingSet; 93.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 93.8 import org.openrdf.sail.generaldb.iteration.GeneralDBBindingIteration; 93.9 import org.openrdf.sail.rdbms.model.RdbmsValue; 93.10 93.11 +import eu.earthobservatory.constants.GeoConstants; 93.12 + 93.13 /** 93.14 * Converts a {@link ResultSet} into a {@link BindingSet} in an iteration. 93.15 *
94.1 --- a/pom.xml Tue Apr 02 13:25:45 2013 +0300 94.2 +++ b/pom.xml Tue Apr 02 13:27:01 2013 +0300 94.3 @@ -135,6 +135,7 @@ 94.4 <module>endpoint</module> 94.5 <module>endpoint-client</module> 94.6 <module>endpoint-exec</module> 94.7 + <module>constants</module> 94.8 </modules> 94.9 94.10 <properties> 94.11 @@ -239,6 +240,12 @@ 94.12 </dependency> 94.13 94.14 <dependency> 94.15 + <groupId>eu.earthobservatory</groupId> 94.16 + <artifactId>spatial-temporal-constants</artifactId> 94.17 + <version>${eu.earthobservatory.version}</version> 94.18 + </dependency> 94.19 + 94.20 + <dependency> 94.21 <groupId>org.openrdf.sesame</groupId> 94.22 <artifactId>sesame-sail-postgis</artifactId> 94.23 <version>${eu.earthobservatory.version}</version>
95.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java Tue Apr 02 13:25:45 2013 +0300 95.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java Tue Apr 02 13:27:01 2013 +0300 95.3 @@ -7,9 +7,10 @@ 95.4 95.5 import java.sql.SQLException; 95.6 95.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 95.8 import org.openrdf.sail.generaldb.GeneralDBSqlTable; 95.9 95.10 +import eu.earthobservatory.constants.GeoConstants; 95.11 + 95.12 /** 95.13 * Converts table names to lower-case and include the analyse optimisation. 95.14 *
96.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java Tue Apr 02 13:25:45 2013 +0300 96.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java Tue Apr 02 13:27:01 2013 +0300 96.3 @@ -10,10 +10,11 @@ 96.4 import java.sql.SQLException; 96.5 96.6 import org.openrdf.query.BindingSet; 96.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 96.8 import org.openrdf.sail.generaldb.iteration.GeneralDBBindingIteration; 96.9 import org.openrdf.sail.rdbms.model.RdbmsValue; 96.10 96.11 +import eu.earthobservatory.constants.GeoConstants; 96.12 + 96.13 /** 96.14 * Converts a {@link ResultSet} into a {@link BindingSet} in an iteration. 96.15 *
97.1 --- a/resultio-spatial/sparqlkml/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java Tue Apr 02 13:25:45 2013 +0300 97.2 +++ b/resultio-spatial/sparqlkml/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java Tue Apr 02 13:27:01 2013 +0300 97.3 @@ -26,7 +26,6 @@ 97.4 import org.openrdf.query.BindingSet; 97.5 import org.openrdf.query.TupleQueryResultHandlerException; 97.6 import org.openrdf.query.algebra.evaluation.function.spatial.AbstractWKT; 97.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 97.8 import org.openrdf.query.algebra.evaluation.util.JTSWrapper; 97.9 import org.openrdf.query.resultio.TupleQueryResultFormat; 97.10 import org.openrdf.query.resultio.TupleQueryResultWriter; 97.11 @@ -47,6 +46,8 @@ 97.12 import com.vividsolutions.jts.geom.Polygon; 97.13 import com.vividsolutions.jts.io.ParseException; 97.14 97.15 +import eu.earthobservatory.constants.GeoConstants; 97.16 + 97.17 /** 97.18 * @author Manos Karpathiotakis <mk@di.uoa.gr> 97.19 * @author Charalampos Nikolaou <charnik@di.uoa.gr>
98.1 --- a/resultio-spatial/sparqlxml/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java Tue Apr 02 13:25:45 2013 +0300 98.2 +++ b/resultio-spatial/sparqlxml/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java Tue Apr 02 13:27:01 2013 +0300 98.3 @@ -34,11 +34,12 @@ 98.4 import org.openrdf.query.Binding; 98.5 import org.openrdf.query.BindingSet; 98.6 import org.openrdf.query.TupleQueryResultHandlerException; 98.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 98.8 import org.openrdf.query.resultio.TupleQueryResultFormat; 98.9 import org.openrdf.query.resultio.TupleQueryResultWriter; 98.10 import org.openrdf.query.resultio.stSPARQLQueryResultFormat; 98.11 98.12 +import eu.earthobservatory.constants.GeoConstants; 98.13 + 98.14 /** 98.15 * A {@link TupleQueryResultWriter} that writes tuple query results in the <a 98.16 * href="http://www.w3.org/TR/rdf-sparql-XMLres/">SPARQL Query Results XML