1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Tue Jun 26 20:46:47 2012 +0300
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Tue Jun 26 21:04:42 2012 +0300
     1.3 @@ -45,96 +45,102 @@
     1.4  
     1.5  	public static final boolean EnableConstraintRepresentation = false;
     1.6  
     1.7 -	public static final String stRDF="http://strdf.di.uoa.gr/ontology#";
     1.8 +	public static final String stRDF			= "http://strdf.di.uoa.gr/ontology#";
     1.9  	public static final String stRDFSemiLinearPointset="http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
    1.10 -	public static final String WKT="http://strdf.di.uoa.gr/ontology#WKT";
    1.11 -	public static final String geof="http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/";
    1.12 -	//Extended functions
    1.13 -	//Spatial Relationships
    1.14 -	public static final String GML="http://www.opengis.net/def/geometryType/OGC-GML/3.2/";
    1.15 -	public static final String anyInteract="http://strdf.di.uoa.gr/ontology#anyInteract";
    1.16 -	public static final String contains="http://strdf.di.uoa.gr/ontology#contains";
    1.17 -	public static final String coveredBy="http://strdf.di.uoa.gr/ontology#coveredBy";
    1.18 -	public static final String covers="http://strdf.di.uoa.gr/ontology#covers";
    1.19 -	public static final String disjoint="http://strdf.di.uoa.gr/ontology#disjoint";
    1.20 -	public static final String equals="http://strdf.di.uoa.gr/ontology#equals";
    1.21 -	public static final String inside="http://strdf.di.uoa.gr/ontology#inside";
    1.22 -	public static final String overlap="http://strdf.di.uoa.gr/ontology#overlap";
    1.23 -	public static final String touch="http://strdf.di.uoa.gr/ontology#touch";
    1.24 -	public static final String relate="http://strdf.di.uoa.gr/ontology#relate";
    1.25 -	public static final String left="http://strdf.di.uoa.gr/ontology#left";
    1.26 -	public static final String right="http://strdf.di.uoa.gr/ontology#right";
    1.27 -	public static final String above="http://strdf.di.uoa.gr/ontology#above";
    1.28 -	public static final String below="http://strdf.di.uoa.gr/ontology#below";
    1.29 -	//Spatial Constructs
    1.30 -	public static final String union="http://strdf.di.uoa.gr/ontology#union";
    1.31 -	public static final String buffer="http://strdf.di.uoa.gr/ontology#buffer";
    1.32 -	public static final String envelope="http://strdf.di.uoa.gr/ontology#envelope";
    1.33 -	public static final String convexHull="http://strdf.di.uoa.gr/ontology#convexHull";
    1.34 -	public static final String boundary="http://strdf.di.uoa.gr/ontology#boundary";
    1.35 -	public static final String intersection="http://strdf.di.uoa.gr/ontology#intersection";
    1.36 -	public static final String difference="http://strdf.di.uoa.gr/ontology#difference";
    1.37 -	public static final String symDifference="http://strdf.di.uoa.gr/ontology#symDifference";
    1.38 -	public static final String transform="http://strdf.di.uoa.gr/ontology#transform";
    1.39 -	//Spatial Metric Functions
    1.40 -	public static final String distance="http://strdf.di.uoa.gr/ontology#distance";
    1.41 -	public static final String area="http://strdf.di.uoa.gr/ontology#area";
    1.42 -	//Spatial Properties
    1.43 -	public static final String dimension="http://strdf.di.uoa.gr/ontology#dimension";
    1.44 -	public static final String geometryType="http://strdf.di.uoa.gr/ontology#geometryType";
    1.45 -	public static final String asText="http://strdf.di.uoa.gr/ontology#asText";
    1.46 -	public static final String srid="http://strdf.di.uoa.gr/ontology#srid";
    1.47 -	public static final Integer defaultSRID=4326; //default srid. 
    1.48 -	public static final String isEmpty="http://strdf.di.uoa.gr/ontology#isEmpty";
    1.49 -	public static final String isSimple="http://strdf.di.uoa.gr/ontology#isSimple";
    1.50 -	//Spatial Aggregate Functions
    1.51 -	public static final String extent="http://strdf.di.uoa.gr/ontology#extent";
    1.52 -	////
    1.53 +	public static final String WKT 				= stRDF + "WKT";
    1.54 +	public static final String GML				="http://www.opengis.net/def/geometryType/OGC-GML/3.2/";
    1.55 +	public static final String geof				= "http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/";
    1.56 +	
    1.57 +	/* 						Extended functions 							*/
    1.58 +	
    1.59 +	// Spatial Relationships
    1.60 +	public static final String anyInteract 		= stRDF + "anyInteract";
    1.61 +	public static final String contains 		= stRDF + "contains";
    1.62 +	public static final String coveredBy 		= stRDF + "coveredBy";
    1.63 +	public static final String covers 			= stRDF + "covers";
    1.64 +	public static final String disjoint 		= stRDF + "disjoint";
    1.65 +	public static final String equals 			= stRDF + "equals";
    1.66 +	public static final String inside 			= stRDF + "inside";
    1.67 +	public static final String overlap 			= stRDF + "overlap";
    1.68 +	public static final String touch 			= stRDF + "touch";
    1.69 +	public static final String relate 			= stRDF + "relate";
    1.70 +	public static final String left 			= stRDF + "left";
    1.71 +	public static final String right			= stRDF + "right";
    1.72 +	public static final String above 			= stRDF + "above";
    1.73 +	public static final String below			= stRDF + "below";
    1.74 +	
    1.75 +	// Spatial Constructs
    1.76 +	public static final String union 			= stRDF + "union";
    1.77 +	public static final String buffer 			= stRDF + "buffer";
    1.78 +	public static final String envelope 		= stRDF + "envelope";
    1.79 +	public static final String convexHull		= stRDF + "convexHull";
    1.80 +	public static final String boundary 		= stRDF + "boundary";
    1.81 +	public static final String intersection 	= stRDF + "intersection";
    1.82 +	public static final String difference 		= stRDF + "difference";
    1.83 +	public static final String symDifference	= stRDF + "symDifference";
    1.84 +	public static final String transform 		= stRDF + "transform";
    1.85 +	
    1.86 +	// Spatial Metric Functions
    1.87 +	public static final String distance 		= stRDF + "distance";
    1.88 +	public static final String area 			= stRDF + "area";
    1.89 +	
    1.90 +	// Spatial Properties
    1.91 +	public static final String dimension 		= stRDF + "dimension";
    1.92 +	public static final String geometryType 	= stRDF + "geometryType";
    1.93 +	public static final String asText 			= stRDF + "asText";
    1.94 +	public static final String asGML 			= stRDF + "asGML";
    1.95 +	public static final String srid 			= stRDF + "srid";
    1.96 +	public static final String isEmpty 			= stRDF + "isEmpty";
    1.97 +	public static final String isSimple 		= stRDF + "isSimple";
    1.98 +	public static final Integer defaultSRID 	= 4326; //default srid.
    1.99 +	
   1.100 +	// Spatial Aggregate Functions
   1.101 +	public static final String extent 			=stRDF + "extent";
   1.102  
   1.103 -	//GEOSPARQL
   1.104 +	// GEOSPARQL
   1.105  
   1.106 -	//Non-topological
   1.107 -	public static final String geoSparqlDistance = geof+"distance"; //3 arguments
   1.108 -	public static final String geoSparqlBuffer = geof+"buffer"; //3 arguments
   1.109 -	public static final String geoSparqlConvexHull = geof+"convexHull";
   1.110 -	public static final String geoSparqlIntersection = geof+"intersection";
   1.111 -	public static final String geoSparqlUnion = geof+"union";
   1.112 -	public static final String geoSparqlDifference = geof+"difference";
   1.113 -	public static final String geoSparqlSymmetricDifference = geof+"symmetricDifference";
   1.114 -	public static final String geoSparqlEnvelope = geof+"envelope";
   1.115 -	public static final String geoSparqlBoundary = geof+"boundary";
   1.116 +	// Non-topological
   1.117 +	public static final String geoSparqlDistance 			= geof + "distance"; //3 arguments
   1.118 +	public static final String geoSparqlBuffer 				= geof + "buffer"; //3 arguments
   1.119 +	public static final String geoSparqlConvexHull 			= geof + "convexHull";
   1.120 +	public static final String geoSparqlIntersection 		= geof + "intersection";
   1.121 +	public static final String geoSparqlUnion 				= geof + "union";
   1.122 +	public static final String geoSparqlDifference 			= geof + "difference";
   1.123 +	public static final String geoSparqlSymmetricDifference = geof + "symmetricDifference";
   1.124 +	public static final String geoSparqlEnvelope 			= geof + "envelope";
   1.125 +	public static final String geoSparqlBoundary 			= geof + "boundary";
   1.126  
   1.127 -	//Simple Features - 8 functions - all with 2 arguments + boolean
   1.128 -	public static final String sfEquals = geof+"sf-equals";  
   1.129 -	public static final String sfDisjoint = geof+"sf-disjoint";  
   1.130 -	public static final String sfIntersects = geof+"sf-intersects";
   1.131 -	public static final String sfTouches = geof+"sf-touches";
   1.132 -	public static final String sfCrosses = geof+"sf-crosses";
   1.133 -	public static final String sfWithin = geof+"sf-within";
   1.134 -	public static final String sfContains = geof+"sf-contains";
   1.135 -	public static final String sfOverlaps = geof+"sf-overlaps";
   1.136 +	// Simple Features - 8 functions - all with 2 arguments + boolean
   1.137 +	public static final String sfEquals 					= geof + "sf-equals";  
   1.138 +	public static final String sfDisjoint 					= geof + "sf-disjoint";  
   1.139 +	public static final String sfIntersects 				= geof + "sf-intersects";
   1.140 +	public static final String sfTouches 					= geof + "sf-touches";
   1.141 +	public static final String sfCrosses 					= geof + "sf-crosses";
   1.142 +	public static final String sfWithin 					= geof + "sf-within";
   1.143 +	public static final String sfContains 					= geof + "sf-contains";
   1.144 +	public static final String sfOverlaps 					= geof + "sf-overlaps";
   1.145  
   1.146 -	//Egenhofer - 8 functions - all with 2 arguments + boolean
   1.147 -	public static final String ehEquals = geof+"eh-equals";  
   1.148 -	public static final String ehDisjoint = geof+"eh-disjoint";  
   1.149 -	public static final String ehMeet = geof+"eh-meet";
   1.150 -	public static final String ehOverlap = geof+"eh-overlap";
   1.151 -	public static final String ehCovers = geof+"eh-covers";
   1.152 -	public static final String ehCoveredBy = geof+"eh-coveredBy";
   1.153 -	public static final String ehInside = geof+"eh-inside";
   1.154 -	public static final String ehContains = geof+"eh-contains";
   1.155 +	// Egenhofer - 8 functions - all with 2 arguments + boolean
   1.156 +	public static final String ehEquals 					= geof + "eh-equals";  
   1.157 +	public static final String ehDisjoint 					= geof + "eh-disjoint";  
   1.158 +	public static final String ehMeet 						= geof + "eh-meet";
   1.159 +	public static final String ehOverlap 					= geof + "eh-overlap";
   1.160 +	public static final String ehCovers 					= geof + "eh-covers";
   1.161 +	public static final String ehCoveredBy 					= geof + "eh-coveredBy";
   1.162 +	public static final String ehInside 					= geof + "eh-inside";
   1.163 +	public static final String ehContains 					= geof + "eh-contains";
   1.164  
   1.165 -	//RCC8 - 8 functions - all with 2 arguments + boolean
   1.166 -	public static final String rccEquals = geof+"rcc8-eq";  
   1.167 -	public static final String rccDisconnected = geof+"rcc8-dc";  
   1.168 -	public static final String rccExternallyConnected = geof+"rcc8-ec";
   1.169 -	public static final String rccPartiallyOverlapping = geof+"rcc8-po";
   1.170 -	public static final String rccTangentialProperPartInverse = geof+"rcc8-tppi";
   1.171 -	public static final String rccTangentialProperPart = geof+"rcc8-tpp";
   1.172 -	public static final String rccNonTangentialProperPart = geof+"rcc8-ntpp";
   1.173 -	public static final String rccNonTangentialProperPartInverse = geof+"rcc8-ntppi";
   1.174 +	// RCC8 - 8 functions - all with 2 arguments + boolean
   1.175 +	public static final String rccEquals 						 = geof + "rcc8-eq";  
   1.176 +	public static final String rccDisconnected 					 = geof + "rcc8-dc";  
   1.177 +	public static final String rccExternallyConnected 			 = geof + "rcc8-ec";
   1.178 +	public static final String rccPartiallyOverlapping 			 = geof + "rcc8-po";
   1.179 +	public static final String rccTangentialProperPartInverse 	 = geof + "rcc8-tppi";
   1.180 +	public static final String rccTangentialProperPart 			 = geof + "rcc8-tpp";
   1.181 +	public static final String rccNonTangentialProperPart 		 = geof + "rcc8-ntpp";
   1.182 +	public static final String rccNonTangentialProperPartInverse = geof + "rcc8-ntppi";
   1.183  
   1.184 -	public static final String geoSparqlRelate = geof+"relate";
   1.185 +	public static final String geoSparqlRelate 					 = geof + "relate";
   1.186  
   1.187  	private static int MAX_POINTS = Integer.MAX_VALUE;//40000;//Integer.MAX_VALUE;//10000;
   1.188