Strabon
changeset 385:75503b0be891
moved constants from StrabonPolyhedron to GeoConstants
line diff
1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Wed Jun 27 18:10:40 2012 +0300 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/link/SimilarTermFunc.java Wed Jun 27 18:36:49 2012 +0300 1.3 @@ -8,7 +8,7 @@ 1.4 import org.openrdf.model.Value; 1.5 import org.openrdf.model.ValueFactory; 1.6 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 1.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 1.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 1.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 1.10 1.11 /** 1.12 @@ -21,7 +21,7 @@ 1.13 1.14 @Override 1.15 public String getURI() { 1.16 - return StrabonPolyhedron.stRDF+name; 1.17 + return GeoConstants.stRDF+name; 1.18 } 1.19 1.20 public Value evaluate(ValueFactory valueFactory, Value... args)
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/GeoConstants.java Wed Jun 27 18:36:49 2012 +0300 2.3 @@ -0,0 +1,143 @@ 2.4 +/** 2.5 + * 2.6 + */ 2.7 +package org.openrdf.query.algebra.evaluation.function.spatial; 2.8 + 2.9 +/** 2.10 + * This class is a placeholder for various constants around geometries. These 2.11 + * constants range from URIs of namespaces, functions, representations, etc., 2.12 + * to other constants, such as the default spatial reference system (SRID) that 2.13 + * is assumed in Strabon. 2.14 + * 2.15 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 2.16 + */ 2.17 +public class GeoConstants { 2.18 + /** * 2.19 + * Namespaces * 2.20 + * */ 2.21 + 2.22 + /** 2.23 + * The namespace for stRDF data model 2.24 + */ 2.25 + public static final String stRDF = "http://strdf.di.uoa.gr/ontology#"; 2.26 + 2.27 + /** 2.28 + * The URI for the datatype SemiLinearPointSet 2.29 + * (linear constraint-based representation of geometries) 2.30 + */ 2.31 + public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 2.32 + 2.33 + /** 2.34 + * The URI for the datatype Well-Known Text (WKT) 2.35 + */ 2.36 + public static final String WKT = stRDF + "WKT"; 2.37 + 2.38 + /** 2.39 + * The URI for the datatype Geography Markup Langague (GML) 2.40 + */ 2.41 + public static final String GML = stRDF + "GML"; 2.42 + 2.43 + /** 2.44 + * The namespace for geometry functions declared by GeoSPARQL 2.45 + */ 2.46 + public static final String geof = "http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/"; 2.47 + 2.48 + /** * 2.49 + * Extended functions * 2.50 + * stSPARQL * 2.51 + * */ 2.52 + // Spatial Relationships 2.53 + public static final String anyInteract = stRDF + "anyInteract"; 2.54 + public static final String contains = stRDF + "contains"; 2.55 + public static final String coveredBy = stRDF + "coveredBy"; 2.56 + public static final String covers = stRDF + "covers"; 2.57 + public static final String disjoint = stRDF + "disjoint"; 2.58 + public static final String equals = stRDF + "equals"; 2.59 + public static final String inside = stRDF + "inside"; 2.60 + public static final String overlap = stRDF + "overlap"; 2.61 + public static final String touch = stRDF + "touch"; 2.62 + public static final String relate = stRDF + "relate"; 2.63 + public static final String left = stRDF + "left"; 2.64 + public static final String right = stRDF + "right"; 2.65 + public static final String above = stRDF + "above"; 2.66 + public static final String below = stRDF + "below"; 2.67 + 2.68 + // Spatial Constructs 2.69 + public static final String union = stRDF + "union"; 2.70 + public static final String buffer = stRDF + "buffer"; 2.71 + public static final String envelope = stRDF + "envelope"; 2.72 + public static final String convexHull = stRDF + "convexHull"; 2.73 + public static final String boundary = stRDF + "boundary"; 2.74 + public static final String intersection = stRDF + "intersection"; 2.75 + public static final String difference = stRDF + "difference"; 2.76 + public static final String symDifference = stRDF + "symDifference"; 2.77 + public static final String transform = stRDF + "transform"; 2.78 + 2.79 + // Spatial Metric Functions 2.80 + public static final String distance = stRDF + "distance"; 2.81 + public static final String area = stRDF + "area"; 2.82 + 2.83 + // Spatial Properties 2.84 + public static final String dimension = stRDF + "dimension"; 2.85 + public static final String geometryType = stRDF + "geometryType"; 2.86 + public static final String asText = stRDF + "asText"; 2.87 + public static final String asGML = stRDF + "asGML"; 2.88 + public static final String srid = stRDF + "srid"; 2.89 + public static final String isEmpty = stRDF + "isEmpty"; 2.90 + public static final String isSimple = stRDF + "isSimple"; 2.91 + 2.92 + // Spatial Aggregate Functions 2.93 + public static final String extent = stRDF + "extent"; 2.94 + 2.95 + /** 2.96 + * Default SRID 2.97 + */ 2.98 + public static final Integer defaultSRID = 4326; 2.99 + 2.100 + /** * 2.101 + * Extended functions * 2.102 + * GeoSPARQL * 2.103 + * */ 2.104 + // Non-topological 2.105 + public static final String geoSparqlDistance = geof + "distance"; //3 arguments 2.106 + public static final String geoSparqlBuffer = geof + "buffer"; //3 arguments 2.107 + public static final String geoSparqlConvexHull = geof + "convexHull"; 2.108 + public static final String geoSparqlIntersection = geof + "intersection"; 2.109 + public static final String geoSparqlUnion = geof + "union"; 2.110 + public static final String geoSparqlDifference = geof + "difference"; 2.111 + public static final String geoSparqlSymmetricDifference = geof + "symmetricDifference"; 2.112 + public static final String geoSparqlEnvelope = geof + "envelope"; 2.113 + public static final String geoSparqlBoundary = geof + "boundary"; 2.114 + 2.115 + // Simple Features - 8 functions - all with 2 arguments + boolean 2.116 + public static final String sfEquals = geof + "sf-equals"; 2.117 + public static final String sfDisjoint = geof + "sf-disjoint"; 2.118 + public static final String sfIntersects = geof + "sf-intersects"; 2.119 + public static final String sfTouches = geof + "sf-touches"; 2.120 + public static final String sfCrosses = geof + "sf-crosses"; 2.121 + public static final String sfWithin = geof + "sf-within"; 2.122 + public static final String sfContains = geof + "sf-contains"; 2.123 + public static final String sfOverlaps = geof + "sf-overlaps"; 2.124 + 2.125 + // Egenhofer - 8 functions - all with 2 arguments + boolean 2.126 + public static final String ehEquals = geof + "eh-equals"; 2.127 + public static final String ehDisjoint = geof + "eh-disjoint"; 2.128 + public static final String ehMeet = geof + "eh-meet"; 2.129 + public static final String ehOverlap = geof + "eh-overlap"; 2.130 + public static final String ehCovers = geof + "eh-covers"; 2.131 + public static final String ehCoveredBy = geof + "eh-coveredBy"; 2.132 + public static final String ehInside = geof + "eh-inside"; 2.133 + public static final String ehContains = geof + "eh-contains"; 2.134 + 2.135 + // RCC8 - 8 functions - all with 2 arguments + boolean 2.136 + public static final String rccEquals = geof + "rcc8-eq"; 2.137 + public static final String rccDisconnected = geof + "rcc8-dc"; 2.138 + public static final String rccExternallyConnected = geof + "rcc8-ec"; 2.139 + public static final String rccPartiallyOverlapping = geof + "rcc8-po"; 2.140 + public static final String rccTangentialProperPartInverse = geof + "rcc8-tppi"; 2.141 + public static final String rccTangentialProperPart = geof + "rcc8-tpp"; 2.142 + public static final String rccNonTangentialProperPart = geof + "rcc8-ntpp"; 2.143 + public static final String rccNonTangentialProperPartInverse = geof + "rcc8-ntppi"; 2.144 + public static final String geoSparqlRelate = geof + "relate"; 2.145 + 2.146 +}
3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java Wed Jun 27 18:10:40 2012 +0300 3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java Wed Jun 27 18:36:49 2012 +0300 3.3 @@ -64,132 +64,12 @@ 3.4 public static String TABLE_SUBJ_OBJ_TYPES = "tableProperties.bin"; 3.5 public static String TABLE_SHIFTING = "groupbys.bin"; 3.6 3.7 - 3.8 public static final boolean EnableConstraintRepresentation = false; 3.9 3.10 - /** 3.11 - * The namespace for stRDF data model 3.12 - */ 3.13 - public static final String stRDF = "http://strdf.di.uoa.gr/ontology#"; 3.14 - 3.15 - /** 3.16 - * The URI for the datatype SemiLinearPointSet 3.17 - * (linear constraint-based representation of geometries) 3.18 - */ 3.19 - public static final String stRDFSemiLinearPointset = stRDF + "SemiLinearPointSet"; 3.20 - 3.21 - /** 3.22 - * The URI for the datatype Well-Known Text (WKT) 3.23 - */ 3.24 - public static final String WKT = stRDF + "WKT"; 3.25 - 3.26 - /** 3.27 - * The URI for the datatype Geography Markup Langague (GML) 3.28 - */ 3.29 - public static final String GML = stRDF + "GML"; 3.30 - 3.31 - //private static final String GML = "http://www.opengis.net/def/geometryType/OGC-GML/3.2/"; 3.32 - 3.33 - /** 3.34 - * The namespace for geometry functions declared by GeoSPARQL 3.35 - */ 3.36 - public static final String geof = "http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/"; 3.37 - 3.38 - /* Extended functions */ 3.39 - 3.40 - // Spatial Relationships 3.41 - public static final String anyInteract = stRDF + "anyInteract"; 3.42 - public static final String contains = stRDF + "contains"; 3.43 - public static final String coveredBy = stRDF + "coveredBy"; 3.44 - public static final String covers = stRDF + "covers"; 3.45 - public static final String disjoint = stRDF + "disjoint"; 3.46 - public static final String equals = stRDF + "equals"; 3.47 - public static final String inside = stRDF + "inside"; 3.48 - public static final String overlap = stRDF + "overlap"; 3.49 - public static final String touch = stRDF + "touch"; 3.50 - public static final String relate = stRDF + "relate"; 3.51 - public static final String left = stRDF + "left"; 3.52 - public static final String right = stRDF + "right"; 3.53 - public static final String above = stRDF + "above"; 3.54 - public static final String below = stRDF + "below"; 3.55 - 3.56 - // Spatial Constructs 3.57 - public static final String union = stRDF + "union"; 3.58 - public static final String buffer = stRDF + "buffer"; 3.59 - public static final String envelope = stRDF + "envelope"; 3.60 - public static final String convexHull = stRDF + "convexHull"; 3.61 - public static final String boundary = stRDF + "boundary"; 3.62 - public static final String intersection = stRDF + "intersection"; 3.63 - public static final String difference = stRDF + "difference"; 3.64 - public static final String symDifference = stRDF + "symDifference"; 3.65 - public static final String transform = stRDF + "transform"; 3.66 - 3.67 - // Spatial Metric Functions 3.68 - public static final String distance = stRDF + "distance"; 3.69 - public static final String area = stRDF + "area"; 3.70 - 3.71 - // Spatial Properties 3.72 - public static final String dimension = stRDF + "dimension"; 3.73 - public static final String geometryType = stRDF + "geometryType"; 3.74 - public static final String asText = stRDF + "asText"; 3.75 - public static final String asGML = stRDF + "asGML"; 3.76 - public static final String srid = stRDF + "srid"; 3.77 - public static final String isEmpty = stRDF + "isEmpty"; 3.78 - public static final String isSimple = stRDF + "isSimple"; 3.79 - public static final Integer defaultSRID = 4326; //default srid. 3.80 - 3.81 - // Spatial Aggregate Functions 3.82 - public static final String extent =stRDF + "extent"; 3.83 - 3.84 - // GEOSPARQL 3.85 - 3.86 - // Non-topological 3.87 - public static final String geoSparqlDistance = geof + "distance"; //3 arguments 3.88 - public static final String geoSparqlBuffer = geof + "buffer"; //3 arguments 3.89 - public static final String geoSparqlConvexHull = geof + "convexHull"; 3.90 - public static final String geoSparqlIntersection = geof + "intersection"; 3.91 - public static final String geoSparqlUnion = geof + "union"; 3.92 - public static final String geoSparqlDifference = geof + "difference"; 3.93 - public static final String geoSparqlSymmetricDifference = geof + "symmetricDifference"; 3.94 - public static final String geoSparqlEnvelope = geof + "envelope"; 3.95 - public static final String geoSparqlBoundary = geof + "boundary"; 3.96 - 3.97 - // Simple Features - 8 functions - all with 2 arguments + boolean 3.98 - public static final String sfEquals = geof + "sf-equals"; 3.99 - public static final String sfDisjoint = geof + "sf-disjoint"; 3.100 - public static final String sfIntersects = geof + "sf-intersects"; 3.101 - public static final String sfTouches = geof + "sf-touches"; 3.102 - public static final String sfCrosses = geof + "sf-crosses"; 3.103 - public static final String sfWithin = geof + "sf-within"; 3.104 - public static final String sfContains = geof + "sf-contains"; 3.105 - public static final String sfOverlaps = geof + "sf-overlaps"; 3.106 - 3.107 - // Egenhofer - 8 functions - all with 2 arguments + boolean 3.108 - public static final String ehEquals = geof + "eh-equals"; 3.109 - public static final String ehDisjoint = geof + "eh-disjoint"; 3.110 - public static final String ehMeet = geof + "eh-meet"; 3.111 - public static final String ehOverlap = geof + "eh-overlap"; 3.112 - public static final String ehCovers = geof + "eh-covers"; 3.113 - public static final String ehCoveredBy = geof + "eh-coveredBy"; 3.114 - public static final String ehInside = geof + "eh-inside"; 3.115 - public static final String ehContains = geof + "eh-contains"; 3.116 - 3.117 - // RCC8 - 8 functions - all with 2 arguments + boolean 3.118 - public static final String rccEquals = geof + "rcc8-eq"; 3.119 - public static final String rccDisconnected = geof + "rcc8-dc"; 3.120 - public static final String rccExternallyConnected = geof + "rcc8-ec"; 3.121 - public static final String rccPartiallyOverlapping = geof + "rcc8-po"; 3.122 - public static final String rccTangentialProperPartInverse = geof + "rcc8-tppi"; 3.123 - public static final String rccTangentialProperPart = geof + "rcc8-tpp"; 3.124 - public static final String rccNonTangentialProperPart = geof + "rcc8-ntpp"; 3.125 - public static final String rccNonTangentialProperPartInverse = geof + "rcc8-ntppi"; 3.126 - 3.127 - public static final String geoSparqlRelate = geof + "relate"; 3.128 - 3.129 private static int MAX_POINTS = Integer.MAX_VALUE;//40000;//Integer.MAX_VALUE;//10000; 3.130 3.131 /** 3.132 - * Get Java Topology Suite wrapper instance. 3.133 + * Get the Java Topology Suite wrapper instance. 3.134 */ 3.135 private static JTSWrapper jts = JTSWrapper.getInstance(); 3.136
4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java Wed Jun 27 18:10:40 2012 +0300 4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/WKTHelper.java Wed Jun 27 18:36:49 2012 +0300 4.3 @@ -43,7 +43,7 @@ 4.4 * @return 4.5 */ 4.6 public static Integer getSRID(String wkt) { 4.7 - int srid = StrabonPolyhedron.defaultSRID; 4.8 + int srid = GeoConstants.defaultSRID; 4.9 4.10 if (wkt == null) return srid; 4.11
5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Wed Jun 27 18:10:40 2012 +0300 5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java Wed Jun 27 18:36:49 2012 +0300 5.3 @@ -5,7 +5,7 @@ 5.4 */ 5.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql; 5.6 5.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 5.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 5.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 5.10 5.11 /** 5.12 @@ -16,6 +16,6 @@ 5.13 5.14 @Override 5.15 public String getURI() { 5.16 - return StrabonPolyhedron.geoSparqlRelate; 5.17 + return GeoConstants.geoSparqlRelate; 5.18 } 5.19 }
6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Wed Jun 27 18:10:40 2012 +0300 6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java Wed Jun 27 18:36:49 2012 +0300 6.3 @@ -5,7 +5,7 @@ 6.4 */ 6.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 6.6 6.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 6.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 6.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 6.10 6.11 /** 6.12 @@ -16,6 +16,6 @@ 6.13 6.14 @Override 6.15 public String getURI() { 6.16 - return StrabonPolyhedron.ehContains; 6.17 + return GeoConstants.ehContains; 6.18 } 6.19 }
7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Wed Jun 27 18:10:40 2012 +0300 7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java Wed Jun 27 18:36:49 2012 +0300 7.3 @@ -5,7 +5,7 @@ 7.4 */ 7.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 7.6 7.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 7.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 7.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 7.10 7.11 7.12 @@ -13,7 +13,7 @@ 7.13 7.14 @Override 7.15 public String getURI() { 7.16 - return StrabonPolyhedron.ehCoveredBy; 7.17 + return GeoConstants.ehCoveredBy; 7.18 } 7.19 7.20 }
8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Wed Jun 27 18:10:40 2012 +0300 8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java Wed Jun 27 18:36:49 2012 +0300 8.3 @@ -5,7 +5,7 @@ 8.4 */ 8.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 8.6 8.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 8.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 8.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 8.10 8.11 8.12 @@ -13,7 +13,7 @@ 8.13 8.14 @Override 8.15 public String getURI() { 8.16 - return StrabonPolyhedron.ehCovers; 8.17 + return GeoConstants.ehCovers; 8.18 } 8.19 8.20 }
9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Wed Jun 27 18:10:40 2012 +0300 9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java Wed Jun 27 18:36:49 2012 +0300 9.3 @@ -5,7 +5,7 @@ 9.4 */ 9.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 9.6 9.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 9.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 9.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 9.10 9.11 9.12 @@ -13,7 +13,7 @@ 9.13 9.14 @Override 9.15 public String getURI() { 9.16 - return StrabonPolyhedron.ehDisjoint; 9.17 + return GeoConstants.ehDisjoint; 9.18 } 9.19 9.20 }
10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Wed Jun 27 18:10:40 2012 +0300 10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java Wed Jun 27 18:36:49 2012 +0300 10.3 @@ -5,7 +5,7 @@ 10.4 */ 10.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 10.6 10.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 10.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 10.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 10.10 10.11 10.12 @@ -13,7 +13,7 @@ 10.13 10.14 @Override 10.15 public String getURI() { 10.16 - return StrabonPolyhedron.ehEquals; 10.17 + return GeoConstants.ehEquals; 10.18 } 10.19 10.20 }
11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Wed Jun 27 18:10:40 2012 +0300 11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java Wed Jun 27 18:36:49 2012 +0300 11.3 @@ -5,7 +5,7 @@ 11.4 */ 11.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer; 11.6 11.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 11.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 11.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 11.10 11.11 11.12 @@ -13,7 +13,7 @@ 11.13 11.14 @Override 11.15 public String getURI() { 11.16 - return StrabonPolyhedron.ehInside; 11.17 + return GeoConstants.ehInside; 11.18 } 11.19 11.20 }
12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Wed Jun 27 18:10:40 2012 +0300 12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java Wed Jun 27 18:36:49 2012 +0300 12.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 12.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 12.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 12.10 12.11 12.12 @@ -13,7 +13,7 @@ 12.13 12.14 @Override 12.15 public String getURI() { 12.16 - return StrabonPolyhedron.ehMeet; 12.17 + return GeoConstants.ehMeet; 12.18 } 12.19 12.20 }
13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Wed Jun 27 18:10:40 2012 +0300 13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java Wed Jun 27 18:36:49 2012 +0300 13.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 13.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 13.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 13.10 13.11 13.12 @@ -13,7 +13,7 @@ 13.13 13.14 @Override 13.15 public String getURI() { 13.16 - return StrabonPolyhedron.ehOverlap; 13.17 + return GeoConstants.ehOverlap; 13.18 } 13.19 13.20 }
14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Wed Jun 27 18:10:40 2012 +0300 14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java Wed Jun 27 18:36:49 2012 +0300 14.3 @@ -5,7 +5,7 @@ 14.4 */ 14.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 14.6 14.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 14.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 14.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 14.10 14.11 /** 14.12 @@ -16,6 +16,6 @@ 14.13 14.14 @Override 14.15 public String getURI() { 14.16 - return StrabonPolyhedron.geoSparqlBoundary; 14.17 + return GeoConstants.geoSparqlBoundary; 14.18 } 14.19 }
15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Wed Jun 27 18:10:40 2012 +0300 15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java Wed Jun 27 18:36:49 2012 +0300 15.3 @@ -5,7 +5,7 @@ 15.4 */ 15.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 15.6 15.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 15.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 15.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 15.10 15.11 /** 15.12 @@ -16,6 +16,6 @@ 15.13 15.14 @Override 15.15 public String getURI() { 15.16 - return StrabonPolyhedron.geoSparqlBuffer; 15.17 + return GeoConstants.geoSparqlBuffer; 15.18 } 15.19 }
16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Wed Jun 27 18:10:40 2012 +0300 16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java Wed Jun 27 18:36:49 2012 +0300 16.3 @@ -5,7 +5,7 @@ 16.4 */ 16.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 16.6 16.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 16.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 16.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 16.10 16.11 /** 16.12 @@ -16,6 +16,6 @@ 16.13 16.14 @Override 16.15 public String getURI() { 16.16 - return StrabonPolyhedron.geoSparqlConvexHull; 16.17 + return GeoConstants.geoSparqlConvexHull; 16.18 } 16.19 }
17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java Wed Jun 27 18:10:40 2012 +0300 17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDifferenceFunc.java Wed Jun 27 18:36:49 2012 +0300 17.3 @@ -1,6 +1,6 @@ 17.4 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 17.5 17.6 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 17.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 17.8 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 17.9 17.10 /** 17.11 @@ -11,6 +11,6 @@ 17.12 17.13 @Override 17.14 public String getURI() { 17.15 - return StrabonPolyhedron.geoSparqlDifference; 17.16 + return GeoConstants.geoSparqlDifference; 17.17 } 17.18 }
18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Wed Jun 27 18:10:40 2012 +0300 18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java Wed Jun 27 18:36:49 2012 +0300 18.3 @@ -5,7 +5,7 @@ 18.4 */ 18.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 18.6 18.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 18.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 18.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric; 18.10 18.11 /** 18.12 @@ -16,6 +16,6 @@ 18.13 18.14 @Override 18.15 public String getURI() { 18.16 - return StrabonPolyhedron.geoSparqlDistance; 18.17 + return GeoConstants.geoSparqlDistance; 18.18 } 18.19 }
19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Wed Jun 27 18:10:40 2012 +0300 19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java Wed Jun 27 18:36:49 2012 +0300 19.3 @@ -5,7 +5,7 @@ 19.4 */ 19.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 19.6 19.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 19.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 19.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct; 19.10 19.11 /** 19.12 @@ -16,6 +16,6 @@ 19.13 19.14 @Override 19.15 public String getURI() { 19.16 - return StrabonPolyhedron.geoSparqlEnvelope; 19.17 + return GeoConstants.geoSparqlEnvelope; 19.18 } 19.19 }
20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java Wed Jun 27 18:10:40 2012 +0300 20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlIntersectionFunc.java Wed Jun 27 18:36:49 2012 +0300 20.3 @@ -1,6 +1,6 @@ 20.4 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 20.5 20.6 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 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 /** 20.11 @@ -11,6 +11,6 @@ 20.12 20.13 @Override 20.14 public String getURI() { 20.15 - return StrabonPolyhedron.geoSparqlIntersection; 20.16 + return GeoConstants.geoSparqlIntersection; 20.17 } 20.18 }
21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java Wed Jun 27 18:10:40 2012 +0300 21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlSymmetricDifferenceFunc.java Wed Jun 27 18:36:49 2012 +0300 21.3 @@ -1,6 +1,6 @@ 21.4 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 21.5 21.6 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 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 /** 21.11 @@ -11,6 +11,6 @@ 21.12 21.13 @Override 21.14 public String getURI() { 21.15 - return StrabonPolyhedron.geoSparqlSymmetricDifference; 21.16 + return GeoConstants.geoSparqlSymmetricDifference; 21.17 } 21.18 }
22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java Wed Jun 27 18:10:40 2012 +0300 22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlUnionFunc.java Wed Jun 27 18:36:49 2012 +0300 22.3 @@ -1,6 +1,6 @@ 22.4 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological; 22.5 22.6 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 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 /** 22.11 @@ -11,6 +11,6 @@ 22.12 22.13 @Override 22.14 public String getURI() { 22.15 - return StrabonPolyhedron.geoSparqlUnion; 22.16 + return GeoConstants.geoSparqlUnion; 22.17 } 22.18 }
23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Wed Jun 27 18:10:40 2012 +0300 23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java Wed Jun 27 18:36:49 2012 +0300 23.3 @@ -5,7 +5,7 @@ 23.4 */ 23.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 23.6 23.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 23.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 23.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 23.10 23.11 /** 23.12 @@ -16,6 +16,6 @@ 23.13 23.14 @Override 23.15 public String getURI() { 23.16 - return StrabonPolyhedron.rccDisconnected; 23.17 + return GeoConstants.rccDisconnected; 23.18 } 23.19 }
24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Wed Jun 27 18:10:40 2012 +0300 24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java Wed Jun 27 18:36:49 2012 +0300 24.3 @@ -5,7 +5,7 @@ 24.4 */ 24.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 24.6 24.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 24.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 24.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 24.10 24.11 /** 24.12 @@ -16,6 +16,6 @@ 24.13 24.14 @Override 24.15 public String getURI() { 24.16 - return StrabonPolyhedron.rccEquals; 24.17 + return GeoConstants.rccEquals; 24.18 } 24.19 }
25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Wed Jun 27 18:10:40 2012 +0300 25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java Wed Jun 27 18:36:49 2012 +0300 25.3 @@ -5,7 +5,7 @@ 25.4 */ 25.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 25.6 25.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 25.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 25.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 25.10 25.11 /** 25.12 @@ -16,6 +16,6 @@ 25.13 25.14 @Override 25.15 public String getURI() { 25.16 - return StrabonPolyhedron.rccExternallyConnected; 25.17 + return GeoConstants.rccExternallyConnected; 25.18 } 25.19 }
26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Wed Jun 27 18:10:40 2012 +0300 26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java Wed Jun 27 18:36:49 2012 +0300 26.3 @@ -5,7 +5,7 @@ 26.4 */ 26.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 26.6 26.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 26.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 26.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 26.10 26.11 /** 26.12 @@ -16,6 +16,6 @@ 26.13 26.14 @Override 26.15 public String getURI() { 26.16 - return StrabonPolyhedron.rccNonTangentialProperPart; 26.17 + return GeoConstants.rccNonTangentialProperPart; 26.18 } 26.19 }
27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Wed Jun 27 18:10:40 2012 +0300 27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java Wed Jun 27 18:36:49 2012 +0300 27.3 @@ -5,7 +5,7 @@ 27.4 */ 27.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 27.6 27.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 27.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 27.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 27.10 27.11 /** 27.12 @@ -16,6 +16,6 @@ 27.13 27.14 @Override 27.15 public String getURI() { 27.16 - return StrabonPolyhedron.rccNonTangentialProperPartInverse; 27.17 + return GeoConstants.rccNonTangentialProperPartInverse; 27.18 } 27.19 }
28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Wed Jun 27 18:10:40 2012 +0300 28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java Wed Jun 27 18:36:49 2012 +0300 28.3 @@ -5,7 +5,7 @@ 28.4 */ 28.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8; 28.6 28.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 28.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 28.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 28.10 28.11 /** 28.12 @@ -16,6 +16,6 @@ 28.13 28.14 @Override 28.15 public String getURI() { 28.16 - return StrabonPolyhedron.rccPartiallyOverlapping; 28.17 + return GeoConstants.rccPartiallyOverlapping; 28.18 } 28.19 }
29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Wed Jun 27 18:10:40 2012 +0300 29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java Wed Jun 27 18:36:49 2012 +0300 29.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 29.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 29.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 29.10 29.11 /** 29.12 @@ -16,6 +16,6 @@ 29.13 29.14 @Override 29.15 public String getURI() { 29.16 - return StrabonPolyhedron.rccTangentialProperPart; 29.17 + return GeoConstants.rccTangentialProperPart; 29.18 } 29.19 }
30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Wed Jun 27 18:10:40 2012 +0300 30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java Wed Jun 27 18:36:49 2012 +0300 30.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 30.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 30.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 30.10 30.11 /** 30.12 @@ -16,6 +16,6 @@ 30.13 30.14 @Override 30.15 public String getURI() { 30.16 - return StrabonPolyhedron.rccTangentialProperPartInverse; 30.17 + return GeoConstants.rccTangentialProperPartInverse; 30.18 } 30.19 }
31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Wed Jun 27 18:10:40 2012 +0300 31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java Wed Jun 27 18:36:49 2012 +0300 31.3 @@ -5,7 +5,7 @@ 31.4 */ 31.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 31.6 31.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 31.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 31.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 31.10 31.11 /** 31.12 @@ -16,6 +16,6 @@ 31.13 31.14 @Override 31.15 public String getURI() { 31.16 - return StrabonPolyhedron.sfTouches; 31.17 + return GeoConstants.sfTouches; 31.18 } 31.19 }
32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Wed Jun 27 18:10:40 2012 +0300 32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java Wed Jun 27 18:36:49 2012 +0300 32.3 @@ -5,7 +5,7 @@ 32.4 */ 32.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 32.6 32.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 32.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 32.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 32.10 32.11 /** 32.12 @@ -16,6 +16,6 @@ 32.13 32.14 @Override 32.15 public String getURI() { 32.16 - return StrabonPolyhedron.sfContains; 32.17 + return GeoConstants.sfContains; 32.18 } 32.19 }
33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Wed Jun 27 18:10:40 2012 +0300 33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java Wed Jun 27 18:36:49 2012 +0300 33.3 @@ -5,7 +5,7 @@ 33.4 */ 33.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 33.6 33.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 33.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 33.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 33.10 33.11 /** 33.12 @@ -16,6 +16,6 @@ 33.13 33.14 @Override 33.15 public String getURI() { 33.16 - return StrabonPolyhedron.sfCrosses; 33.17 + return GeoConstants.sfCrosses; 33.18 } 33.19 }
34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Wed Jun 27 18:10:40 2012 +0300 34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java Wed Jun 27 18:36:49 2012 +0300 34.3 @@ -5,7 +5,7 @@ 34.4 */ 34.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 34.6 34.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 34.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 34.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 34.10 34.11 /** 34.12 @@ -16,6 +16,6 @@ 34.13 34.14 @Override 34.15 public String getURI() { 34.16 - return StrabonPolyhedron.sfDisjoint; 34.17 + return GeoConstants.sfDisjoint; 34.18 } 34.19 }
35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Wed Jun 27 18:10:40 2012 +0300 35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java Wed Jun 27 18:36:49 2012 +0300 35.3 @@ -5,7 +5,7 @@ 35.4 */ 35.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 35.6 35.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 35.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 35.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 35.10 35.11 /** 35.12 @@ -16,6 +16,6 @@ 35.13 35.14 @Override 35.15 public String getURI() { 35.16 - return StrabonPolyhedron.sfEquals; 35.17 + return GeoConstants.sfEquals; 35.18 } 35.19 }
36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Wed Jun 27 18:10:40 2012 +0300 36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java Wed Jun 27 18:36:49 2012 +0300 36.3 @@ -5,7 +5,7 @@ 36.4 */ 36.5 package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf; 36.6 36.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 36.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 36.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 36.10 36.11 /** 36.12 @@ -16,6 +16,6 @@ 36.13 36.14 @Override 36.15 public String getURI() { 36.16 - return StrabonPolyhedron.sfIntersects; 36.17 + return GeoConstants.sfIntersects; 36.18 } 36.19 }
37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Wed Jun 27 18:10:40 2012 +0300 37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java Wed Jun 27 18:36:49 2012 +0300 37.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 37.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 37.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 37.10 37.11 /** 37.12 @@ -16,6 +16,6 @@ 37.13 37.14 @Override 37.15 public String getURI() { 37.16 - return StrabonPolyhedron.sfOverlaps; 37.17 + return GeoConstants.sfOverlaps; 37.18 } 37.19 }
38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Wed Jun 27 18:10:40 2012 +0300 38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java Wed Jun 27 18:36:49 2012 +0300 38.3 @@ -5,7 +5,7 @@ 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.StrabonPolyhedron; 38.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 38.9 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation; 38.10 38.11 /** 38.12 @@ -16,6 +16,6 @@ 38.13 38.14 @Override 38.15 public String getURI() { 38.16 - return StrabonPolyhedron.sfWithin; 38.17 + return GeoConstants.sfWithin; 38.18 } 38.19 }
39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java Wed Jun 27 18:10:40 2012 +0300 39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/aggregate/ExtentFunc.java Wed Jun 27 18:36:49 2012 +0300 39.3 @@ -1,7 +1,7 @@ 39.4 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate; 39.5 39.6 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 39.7 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 39.8 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 39.9 39.10 /** 39.11 * 39.12 @@ -11,6 +11,6 @@ 39.13 39.14 @Override 39.15 public String getURI() { 39.16 - return StrabonPolyhedron.extent; 39.17 + return GeoConstants.extent; 39.18 } 39.19 }
40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Wed Jun 27 18:10:40 2012 +0300 40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java Wed Jun 27 18:36:49 2012 +0300 40.3 @@ -5,8 +5,8 @@ 40.4 */ 40.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 40.6 40.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 40.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 40.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 40.10 40.11 /** 40.12 * 40.13 @@ -16,6 +16,6 @@ 40.14 40.15 @Override 40.16 public String getURI() { 40.17 - return StrabonPolyhedron.boundary; 40.18 + return GeoConstants.boundary; 40.19 } 40.20 }
41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Wed Jun 27 18:10:40 2012 +0300 41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java Wed Jun 27 18:36:49 2012 +0300 41.3 @@ -5,8 +5,8 @@ 41.4 */ 41.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 41.6 41.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 41.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 41.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 41.10 41.11 /** 41.12 * @author Manos Karpathiotakis <mk@di.uoa.gr> 41.13 @@ -15,6 +15,6 @@ 41.14 41.15 @Override 41.16 public String getURI() { 41.17 - return StrabonPolyhedron.buffer; 41.18 + return GeoConstants.buffer; 41.19 } 41.20 }
42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Wed Jun 27 18:10:40 2012 +0300 42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java Wed Jun 27 18:36:49 2012 +0300 42.3 @@ -5,8 +5,8 @@ 42.4 */ 42.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 42.6 42.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 42.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 42.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 42.10 42.11 /** 42.12 * 42.13 @@ -16,6 +16,6 @@ 42.14 42.15 @Override 42.16 public String getURI() { 42.17 - return StrabonPolyhedron.convexHull; 42.18 + return GeoConstants.convexHull; 42.19 } 42.20 }
43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java Wed Jun 27 18:10:40 2012 +0300 43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/DifferenceFunc.java Wed Jun 27 18:36:49 2012 +0300 43.3 @@ -1,7 +1,7 @@ 43.4 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 43.5 43.6 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 43.7 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 43.8 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 43.9 43.10 /** 43.11 * 43.12 @@ -11,6 +11,6 @@ 43.13 43.14 @Override 43.15 public String getURI() { 43.16 - return StrabonPolyhedron.difference; 43.17 + return GeoConstants.difference; 43.18 } 43.19 }
44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Wed Jun 27 18:10:40 2012 +0300 44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java Wed Jun 27 18:36:49 2012 +0300 44.3 @@ -5,8 +5,8 @@ 44.4 */ 44.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 44.6 44.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 44.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 44.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 44.10 44.11 /** 44.12 * 44.13 @@ -16,6 +16,6 @@ 44.14 44.15 @Override 44.16 public String getURI() { 44.17 - return StrabonPolyhedron.envelope; 44.18 + return GeoConstants.envelope; 44.19 } 44.20 }
45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java Wed Jun 27 18:10:40 2012 +0300 45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/IntersectionFunc.java Wed Jun 27 18:36:49 2012 +0300 45.3 @@ -1,7 +1,7 @@ 45.4 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 45.5 45.6 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 45.7 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 45.8 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 45.9 45.10 /** 45.11 * 45.12 @@ -11,6 +11,6 @@ 45.13 45.14 @Override 45.15 public String getURI() { 45.16 - return StrabonPolyhedron.intersection; 45.17 + return GeoConstants.intersection; 45.18 } 45.19 }
46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java Wed Jun 27 18:10:40 2012 +0300 46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/SymDifferenceFunc.java Wed Jun 27 18:36:49 2012 +0300 46.3 @@ -1,7 +1,7 @@ 46.4 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 46.5 46.6 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 46.7 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 46.8 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 46.9 46.10 /** 46.11 * 46.12 @@ -11,6 +11,6 @@ 46.13 46.14 @Override 46.15 public String getURI() { 46.16 - return StrabonPolyhedron.symDifference; 46.17 + return GeoConstants.symDifference; 46.18 } 46.19 }
47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Wed Jun 27 18:10:40 2012 +0300 47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java Wed Jun 27 18:36:49 2012 +0300 47.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 47.10 47.11 /** 47.12 * 47.13 @@ -16,6 +16,6 @@ 47.14 47.15 @Override 47.16 public String getURI() { 47.17 - return StrabonPolyhedron.transform; 47.18 + return GeoConstants.transform; 47.19 } 47.20 }
48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java Wed Jun 27 18:10:40 2012 +0300 48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/UnionFunc.java Wed Jun 27 18:36:49 2012 +0300 48.3 @@ -1,7 +1,7 @@ 48.4 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct; 48.5 48.6 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 48.7 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 48.8 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 48.9 48.10 /** 48.11 * 48.12 @@ -11,6 +11,6 @@ 48.13 48.14 @Override 48.15 public String getURI() { 48.16 - return StrabonPolyhedron.union; 48.17 + return GeoConstants.union; 48.18 } 48.19 }
49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Wed Jun 27 18:10:40 2012 +0300 49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java Wed Jun 27 18:36:49 2012 +0300 49.3 @@ -5,8 +5,8 @@ 49.4 */ 49.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 49.6 49.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 49.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 49.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 49.10 49.11 /** 49.12 * A spatial function computing the area of a geometry. 49.13 @@ -17,6 +17,6 @@ 49.14 49.15 @Override 49.16 public String getURI() { 49.17 - return StrabonPolyhedron.area; 49.18 + return GeoConstants.area; 49.19 } 49.20 }
50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Wed Jun 27 18:10:40 2012 +0300 50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java Wed Jun 27 18:36:49 2012 +0300 50.3 @@ -5,8 +5,8 @@ 50.4 */ 50.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric; 50.6 50.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 50.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 50.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 50.10 50.11 /** 50.12 * A spatial function computing the distance between two geometries. 50.13 @@ -17,6 +17,6 @@ 50.14 50.15 @Override 50.16 public String getURI() { 50.17 - return StrabonPolyhedron.distance; 50.18 + return GeoConstants.distance; 50.19 } 50.20 }
51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java Wed Jun 27 18:10:40 2012 +0300 51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java Wed Jun 27 18:36:49 2012 +0300 51.3 @@ -3,8 +3,8 @@ 51.4 */ 51.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 51.6 51.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 51.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 51.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 51.10 51.11 /** 51.12 * A spatial function returning a geometry in GML encoding. 51.13 @@ -15,6 +15,6 @@ 51.14 51.15 @Override 51.16 public String getURI() { 51.17 - return StrabonPolyhedron.asGML; 51.18 + return GeoConstants.asGML; 51.19 } 51.20 }
52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Wed Jun 27 18:10:40 2012 +0300 52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java Wed Jun 27 18:36:49 2012 +0300 52.3 @@ -5,8 +5,8 @@ 52.4 */ 52.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 52.6 52.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 52.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 52.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 52.10 52.11 /** 52.12 * A spatial function returning a geometry as text (in WKT format). 52.13 @@ -17,6 +17,6 @@ 52.14 52.15 @Override 52.16 public String getURI() { 52.17 - return StrabonPolyhedron.asText; 52.18 + return GeoConstants.asText; 52.19 } 52.20 }
53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Wed Jun 27 18:10:40 2012 +0300 53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java Wed Jun 27 18:36:49 2012 +0300 53.3 @@ -5,8 +5,8 @@ 53.4 */ 53.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 53.6 53.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 53.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 53.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 53.10 53.11 /** 53.12 * A spatial function returning the dimension of a geometry. 53.13 @@ -17,6 +17,6 @@ 53.14 53.15 @Override 53.16 public String getURI() { 53.17 - return StrabonPolyhedron.dimension; 53.18 + return GeoConstants.dimension; 53.19 } 53.20 }
54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Wed Jun 27 18:10:40 2012 +0300 54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java Wed Jun 27 18:36:49 2012 +0300 54.3 @@ -5,8 +5,8 @@ 54.4 */ 54.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 54.6 54.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 54.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 54.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 54.10 54.11 /** 54.12 * A spatial function returning the type of a geometry. 54.13 @@ -17,6 +17,6 @@ 54.14 54.15 @Override 54.16 public String getURI() { 54.17 - return StrabonPolyhedron.geometryType; 54.18 + return GeoConstants.geometryType; 54.19 } 54.20 }
55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Wed Jun 27 18:10:40 2012 +0300 55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java Wed Jun 27 18:36:49 2012 +0300 55.3 @@ -5,8 +5,8 @@ 55.4 */ 55.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 55.6 55.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 55.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 55.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 55.10 55.11 /** 55.12 * A spatial function for testing whether a geometry is empty. 55.13 @@ -17,6 +17,6 @@ 55.14 55.15 @Override 55.16 public String getURI() { 55.17 - return StrabonPolyhedron.isEmpty; 55.18 + return GeoConstants.isEmpty; 55.19 } 55.20 }
56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Wed Jun 27 18:10:40 2012 +0300 56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java Wed Jun 27 18:36:49 2012 +0300 56.3 @@ -5,8 +5,8 @@ 56.4 */ 56.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 56.6 56.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 56.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 56.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 56.10 56.11 /** 56.12 * A spatial function for testing whether a geometry is simple. 56.13 @@ -17,6 +17,6 @@ 56.14 56.15 @Override 56.16 public String getURI() { 56.17 - return StrabonPolyhedron.isSimple; 56.18 + return GeoConstants.isSimple; 56.19 } 56.20 }
57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Wed Jun 27 18:10:40 2012 +0300 57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java Wed Jun 27 18:36:49 2012 +0300 57.3 @@ -5,8 +5,8 @@ 57.4 */ 57.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 57.6 57.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 57.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 57.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 57.10 57.11 /** 57.12 * A spatial function returning the SRID of a geometry. 57.13 @@ -17,6 +17,6 @@ 57.14 57.15 @Override 57.16 public String getURI() { 57.17 - return StrabonPolyhedron.srid.toString(); //changed this-constant 57.18 + return GeoConstants.srid.toString(); //changed this-constant 57.19 } 57.20 }
58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Wed Jun 27 18:10:40 2012 +0300 58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java Wed Jun 27 18:36:49 2012 +0300 58.3 @@ -5,8 +5,8 @@ 58.4 */ 58.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 58.6 58.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 58.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 58.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 58.10 58.11 /** 58.12 * 58.13 @@ -16,6 +16,6 @@ 58.14 58.15 @Override 58.16 public String getURI() { 58.17 - return StrabonPolyhedron.above; 58.18 + return GeoConstants.above; 58.19 } 58.20 }
59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java Wed Jun 27 18:10:40 2012 +0300 59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java Wed Jun 27 18:36:49 2012 +0300 59.3 @@ -5,8 +5,8 @@ 59.4 */ 59.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 59.6 59.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 59.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 59.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 59.10 59.11 /** 59.12 * 59.13 @@ -16,7 +16,7 @@ 59.14 59.15 @Override 59.16 public String getURI() { 59.17 - return StrabonPolyhedron.anyInteract; 59.18 + return GeoConstants.anyInteract; 59.19 } 59.20 59.21 // public Literal evaluate(ValueFactory valueFactory, Value... args)
60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Wed Jun 27 18:10:40 2012 +0300 60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java Wed Jun 27 18:36:49 2012 +0300 60.3 @@ -5,8 +5,8 @@ 60.4 */ 60.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 60.6 60.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 60.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 60.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 60.10 60.11 /** 60.12 * 60.13 @@ -16,6 +16,6 @@ 60.14 60.15 @Override 60.16 public String getURI() { 60.17 - return StrabonPolyhedron.below; 60.18 + return GeoConstants.below; 60.19 } 60.20 }
61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Wed Jun 27 18:10:40 2012 +0300 61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java Wed Jun 27 18:36:49 2012 +0300 61.3 @@ -5,8 +5,8 @@ 61.4 */ 61.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 61.6 61.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 61.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 61.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 61.10 61.11 /** 61.12 * 61.13 @@ -16,6 +16,6 @@ 61.14 61.15 @Override 61.16 public String getURI() { 61.17 - return StrabonPolyhedron.contains; 61.18 + return GeoConstants.contains; 61.19 } 61.20 }
62.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java Wed Jun 27 18:10:40 2012 +0300 62.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java Wed Jun 27 18:36:49 2012 +0300 62.3 @@ -5,8 +5,8 @@ 62.4 */ 62.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 62.6 62.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 62.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 62.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 62.10 62.11 /** 62.12 * 62.13 @@ -16,6 +16,6 @@ 62.14 62.15 @Override 62.16 public String getURI() { 62.17 - return StrabonPolyhedron.coveredBy; 62.18 + return GeoConstants.coveredBy; 62.19 } 62.20 }
63.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java Wed Jun 27 18:10:40 2012 +0300 63.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java Wed Jun 27 18:36:49 2012 +0300 63.3 @@ -5,8 +5,8 @@ 63.4 */ 63.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 63.6 63.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 63.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 63.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 63.10 63.11 /** 63.12 * 63.13 @@ -16,6 +16,6 @@ 63.14 63.15 @Override 63.16 public String getURI() { 63.17 - return StrabonPolyhedron.covers; 63.18 + return GeoConstants.covers; 63.19 } 63.20 }
64.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Wed Jun 27 18:10:40 2012 +0300 64.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java Wed Jun 27 18:36:49 2012 +0300 64.3 @@ -5,8 +5,8 @@ 64.4 */ 64.5 package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; 64.6 64.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 64.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 64.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 64.10 64.11 /** 64.12 * 64.13 @@ -16,6 +16,6 @@ 64.14 64.15 @Override 64.16 public String getURI() { 64.17 - return StrabonPolyhedron.disjoint; 64.18 + return GeoConstants.disjoint; 64.19 } 64.20 }
65.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Wed Jun 27 18:10:40 2012 +0300 65.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java Wed Jun 27 18:36:49 2012 +0300 65.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 65.10 65.11 /** 65.12 * 65.13 @@ -16,6 +16,6 @@ 65.14 65.15 @Override 65.16 public String getURI() { 65.17 - return StrabonPolyhedron.equals; 65.18 + return GeoConstants.equals; 65.19 } 65.20 }
66.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Wed Jun 27 18:10:40 2012 +0300 66.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Wed Jun 27 18:36:49 2012 +0300 66.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 66.10 66.11 /** 66.12 * 66.13 @@ -16,6 +16,6 @@ 66.14 66.15 @Override 66.16 public String getURI() { 66.17 - return StrabonPolyhedron.inside; 66.18 + return GeoConstants.inside; 66.19 } 66.20 }
67.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Wed Jun 27 18:10:40 2012 +0300 67.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java Wed Jun 27 18:36:49 2012 +0300 67.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 67.10 67.11 /** 67.12 * 67.13 @@ -16,6 +16,6 @@ 67.14 67.15 @Override 67.16 public String getURI() { 67.17 - return StrabonPolyhedron.left; 67.18 + return GeoConstants.left; 67.19 } 67.20 }
68.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java Wed Jun 27 18:10:40 2012 +0300 68.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java Wed Jun 27 18:36:49 2012 +0300 68.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 68.10 68.11 /** 68.12 * 68.13 @@ -16,6 +16,6 @@ 68.14 68.15 @Override 68.16 public String getURI() { 68.17 - return StrabonPolyhedron.overlap; 68.18 + return GeoConstants.overlap; 68.19 } 68.20 }
69.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Wed Jun 27 18:10:40 2012 +0300 69.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java Wed Jun 27 18:36:49 2012 +0300 69.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 69.10 69.11 /** 69.12 * @author Manos Karpathiotakis <mk@di.uoa.gr> 69.13 @@ -15,7 +15,7 @@ 69.14 69.15 @Override 69.16 public String getURI() { 69.17 - return StrabonPolyhedron.relate; 69.18 + return GeoConstants.relate; 69.19 } 69.20 69.21 // public Literal evaluate(ValueFactory valueFactory, Value... args)
70.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Wed Jun 27 18:10:40 2012 +0300 70.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java Wed Jun 27 18:36:49 2012 +0300 70.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 70.10 70.11 /** 70.12 * 70.13 @@ -16,6 +16,6 @@ 70.14 70.15 @Override 70.16 public String getURI() { 70.17 - return StrabonPolyhedron.right; 70.18 + return GeoConstants.right; 70.19 } 70.20 }
71.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java Wed Jun 27 18:10:40 2012 +0300 71.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java Wed Jun 27 18:36:49 2012 +0300 71.3 @@ -5,8 +5,8 @@ 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 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 71.10 71.11 /** 71.12 * 71.13 @@ -16,6 +16,6 @@ 71.14 71.15 @Override 71.16 public String getURI() { 71.17 - return StrabonPolyhedron.touch; 71.18 + return GeoConstants.touch; 71.19 } 71.20 }
72.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Wed Jun 27 18:10:40 2012 +0300 72.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java Wed Jun 27 18:36:49 2012 +0300 72.3 @@ -48,6 +48,7 @@ 72.4 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 72.5 import org.openrdf.query.algebra.evaluation.function.Function; 72.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 72.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 72.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 72.9 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc; 72.10 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc; 72.11 @@ -352,7 +353,7 @@ 72.12 if(val instanceof StrabonPolyhedron) 72.13 { 72.14 String label = val.toString()+";http://www.opengis.net/def/crs/EPSG/0/"+((StrabonPolyhedron)val).getGeometry().getSRID(); 72.15 - Literal wkt = new LiteralImpl(label,new URIImpl(StrabonPolyhedron.WKT)); 72.16 + Literal wkt = new LiteralImpl(label,new URIImpl(GeoConstants.WKT)); 72.17 sol.setBinding(name,wkt); 72.18 } 72.19 else
73.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java Wed Jun 27 18:10:40 2012 +0300 73.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/util/StSPARQLOrderComparator.java Wed Jun 27 18:36:49 2012 +0300 73.3 @@ -17,7 +17,7 @@ 73.4 import org.openrdf.query.algebra.Var; 73.5 import org.openrdf.query.algebra.evaluation.EvaluationStrategy; 73.6 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 73.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 73.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 73.9 import org.slf4j.Logger; 73.10 import org.slf4j.LoggerFactory; 73.11 73.12 @@ -51,7 +51,7 @@ 73.13 if(element.getExpr() instanceof FunctionCall) 73.14 { 73.15 FunctionCall fc = (FunctionCall) element.getExpr(); 73.16 - if(fc.getURI().equals(StrabonPolyhedron.envelope) && fc.getArgs().size()==2) 73.17 + if(fc.getURI().equals(GeoConstants.envelope) && fc.getArgs().size()==2) 73.18 { 73.19 mbbFlag = true; 73.20 FunctionCall expr = (FunctionCall) element.getExpr();
74.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java Wed Jun 27 18:10:40 2012 +0300 74.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/GeneralDBValueFactory.java Wed Jun 27 18:36:49 2012 +0300 74.3 @@ -21,6 +21,7 @@ 74.4 import org.openrdf.model.impl.LiteralImpl; 74.5 import org.openrdf.model.impl.URIImpl; 74.6 import org.openrdf.model.impl.ValueFactoryBase; 74.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 74.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 74.9 import org.openrdf.sail.generaldb.managers.BNodeManager; 74.10 import org.openrdf.sail.generaldb.managers.LiteralManager; 74.11 @@ -239,7 +240,7 @@ 74.12 /****************************************************/ 74.13 public RdbmsLiteral asRdbmsLiteral(GeneralDBPolyhedron polyhedron) { 74.14 try { 74.15 - URI wkt = new URIImpl(StrabonPolyhedron.WKT); 74.16 + URI wkt = new URIImpl(GeoConstants.WKT); 74.17 RdbmsLiteral literal = new RdbmsLiteral(polyhedron.getInternalId(), polyhedron.getVersion(),new LiteralImpl(polyhedron.stringValue(), wkt)); 74.18 74.19 if (polyhedron instanceof GeneralDBPolyhedron) { 74.20 @@ -262,7 +263,7 @@ 74.21 74.22 public RdbmsLiteral asRdbmsLiteral(StrabonPolyhedron polyhedron) { 74.23 try { 74.24 - URI wkt = new URIImpl(StrabonPolyhedron.WKT); 74.25 + URI wkt = new URIImpl(GeoConstants.WKT); 74.26 RdbmsLiteral literal = new RdbmsLiteral(new LiteralImpl(polyhedron.stringValue(), wkt)); 74.27 74.28 if (polyhedron instanceof StrabonPolyhedron) {
75.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Wed Jun 27 18:10:40 2012 +0300 75.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Wed Jun 27 18:36:49 2012 +0300 75.3 @@ -108,11 +108,11 @@ 75.4 import org.openrdf.query.algebra.Var; 75.5 import org.openrdf.query.algebra.evaluation.function.Function; 75.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 75.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 75.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 75.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 75.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 75.11 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 75.12 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 75.13 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc; 75.14 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc; 75.15 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc; 75.16 @@ -628,12 +628,12 @@ 75.17 } 75.18 else 75.19 { 75.20 - if(function.getURI().equals(StrabonPolyhedron.buffer)) 75.21 + if(function.getURI().equals(GeoConstants.buffer)) 75.22 { 75.23 //Be it a Var or a Value Constant, 'numeric' is the way to go 75.24 rightArg = numeric(right); 75.25 } 75.26 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 75.27 + else if(function.getURI().equals(GeoConstants.transform)) 75.28 { 75.29 //Another special case -> Second argument of this function is a URI 75.30 rightArg = uri(right); 75.31 @@ -846,12 +846,12 @@ 75.32 } 75.33 else 75.34 { 75.35 - if(function.getURI().equals(StrabonPolyhedron.buffer)) 75.36 + if(function.getURI().equals(GeoConstants.buffer)) 75.37 { 75.38 //Be it a Var or a Value Constant, 'numeric' is the way to go 75.39 rightArg = numeric(right); 75.40 } 75.41 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 75.42 + else if(function.getURI().equals(GeoConstants.transform)) 75.43 { 75.44 //Another special case -> Second argument of this function is a URI 75.45 rightArg = uri(right); 75.46 @@ -929,163 +929,163 @@ 75.47 GeneralDBSqlExpr thirdArg) 75.48 { 75.49 //XXX stSPARQL++ 75.50 - if(function.getURI().equals(StrabonPolyhedron.anyInteract)) 75.51 + if(function.getURI().equals(GeoConstants.anyInteract)) 75.52 { 75.53 return anyInteract(leftArg,rightArg); 75.54 } 75.55 - else if(function.getURI().equals(StrabonPolyhedron.contains)) 75.56 + else if(function.getURI().equals(GeoConstants.contains)) 75.57 { 75.58 return contains(leftArg,rightArg); 75.59 } 75.60 - else if(function.getURI().equals(StrabonPolyhedron.coveredBy)) 75.61 + else if(function.getURI().equals(GeoConstants.coveredBy)) 75.62 { 75.63 return coveredBy(leftArg,rightArg); 75.64 } 75.65 - else if(function.getURI().equals(StrabonPolyhedron.covers)) 75.66 + else if(function.getURI().equals(GeoConstants.covers)) 75.67 { 75.68 return covers(leftArg,rightArg); 75.69 } 75.70 - else if(function.getURI().equals(StrabonPolyhedron.disjoint)) 75.71 + else if(function.getURI().equals(GeoConstants.disjoint)) 75.72 { 75.73 return disjoint(leftArg,rightArg); 75.74 } 75.75 - else if(function.getURI().equals(StrabonPolyhedron.equals)) 75.76 + else if(function.getURI().equals(GeoConstants.equals)) 75.77 { 75.78 return equalsGeo(leftArg,rightArg); 75.79 } 75.80 - else if(function.getURI().equals(StrabonPolyhedron.inside)) 75.81 + else if(function.getURI().equals(GeoConstants.inside)) 75.82 { 75.83 return inside(leftArg,rightArg); 75.84 } 75.85 - else if(function.getURI().equals(StrabonPolyhedron.overlap)) 75.86 + else if(function.getURI().equals(GeoConstants.overlap)) 75.87 { 75.88 return overlap(leftArg,rightArg); 75.89 } 75.90 - else if(function.getURI().equals(StrabonPolyhedron.touch)) 75.91 + else if(function.getURI().equals(GeoConstants.touch)) 75.92 { 75.93 return touch(leftArg,rightArg); 75.94 } 75.95 - else if(function.getURI().equals(StrabonPolyhedron.relate)) 75.96 + else if(function.getURI().equals(GeoConstants.relate)) 75.97 { 75.98 return relate(leftArg,rightArg,thirdArg); 75.99 } 75.100 - else if(function.getURI().equals(StrabonPolyhedron.left)) 75.101 + else if(function.getURI().equals(GeoConstants.left)) 75.102 { 75.103 return left(leftArg,rightArg); 75.104 } 75.105 - else if(function.getURI().equals(StrabonPolyhedron.right)) 75.106 + else if(function.getURI().equals(GeoConstants.right)) 75.107 { 75.108 return right(leftArg,rightArg); 75.109 } 75.110 - else if(function.getURI().equals(StrabonPolyhedron.above)) 75.111 + else if(function.getURI().equals(GeoConstants.above)) 75.112 { 75.113 return above(leftArg,rightArg); 75.114 } 75.115 - else if(function.getURI().equals(StrabonPolyhedron.below)) 75.116 + else if(function.getURI().equals(GeoConstants.below)) 75.117 { 75.118 return below(leftArg,rightArg); 75.119 } 75.120 //XXX GeoSPARQL 75.121 //Simple Features 75.122 - else if(function.getURI().equals(StrabonPolyhedron.sfContains)) 75.123 + else if(function.getURI().equals(GeoConstants.sfContains)) 75.124 { 75.125 return sfContains(leftArg,rightArg); 75.126 } 75.127 - else if(function.getURI().equals(StrabonPolyhedron.sfCrosses)) 75.128 + else if(function.getURI().equals(GeoConstants.sfCrosses)) 75.129 { 75.130 return sfCrosses(leftArg,rightArg); 75.131 } 75.132 - else if(function.getURI().equals(StrabonPolyhedron.sfDisjoint)) 75.133 + else if(function.getURI().equals(GeoConstants.sfDisjoint)) 75.134 { 75.135 return sfDisjoint(leftArg,rightArg); 75.136 } 75.137 - else if(function.getURI().equals(StrabonPolyhedron.sfEquals)) 75.138 + else if(function.getURI().equals(GeoConstants.sfEquals)) 75.139 { 75.140 return sfEquals(leftArg,rightArg); 75.141 } 75.142 - else if(function.getURI().equals(StrabonPolyhedron.sfIntersects)) 75.143 + else if(function.getURI().equals(GeoConstants.sfIntersects)) 75.144 { 75.145 return sfIntersects(leftArg,rightArg); 75.146 } 75.147 - else if(function.getURI().equals(StrabonPolyhedron.sfOverlaps)) 75.148 + else if(function.getURI().equals(GeoConstants.sfOverlaps)) 75.149 { 75.150 return sfOverlaps(leftArg,rightArg); 75.151 } 75.152 - else if(function.getURI().equals(StrabonPolyhedron.sfTouches)) 75.153 + else if(function.getURI().equals(GeoConstants.sfTouches)) 75.154 { 75.155 return sfTouches(leftArg,rightArg); 75.156 } 75.157 - else if(function.getURI().equals(StrabonPolyhedron.sfWithin)) 75.158 + else if(function.getURI().equals(GeoConstants.sfWithin)) 75.159 { 75.160 return sfWithin(leftArg,rightArg); 75.161 } 75.162 //RCC8 75.163 - else if(function.getURI().equals(StrabonPolyhedron.rccDisconnected)) 75.164 + else if(function.getURI().equals(GeoConstants.rccDisconnected)) 75.165 { 75.166 return rccDisconnected(leftArg,rightArg); 75.167 } 75.168 - else if(function.getURI().equals(StrabonPolyhedron.rccEquals)) 75.169 + else if(function.getURI().equals(GeoConstants.rccEquals)) 75.170 { 75.171 return rccEquals(leftArg,rightArg); 75.172 } 75.173 - else if(function.getURI().equals(StrabonPolyhedron.rccExternallyConnected)) 75.174 + else if(function.getURI().equals(GeoConstants.rccExternallyConnected)) 75.175 { 75.176 return rccExternallyConnected(leftArg,rightArg); 75.177 } 75.178 - else if(function.getURI().equals(StrabonPolyhedron.rccNonTangentialProperPart)) 75.179 + else if(function.getURI().equals(GeoConstants.rccNonTangentialProperPart)) 75.180 { 75.181 return rccNonTangentialProperPart(leftArg,rightArg); 75.182 } 75.183 - else if(function.getURI().equals(StrabonPolyhedron.rccNonTangentialProperPartInverse)) 75.184 + else if(function.getURI().equals(GeoConstants.rccNonTangentialProperPartInverse)) 75.185 { 75.186 return rccNonTangentialProperPartInverse(leftArg,rightArg); 75.187 } 75.188 - else if(function.getURI().equals(StrabonPolyhedron.rccPartiallyOverlapping)) 75.189 + else if(function.getURI().equals(GeoConstants.rccPartiallyOverlapping)) 75.190 { 75.191 return rccPartiallyOverlapping(leftArg,rightArg); 75.192 } 75.193 - else if(function.getURI().equals(StrabonPolyhedron.rccTangentialProperPart)) 75.194 + else if(function.getURI().equals(GeoConstants.rccTangentialProperPart)) 75.195 { 75.196 return rccTangentialProperPart(leftArg,rightArg); 75.197 } 75.198 - else if(function.getURI().equals(StrabonPolyhedron.rccTangentialProperPartInverse)) 75.199 + else if(function.getURI().equals(GeoConstants.rccTangentialProperPartInverse)) 75.200 { 75.201 return rccTangentialProperPartInverse(leftArg,rightArg); 75.202 } 75.203 //Egenhofer 75.204 - else if(function.getURI().equals(StrabonPolyhedron.ehContains)) 75.205 + else if(function.getURI().equals(GeoConstants.ehContains)) 75.206 { 75.207 return ehContains(leftArg,rightArg); 75.208 } 75.209 - else if(function.getURI().equals(StrabonPolyhedron.ehCoveredBy)) 75.210 + else if(function.getURI().equals(GeoConstants.ehCoveredBy)) 75.211 { 75.212 return ehCoveredBy(leftArg,rightArg); 75.213 } 75.214 - else if(function.getURI().equals(StrabonPolyhedron.ehCovers)) 75.215 + else if(function.getURI().equals(GeoConstants.ehCovers)) 75.216 { 75.217 return ehCovers(leftArg,rightArg); 75.218 } 75.219 - else if(function.getURI().equals(StrabonPolyhedron.ehDisjoint)) 75.220 + else if(function.getURI().equals(GeoConstants.ehDisjoint)) 75.221 { 75.222 return ehDisjoint(leftArg,rightArg); 75.223 } 75.224 - else if(function.getURI().equals(StrabonPolyhedron.ehEquals)) 75.225 + else if(function.getURI().equals(GeoConstants.ehEquals)) 75.226 { 75.227 return ehEquals(leftArg,rightArg); 75.228 } 75.229 - else if(function.getURI().equals(StrabonPolyhedron.ehInside)) 75.230 + else if(function.getURI().equals(GeoConstants.ehInside)) 75.231 { 75.232 return ehInside(leftArg,rightArg); 75.233 } 75.234 - else if(function.getURI().equals(StrabonPolyhedron.ehMeet)) 75.235 + else if(function.getURI().equals(GeoConstants.ehMeet)) 75.236 { 75.237 return ehMeet(leftArg,rightArg); 75.238 } 75.239 - else if(function.getURI().equals(StrabonPolyhedron.ehOverlap)) 75.240 + else if(function.getURI().equals(GeoConstants.ehOverlap)) 75.241 { 75.242 return ehOverlap(leftArg,rightArg); 75.243 } 75.244 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlRelate)) 75.245 + else if(function.getURI().equals(GeoConstants.geoSparqlRelate)) 75.246 { 75.247 return relate(leftArg,rightArg,thirdArg); 75.248 } 75.249 @@ -1096,69 +1096,69 @@ 75.250 75.251 GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg) 75.252 { 75.253 - if(function.getURI().equals(StrabonPolyhedron.union)) 75.254 + if(function.getURI().equals(GeoConstants.union)) 75.255 { 75.256 return geoUnion(leftArg, rightArg); 75.257 } 75.258 - else if(function.getURI().equals(StrabonPolyhedron.buffer)) 75.259 + else if(function.getURI().equals(GeoConstants.buffer)) 75.260 { 75.261 return geoBuffer(leftArg,rightArg); 75.262 } 75.263 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 75.264 + else if(function.getURI().equals(GeoConstants.transform)) 75.265 { 75.266 return geoTransform(leftArg,rightArg); 75.267 } 75.268 - else if(function.getURI().equals(StrabonPolyhedron.envelope)) 75.269 + else if(function.getURI().equals(GeoConstants.envelope)) 75.270 { 75.271 return geoEnvelope(leftArg); 75.272 } 75.273 - else if(function.getURI().equals(StrabonPolyhedron.convexHull)) 75.274 + else if(function.getURI().equals(GeoConstants.convexHull)) 75.275 { 75.276 return geoConvexHull(leftArg); 75.277 } 75.278 - else if(function.getURI().equals(StrabonPolyhedron.boundary)) 75.279 + else if(function.getURI().equals(GeoConstants.boundary)) 75.280 { 75.281 return geoBoundary(leftArg); 75.282 } 75.283 - else if(function.getURI().equals(StrabonPolyhedron.intersection)) 75.284 + else if(function.getURI().equals(GeoConstants.intersection)) 75.285 { 75.286 return geoIntersection(leftArg, rightArg); 75.287 } 75.288 - else if(function.getURI().equals(StrabonPolyhedron.difference)) 75.289 + else if(function.getURI().equals(GeoConstants.difference)) 75.290 { 75.291 return geoDifference(leftArg, rightArg); 75.292 } 75.293 - else if(function.getURI().equals(StrabonPolyhedron.symDifference)) 75.294 + else if(function.getURI().equals(GeoConstants.symDifference)) 75.295 { 75.296 return geoSymDifference(leftArg, rightArg); 75.297 } 75.298 //XXX GeoSPARQL - Non topological - except distance 75.299 //TODO Must add buffer after deciding how to implement it 75.300 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlConvexHull)) 75.301 + else if(function.getURI().equals(GeoConstants.geoSparqlConvexHull)) 75.302 { 75.303 return geoConvexHull(leftArg); 75.304 } 75.305 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlIntersection)) 75.306 + else if(function.getURI().equals(GeoConstants.geoSparqlIntersection)) 75.307 { 75.308 return geoIntersection(leftArg, rightArg); 75.309 } 75.310 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlUnion)) 75.311 + else if(function.getURI().equals(GeoConstants.geoSparqlUnion)) 75.312 { 75.313 return geoUnion(leftArg, rightArg); 75.314 } 75.315 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlDifference)) 75.316 + else if(function.getURI().equals(GeoConstants.geoSparqlDifference)) 75.317 { 75.318 return geoDifference(leftArg, rightArg); 75.319 } 75.320 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlSymmetricDifference)) 75.321 + else if(function.getURI().equals(GeoConstants.geoSparqlSymmetricDifference)) 75.322 { 75.323 return geoSymDifference(leftArg, rightArg); 75.324 } 75.325 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlEnvelope)) 75.326 + else if(function.getURI().equals(GeoConstants.geoSparqlEnvelope)) 75.327 { 75.328 return geoEnvelope(leftArg); 75.329 } 75.330 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlBoundary)) 75.331 + else if(function.getURI().equals(GeoConstants.geoSparqlBoundary)) 75.332 { 75.333 return geoBoundary(leftArg); 75.334 } 75.335 @@ -1170,11 +1170,11 @@ 75.336 //TODO more to be added here probably 75.337 GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg) 75.338 { 75.339 - if(function.getURI().equals(StrabonPolyhedron.distance)) 75.340 + if(function.getURI().equals(GeoConstants.distance)) 75.341 { 75.342 return geoDistance(leftArg, rightArg); 75.343 } 75.344 - else if(function.getURI().equals(StrabonPolyhedron.area)) 75.345 + else if(function.getURI().equals(GeoConstants.area)) 75.346 { 75.347 return geoArea(leftArg); 75.348 } 75.349 @@ -1186,31 +1186,31 @@ 75.350 75.351 GeneralDBSqlExpr spatialPropertyPicker(Function function,GeneralDBSqlExpr arg) 75.352 { 75.353 - if(function.getURI().equals(StrabonPolyhedron.dimension)) 75.354 + if(function.getURI().equals(GeoConstants.dimension)) 75.355 { 75.356 return dimension(arg); 75.357 } 75.358 - else if(function.getURI().equals(StrabonPolyhedron.geometryType)) 75.359 + else if(function.getURI().equals(GeoConstants.geometryType)) 75.360 { 75.361 return geometryType(arg); 75.362 } 75.363 - else if(function.getURI().equals(StrabonPolyhedron.asText)) 75.364 + else if(function.getURI().equals(GeoConstants.asText)) 75.365 { 75.366 return asText(arg); 75.367 } 75.368 - else if(function.getURI().equals(StrabonPolyhedron.srid)) 75.369 + else if(function.getURI().equals(GeoConstants.srid)) 75.370 { 75.371 return srid(arg); 75.372 } 75.373 - else if(function.getURI().equals(StrabonPolyhedron.isEmpty)) 75.374 + else if(function.getURI().equals(GeoConstants.isEmpty)) 75.375 { 75.376 return isEmpty(arg); 75.377 } 75.378 - else if(function.getURI().equals(StrabonPolyhedron.isSimple)) 75.379 + else if(function.getURI().equals(GeoConstants.isSimple)) 75.380 { 75.381 return isSimple(arg); 75.382 75.383 - } else if (function.getURI().equals(StrabonPolyhedron.asGML)) { 75.384 + } else if (function.getURI().equals(GeoConstants.asGML)) { 75.385 return asGML(arg); 75.386 } 75.387
76.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java Wed Jun 27 18:10:40 2012 +0300 76.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBNumericExprFactory.java Wed Jun 27 18:36:49 2012 +0300 76.3 @@ -50,11 +50,11 @@ 76.4 import org.openrdf.query.algebra.MathExpr.MathOp; 76.5 import org.openrdf.query.algebra.evaluation.function.Function; 76.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 76.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 76.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 76.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 76.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 76.11 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 76.12 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 76.13 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc; 76.14 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc; 76.15 import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc; 76.16 @@ -312,12 +312,12 @@ 76.17 } 76.18 else 76.19 { 76.20 - if(function.getURI().equals(StrabonPolyhedron.buffer)) 76.21 + if(function.getURI().equals(GeoConstants.buffer)) 76.22 { 76.23 //Be it a Var or a Value Constant, 'numeric' is the way to go 76.24 rightArg = this.createNumericExpr(right); 76.25 } 76.26 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 76.27 + else if(function.getURI().equals(GeoConstants.transform)) 76.28 { 76.29 //Another special case -> Second argument of this function is a URI 76.30 rightArg = uri(right); 76.31 @@ -398,69 +398,69 @@ 76.32 76.33 GeneralDBSqlExpr spatialConstructPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg) 76.34 { 76.35 - if(function.getURI().equals(StrabonPolyhedron.union)) 76.36 + if(function.getURI().equals(GeoConstants.union)) 76.37 { 76.38 return geoUnion(leftArg, rightArg); 76.39 } 76.40 - else if(function.getURI().equals(StrabonPolyhedron.buffer)) 76.41 + else if(function.getURI().equals(GeoConstants.buffer)) 76.42 { 76.43 return geoBuffer(leftArg,rightArg); 76.44 } 76.45 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 76.46 + else if(function.getURI().equals(GeoConstants.transform)) 76.47 { 76.48 return geoTransform(leftArg,rightArg); 76.49 } 76.50 - else if(function.getURI().equals(StrabonPolyhedron.envelope)) 76.51 + else if(function.getURI().equals(GeoConstants.envelope)) 76.52 { 76.53 return geoEnvelope(leftArg); 76.54 } 76.55 - else if(function.getURI().equals(StrabonPolyhedron.convexHull)) 76.56 + else if(function.getURI().equals(GeoConstants.convexHull)) 76.57 { 76.58 return geoConvexHull(leftArg); 76.59 } 76.60 - else if(function.getURI().equals(StrabonPolyhedron.boundary)) 76.61 + else if(function.getURI().equals(GeoConstants.boundary)) 76.62 { 76.63 return geoBoundary(leftArg); 76.64 } 76.65 - else if(function.getURI().equals(StrabonPolyhedron.intersection)) 76.66 + else if(function.getURI().equals(GeoConstants.intersection)) 76.67 { 76.68 return geoIntersection(leftArg, rightArg); 76.69 } 76.70 - else if(function.getURI().equals(StrabonPolyhedron.difference)) 76.71 + else if(function.getURI().equals(GeoConstants.difference)) 76.72 { 76.73 return geoDifference(leftArg, rightArg); 76.74 } 76.75 - else if(function.getURI().equals(StrabonPolyhedron.symDifference)) 76.76 + else if(function.getURI().equals(GeoConstants.symDifference)) 76.77 { 76.78 return geoSymDifference(leftArg, rightArg); 76.79 } 76.80 //XXX GeoSPARQL - Non topological - except distance 76.81 //TODO Must add buffer after deciding how to implement it 76.82 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlConvexHull)) 76.83 + else if(function.getURI().equals(GeoConstants.geoSparqlConvexHull)) 76.84 { 76.85 return geoConvexHull(leftArg); 76.86 } 76.87 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlIntersection)) 76.88 + else if(function.getURI().equals(GeoConstants.geoSparqlIntersection)) 76.89 { 76.90 return geoIntersection(leftArg, rightArg); 76.91 } 76.92 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlUnion)) 76.93 + else if(function.getURI().equals(GeoConstants.geoSparqlUnion)) 76.94 { 76.95 return geoUnion(leftArg, rightArg); 76.96 } 76.97 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlDifference)) 76.98 + else if(function.getURI().equals(GeoConstants.geoSparqlDifference)) 76.99 { 76.100 return geoDifference(leftArg, rightArg); 76.101 } 76.102 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlSymmetricDifference)) 76.103 + else if(function.getURI().equals(GeoConstants.geoSparqlSymmetricDifference)) 76.104 { 76.105 return geoSymDifference(leftArg, rightArg); 76.106 } 76.107 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlEnvelope)) 76.108 + else if(function.getURI().equals(GeoConstants.geoSparqlEnvelope)) 76.109 { 76.110 return geoEnvelope(leftArg); 76.111 } 76.112 - else if(function.getURI().equals(StrabonPolyhedron.geoSparqlBoundary)) 76.113 + else if(function.getURI().equals(GeoConstants.geoSparqlBoundary)) 76.114 { 76.115 return geoBoundary(leftArg); 76.116 } 76.117 @@ -471,11 +471,11 @@ 76.118 //TODO more to be added here probably 76.119 GeneralDBSqlExpr spatialMetricPicker(Function function,GeneralDBSqlExpr leftArg, GeneralDBSqlExpr rightArg) 76.120 { 76.121 - if(function.getURI().equals(StrabonPolyhedron.distance)) 76.122 + if(function.getURI().equals(GeoConstants.distance)) 76.123 { 76.124 return geoDistance(leftArg, rightArg); 76.125 } 76.126 - else if(function.getURI().equals(StrabonPolyhedron.area)) 76.127 + else if(function.getURI().equals(GeoConstants.area)) 76.128 { 76.129 return geoArea(leftArg); 76.130 } 76.131 @@ -487,27 +487,27 @@ 76.132 76.133 GeneralDBSqlExpr spatialPropertyPicker(Function function,GeneralDBSqlExpr arg) 76.134 { 76.135 - if(function.getURI().equals(StrabonPolyhedron.dimension)) 76.136 + if(function.getURI().equals(GeoConstants.dimension)) 76.137 { 76.138 return dimension(arg); 76.139 } 76.140 - else if(function.getURI().equals(StrabonPolyhedron.geometryType)) 76.141 + else if(function.getURI().equals(GeoConstants.geometryType)) 76.142 { 76.143 return geometryType(arg); 76.144 } 76.145 - else if(function.getURI().equals(StrabonPolyhedron.asText)) 76.146 + else if(function.getURI().equals(GeoConstants.asText)) 76.147 { 76.148 return asText(arg); 76.149 } 76.150 - else if(function.getURI().equals(StrabonPolyhedron.srid)) 76.151 + else if(function.getURI().equals(GeoConstants.srid)) 76.152 { 76.153 return srid(arg); 76.154 } 76.155 - else if(function.getURI().equals(StrabonPolyhedron.isEmpty)) 76.156 + else if(function.getURI().equals(GeoConstants.isEmpty)) 76.157 { 76.158 return isEmpty(arg); 76.159 } 76.160 - else if(function.getURI().equals(StrabonPolyhedron.isSimple)) 76.161 + else if(function.getURI().equals(GeoConstants.isSimple)) 76.162 { 76.163 return isSimple(arg); 76.164 }
77.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Wed Jun 27 18:10:40 2012 +0300 77.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Wed Jun 27 18:36:49 2012 +0300 77.3 @@ -38,6 +38,7 @@ 77.4 import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; 77.5 import org.openrdf.query.algebra.evaluation.function.Function; 77.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 77.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 77.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 77.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 77.10 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 77.11 @@ -436,12 +437,12 @@ 77.12 public StrabonPolyhedron spatialConstructPicker(Function function, Value left, Value right) throws Exception 77.13 { 77.14 StrabonPolyhedron leftArg = ((GeneralDBPolyhedron) left).getPolyhedron(); 77.15 - if(function.getURI().equals(StrabonPolyhedron.union)) 77.16 + if(function.getURI().equals(GeoConstants.union)) 77.17 { 77.18 StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron(); 77.19 return StrabonPolyhedron.union(leftArg, rightArg); 77.20 } 77.21 - else if(function.getURI().equals(StrabonPolyhedron.buffer)) 77.22 + else if(function.getURI().equals(GeoConstants.buffer)) 77.23 { 77.24 if(right instanceof LiteralImpl) 77.25 { 77.26 @@ -455,7 +456,7 @@ 77.27 } 77.28 77.29 } 77.30 - else if(function.getURI().equals(StrabonPolyhedron.transform)) 77.31 + else if(function.getURI().equals(GeoConstants.transform)) 77.32 { 77.33 if(right instanceof URIImpl) 77.34 { 77.35 @@ -471,29 +472,29 @@ 77.36 } 77.37 77.38 } 77.39 - else if(function.getURI().equals(StrabonPolyhedron.envelope)) 77.40 + else if(function.getURI().equals(GeoConstants.envelope)) 77.41 { 77.42 return StrabonPolyhedron.envelope(leftArg); 77.43 } 77.44 - else if(function.getURI().equals(StrabonPolyhedron.convexHull)) 77.45 + else if(function.getURI().equals(GeoConstants.convexHull)) 77.46 { 77.47 return StrabonPolyhedron.convexHull(leftArg); 77.48 } 77.49 - else if(function.getURI().equals(StrabonPolyhedron.boundary)) 77.50 + else if(function.getURI().equals(GeoConstants.boundary)) 77.51 { 77.52 return StrabonPolyhedron.boundary(leftArg); 77.53 } 77.54 - else if(function.getURI().equals(StrabonPolyhedron.intersection)) 77.55 + else if(function.getURI().equals(GeoConstants.intersection)) 77.56 { 77.57 StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron(); 77.58 return StrabonPolyhedron.intersection(leftArg, rightArg); 77.59 } 77.60 - else if(function.getURI().equals(StrabonPolyhedron.difference)) 77.61 + else if(function.getURI().equals(GeoConstants.difference)) 77.62 { 77.63 StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron(); 77.64 return StrabonPolyhedron.difference(leftArg, rightArg); 77.65 } 77.66 - else if(function.getURI().equals(StrabonPolyhedron.symDifference)) 77.67 + else if(function.getURI().equals(GeoConstants.symDifference)) 77.68 { 77.69 StrabonPolyhedron rightArg = ((GeneralDBPolyhedron) right).getPolyhedron(); 77.70 return StrabonPolyhedron.symDifference(leftArg, rightArg);
78.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Wed Jun 27 18:10:40 2012 +0300 78.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java Wed Jun 27 18:36:49 2012 +0300 78.3 @@ -3,6 +3,7 @@ 78.4 import java.io.IOException; 78.5 78.6 import org.openrdf.model.URI; 78.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 78.8 import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 78.9 import org.openrdf.sail.rdbms.model.RdbmsValue; 78.10 78.11 @@ -117,7 +118,7 @@ 78.12 return new String("\""+this.polyhedronStringRep+";http://www.opengis.net/def/crs/EPSG/0/" 78.13 +this.getPolyhedron().getGeometry().getSRID()+"\"" + "^^<" + 78.14 ((StrabonPolyhedron.EnableConstraintRepresentation) ? 78.15 - StrabonPolyhedron.stRDFSemiLinearPointset : StrabonPolyhedron.WKT) 78.16 + GeoConstants.stRDFSemiLinearPointset : GeoConstants.WKT) 78.17 +">"); 78.18 } 78.19
79.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/XMLGSDatatypeUtil.java Wed Jun 27 18:10:40 2012 +0300 79.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/XMLGSDatatypeUtil.java Wed Jun 27 18:36:49 2012 +0300 79.3 @@ -17,7 +17,7 @@ 79.4 import org.openrdf.model.vocabulary.XMLSchema; 79.5 79.6 import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 79.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 79.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 79.9 79.10 79.11 79.12 @@ -53,7 +53,7 @@ 79.13 Literal literal = (Literal) value; 79.14 String datatype = literal.getDatatype() == null ? "":literal.getDatatype().stringValue(); 79.15 79.16 - if (StrabonPolyhedron.WKT.equals(datatype) || StrabonPolyhedron.GML.equals(datatype)) { 79.17 + if (GeoConstants.WKT.equals(datatype) || GeoConstants.GML.equals(datatype)) { 79.18 return true; 79.19 } 79.20 79.21 @@ -97,7 +97,7 @@ 79.22 return false; 79.23 } 79.24 79.25 - return StrabonPolyhedron.WKT.equals(datatype.stringValue()); 79.26 + return GeoConstants.WKT.equals(datatype.stringValue()); 79.27 } 79.28 79.29 /** 79.30 @@ -112,7 +112,7 @@ 79.31 return false; 79.32 } 79.33 79.34 - return StrabonPolyhedron.GML.equals(datatype.stringValue()); 79.35 + return GeoConstants.GML.equals(datatype.stringValue()); 79.36 } 79.37 79.38 /**
80.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java Wed Jun 27 18:10:40 2012 +0300 80.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/optimizers/GeneralDBSelectQueryOptimizer.java Wed Jun 27 18:36:49 2012 +0300 80.3 @@ -64,11 +64,11 @@ 80.4 import org.openrdf.query.algebra.evaluation.QueryOptimizer; 80.5 import org.openrdf.query.algebra.evaluation.function.Function; 80.6 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 80.7 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 80.8 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 80.9 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc; 80.10 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 80.11 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; 80.12 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 80.13 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc; 80.14 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc; 80.15 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc; 80.16 @@ -1265,7 +1265,7 @@ 80.17 String originalName = copy.getName(); 80.18 //((Var) expr).setName(originalName+"?spatial"); 80.19 80.20 - FunctionCall fc = new FunctionCall(StrabonPolyhedron.envelope,copy); 80.21 + FunctionCall fc = new FunctionCall(GeoConstants.envelope,copy); 80.22 //XXX volatile - using an extra arg to 'hang' the name I need 80.23 fc.addArg(new Var("-mbb-"+originalName)); 80.24 ExtensionElem extElem = new ExtensionElem(fc,"-mbb-"+originalName); 80.25 @@ -1300,7 +1300,7 @@ 80.26 } 80.27 else //Function call met 80.28 { 80.29 - FunctionCall fc = new FunctionCall(StrabonPolyhedron.envelope,expr); 80.30 + FunctionCall fc = new FunctionCall(GeoConstants.envelope,expr); 80.31 80.32 fc.addArg(new Var("-mbb-"+(++mbbCounter))); 80.33 ExtensionElem extElem = new ExtensionElem(fc,"-mbb-"+(mbbCounter));
81.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java Wed Jun 27 18:10:40 2012 +0300 81.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java Wed Jun 27 18:36:49 2012 +0300 81.3 @@ -7,7 +7,7 @@ 81.4 81.5 import java.sql.SQLException; 81.6 81.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 81.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 81.9 import org.openrdf.sail.generaldb.GeneralDBSqlTable; 81.10 81.11 /** 81.12 @@ -47,7 +47,7 @@ 81.13 81.14 @Override 81.15 public String buildInsertGeometryValue() { 81.16 - Integer srid= StrabonPolyhedron.defaultSRID; 81.17 + Integer srid= GeoConstants.defaultSRID; 81.18 return " (id, strdfgeo,srid) VALUES (CAST(? AS INTEGER), Transform(GeomFromWKB(CAST(? AS BLOB),CAST(? AS INTEGER)),"+srid+"), CAST(? AS INTEGER))"; 81.19 } 81.20
82.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java Wed Jun 27 18:10:40 2012 +0300 82.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/iteration/MonetDBBindingIteration.java Wed Jun 27 18:36:49 2012 +0300 82.3 @@ -11,7 +11,7 @@ 82.4 import java.sql.SQLException; 82.5 82.6 import org.openrdf.query.BindingSet; 82.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 82.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 82.9 import org.openrdf.sail.generaldb.iteration.GeneralDBBindingIteration; 82.10 import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 82.11 import org.openrdf.sail.rdbms.model.RdbmsValue; 82.12 @@ -48,7 +48,7 @@ 82.13 Blob labelBlob = rs.getBlob(index + 1); 82.14 byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length()); 82.15 int srid = rs.getInt(index + 2); 82.16 - return vf.getRdbmsPolyhedron(id, StrabonPolyhedron.WKT, label, srid); 82.17 + return vf.getRdbmsPolyhedron(id, GeoConstants.WKT, label, srid); 82.18 82.19 } 82.20 82.21 @@ -64,6 +64,6 @@ 82.22 Blob labelBlob = rs.getBlob(index + 1); 82.23 byte[] label = labelBlob.getBytes((long)1, (int)labelBlob.length()); 82.24 int srid = rs.getInt(index + 2); 82.25 - return vf.getRdbmsPolyhedron(114, StrabonPolyhedron.WKT, label, srid); 82.26 + return vf.getRdbmsPolyhedron(114, GeoConstants.WKT, label, srid); 82.27 } 82.28 } 82.29 \ No newline at end of file
83.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java Wed Jun 27 18:10:40 2012 +0300 83.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java Wed Jun 27 18:36:49 2012 +0300 83.3 @@ -7,7 +7,7 @@ 83.4 83.5 import java.sql.SQLException; 83.6 83.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 83.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 83.9 import org.openrdf.sail.generaldb.GeneralDBSqlTable; 83.10 83.11 /** 83.12 @@ -46,7 +46,7 @@ 83.13 83.14 @Override 83.15 public String buildInsertGeometryValue() { 83.16 - Integer srid= StrabonPolyhedron.defaultSRID; 83.17 + Integer srid= GeoConstants.defaultSRID; 83.18 return " (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),"+srid+"),?)"; 83.19 } 83.20
84.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java Wed Jun 27 18:10:40 2012 +0300 84.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/iteration/PostGISBindingIteration.java Wed Jun 27 18:36:49 2012 +0300 84.3 @@ -11,7 +11,7 @@ 84.4 import java.sql.SQLException; 84.5 84.6 import org.openrdf.query.BindingSet; 84.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 84.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 84.9 import org.openrdf.sail.generaldb.iteration.GeneralDBBindingIteration; 84.10 import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 84.11 import org.openrdf.sail.rdbms.model.RdbmsValue; 84.12 @@ -47,7 +47,7 @@ 84.13 { 84.14 byte[] label = rs.getBytes(index + 1); 84.15 int srid = rs.getInt(index + 2); 84.16 - return vf.getRdbmsPolyhedron(id, StrabonPolyhedron.WKT, label, srid); 84.17 + return vf.getRdbmsPolyhedron(id, GeoConstants.WKT, label, srid); 84.18 84.19 } 84.20 84.21 @@ -62,7 +62,7 @@ 84.22 //Case of spatial constructs 84.23 byte[] label = rs.getBytes(index + 1); 84.24 int srid = rs.getInt(index + 2); 84.25 - return vf.getRdbmsPolyhedron(114, StrabonPolyhedron.WKT, label, srid); 84.26 + return vf.getRdbmsPolyhedron(114, GeoConstants.WKT, label, srid); 84.27 84.28 } 84.29 } 84.30 \ No newline at end of file
85.1 --- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java Wed Jun 27 18:10:40 2012 +0300 85.2 +++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlkml/stSPARQLResultsKMLWriter.java Wed Jun 27 18:36:49 2012 +0300 85.3 @@ -16,7 +16,7 @@ 85.4 import org.openrdf.query.Binding; 85.5 import org.openrdf.query.BindingSet; 85.6 import org.openrdf.query.TupleQueryResultHandlerException; 85.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 85.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 85.9 import org.openrdf.query.algebra.evaluation.function.spatial.WKTHelper; 85.10 import org.openrdf.query.algebra.evaluation.util.JTSWrapper; 85.11 import org.openrdf.query.resultio.TupleQueryResultFormat; 85.12 @@ -301,7 +301,7 @@ 85.13 } 85.14 85.15 // transform the geometry to 4326 85.16 - geom = jts.transform(geom, srid, StrabonPolyhedron.defaultSRID); 85.17 + geom = jts.transform(geom, srid, GeoConstants.defaultSRID); 85.18 85.19 if (geom instanceof Point) { 85.20 geometryType = KML.Point;
86.1 --- a/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java Wed Jun 27 18:10:40 2012 +0300 86.2 +++ b/resultio/src/main/java/org/openrdf/query/resultio/sparqlxml/stSPARQLResultsXMLWriter.java Wed Jun 27 18:36:49 2012 +0300 86.3 @@ -34,7 +34,7 @@ 86.4 import org.openrdf.query.Binding; 86.5 import org.openrdf.query.BindingSet; 86.6 import org.openrdf.query.TupleQueryResultHandlerException; 86.7 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 86.8 +import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; 86.9 import org.openrdf.query.resultio.TupleQueryResultFormat; 86.10 import org.openrdf.query.resultio.TupleQueryResultWriter; 86.11 import org.openrdf.query.resultio.stSPARQLQueryResultFormat; 86.12 @@ -156,7 +156,7 @@ 86.13 } 86.14 else { // spatial literal 86.15 // else if (value instanceof RdbmsPolyhedron) 86.16 - URI datatype = new URIImpl(StrabonPolyhedron.WKT); 86.17 + URI datatype = new URIImpl(GeoConstants.WKT); 86.18 Literal literal = new LiteralImpl(value.stringValue(), datatype); 86.19 writeLiteral(literal); 86.20 }