Strabon

changeset 580:58281a3cd490

Merge with default branch
author Teleios Repository <opteleios@teleios-repo.acsys.it>
date Mon Mar 19 22:06:59 2012 +0100 (2012-03-19)
parents 5e58b11d2c68 e1ba3a5db0a2
children 4dce12617716
files
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Mon Mar 19 21:57:30 2012 +0100
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalConstruct.java	Mon Mar 19 22:06:59 2012 +0100
     1.3 @@ -1,41 +1,41 @@
     1.4 -/*
     1.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     1.6 - *
     1.7 - * Licensed under the Aduna BSD-style license.
     1.8 - */
     1.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    1.10 -
    1.11 -import java.math.BigDecimal;
    1.12 -import java.math.BigInteger;
    1.13 -
    1.14 -import org.openrdf.model.Literal;
    1.15 -import org.openrdf.model.URI;
    1.16 -import org.openrdf.model.Value;
    1.17 -import org.openrdf.model.ValueFactory;
    1.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    1.19 -import org.openrdf.model.vocabulary.XMLSchema;
    1.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    1.21 -import org.openrdf.query.algebra.evaluation.function.Function;
    1.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    1.23 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    1.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    1.25 -
    1.26 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    1.27 -
    1.28 -public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc {
    1.29 -
    1.30 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    1.31 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    1.32 -	throws ValueExprEvaluationException {
    1.33 -
    1.34 -		return null;
    1.35 -	}
    1.36 -
    1.37 -	//I'll have everyone override it
    1.38 -	public String getURI() {
    1.39 -
    1.40 -		return null;
    1.41 -	}
    1.42 -
    1.43 -	
    1.44 -}
    1.45 +/*
    1.46 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    1.47 + *
    1.48 + * Licensed under the Aduna BSD-style license.
    1.49 + */
    1.50 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    1.51 +
    1.52 +import java.math.BigDecimal;
    1.53 +import java.math.BigInteger;
    1.54 +
    1.55 +import org.openrdf.model.Literal;
    1.56 +import org.openrdf.model.URI;
    1.57 +import org.openrdf.model.Value;
    1.58 +import org.openrdf.model.ValueFactory;
    1.59 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
    1.60 +import org.openrdf.model.vocabulary.XMLSchema;
    1.61 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    1.62 +import org.openrdf.query.algebra.evaluation.function.Function;
    1.63 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    1.64 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    1.65 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    1.66 +
    1.67 +//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    1.68 +
    1.69 +public abstract class GeoSparqlNonTopologicalConstruct extends SpatialConstructFunc {
    1.70 +
    1.71 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    1.72 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    1.73 +	throws ValueExprEvaluationException {
    1.74 +
    1.75 +		return null;
    1.76 +	}
    1.77 +
    1.78 +	//I'll have everyone override it
    1.79 +	public String getURI() {
    1.80 +
    1.81 +		return null;
    1.82 +	}
    1.83 +
    1.84 +	
    1.85 +}
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Mon Mar 19 21:57:30 2012 +0100
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlNonTopologicalMetric.java	Mon Mar 19 22:06:59 2012 +0100
     2.3 @@ -1,41 +1,41 @@
     2.4 -/*
     2.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     2.6 - *
     2.7 - * Licensed under the Aduna BSD-style license.
     2.8 - */
     2.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    2.10 -
    2.11 -import java.math.BigDecimal;
    2.12 -import java.math.BigInteger;
    2.13 -
    2.14 -import org.openrdf.model.Literal;
    2.15 -import org.openrdf.model.URI;
    2.16 -import org.openrdf.model.Value;
    2.17 -import org.openrdf.model.ValueFactory;
    2.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    2.19 -import org.openrdf.model.vocabulary.XMLSchema;
    2.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    2.21 -import org.openrdf.query.algebra.evaluation.function.Function;
    2.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    2.23 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    2.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    2.25 -
    2.26 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    2.27 -
    2.28 -public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc {
    2.29 -
    2.30 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    2.31 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    2.32 -	throws ValueExprEvaluationException {
    2.33 -
    2.34 -		return null;
    2.35 -	}
    2.36 -
    2.37 -	//I'll have everyone override it
    2.38 -	public String getURI() {
    2.39 -
    2.40 -		return null;
    2.41 -	}
    2.42 -
    2.43 -	
    2.44 -}
    2.45 +/*
    2.46 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    2.47 + *
    2.48 + * Licensed under the Aduna BSD-style license.
    2.49 + */
    2.50 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    2.51 +
    2.52 +import java.math.BigDecimal;
    2.53 +import java.math.BigInteger;
    2.54 +
    2.55 +import org.openrdf.model.Literal;
    2.56 +import org.openrdf.model.URI;
    2.57 +import org.openrdf.model.Value;
    2.58 +import org.openrdf.model.ValueFactory;
    2.59 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
    2.60 +import org.openrdf.model.vocabulary.XMLSchema;
    2.61 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    2.62 +import org.openrdf.query.algebra.evaluation.function.Function;
    2.63 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    2.64 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    2.65 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    2.66 +
    2.67 +//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    2.68 +
    2.69 +public abstract class GeoSparqlNonTopologicalMetric extends SpatialConstructFunc {
    2.70 +
    2.71 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    2.72 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    2.73 +	throws ValueExprEvaluationException {
    2.74 +
    2.75 +		return null;
    2.76 +	}
    2.77 +
    2.78 +	//I'll have everyone override it
    2.79 +	public String getURI() {
    2.80 +
    2.81 +		return null;
    2.82 +	}
    2.83 +
    2.84 +	
    2.85 +}
     3.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Mon Mar 19 21:57:30 2012 +0100
     3.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelateFunc.java	Mon Mar 19 22:06:59 2012 +0100
     3.3 @@ -1,19 +1,19 @@
     3.4 -/*
     3.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     3.6 - *
     3.7 - * Licensed under the Aduna BSD-style license.
     3.8 - */
     3.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    3.10 -
    3.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    3.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    3.13 -
    3.14 -
    3.15 -public class GeoSparqlRelateFunc extends GeoSparqlRelation {
    3.16 -
    3.17 -	@Override
    3.18 -	public String getURI() {
    3.19 -		return StrabonPolyhedron.geoSparqlRelate;
    3.20 -		}
    3.21 -
    3.22 -}
    3.23 +/*
    3.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    3.25 + *
    3.26 + * Licensed under the Aduna BSD-style license.
    3.27 + */
    3.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    3.29 +
    3.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    3.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    3.32 +
    3.33 +
    3.34 +public class GeoSparqlRelateFunc extends GeoSparqlRelation {
    3.35 +
    3.36 +	@Override
    3.37 +	public String getURI() {
    3.38 +		return StrabonPolyhedron.geoSparqlRelate;
    3.39 +		}
    3.40 +
    3.41 +}
     4.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Mon Mar 19 21:57:30 2012 +0100
     4.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/GeoSparqlRelation.java	Mon Mar 19 22:06:59 2012 +0100
     4.3 @@ -1,40 +1,40 @@
     4.4 -/*
     4.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     4.6 - *
     4.7 - * Licensed under the Aduna BSD-style license.
     4.8 - */
     4.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    4.10 -
    4.11 -import java.math.BigDecimal;
    4.12 -import java.math.BigInteger;
    4.13 -
    4.14 -import org.openrdf.model.Literal;
    4.15 -import org.openrdf.model.URI;
    4.16 -import org.openrdf.model.Value;
    4.17 -import org.openrdf.model.ValueFactory;
    4.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
    4.19 -import org.openrdf.model.vocabulary.XMLSchema;
    4.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    4.21 -import org.openrdf.query.algebra.evaluation.function.Function;
    4.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    4.23 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    4.24 -
    4.25 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    4.26 -
    4.27 -public abstract class GeoSparqlRelation extends SpatialRelationshipFunc {
    4.28 -
    4.29 -	//No need for any implementation, I will have replaced this class's presence before reaching this place
    4.30 -	public Value evaluate(ValueFactory valueFactory, Value... args)
    4.31 -	throws ValueExprEvaluationException {
    4.32 -
    4.33 -		return null;
    4.34 -	}
    4.35 -
    4.36 -	//I'll have everyone override it
    4.37 -	public String getURI() {
    4.38 -
    4.39 -		return null;
    4.40 -	}
    4.41 -
    4.42 -	
    4.43 -}
    4.44 +/*
    4.45 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    4.46 + *
    4.47 + * Licensed under the Aduna BSD-style license.
    4.48 + */
    4.49 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql;
    4.50 +
    4.51 +import java.math.BigDecimal;
    4.52 +import java.math.BigInteger;
    4.53 +
    4.54 +import org.openrdf.model.Literal;
    4.55 +import org.openrdf.model.URI;
    4.56 +import org.openrdf.model.Value;
    4.57 +import org.openrdf.model.ValueFactory;
    4.58 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
    4.59 +import org.openrdf.model.vocabulary.XMLSchema;
    4.60 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
    4.61 +import org.openrdf.query.algebra.evaluation.function.Function;
    4.62 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
    4.63 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
    4.64 +
    4.65 +//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
    4.66 +
    4.67 +public abstract class GeoSparqlRelation extends SpatialRelationshipFunc {
    4.68 +
    4.69 +	//No need for any implementation, I will have replaced this class's presence before reaching this place
    4.70 +	public Value evaluate(ValueFactory valueFactory, Value... args)
    4.71 +	throws ValueExprEvaluationException {
    4.72 +
    4.73 +		return null;
    4.74 +	}
    4.75 +
    4.76 +	//I'll have everyone override it
    4.77 +	public String getURI() {
    4.78 +
    4.79 +		return null;
    4.80 +	}
    4.81 +
    4.82 +	
    4.83 +}
     5.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Mon Mar 19 21:57:30 2012 +0100
     5.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferContainsFunc.java	Mon Mar 19 22:06:59 2012 +0100
     5.3 @@ -1,19 +1,19 @@
     5.4 -/*
     5.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     5.6 - *
     5.7 - * Licensed under the Aduna BSD-style license.
     5.8 - */
     5.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    5.10 -
    5.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    5.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    5.13 -
    5.14 -
    5.15 -public class EgenhoferContainsFunc extends GeoSparqlRelation {
    5.16 -
    5.17 -	@Override
    5.18 -	public String getURI() {
    5.19 -		return StrabonPolyhedron.ehContains;
    5.20 -		}
    5.21 -
    5.22 -}
    5.23 +/*
    5.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    5.25 + *
    5.26 + * Licensed under the Aduna BSD-style license.
    5.27 + */
    5.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    5.29 +
    5.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    5.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    5.32 +
    5.33 +
    5.34 +public class EgenhoferContainsFunc extends GeoSparqlRelation {
    5.35 +
    5.36 +	@Override
    5.37 +	public String getURI() {
    5.38 +		return StrabonPolyhedron.ehContains;
    5.39 +		}
    5.40 +
    5.41 +}
     6.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Mon Mar 19 21:57:30 2012 +0100
     6.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoveredByFunc.java	Mon Mar 19 22:06:59 2012 +0100
     6.3 @@ -1,19 +1,19 @@
     6.4 -/*
     6.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     6.6 - *
     6.7 - * Licensed under the Aduna BSD-style license.
     6.8 - */
     6.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    6.10 -
    6.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    6.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    6.13 -
    6.14 -
    6.15 -public class EgenhoferCoveredByFunc extends GeoSparqlRelation {
    6.16 -
    6.17 -	@Override
    6.18 -	public String getURI() {
    6.19 -		return StrabonPolyhedron.ehCoveredBy;
    6.20 -		}
    6.21 -
    6.22 -}
    6.23 +/*
    6.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    6.25 + *
    6.26 + * Licensed under the Aduna BSD-style license.
    6.27 + */
    6.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    6.29 +
    6.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    6.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    6.32 +
    6.33 +
    6.34 +public class EgenhoferCoveredByFunc extends GeoSparqlRelation {
    6.35 +
    6.36 +	@Override
    6.37 +	public String getURI() {
    6.38 +		return StrabonPolyhedron.ehCoveredBy;
    6.39 +		}
    6.40 +
    6.41 +}
     7.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Mon Mar 19 21:57:30 2012 +0100
     7.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferCoversFunc.java	Mon Mar 19 22:06:59 2012 +0100
     7.3 @@ -1,19 +1,19 @@
     7.4 -/*
     7.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     7.6 - *
     7.7 - * Licensed under the Aduna BSD-style license.
     7.8 - */
     7.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    7.10 -
    7.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    7.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    7.13 -
    7.14 -
    7.15 -public class EgenhoferCoversFunc extends GeoSparqlRelation {
    7.16 -
    7.17 -	@Override
    7.18 -	public String getURI() {
    7.19 -		return StrabonPolyhedron.ehCovers;
    7.20 -		}
    7.21 -
    7.22 -}
    7.23 +/*
    7.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    7.25 + *
    7.26 + * Licensed under the Aduna BSD-style license.
    7.27 + */
    7.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    7.29 +
    7.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    7.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    7.32 +
    7.33 +
    7.34 +public class EgenhoferCoversFunc extends GeoSparqlRelation {
    7.35 +
    7.36 +	@Override
    7.37 +	public String getURI() {
    7.38 +		return StrabonPolyhedron.ehCovers;
    7.39 +		}
    7.40 +
    7.41 +}
     8.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Mon Mar 19 21:57:30 2012 +0100
     8.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferDisjointFunc.java	Mon Mar 19 22:06:59 2012 +0100
     8.3 @@ -1,19 +1,19 @@
     8.4 -/*
     8.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     8.6 - *
     8.7 - * Licensed under the Aduna BSD-style license.
     8.8 - */
     8.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    8.10 -
    8.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    8.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    8.13 -
    8.14 -
    8.15 -public class EgenhoferDisjointFunc extends GeoSparqlRelation {
    8.16 -
    8.17 -	@Override
    8.18 -	public String getURI() {
    8.19 -		return StrabonPolyhedron.ehDisjoint;
    8.20 -		}
    8.21 -
    8.22 -}
    8.23 +/*
    8.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    8.25 + *
    8.26 + * Licensed under the Aduna BSD-style license.
    8.27 + */
    8.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    8.29 +
    8.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    8.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    8.32 +
    8.33 +
    8.34 +public class EgenhoferDisjointFunc extends GeoSparqlRelation {
    8.35 +
    8.36 +	@Override
    8.37 +	public String getURI() {
    8.38 +		return StrabonPolyhedron.ehDisjoint;
    8.39 +		}
    8.40 +
    8.41 +}
     9.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Mon Mar 19 21:57:30 2012 +0100
     9.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferEqualsFunc.java	Mon Mar 19 22:06:59 2012 +0100
     9.3 @@ -1,19 +1,19 @@
     9.4 -/*
     9.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
     9.6 - *
     9.7 - * Licensed under the Aduna BSD-style license.
     9.8 - */
     9.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    9.10 -
    9.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    9.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    9.13 -
    9.14 -
    9.15 -public class EgenhoferEqualsFunc extends GeoSparqlRelation {
    9.16 -
    9.17 -	@Override
    9.18 -	public String getURI() {
    9.19 -		return StrabonPolyhedron.ehEquals;
    9.20 -		}
    9.21 -
    9.22 -}
    9.23 +/*
    9.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    9.25 + *
    9.26 + * Licensed under the Aduna BSD-style license.
    9.27 + */
    9.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
    9.29 +
    9.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
    9.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
    9.32 +
    9.33 +
    9.34 +public class EgenhoferEqualsFunc extends GeoSparqlRelation {
    9.35 +
    9.36 +	@Override
    9.37 +	public String getURI() {
    9.38 +		return StrabonPolyhedron.ehEquals;
    9.39 +		}
    9.40 +
    9.41 +}
    10.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Mon Mar 19 21:57:30 2012 +0100
    10.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferInsideFunc.java	Mon Mar 19 22:06:59 2012 +0100
    10.3 @@ -1,19 +1,19 @@
    10.4 -/*
    10.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    10.6 - *
    10.7 - * Licensed under the Aduna BSD-style license.
    10.8 - */
    10.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   10.10 -
   10.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   10.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   10.13 -
   10.14 -
   10.15 -public class EgenhoferInsideFunc extends GeoSparqlRelation {
   10.16 -
   10.17 -	@Override
   10.18 -	public String getURI() {
   10.19 -		return StrabonPolyhedron.ehInside;
   10.20 -		}
   10.21 -
   10.22 -}
   10.23 +/*
   10.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   10.25 + *
   10.26 + * Licensed under the Aduna BSD-style license.
   10.27 + */
   10.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   10.29 +
   10.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   10.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   10.32 +
   10.33 +
   10.34 +public class EgenhoferInsideFunc extends GeoSparqlRelation {
   10.35 +
   10.36 +	@Override
   10.37 +	public String getURI() {
   10.38 +		return StrabonPolyhedron.ehInside;
   10.39 +		}
   10.40 +
   10.41 +}
    11.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Mon Mar 19 21:57:30 2012 +0100
    11.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferMeetFunc.java	Mon Mar 19 22:06:59 2012 +0100
    11.3 @@ -1,19 +1,19 @@
    11.4 -/*
    11.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    11.6 - *
    11.7 - * Licensed under the Aduna BSD-style license.
    11.8 - */
    11.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   11.10 -
   11.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   11.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   11.13 -
   11.14 -
   11.15 -public class EgenhoferMeetFunc extends GeoSparqlRelation {
   11.16 -
   11.17 -	@Override
   11.18 -	public String getURI() {
   11.19 -		return StrabonPolyhedron.ehMeet;
   11.20 -		}
   11.21 -
   11.22 -}
   11.23 +/*
   11.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   11.25 + *
   11.26 + * Licensed under the Aduna BSD-style license.
   11.27 + */
   11.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   11.29 +
   11.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   11.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   11.32 +
   11.33 +
   11.34 +public class EgenhoferMeetFunc extends GeoSparqlRelation {
   11.35 +
   11.36 +	@Override
   11.37 +	public String getURI() {
   11.38 +		return StrabonPolyhedron.ehMeet;
   11.39 +		}
   11.40 +
   11.41 +}
    12.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Mon Mar 19 21:57:30 2012 +0100
    12.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/egenhofer/EgenhoferOverlapFunc.java	Mon Mar 19 22:06:59 2012 +0100
    12.3 @@ -1,19 +1,19 @@
    12.4 -/*
    12.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    12.6 - *
    12.7 - * Licensed under the Aduna BSD-style license.
    12.8 - */
    12.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   12.10 -
   12.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   12.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   12.13 -
   12.14 -
   12.15 -public class EgenhoferOverlapFunc extends GeoSparqlRelation {
   12.16 -
   12.17 -	@Override
   12.18 -	public String getURI() {
   12.19 -		return StrabonPolyhedron.ehOverlap;
   12.20 -		}
   12.21 -
   12.22 -}
   12.23 +/*
   12.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   12.25 + *
   12.26 + * Licensed under the Aduna BSD-style license.
   12.27 + */
   12.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer;
   12.29 +
   12.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   12.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   12.32 +
   12.33 +
   12.34 +public class EgenhoferOverlapFunc extends GeoSparqlRelation {
   12.35 +
   12.36 +	@Override
   12.37 +	public String getURI() {
   12.38 +		return StrabonPolyhedron.ehOverlap;
   12.39 +		}
   12.40 +
   12.41 +}
    13.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Mon Mar 19 21:57:30 2012 +0100
    13.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBoundaryFunc.java	Mon Mar 19 22:06:59 2012 +0100
    13.3 @@ -1,37 +1,37 @@
    13.4 -/*
    13.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    13.6 - *
    13.7 - * Licensed under the Aduna BSD-style license.
    13.8 - */
    13.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   13.10 -
   13.11 -import java.math.BigDecimal;
   13.12 -import java.math.BigInteger;
   13.13 -
   13.14 -import org.openrdf.model.Literal;
   13.15 -import org.openrdf.model.URI;
   13.16 -import org.openrdf.model.Value;
   13.17 -import org.openrdf.model.ValueFactory;
   13.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   13.19 -import org.openrdf.model.vocabulary.XMLSchema;
   13.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   13.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   13.22 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   13.23 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   13.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   13.25 - 
   13.26 -/**
   13.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   13.28 - * 
   13.29 - * @author Arjohn Kampman
   13.30 - */
   13.31 -public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct {
   13.32 -
   13.33 -	@Override
   13.34 -	public String getURI() {
   13.35 -		return StrabonPolyhedron.geoSparqlBoundary;
   13.36 -	}
   13.37 -
   13.38 -	 
   13.39 - 
   13.40 -}
   13.41 +/*
   13.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   13.43 + *
   13.44 + * Licensed under the Aduna BSD-style license.
   13.45 + */
   13.46 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   13.47 +
   13.48 +import java.math.BigDecimal;
   13.49 +import java.math.BigInteger;
   13.50 +
   13.51 +import org.openrdf.model.Literal;
   13.52 +import org.openrdf.model.URI;
   13.53 +import org.openrdf.model.Value;
   13.54 +import org.openrdf.model.ValueFactory;
   13.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   13.56 +import org.openrdf.model.vocabulary.XMLSchema;
   13.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   13.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   13.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   13.60 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   13.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   13.62 + 
   13.63 +/**
   13.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   13.65 + * 
   13.66 + * @author Arjohn Kampman
   13.67 + */
   13.68 +public class GeoSparqlBoundaryFunc extends GeoSparqlNonTopologicalConstruct {
   13.69 +
   13.70 +	@Override
   13.71 +	public String getURI() {
   13.72 +		return StrabonPolyhedron.geoSparqlBoundary;
   13.73 +	}
   13.74 +
   13.75 +	 
   13.76 + 
   13.77 +}
    14.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Mon Mar 19 21:57:30 2012 +0100
    14.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlBufferFunc.java	Mon Mar 19 22:06:59 2012 +0100
    14.3 @@ -1,37 +1,37 @@
    14.4 -/*
    14.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    14.6 - *
    14.7 - * Licensed under the Aduna BSD-style license.
    14.8 - */
    14.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   14.10 -
   14.11 -import java.math.BigDecimal;
   14.12 -import java.math.BigInteger;
   14.13 -
   14.14 -import org.openrdf.model.Literal;
   14.15 -import org.openrdf.model.URI;
   14.16 -import org.openrdf.model.Value;
   14.17 -import org.openrdf.model.ValueFactory;
   14.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   14.19 -import org.openrdf.model.vocabulary.XMLSchema;
   14.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   14.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   14.22 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   14.23 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   14.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   14.25 - 
   14.26 -/**
   14.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   14.28 - * 
   14.29 - * @author Arjohn Kampman
   14.30 - */
   14.31 -public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct {
   14.32 -
   14.33 -	@Override
   14.34 -	public String getURI() {
   14.35 -		return StrabonPolyhedron.geoSparqlBuffer;
   14.36 -	}
   14.37 -
   14.38 -	 
   14.39 - 
   14.40 -}
   14.41 +/*
   14.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   14.43 + *
   14.44 + * Licensed under the Aduna BSD-style license.
   14.45 + */
   14.46 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   14.47 +
   14.48 +import java.math.BigDecimal;
   14.49 +import java.math.BigInteger;
   14.50 +
   14.51 +import org.openrdf.model.Literal;
   14.52 +import org.openrdf.model.URI;
   14.53 +import org.openrdf.model.Value;
   14.54 +import org.openrdf.model.ValueFactory;
   14.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   14.56 +import org.openrdf.model.vocabulary.XMLSchema;
   14.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   14.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   14.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   14.60 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   14.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   14.62 + 
   14.63 +/**
   14.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   14.65 + * 
   14.66 + * @author Arjohn Kampman
   14.67 + */
   14.68 +public class GeoSparqlBufferFunc extends GeoSparqlNonTopologicalConstruct {
   14.69 +
   14.70 +	@Override
   14.71 +	public String getURI() {
   14.72 +		return StrabonPolyhedron.geoSparqlBuffer;
   14.73 +	}
   14.74 +
   14.75 +	 
   14.76 + 
   14.77 +}
    15.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Mon Mar 19 21:57:30 2012 +0100
    15.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlConvexHullFunc.java	Mon Mar 19 22:06:59 2012 +0100
    15.3 @@ -1,37 +1,37 @@
    15.4 -/*
    15.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    15.6 - *
    15.7 - * Licensed under the Aduna BSD-style license.
    15.8 - */
    15.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   15.10 -
   15.11 -import java.math.BigDecimal;
   15.12 -import java.math.BigInteger;
   15.13 -
   15.14 -import org.openrdf.model.Literal;
   15.15 -import org.openrdf.model.URI;
   15.16 -import org.openrdf.model.Value;
   15.17 -import org.openrdf.model.ValueFactory;
   15.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   15.19 -import org.openrdf.model.vocabulary.XMLSchema;
   15.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   15.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   15.22 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   15.23 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   15.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   15.25 - 
   15.26 -/**
   15.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   15.28 - * 
   15.29 - * @author Arjohn Kampman
   15.30 - */
   15.31 -public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct {
   15.32 -
   15.33 -	@Override
   15.34 -	public String getURI() {
   15.35 -		return StrabonPolyhedron.geoSparqlConvexHull;
   15.36 -	}
   15.37 -
   15.38 -	 
   15.39 - 
   15.40 -}
   15.41 +/*
   15.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   15.43 + *
   15.44 + * Licensed under the Aduna BSD-style license.
   15.45 + */
   15.46 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   15.47 +
   15.48 +import java.math.BigDecimal;
   15.49 +import java.math.BigInteger;
   15.50 +
   15.51 +import org.openrdf.model.Literal;
   15.52 +import org.openrdf.model.URI;
   15.53 +import org.openrdf.model.Value;
   15.54 +import org.openrdf.model.ValueFactory;
   15.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   15.56 +import org.openrdf.model.vocabulary.XMLSchema;
   15.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   15.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   15.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   15.60 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   15.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   15.62 + 
   15.63 +/**
   15.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   15.65 + * 
   15.66 + * @author Arjohn Kampman
   15.67 + */
   15.68 +public class GeoSparqlConvexHullFunc extends GeoSparqlNonTopologicalConstruct {
   15.69 +
   15.70 +	@Override
   15.71 +	public String getURI() {
   15.72 +		return StrabonPolyhedron.geoSparqlConvexHull;
   15.73 +	}
   15.74 +
   15.75 +	 
   15.76 + 
   15.77 +}
    16.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Mon Mar 19 21:57:30 2012 +0100
    16.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlDistanceFunc.java	Mon Mar 19 22:06:59 2012 +0100
    16.3 @@ -1,31 +1,31 @@
    16.4 -/*
    16.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    16.6 - *
    16.7 - * Licensed under the Aduna BSD-style license.
    16.8 - */
    16.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   16.10 -
   16.11 -import java.math.BigDecimal;
   16.12 -import java.math.BigInteger;
   16.13 -
   16.14 -import org.openrdf.model.Literal;
   16.15 -import org.openrdf.model.URI;
   16.16 -import org.openrdf.model.Value;
   16.17 -import org.openrdf.model.ValueFactory;
   16.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   16.19 -import org.openrdf.model.vocabulary.XMLSchema;
   16.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   16.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   16.22 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   16.23 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   16.24 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   16.25 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   16.26 -
   16.27 -public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric {
   16.28 -
   16.29 -	@Override
   16.30 -	public String getURI() {
   16.31 -		return StrabonPolyhedron.geoSparqlDistance;
   16.32 -		}
   16.33 -
   16.34 -}
   16.35 +/*
   16.36 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   16.37 + *
   16.38 + * Licensed under the Aduna BSD-style license.
   16.39 + */
   16.40 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   16.41 +
   16.42 +import java.math.BigDecimal;
   16.43 +import java.math.BigInteger;
   16.44 +
   16.45 +import org.openrdf.model.Literal;
   16.46 +import org.openrdf.model.URI;
   16.47 +import org.openrdf.model.Value;
   16.48 +import org.openrdf.model.ValueFactory;
   16.49 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   16.50 +import org.openrdf.model.vocabulary.XMLSchema;
   16.51 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   16.52 +import org.openrdf.query.algebra.evaluation.function.Function;
   16.53 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   16.54 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   16.55 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalMetric;
   16.56 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   16.57 +
   16.58 +public class GeoSparqlDistanceFunc extends GeoSparqlNonTopologicalMetric {
   16.59 +
   16.60 +	@Override
   16.61 +	public String getURI() {
   16.62 +		return StrabonPolyhedron.geoSparqlDistance;
   16.63 +		}
   16.64 +
   16.65 +}
    17.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Mon Mar 19 21:57:30 2012 +0100
    17.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/nontopological/GeoSparqlEnvelopeFunc.java	Mon Mar 19 22:06:59 2012 +0100
    17.3 @@ -1,32 +1,32 @@
    17.4 -/*
    17.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    17.6 - *
    17.7 - * Licensed under the Aduna BSD-style license.
    17.8 - */
    17.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   17.10 -
   17.11 -import java.math.BigDecimal;
   17.12 -import java.math.BigInteger;
   17.13 -
   17.14 -import org.openrdf.model.Literal;
   17.15 -import org.openrdf.model.URI;
   17.16 -import org.openrdf.model.Value;
   17.17 -import org.openrdf.model.ValueFactory;
   17.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   17.19 -import org.openrdf.model.vocabulary.XMLSchema;
   17.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   17.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   17.22 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   17.23 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   17.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   17.25 - 
   17.26 -public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct {
   17.27 -
   17.28 -	@Override
   17.29 -	public String getURI() {
   17.30 -		return StrabonPolyhedron.geoSparqlEnvelope;
   17.31 -	}
   17.32 -
   17.33 -	 
   17.34 - 
   17.35 -}
   17.36 +/*
   17.37 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   17.38 + *
   17.39 + * Licensed under the Aduna BSD-style license.
   17.40 + */
   17.41 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological;
   17.42 +
   17.43 +import java.math.BigDecimal;
   17.44 +import java.math.BigInteger;
   17.45 +
   17.46 +import org.openrdf.model.Literal;
   17.47 +import org.openrdf.model.URI;
   17.48 +import org.openrdf.model.Value;
   17.49 +import org.openrdf.model.ValueFactory;
   17.50 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   17.51 +import org.openrdf.model.vocabulary.XMLSchema;
   17.52 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   17.53 +import org.openrdf.query.algebra.evaluation.function.Function;
   17.54 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   17.55 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlNonTopologicalConstruct;
   17.56 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   17.57 + 
   17.58 +public class GeoSparqlEnvelopeFunc extends GeoSparqlNonTopologicalConstruct {
   17.59 +
   17.60 +	@Override
   17.61 +	public String getURI() {
   17.62 +		return StrabonPolyhedron.geoSparqlEnvelope;
   17.63 +	}
   17.64 +
   17.65 +	 
   17.66 + 
   17.67 +}
    18.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Mon Mar 19 21:57:30 2012 +0100
    18.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8DisconnectedFunc.java	Mon Mar 19 22:06:59 2012 +0100
    18.3 @@ -1,20 +1,20 @@
    18.4 -/*
    18.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    18.6 - *
    18.7 - * Licensed under the Aduna BSD-style license.
    18.8 - */
    18.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   18.10 -
   18.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   18.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   18.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   18.14 -
   18.15 -
   18.16 -public class RCC8DisconnectedFunc extends GeoSparqlRelation {
   18.17 -
   18.18 -	@Override
   18.19 -	public String getURI() {
   18.20 -		return StrabonPolyhedron.rccDisconnected;
   18.21 -		}
   18.22 -
   18.23 -}
   18.24 +/*
   18.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   18.26 + *
   18.27 + * Licensed under the Aduna BSD-style license.
   18.28 + */
   18.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   18.30 +
   18.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   18.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   18.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   18.34 +
   18.35 +
   18.36 +public class RCC8DisconnectedFunc extends GeoSparqlRelation {
   18.37 +
   18.38 +	@Override
   18.39 +	public String getURI() {
   18.40 +		return StrabonPolyhedron.rccDisconnected;
   18.41 +		}
   18.42 +
   18.43 +}
    19.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    19.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8EqualsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    19.3 @@ -1,20 +1,20 @@
    19.4 -/*
    19.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    19.6 - *
    19.7 - * Licensed under the Aduna BSD-style license.
    19.8 - */
    19.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   19.10 -
   19.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   19.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   19.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   19.14 -
   19.15 -
   19.16 -public class RCC8EqualsFunc extends GeoSparqlRelation {
   19.17 -
   19.18 -	@Override
   19.19 -	public String getURI() {
   19.20 -		return StrabonPolyhedron.rccEquals;
   19.21 -		}
   19.22 -
   19.23 -}
   19.24 +/*
   19.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   19.26 + *
   19.27 + * Licensed under the Aduna BSD-style license.
   19.28 + */
   19.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   19.30 +
   19.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   19.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   19.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   19.34 +
   19.35 +
   19.36 +public class RCC8EqualsFunc extends GeoSparqlRelation {
   19.37 +
   19.38 +	@Override
   19.39 +	public String getURI() {
   19.40 +		return StrabonPolyhedron.rccEquals;
   19.41 +		}
   19.42 +
   19.43 +}
    20.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Mon Mar 19 21:57:30 2012 +0100
    20.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8ExternallyConnectedFunc.java	Mon Mar 19 22:06:59 2012 +0100
    20.3 @@ -1,20 +1,20 @@
    20.4 -/*
    20.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    20.6 - *
    20.7 - * Licensed under the Aduna BSD-style license.
    20.8 - */
    20.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   20.10 -
   20.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   20.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   20.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   20.14 -
   20.15 -
   20.16 -public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation {
   20.17 -
   20.18 -	@Override
   20.19 -	public String getURI() {
   20.20 -		return StrabonPolyhedron.rccExternallyConnected;
   20.21 -		}
   20.22 -
   20.23 -}
   20.24 +/*
   20.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   20.26 + *
   20.27 + * Licensed under the Aduna BSD-style license.
   20.28 + */
   20.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   20.30 +
   20.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   20.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   20.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   20.34 +
   20.35 +
   20.36 +public class RCC8ExternallyConnectedFunc extends GeoSparqlRelation {
   20.37 +
   20.38 +	@Override
   20.39 +	public String getURI() {
   20.40 +		return StrabonPolyhedron.rccExternallyConnected;
   20.41 +		}
   20.42 +
   20.43 +}
    21.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Mon Mar 19 21:57:30 2012 +0100
    21.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartFunc.java	Mon Mar 19 22:06:59 2012 +0100
    21.3 @@ -1,20 +1,20 @@
    21.4 -/*
    21.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    21.6 - *
    21.7 - * Licensed under the Aduna BSD-style license.
    21.8 - */
    21.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   21.10 -
   21.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   21.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   21.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   21.14 -
   21.15 -
   21.16 -public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation {
   21.17 -
   21.18 -	@Override
   21.19 -	public String getURI() {
   21.20 -		return StrabonPolyhedron.rccNonTangentialProperPart;
   21.21 -		}
   21.22 -
   21.23 -}
   21.24 +/*
   21.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   21.26 + *
   21.27 + * Licensed under the Aduna BSD-style license.
   21.28 + */
   21.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   21.30 +
   21.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   21.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   21.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   21.34 +
   21.35 +
   21.36 +public class RCC8NonTangentialProperPartFunc extends GeoSparqlRelation {
   21.37 +
   21.38 +	@Override
   21.39 +	public String getURI() {
   21.40 +		return StrabonPolyhedron.rccNonTangentialProperPart;
   21.41 +		}
   21.42 +
   21.43 +}
    22.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Mon Mar 19 21:57:30 2012 +0100
    22.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8NonTangentialProperPartInverseFunc.java	Mon Mar 19 22:06:59 2012 +0100
    22.3 @@ -1,20 +1,20 @@
    22.4 -/*
    22.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    22.6 - *
    22.7 - * Licensed under the Aduna BSD-style license.
    22.8 - */
    22.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   22.10 -
   22.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   22.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   22.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   22.14 -
   22.15 -
   22.16 -public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation {
   22.17 -
   22.18 -	@Override
   22.19 -	public String getURI() {
   22.20 -		return StrabonPolyhedron.rccNonTangentialProperPartInverse;
   22.21 -		}
   22.22 -
   22.23 -}
   22.24 +/*
   22.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   22.26 + *
   22.27 + * Licensed under the Aduna BSD-style license.
   22.28 + */
   22.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   22.30 +
   22.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   22.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   22.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   22.34 +
   22.35 +
   22.36 +public class RCC8NonTangentialProperPartInverseFunc extends GeoSparqlRelation {
   22.37 +
   22.38 +	@Override
   22.39 +	public String getURI() {
   22.40 +		return StrabonPolyhedron.rccNonTangentialProperPartInverse;
   22.41 +		}
   22.42 +
   22.43 +}
    23.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Mon Mar 19 21:57:30 2012 +0100
    23.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8PartiallyOverlappingFunc.java	Mon Mar 19 22:06:59 2012 +0100
    23.3 @@ -1,20 +1,20 @@
    23.4 -/*
    23.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    23.6 - *
    23.7 - * Licensed under the Aduna BSD-style license.
    23.8 - */
    23.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   23.10 -
   23.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   23.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   23.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   23.14 -
   23.15 -
   23.16 -public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation {
   23.17 -
   23.18 -	@Override
   23.19 -	public String getURI() {
   23.20 -		return StrabonPolyhedron.rccPartiallyOverlapping;
   23.21 -		}
   23.22 -
   23.23 -}
   23.24 +/*
   23.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   23.26 + *
   23.27 + * Licensed under the Aduna BSD-style license.
   23.28 + */
   23.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   23.30 +
   23.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   23.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   23.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   23.34 +
   23.35 +
   23.36 +public class RCC8PartiallyOverlappingFunc extends GeoSparqlRelation {
   23.37 +
   23.38 +	@Override
   23.39 +	public String getURI() {
   23.40 +		return StrabonPolyhedron.rccPartiallyOverlapping;
   23.41 +		}
   23.42 +
   23.43 +}
    24.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Mon Mar 19 21:57:30 2012 +0100
    24.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartFunc.java	Mon Mar 19 22:06:59 2012 +0100
    24.3 @@ -1,20 +1,20 @@
    24.4 -/*
    24.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    24.6 - *
    24.7 - * Licensed under the Aduna BSD-style license.
    24.8 - */
    24.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   24.10 -
   24.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   24.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   24.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   24.14 -
   24.15 -
   24.16 -public class RCC8TangentialProperPartFunc extends GeoSparqlRelation {
   24.17 -
   24.18 -	@Override
   24.19 -	public String getURI() {
   24.20 -		return StrabonPolyhedron.rccTangentialProperPart;
   24.21 -		}
   24.22 -
   24.23 -}
   24.24 +/*
   24.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   24.26 + *
   24.27 + * Licensed under the Aduna BSD-style license.
   24.28 + */
   24.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   24.30 +
   24.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   24.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   24.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   24.34 +
   24.35 +
   24.36 +public class RCC8TangentialProperPartFunc extends GeoSparqlRelation {
   24.37 +
   24.38 +	@Override
   24.39 +	public String getURI() {
   24.40 +		return StrabonPolyhedron.rccTangentialProperPart;
   24.41 +		}
   24.42 +
   24.43 +}
    25.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Mon Mar 19 21:57:30 2012 +0100
    25.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/rcc8/RCC8TangentialProperPartInverseFunc.java	Mon Mar 19 22:06:59 2012 +0100
    25.3 @@ -1,20 +1,20 @@
    25.4 -/*
    25.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    25.6 - *
    25.7 - * Licensed under the Aduna BSD-style license.
    25.8 - */
    25.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   25.10 -
   25.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   25.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   25.13 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   25.14 -
   25.15 -
   25.16 -public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation {
   25.17 -
   25.18 -	@Override
   25.19 -	public String getURI() {
   25.20 -		return StrabonPolyhedron.rccTangentialProperPartInverse;
   25.21 -		}
   25.22 -
   25.23 -}
   25.24 +/*
   25.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   25.26 + *
   25.27 + * Licensed under the Aduna BSD-style license.
   25.28 + */
   25.29 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8;
   25.30 +
   25.31 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   25.32 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   25.33 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc;
   25.34 +
   25.35 +
   25.36 +public class RCC8TangentialProperPartInverseFunc extends GeoSparqlRelation {
   25.37 +
   25.38 +	@Override
   25.39 +	public String getURI() {
   25.40 +		return StrabonPolyhedron.rccTangentialProperPartInverse;
   25.41 +		}
   25.42 +
   25.43 +}
    26.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Mon Mar 19 21:57:30 2012 +0100
    26.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeatureTouchesFunc.java	Mon Mar 19 22:06:59 2012 +0100
    26.3 @@ -1,19 +1,19 @@
    26.4 -/*
    26.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    26.6 - *
    26.7 - * Licensed under the Aduna BSD-style license.
    26.8 - */
    26.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   26.10 -
   26.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   26.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   26.13 -
   26.14 -
   26.15 -public class SimpleFeatureTouchesFunc extends GeoSparqlRelation {
   26.16 -
   26.17 -	@Override
   26.18 -	public String getURI() {
   26.19 -		return StrabonPolyhedron.sfTouches;
   26.20 -		}
   26.21 -
   26.22 -}
   26.23 +/*
   26.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   26.25 + *
   26.26 + * Licensed under the Aduna BSD-style license.
   26.27 + */
   26.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   26.29 +
   26.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   26.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   26.32 +
   26.33 +
   26.34 +public class SimpleFeatureTouchesFunc extends GeoSparqlRelation {
   26.35 +
   26.36 +	@Override
   26.37 +	public String getURI() {
   26.38 +		return StrabonPolyhedron.sfTouches;
   26.39 +		}
   26.40 +
   26.41 +}
    27.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    27.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesContainsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    27.3 @@ -1,19 +1,19 @@
    27.4 -/*
    27.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    27.6 - *
    27.7 - * Licensed under the Aduna BSD-style license.
    27.8 - */
    27.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   27.10 -
   27.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   27.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   27.13 -
   27.14 -
   27.15 -public class SimpleFeaturesContainsFunc extends GeoSparqlRelation {
   27.16 -
   27.17 -	@Override
   27.18 -	public String getURI() {
   27.19 -		return StrabonPolyhedron.sfContains;
   27.20 -		}
   27.21 -
   27.22 -}
   27.23 +/*
   27.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   27.25 + *
   27.26 + * Licensed under the Aduna BSD-style license.
   27.27 + */
   27.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   27.29 +
   27.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   27.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   27.32 +
   27.33 +
   27.34 +public class SimpleFeaturesContainsFunc extends GeoSparqlRelation {
   27.35 +
   27.36 +	@Override
   27.37 +	public String getURI() {
   27.38 +		return StrabonPolyhedron.sfContains;
   27.39 +		}
   27.40 +
   27.41 +}
    28.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Mon Mar 19 21:57:30 2012 +0100
    28.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesCrossesFunc.java	Mon Mar 19 22:06:59 2012 +0100
    28.3 @@ -1,19 +1,19 @@
    28.4 -/*
    28.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    28.6 - *
    28.7 - * Licensed under the Aduna BSD-style license.
    28.8 - */
    28.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   28.10 -
   28.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   28.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   28.13 -
   28.14 -
   28.15 -public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation {
   28.16 -
   28.17 -	@Override
   28.18 -	public String getURI() {
   28.19 -		return StrabonPolyhedron.sfCrosses;
   28.20 -		}
   28.21 -
   28.22 -}
   28.23 +/*
   28.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   28.25 + *
   28.26 + * Licensed under the Aduna BSD-style license.
   28.27 + */
   28.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   28.29 +
   28.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   28.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   28.32 +
   28.33 +
   28.34 +public class SimpleFeaturesCrossesFunc extends GeoSparqlRelation {
   28.35 +
   28.36 +	@Override
   28.37 +	public String getURI() {
   28.38 +		return StrabonPolyhedron.sfCrosses;
   28.39 +		}
   28.40 +
   28.41 +}
    29.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Mon Mar 19 21:57:30 2012 +0100
    29.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesDisjointFunc.java	Mon Mar 19 22:06:59 2012 +0100
    29.3 @@ -1,19 +1,19 @@
    29.4 -/*
    29.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    29.6 - *
    29.7 - * Licensed under the Aduna BSD-style license.
    29.8 - */
    29.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   29.10 -
   29.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   29.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   29.13 -
   29.14 -
   29.15 -public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation {
   29.16 -
   29.17 -	@Override
   29.18 -	public String getURI() {
   29.19 -		return StrabonPolyhedron.sfDisjoint;
   29.20 -		}
   29.21 -
   29.22 -}
   29.23 +/*
   29.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   29.25 + *
   29.26 + * Licensed under the Aduna BSD-style license.
   29.27 + */
   29.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   29.29 +
   29.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   29.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   29.32 +
   29.33 +
   29.34 +public class SimpleFeaturesDisjointFunc extends GeoSparqlRelation {
   29.35 +
   29.36 +	@Override
   29.37 +	public String getURI() {
   29.38 +		return StrabonPolyhedron.sfDisjoint;
   29.39 +		}
   29.40 +
   29.41 +}
    30.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    30.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesEqualsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    30.3 @@ -1,19 +1,19 @@
    30.4 -/*
    30.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    30.6 - *
    30.7 - * Licensed under the Aduna BSD-style license.
    30.8 - */
    30.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   30.10 -
   30.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   30.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   30.13 -
   30.14 -
   30.15 -public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation {
   30.16 -
   30.17 -	@Override
   30.18 -	public String getURI() {
   30.19 -		return StrabonPolyhedron.sfEquals;
   30.20 -		}
   30.21 -
   30.22 -}
   30.23 +/*
   30.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   30.25 + *
   30.26 + * Licensed under the Aduna BSD-style license.
   30.27 + */
   30.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   30.29 +
   30.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   30.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   30.32 +
   30.33 +
   30.34 +public class SimpleFeaturesEqualsFunc extends GeoSparqlRelation {
   30.35 +
   30.36 +	@Override
   30.37 +	public String getURI() {
   30.38 +		return StrabonPolyhedron.sfEquals;
   30.39 +		}
   30.40 +
   30.41 +}
    31.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    31.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesIntersectsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    31.3 @@ -1,19 +1,19 @@
    31.4 -/*
    31.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    31.6 - *
    31.7 - * Licensed under the Aduna BSD-style license.
    31.8 - */
    31.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   31.10 -
   31.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   31.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   31.13 -
   31.14 -
   31.15 -public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation {
   31.16 -
   31.17 -	@Override
   31.18 -	public String getURI() {
   31.19 -		return StrabonPolyhedron.sfIntersects;
   31.20 -		}
   31.21 -
   31.22 -}
   31.23 +/*
   31.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   31.25 + *
   31.26 + * Licensed under the Aduna BSD-style license.
   31.27 + */
   31.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   31.29 +
   31.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   31.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   31.32 +
   31.33 +
   31.34 +public class SimpleFeaturesIntersectsFunc extends GeoSparqlRelation {
   31.35 +
   31.36 +	@Override
   31.37 +	public String getURI() {
   31.38 +		return StrabonPolyhedron.sfIntersects;
   31.39 +		}
   31.40 +
   31.41 +}
    32.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    32.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesOverlapsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    32.3 @@ -1,19 +1,19 @@
    32.4 -/*
    32.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    32.6 - *
    32.7 - * Licensed under the Aduna BSD-style license.
    32.8 - */
    32.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   32.10 -
   32.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   32.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   32.13 -
   32.14 -
   32.15 -public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation {
   32.16 -
   32.17 -	@Override
   32.18 -	public String getURI() {
   32.19 -		return StrabonPolyhedron.sfOverlaps;
   32.20 -		}
   32.21 -
   32.22 -}
   32.23 +/*
   32.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   32.25 + *
   32.26 + * Licensed under the Aduna BSD-style license.
   32.27 + */
   32.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   32.29 +
   32.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   32.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   32.32 +
   32.33 +
   32.34 +public class SimpleFeaturesOverlapsFunc extends GeoSparqlRelation {
   32.35 +
   32.36 +	@Override
   32.37 +	public String getURI() {
   32.38 +		return StrabonPolyhedron.sfOverlaps;
   32.39 +		}
   32.40 +
   32.41 +}
    33.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Mon Mar 19 21:57:30 2012 +0100
    33.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/geosparql/sf/SimpleFeaturesWithinFunc.java	Mon Mar 19 22:06:59 2012 +0100
    33.3 @@ -1,19 +1,19 @@
    33.4 -/*
    33.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    33.6 - *
    33.7 - * Licensed under the Aduna BSD-style license.
    33.8 - */
    33.9 -package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   33.10 -
   33.11 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   33.12 -import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   33.13 -
   33.14 -
   33.15 -public class SimpleFeaturesWithinFunc extends GeoSparqlRelation {
   33.16 -
   33.17 -	@Override
   33.18 -	public String getURI() {
   33.19 -		return StrabonPolyhedron.sfWithin;
   33.20 -		}
   33.21 -
   33.22 -}
   33.23 +/*
   33.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   33.25 + *
   33.26 + * Licensed under the Aduna BSD-style license.
   33.27 + */
   33.28 +package org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf;
   33.29 +
   33.30 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   33.31 +import org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelation;
   33.32 +
   33.33 +
   33.34 +public class SimpleFeaturesWithinFunc extends GeoSparqlRelation {
   33.35 +
   33.36 +	@Override
   33.37 +	public String getURI() {
   33.38 +		return StrabonPolyhedron.sfWithin;
   33.39 +		}
   33.40 +
   33.41 +}
    34.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Mon Mar 19 21:57:30 2012 +0100
    34.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BoundaryFunc.java	Mon Mar 19 22:06:59 2012 +0100
    34.3 @@ -1,37 +1,37 @@
    34.4 -/*
    34.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    34.6 - *
    34.7 - * Licensed under the Aduna BSD-style license.
    34.8 - */
    34.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   34.10 -
   34.11 -import java.math.BigDecimal;
   34.12 -import java.math.BigInteger;
   34.13 -
   34.14 -import org.openrdf.model.Literal;
   34.15 -import org.openrdf.model.URI;
   34.16 -import org.openrdf.model.Value;
   34.17 -import org.openrdf.model.ValueFactory;
   34.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   34.19 -import org.openrdf.model.vocabulary.XMLSchema;
   34.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   34.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   34.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   34.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   34.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   34.25 - 
   34.26 -/**
   34.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   34.28 - * 
   34.29 - * @author Arjohn Kampman
   34.30 - */
   34.31 -public class BoundaryFunc extends SpatialConstructFunc {
   34.32 -
   34.33 -	@Override
   34.34 -	public String getURI() {
   34.35 -		return StrabonPolyhedron.boundary;
   34.36 -	}
   34.37 -
   34.38 -	 
   34.39 - 
   34.40 -}
   34.41 +/*
   34.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   34.43 + *
   34.44 + * Licensed under the Aduna BSD-style license.
   34.45 + */
   34.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   34.47 +
   34.48 +import java.math.BigDecimal;
   34.49 +import java.math.BigInteger;
   34.50 +
   34.51 +import org.openrdf.model.Literal;
   34.52 +import org.openrdf.model.URI;
   34.53 +import org.openrdf.model.Value;
   34.54 +import org.openrdf.model.ValueFactory;
   34.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   34.56 +import org.openrdf.model.vocabulary.XMLSchema;
   34.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   34.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   34.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   34.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   34.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   34.62 + 
   34.63 +/**
   34.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   34.65 + * 
   34.66 + * @author Arjohn Kampman
   34.67 + */
   34.68 +public class BoundaryFunc extends SpatialConstructFunc {
   34.69 +
   34.70 +	@Override
   34.71 +	public String getURI() {
   34.72 +		return StrabonPolyhedron.boundary;
   34.73 +	}
   34.74 +
   34.75 +	 
   34.76 + 
   34.77 +}
    35.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Mon Mar 19 21:57:30 2012 +0100
    35.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/BufferFunc.java	Mon Mar 19 22:06:59 2012 +0100
    35.3 @@ -1,37 +1,37 @@
    35.4 -/*
    35.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    35.6 - *
    35.7 - * Licensed under the Aduna BSD-style license.
    35.8 - */
    35.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   35.10 -
   35.11 -import java.math.BigDecimal;
   35.12 -import java.math.BigInteger;
   35.13 -
   35.14 -import org.openrdf.model.Literal;
   35.15 -import org.openrdf.model.URI;
   35.16 -import org.openrdf.model.Value;
   35.17 -import org.openrdf.model.ValueFactory;
   35.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   35.19 -import org.openrdf.model.vocabulary.XMLSchema;
   35.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   35.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   35.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   35.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   35.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   35.25 - 
   35.26 -/**
   35.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   35.28 - * 
   35.29 - * @author Arjohn Kampman
   35.30 - */
   35.31 -public class BufferFunc extends SpatialConstructFunc {
   35.32 -
   35.33 -	@Override
   35.34 -	public String getURI() {
   35.35 -		return StrabonPolyhedron.buffer;
   35.36 -	}
   35.37 -
   35.38 -	 
   35.39 - 
   35.40 -}
   35.41 +/*
   35.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   35.43 + *
   35.44 + * Licensed under the Aduna BSD-style license.
   35.45 + */
   35.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   35.47 +
   35.48 +import java.math.BigDecimal;
   35.49 +import java.math.BigInteger;
   35.50 +
   35.51 +import org.openrdf.model.Literal;
   35.52 +import org.openrdf.model.URI;
   35.53 +import org.openrdf.model.Value;
   35.54 +import org.openrdf.model.ValueFactory;
   35.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   35.56 +import org.openrdf.model.vocabulary.XMLSchema;
   35.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   35.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   35.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   35.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   35.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   35.62 + 
   35.63 +/**
   35.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   35.65 + * 
   35.66 + * @author Arjohn Kampman
   35.67 + */
   35.68 +public class BufferFunc extends SpatialConstructFunc {
   35.69 +
   35.70 +	@Override
   35.71 +	public String getURI() {
   35.72 +		return StrabonPolyhedron.buffer;
   35.73 +	}
   35.74 +
   35.75 +	 
   35.76 + 
   35.77 +}
    36.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Mon Mar 19 21:57:30 2012 +0100
    36.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/ConvexHullFunc.java	Mon Mar 19 22:06:59 2012 +0100
    36.3 @@ -1,37 +1,37 @@
    36.4 -/*
    36.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    36.6 - *
    36.7 - * Licensed under the Aduna BSD-style license.
    36.8 - */
    36.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   36.10 -
   36.11 -import java.math.BigDecimal;
   36.12 -import java.math.BigInteger;
   36.13 -
   36.14 -import org.openrdf.model.Literal;
   36.15 -import org.openrdf.model.URI;
   36.16 -import org.openrdf.model.Value;
   36.17 -import org.openrdf.model.ValueFactory;
   36.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   36.19 -import org.openrdf.model.vocabulary.XMLSchema;
   36.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   36.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   36.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   36.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   36.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   36.25 - 
   36.26 -/**
   36.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   36.28 - * 
   36.29 - * @author Arjohn Kampman
   36.30 - */
   36.31 -public class ConvexHullFunc extends SpatialConstructFunc {
   36.32 -
   36.33 -	@Override
   36.34 -	public String getURI() {
   36.35 -		return StrabonPolyhedron.convexHull;
   36.36 -	}
   36.37 -
   36.38 -	 
   36.39 - 
   36.40 -}
   36.41 +/*
   36.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   36.43 + *
   36.44 + * Licensed under the Aduna BSD-style license.
   36.45 + */
   36.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   36.47 +
   36.48 +import java.math.BigDecimal;
   36.49 +import java.math.BigInteger;
   36.50 +
   36.51 +import org.openrdf.model.Literal;
   36.52 +import org.openrdf.model.URI;
   36.53 +import org.openrdf.model.Value;
   36.54 +import org.openrdf.model.ValueFactory;
   36.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   36.56 +import org.openrdf.model.vocabulary.XMLSchema;
   36.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   36.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   36.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   36.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   36.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   36.62 + 
   36.63 +/**
   36.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   36.65 + * 
   36.66 + * @author Arjohn Kampman
   36.67 + */
   36.68 +public class ConvexHullFunc extends SpatialConstructFunc {
   36.69 +
   36.70 +	@Override
   36.71 +	public String getURI() {
   36.72 +		return StrabonPolyhedron.convexHull;
   36.73 +	}
   36.74 +
   36.75 +	 
   36.76 + 
   36.77 +}
    37.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Mon Mar 19 21:57:30 2012 +0100
    37.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/EnvelopeFunc.java	Mon Mar 19 22:06:59 2012 +0100
    37.3 @@ -1,37 +1,37 @@
    37.4 -/*
    37.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    37.6 - *
    37.7 - * Licensed under the Aduna BSD-style license.
    37.8 - */
    37.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   37.10 -
   37.11 -import java.math.BigDecimal;
   37.12 -import java.math.BigInteger;
   37.13 -
   37.14 -import org.openrdf.model.Literal;
   37.15 -import org.openrdf.model.URI;
   37.16 -import org.openrdf.model.Value;
   37.17 -import org.openrdf.model.ValueFactory;
   37.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   37.19 -import org.openrdf.model.vocabulary.XMLSchema;
   37.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   37.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   37.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   37.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   37.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   37.25 - 
   37.26 -/**
   37.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   37.28 - * 
   37.29 - * @author Arjohn Kampman
   37.30 - */
   37.31 -public class EnvelopeFunc extends SpatialConstructFunc {
   37.32 -
   37.33 -	@Override
   37.34 -	public String getURI() {
   37.35 -		return StrabonPolyhedron.envelope;
   37.36 -	}
   37.37 -
   37.38 -	 
   37.39 - 
   37.40 -}
   37.41 +/*
   37.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   37.43 + *
   37.44 + * Licensed under the Aduna BSD-style license.
   37.45 + */
   37.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   37.47 +
   37.48 +import java.math.BigDecimal;
   37.49 +import java.math.BigInteger;
   37.50 +
   37.51 +import org.openrdf.model.Literal;
   37.52 +import org.openrdf.model.URI;
   37.53 +import org.openrdf.model.Value;
   37.54 +import org.openrdf.model.ValueFactory;
   37.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   37.56 +import org.openrdf.model.vocabulary.XMLSchema;
   37.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   37.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   37.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   37.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   37.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   37.62 + 
   37.63 +/**
   37.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   37.65 + * 
   37.66 + * @author Arjohn Kampman
   37.67 + */
   37.68 +public class EnvelopeFunc extends SpatialConstructFunc {
   37.69 +
   37.70 +	@Override
   37.71 +	public String getURI() {
   37.72 +		return StrabonPolyhedron.envelope;
   37.73 +	}
   37.74 +
   37.75 +	 
   37.76 + 
   37.77 +}
    38.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Mon Mar 19 21:57:30 2012 +0100
    38.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/construct/TransformFunc.java	Mon Mar 19 22:06:59 2012 +0100
    38.3 @@ -1,37 +1,37 @@
    38.4 -/*
    38.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    38.6 - *
    38.7 - * Licensed under the Aduna BSD-style license.
    38.8 - */
    38.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   38.10 -
   38.11 -import java.math.BigDecimal;
   38.12 -import java.math.BigInteger;
   38.13 -
   38.14 -import org.openrdf.model.Literal;
   38.15 -import org.openrdf.model.URI;
   38.16 -import org.openrdf.model.Value;
   38.17 -import org.openrdf.model.ValueFactory;
   38.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   38.19 -import org.openrdf.model.vocabulary.XMLSchema;
   38.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   38.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   38.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   38.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   38.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   38.25 - 
   38.26 -/**
   38.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   38.28 - * 
   38.29 - * @author Arjohn Kampman
   38.30 - */
   38.31 -public class TransformFunc extends SpatialConstructFunc {
   38.32 -
   38.33 -	@Override
   38.34 -	public String getURI() {
   38.35 -		return StrabonPolyhedron.transform;
   38.36 -	}
   38.37 -
   38.38 -	 
   38.39 - 
   38.40 -}
   38.41 +/*
   38.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   38.43 + *
   38.44 + * Licensed under the Aduna BSD-style license.
   38.45 + */
   38.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct;
   38.47 +
   38.48 +import java.math.BigDecimal;
   38.49 +import java.math.BigInteger;
   38.50 +
   38.51 +import org.openrdf.model.Literal;
   38.52 +import org.openrdf.model.URI;
   38.53 +import org.openrdf.model.Value;
   38.54 +import org.openrdf.model.ValueFactory;
   38.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   38.56 +import org.openrdf.model.vocabulary.XMLSchema;
   38.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   38.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   38.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
   38.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   38.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   38.62 + 
   38.63 +/**
   38.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   38.65 + * 
   38.66 + * @author Arjohn Kampman
   38.67 + */
   38.68 +public class TransformFunc extends SpatialConstructFunc {
   38.69 +
   38.70 +	@Override
   38.71 +	public String getURI() {
   38.72 +		return StrabonPolyhedron.transform;
   38.73 +	}
   38.74 +
   38.75 +	 
   38.76 + 
   38.77 +}
    39.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Mon Mar 19 21:57:30 2012 +0100
    39.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/AreaFunc.java	Mon Mar 19 22:06:59 2012 +0100
    39.3 @@ -1,37 +1,37 @@
    39.4 -/*
    39.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    39.6 - *
    39.7 - * Licensed under the Aduna BSD-style license.
    39.8 - */
    39.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   39.10 -
   39.11 -import java.math.BigDecimal;
   39.12 -import java.math.BigInteger;
   39.13 -
   39.14 -import org.openrdf.model.Literal;
   39.15 -import org.openrdf.model.URI;
   39.16 -import org.openrdf.model.Value;
   39.17 -import org.openrdf.model.ValueFactory;
   39.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   39.19 -import org.openrdf.model.vocabulary.XMLSchema;
   39.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   39.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   39.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   39.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   39.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   39.25 - 
   39.26 -/**
   39.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   39.28 - * 
   39.29 - * @author Arjohn Kampman
   39.30 - */
   39.31 -public class AreaFunc extends SpatialMetricFunc {
   39.32 -
   39.33 -	@Override
   39.34 -	public String getURI() {
   39.35 -		return StrabonPolyhedron.area;
   39.36 -	}
   39.37 -
   39.38 -	 
   39.39 - 
   39.40 -}
   39.41 +/*
   39.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   39.43 + *
   39.44 + * Licensed under the Aduna BSD-style license.
   39.45 + */
   39.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   39.47 +
   39.48 +import java.math.BigDecimal;
   39.49 +import java.math.BigInteger;
   39.50 +
   39.51 +import org.openrdf.model.Literal;
   39.52 +import org.openrdf.model.URI;
   39.53 +import org.openrdf.model.Value;
   39.54 +import org.openrdf.model.ValueFactory;
   39.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   39.56 +import org.openrdf.model.vocabulary.XMLSchema;
   39.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   39.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   39.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   39.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   39.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   39.62 + 
   39.63 +/**
   39.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   39.65 + * 
   39.66 + * @author Arjohn Kampman
   39.67 + */
   39.68 +public class AreaFunc extends SpatialMetricFunc {
   39.69 +
   39.70 +	@Override
   39.71 +	public String getURI() {
   39.72 +		return StrabonPolyhedron.area;
   39.73 +	}
   39.74 +
   39.75 +	 
   39.76 + 
   39.77 +}
    40.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Mon Mar 19 21:57:30 2012 +0100
    40.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/metric/DistanceFunc.java	Mon Mar 19 22:06:59 2012 +0100
    40.3 @@ -1,35 +1,35 @@
    40.4 -/*
    40.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    40.6 - *
    40.7 - * Licensed under the Aduna BSD-style license.
    40.8 - */
    40.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   40.10 -
   40.11 -import java.math.BigDecimal;
   40.12 -import java.math.BigInteger;
   40.13 -
   40.14 -import org.openrdf.model.Literal;
   40.15 -import org.openrdf.model.URI;
   40.16 -import org.openrdf.model.Value;
   40.17 -import org.openrdf.model.ValueFactory;
   40.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   40.19 -import org.openrdf.model.vocabulary.XMLSchema;
   40.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   40.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   40.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   40.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   40.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   40.25 -
   40.26 -/**
   40.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   40.28 - * 
   40.29 - * @author Arjohn Kampman
   40.30 - */
   40.31 -public class DistanceFunc extends SpatialMetricFunc {
   40.32 -
   40.33 -	@Override
   40.34 -	public String getURI() {
   40.35 -		return StrabonPolyhedron.distance;
   40.36 -		}
   40.37 -
   40.38 -}
   40.39 +/*
   40.40 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   40.41 + *
   40.42 + * Licensed under the Aduna BSD-style license.
   40.43 + */
   40.44 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric;
   40.45 +
   40.46 +import java.math.BigDecimal;
   40.47 +import java.math.BigInteger;
   40.48 +
   40.49 +import org.openrdf.model.Literal;
   40.50 +import org.openrdf.model.URI;
   40.51 +import org.openrdf.model.Value;
   40.52 +import org.openrdf.model.ValueFactory;
   40.53 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   40.54 +import org.openrdf.model.vocabulary.XMLSchema;
   40.55 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   40.56 +import org.openrdf.query.algebra.evaluation.function.Function;
   40.57 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
   40.58 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   40.59 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   40.60 +
   40.61 +/**
   40.62 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   40.63 + * 
   40.64 + * @author Arjohn Kampman
   40.65 + */
   40.66 +public class DistanceFunc extends SpatialMetricFunc {
   40.67 +
   40.68 +	@Override
   40.69 +	public String getURI() {
   40.70 +		return StrabonPolyhedron.distance;
   40.71 +		}
   40.72 +
   40.73 +}
    41.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Mon Mar 19 21:57:30 2012 +0100
    41.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsTextFunc.java	Mon Mar 19 22:06:59 2012 +0100
    41.3 @@ -1,37 +1,37 @@
    41.4 -/*
    41.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    41.6 - *
    41.7 - * Licensed under the Aduna BSD-style license.
    41.8 - */
    41.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   41.10 -
   41.11 -import java.math.BigDecimal;
   41.12 -import java.math.BigInteger;
   41.13 -
   41.14 -import org.openrdf.model.Literal;
   41.15 -import org.openrdf.model.URI;
   41.16 -import org.openrdf.model.Value;
   41.17 -import org.openrdf.model.ValueFactory;
   41.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   41.19 -import org.openrdf.model.vocabulary.XMLSchema;
   41.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   41.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   41.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   41.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   41.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   41.25 - 
   41.26 -/**
   41.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   41.28 - * 
   41.29 - * @author Arjohn Kampman
   41.30 - */
   41.31 -public class AsTextFunc extends SpatialPropertyFunc {
   41.32 -
   41.33 -	@Override
   41.34 -	public String getURI() {
   41.35 -		return StrabonPolyhedron.asText;
   41.36 -	}
   41.37 -
   41.38 -	 
   41.39 - 
   41.40 -}
   41.41 +/*
   41.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   41.43 + *
   41.44 + * Licensed under the Aduna BSD-style license.
   41.45 + */
   41.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   41.47 +
   41.48 +import java.math.BigDecimal;
   41.49 +import java.math.BigInteger;
   41.50 +
   41.51 +import org.openrdf.model.Literal;
   41.52 +import org.openrdf.model.URI;
   41.53 +import org.openrdf.model.Value;
   41.54 +import org.openrdf.model.ValueFactory;
   41.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   41.56 +import org.openrdf.model.vocabulary.XMLSchema;
   41.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   41.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   41.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   41.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   41.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   41.62 + 
   41.63 +/**
   41.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   41.65 + * 
   41.66 + * @author Arjohn Kampman
   41.67 + */
   41.68 +public class AsTextFunc extends SpatialPropertyFunc {
   41.69 +
   41.70 +	@Override
   41.71 +	public String getURI() {
   41.72 +		return StrabonPolyhedron.asText;
   41.73 +	}
   41.74 +
   41.75 +	 
   41.76 + 
   41.77 +}
    42.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Mon Mar 19 21:57:30 2012 +0100
    42.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/DimensionFunc.java	Mon Mar 19 22:06:59 2012 +0100
    42.3 @@ -1,31 +1,31 @@
    42.4 -/*
    42.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    42.6 - *
    42.7 - * Licensed under the Aduna BSD-style license.
    42.8 - */
    42.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   42.10 -
   42.11 -import org.openrdf.model.Literal;
   42.12 -import org.openrdf.model.Value;
   42.13 -import org.openrdf.model.ValueFactory;
   42.14 -import org.openrdf.model.impl.LiteralImpl;
   42.15 -import org.openrdf.model.vocabulary.XMLSchema;
   42.16 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   42.17 -import org.openrdf.query.algebra.evaluation.function.Function;
   42.18 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   42.19 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   42.20 -
   42.21 -import com.vividsolutions.jts.io.WKTReader;
   42.22 - 
   42.23 -/**
   42.24 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   42.25 - * 
   42.26 - * @author Arjohn Kampman
   42.27 - */
   42.28 -public class DimensionFunc extends SpatialPropertyFunc {
   42.29 -
   42.30 -	@Override
   42.31 -	public String getURI() {
   42.32 -		return StrabonPolyhedron.dimension;
   42.33 -	}
   42.34 -}
   42.35 +/*
   42.36 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   42.37 + *
   42.38 + * Licensed under the Aduna BSD-style license.
   42.39 + */
   42.40 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   42.41 +
   42.42 +import org.openrdf.model.Literal;
   42.43 +import org.openrdf.model.Value;
   42.44 +import org.openrdf.model.ValueFactory;
   42.45 +import org.openrdf.model.impl.LiteralImpl;
   42.46 +import org.openrdf.model.vocabulary.XMLSchema;
   42.47 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   42.48 +import org.openrdf.query.algebra.evaluation.function.Function;
   42.49 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   42.50 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   42.51 +
   42.52 +import com.vividsolutions.jts.io.WKTReader;
   42.53 + 
   42.54 +/**
   42.55 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   42.56 + * 
   42.57 + * @author Arjohn Kampman
   42.58 + */
   42.59 +public class DimensionFunc extends SpatialPropertyFunc {
   42.60 +
   42.61 +	@Override
   42.62 +	public String getURI() {
   42.63 +		return StrabonPolyhedron.dimension;
   42.64 +	}
   42.65 +}
    43.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Mon Mar 19 21:57:30 2012 +0100
    43.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/GeometryTypeFunc.java	Mon Mar 19 22:06:59 2012 +0100
    43.3 @@ -1,37 +1,37 @@
    43.4 -/*
    43.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    43.6 - *
    43.7 - * Licensed under the Aduna BSD-style license.
    43.8 - */
    43.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   43.10 -
   43.11 -import java.math.BigDecimal;
   43.12 -import java.math.BigInteger;
   43.13 -
   43.14 -import org.openrdf.model.Literal;
   43.15 -import org.openrdf.model.URI;
   43.16 -import org.openrdf.model.Value;
   43.17 -import org.openrdf.model.ValueFactory;
   43.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   43.19 -import org.openrdf.model.vocabulary.XMLSchema;
   43.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   43.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   43.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   43.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   43.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   43.25 - 
   43.26 -/**
   43.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   43.28 - * 
   43.29 - * @author Arjohn Kampman
   43.30 - */
   43.31 -public class GeometryTypeFunc extends SpatialPropertyFunc {
   43.32 -
   43.33 -	@Override
   43.34 -	public String getURI() {
   43.35 -		return StrabonPolyhedron.geometryType;
   43.36 -	}
   43.37 -
   43.38 -	 
   43.39 - 
   43.40 -}
   43.41 +/*
   43.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   43.43 + *
   43.44 + * Licensed under the Aduna BSD-style license.
   43.45 + */
   43.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   43.47 +
   43.48 +import java.math.BigDecimal;
   43.49 +import java.math.BigInteger;
   43.50 +
   43.51 +import org.openrdf.model.Literal;
   43.52 +import org.openrdf.model.URI;
   43.53 +import org.openrdf.model.Value;
   43.54 +import org.openrdf.model.ValueFactory;
   43.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   43.56 +import org.openrdf.model.vocabulary.XMLSchema;
   43.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   43.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   43.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   43.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   43.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   43.62 + 
   43.63 +/**
   43.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   43.65 + * 
   43.66 + * @author Arjohn Kampman
   43.67 + */
   43.68 +public class GeometryTypeFunc extends SpatialPropertyFunc {
   43.69 +
   43.70 +	@Override
   43.71 +	public String getURI() {
   43.72 +		return StrabonPolyhedron.geometryType;
   43.73 +	}
   43.74 +
   43.75 +	 
   43.76 + 
   43.77 +}
    44.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Mon Mar 19 21:57:30 2012 +0100
    44.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsEmptyFunc.java	Mon Mar 19 22:06:59 2012 +0100
    44.3 @@ -1,37 +1,37 @@
    44.4 -/*
    44.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    44.6 - *
    44.7 - * Licensed under the Aduna BSD-style license.
    44.8 - */
    44.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   44.10 -
   44.11 -import java.math.BigDecimal;
   44.12 -import java.math.BigInteger;
   44.13 -
   44.14 -import org.openrdf.model.Literal;
   44.15 -import org.openrdf.model.URI;
   44.16 -import org.openrdf.model.Value;
   44.17 -import org.openrdf.model.ValueFactory;
   44.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   44.19 -import org.openrdf.model.vocabulary.XMLSchema;
   44.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   44.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   44.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   44.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   44.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   44.25 - 
   44.26 -/**
   44.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   44.28 - * 
   44.29 - * @author Arjohn Kampman
   44.30 - */
   44.31 -public class IsEmptyFunc extends SpatialPropertyFunc {
   44.32 -
   44.33 -	@Override
   44.34 -	public String getURI() {
   44.35 -		return StrabonPolyhedron.isEmpty;
   44.36 -	}
   44.37 -
   44.38 -	 
   44.39 - 
   44.40 -}
   44.41 +/*
   44.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   44.43 + *
   44.44 + * Licensed under the Aduna BSD-style license.
   44.45 + */
   44.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   44.47 +
   44.48 +import java.math.BigDecimal;
   44.49 +import java.math.BigInteger;
   44.50 +
   44.51 +import org.openrdf.model.Literal;
   44.52 +import org.openrdf.model.URI;
   44.53 +import org.openrdf.model.Value;
   44.54 +import org.openrdf.model.ValueFactory;
   44.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   44.56 +import org.openrdf.model.vocabulary.XMLSchema;
   44.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   44.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   44.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   44.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   44.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   44.62 + 
   44.63 +/**
   44.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   44.65 + * 
   44.66 + * @author Arjohn Kampman
   44.67 + */
   44.68 +public class IsEmptyFunc extends SpatialPropertyFunc {
   44.69 +
   44.70 +	@Override
   44.71 +	public String getURI() {
   44.72 +		return StrabonPolyhedron.isEmpty;
   44.73 +	}
   44.74 +
   44.75 +	 
   44.76 + 
   44.77 +}
    45.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Mon Mar 19 21:57:30 2012 +0100
    45.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/IsSimpleFunc.java	Mon Mar 19 22:06:59 2012 +0100
    45.3 @@ -1,37 +1,37 @@
    45.4 -/*
    45.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    45.6 - *
    45.7 - * Licensed under the Aduna BSD-style license.
    45.8 - */
    45.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   45.10 -
   45.11 -import java.math.BigDecimal;
   45.12 -import java.math.BigInteger;
   45.13 -
   45.14 -import org.openrdf.model.Literal;
   45.15 -import org.openrdf.model.URI;
   45.16 -import org.openrdf.model.Value;
   45.17 -import org.openrdf.model.ValueFactory;
   45.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   45.19 -import org.openrdf.model.vocabulary.XMLSchema;
   45.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   45.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   45.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   45.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   45.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   45.25 - 
   45.26 -/**
   45.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   45.28 - * 
   45.29 - * @author Arjohn Kampman
   45.30 - */
   45.31 -public class IsSimpleFunc extends SpatialPropertyFunc {
   45.32 -
   45.33 -	@Override
   45.34 -	public String getURI() {
   45.35 -		return StrabonPolyhedron.isSimple;
   45.36 -	}
   45.37 -
   45.38 -	 
   45.39 - 
   45.40 -}
   45.41 +/*
   45.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   45.43 + *
   45.44 + * Licensed under the Aduna BSD-style license.
   45.45 + */
   45.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   45.47 +
   45.48 +import java.math.BigDecimal;
   45.49 +import java.math.BigInteger;
   45.50 +
   45.51 +import org.openrdf.model.Literal;
   45.52 +import org.openrdf.model.URI;
   45.53 +import org.openrdf.model.Value;
   45.54 +import org.openrdf.model.ValueFactory;
   45.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   45.56 +import org.openrdf.model.vocabulary.XMLSchema;
   45.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   45.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   45.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   45.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   45.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   45.62 + 
   45.63 +/**
   45.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   45.65 + * 
   45.66 + * @author Arjohn Kampman
   45.67 + */
   45.68 +public class IsSimpleFunc extends SpatialPropertyFunc {
   45.69 +
   45.70 +	@Override
   45.71 +	public String getURI() {
   45.72 +		return StrabonPolyhedron.isSimple;
   45.73 +	}
   45.74 +
   45.75 +	 
   45.76 + 
   45.77 +}
    46.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Mon Mar 19 21:57:30 2012 +0100
    46.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Mon Mar 19 22:06:59 2012 +0100
    46.3 @@ -1,37 +1,37 @@
    46.4 -/*
    46.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    46.6 - *
    46.7 - * Licensed under the Aduna BSD-style license.
    46.8 - */
    46.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   46.10 -
   46.11 -import java.math.BigDecimal;
   46.12 -import java.math.BigInteger;
   46.13 -
   46.14 -import org.openrdf.model.Literal;
   46.15 -import org.openrdf.model.URI;
   46.16 -import org.openrdf.model.Value;
   46.17 -import org.openrdf.model.ValueFactory;
   46.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   46.19 -import org.openrdf.model.vocabulary.XMLSchema;
   46.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   46.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   46.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   46.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   46.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   46.25 - 
   46.26 -/**
   46.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   46.28 - * 
   46.29 - * @author Arjohn Kampman
   46.30 - */
   46.31 -public class SridFunc extends SpatialPropertyFunc {
   46.32 -
   46.33 -	@Override
   46.34 -	public String getURI() {
   46.35 -		return StrabonPolyhedron.srid.toString(); //changed this-constant
   46.36 -	}
   46.37 -
   46.38 -	 
   46.39 - 
   46.40 -}
   46.41 +/*
   46.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   46.43 + *
   46.44 + * Licensed under the Aduna BSD-style license.
   46.45 + */
   46.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property;
   46.47 +
   46.48 +import java.math.BigDecimal;
   46.49 +import java.math.BigInteger;
   46.50 +
   46.51 +import org.openrdf.model.Literal;
   46.52 +import org.openrdf.model.URI;
   46.53 +import org.openrdf.model.Value;
   46.54 +import org.openrdf.model.ValueFactory;
   46.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   46.56 +import org.openrdf.model.vocabulary.XMLSchema;
   46.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   46.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   46.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc;
   46.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   46.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   46.62 + 
   46.63 +/**
   46.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   46.65 + * 
   46.66 + * @author Arjohn Kampman
   46.67 + */
   46.68 +public class SridFunc extends SpatialPropertyFunc {
   46.69 +
   46.70 +	@Override
   46.71 +	public String getURI() {
   46.72 +		return StrabonPolyhedron.srid.toString(); //changed this-constant
   46.73 +	}
   46.74 +
   46.75 +	 
   46.76 + 
   46.77 +}
    47.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Mon Mar 19 21:57:30 2012 +0100
    47.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AboveFunc.java	Mon Mar 19 22:06:59 2012 +0100
    47.3 @@ -1,37 +1,37 @@
    47.4 -/*
    47.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    47.6 - *
    47.7 - * Licensed under the Aduna BSD-style license.
    47.8 - */
    47.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   47.10 -
   47.11 -import java.math.BigDecimal;
   47.12 -import java.math.BigInteger;
   47.13 -
   47.14 -import org.openrdf.model.Literal;
   47.15 -import org.openrdf.model.URI;
   47.16 -import org.openrdf.model.Value;
   47.17 -import org.openrdf.model.ValueFactory;
   47.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   47.19 -import org.openrdf.model.vocabulary.XMLSchema;
   47.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   47.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   47.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   47.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   47.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   47.25 - 
   47.26 -/**
   47.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   47.28 - * 
   47.29 - * @author Arjohn Kampman
   47.30 - */
   47.31 -public class AboveFunc extends SpatialRelationshipFunc {
   47.32 -
   47.33 -	@Override
   47.34 -	public String getURI() {
   47.35 -		return StrabonPolyhedron.above;
   47.36 -	}
   47.37 -
   47.38 -	 
   47.39 - 
   47.40 -}
   47.41 +/*
   47.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   47.43 + *
   47.44 + * Licensed under the Aduna BSD-style license.
   47.45 + */
   47.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   47.47 +
   47.48 +import java.math.BigDecimal;
   47.49 +import java.math.BigInteger;
   47.50 +
   47.51 +import org.openrdf.model.Literal;
   47.52 +import org.openrdf.model.URI;
   47.53 +import org.openrdf.model.Value;
   47.54 +import org.openrdf.model.ValueFactory;
   47.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   47.56 +import org.openrdf.model.vocabulary.XMLSchema;
   47.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   47.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   47.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   47.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   47.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   47.62 + 
   47.63 +/**
   47.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   47.65 + * 
   47.66 + * @author Arjohn Kampman
   47.67 + */
   47.68 +public class AboveFunc extends SpatialRelationshipFunc {
   47.69 +
   47.70 +	@Override
   47.71 +	public String getURI() {
   47.72 +		return StrabonPolyhedron.above;
   47.73 +	}
   47.74 +
   47.75 +	 
   47.76 + 
   47.77 +}
    48.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Mon Mar 19 21:57:30 2012 +0100
    48.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/AnyInteractFunc.java	Mon Mar 19 22:06:59 2012 +0100
    48.3 @@ -1,98 +1,98 @@
    48.4 -/*
    48.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    48.6 - *
    48.7 - * Licensed under the Aduna BSD-style license.
    48.8 - */
    48.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   48.10 -
   48.11 -import java.math.BigDecimal;
   48.12 -import java.math.BigInteger;
   48.13 -
   48.14 -import org.openrdf.model.Literal;
   48.15 -import org.openrdf.model.URI;
   48.16 -import org.openrdf.model.Value;
   48.17 -import org.openrdf.model.ValueFactory;
   48.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   48.19 -import org.openrdf.model.vocabulary.XMLSchema;
   48.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   48.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   48.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   48.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   48.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   48.25 -
   48.26 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
   48.27 -
   48.28 -/**
   48.29 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   48.30 - * 
   48.31 - * @author Arjohn Kampman
   48.32 - */
   48.33 -public class AnyInteractFunc extends SpatialRelationshipFunc {
   48.34 -
   48.35 -	@Override
   48.36 -	public String getURI() {
   48.37 -		return StrabonPolyhedron.anyInteract;
   48.38 -		}
   48.39 -
   48.40 -	
   48.41 -
   48.42 -//	public Literal evaluate(ValueFactory valueFactory, Value... args)
   48.43 -//		throws ValueExprEvaluationException
   48.44 -//	{
   48.45 -//		if (args.length != 1) {
   48.46 -//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
   48.47 -//					+ args.length);
   48.48 -//		}
   48.49 -//
   48.50 -//		if (args[0] instanceof Literal) {
   48.51 -//			Literal literal = (Literal)args[0];
   48.52 -//			URI datatype = literal.getDatatype();
   48.53 -//
   48.54 -//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
   48.55 -//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
   48.56 -//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
   48.57 -//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
   48.58 -//				}
   48.59 -//			}
   48.60 -//			else if (datatype != null) {
   48.61 -//				if (datatype.equals(XMLSchema.BOOLEAN)) {
   48.62 -//					return literal;
   48.63 -//				}
   48.64 -//				else {
   48.65 -//					Boolean booleanValue = null;
   48.66 -//
   48.67 -//					try {
   48.68 -//						if (datatype.equals(XMLSchema.FLOAT)) {
   48.69 -//							float floatValue = literal.floatValue();
   48.70 -//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
   48.71 -//						}
   48.72 -//						else if (datatype.equals(XMLSchema.DOUBLE)) {
   48.73 -//							double doubleValue = literal.doubleValue();
   48.74 -//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
   48.75 -//						}
   48.76 -//						else if (datatype.equals(XMLSchema.DECIMAL)) {
   48.77 -//							BigDecimal decimalValue = literal.decimalValue();
   48.78 -//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
   48.79 -//						}
   48.80 -//						else if (datatype.equals(XMLSchema.INTEGER)) {
   48.81 -//							BigInteger integerValue = literal.integerValue();
   48.82 -//							booleanValue = !integerValue.equals(BigInteger.ZERO);
   48.83 -//						}
   48.84 -//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
   48.85 -//							booleanValue = literal.longValue() != 0L;
   48.86 -//						}
   48.87 -//					}
   48.88 -//					catch (NumberFormatException e) {
   48.89 -//						throw new ValueExprEvaluationException(e.getMessage(), e);
   48.90 -//					}
   48.91 -//
   48.92 -//					if (booleanValue != null) {
   48.93 -//						return valueFactory.createLiteral(booleanValue);
   48.94 -//					}
   48.95 -//				}
   48.96 -//			}
   48.97 -//		}
   48.98 -//
   48.99 -//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  48.100 -//	}
  48.101 -}
  48.102 +/*
  48.103 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
  48.104 + *
  48.105 + * Licensed under the Aduna BSD-style license.
  48.106 + */
  48.107 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
  48.108 +
  48.109 +import java.math.BigDecimal;
  48.110 +import java.math.BigInteger;
  48.111 +
  48.112 +import org.openrdf.model.Literal;
  48.113 +import org.openrdf.model.URI;
  48.114 +import org.openrdf.model.Value;
  48.115 +import org.openrdf.model.ValueFactory;
  48.116 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
  48.117 +import org.openrdf.model.vocabulary.XMLSchema;
  48.118 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
  48.119 +import org.openrdf.query.algebra.evaluation.function.Function;
  48.120 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
  48.121 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
  48.122 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
  48.123 +
  48.124 +//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
  48.125 +
  48.126 +/**
  48.127 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
  48.128 + * 
  48.129 + * @author Arjohn Kampman
  48.130 + */
  48.131 +public class AnyInteractFunc extends SpatialRelationshipFunc {
  48.132 +
  48.133 +	@Override
  48.134 +	public String getURI() {
  48.135 +		return StrabonPolyhedron.anyInteract;
  48.136 +		}
  48.137 +
  48.138 +	
  48.139 +
  48.140 +//	public Literal evaluate(ValueFactory valueFactory, Value... args)
  48.141 +//		throws ValueExprEvaluationException
  48.142 +//	{
  48.143 +//		if (args.length != 1) {
  48.144 +//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
  48.145 +//					+ args.length);
  48.146 +//		}
  48.147 +//
  48.148 +//		if (args[0] instanceof Literal) {
  48.149 +//			Literal literal = (Literal)args[0];
  48.150 +//			URI datatype = literal.getDatatype();
  48.151 +//
  48.152 +//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
  48.153 +//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
  48.154 +//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
  48.155 +//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
  48.156 +//				}
  48.157 +//			}
  48.158 +//			else if (datatype != null) {
  48.159 +//				if (datatype.equals(XMLSchema.BOOLEAN)) {
  48.160 +//					return literal;
  48.161 +//				}
  48.162 +//				else {
  48.163 +//					Boolean booleanValue = null;
  48.164 +//
  48.165 +//					try {
  48.166 +//						if (datatype.equals(XMLSchema.FLOAT)) {
  48.167 +//							float floatValue = literal.floatValue();
  48.168 +//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
  48.169 +//						}
  48.170 +//						else if (datatype.equals(XMLSchema.DOUBLE)) {
  48.171 +//							double doubleValue = literal.doubleValue();
  48.172 +//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
  48.173 +//						}
  48.174 +//						else if (datatype.equals(XMLSchema.DECIMAL)) {
  48.175 +//							BigDecimal decimalValue = literal.decimalValue();
  48.176 +//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
  48.177 +//						}
  48.178 +//						else if (datatype.equals(XMLSchema.INTEGER)) {
  48.179 +//							BigInteger integerValue = literal.integerValue();
  48.180 +//							booleanValue = !integerValue.equals(BigInteger.ZERO);
  48.181 +//						}
  48.182 +//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
  48.183 +//							booleanValue = literal.longValue() != 0L;
  48.184 +//						}
  48.185 +//					}
  48.186 +//					catch (NumberFormatException e) {
  48.187 +//						throw new ValueExprEvaluationException(e.getMessage(), e);
  48.188 +//					}
  48.189 +//
  48.190 +//					if (booleanValue != null) {
  48.191 +//						return valueFactory.createLiteral(booleanValue);
  48.192 +//					}
  48.193 +//				}
  48.194 +//			}
  48.195 +//		}
  48.196 +//
  48.197 +//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  48.198 +//	}
  48.199 +}
    49.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Mon Mar 19 21:57:30 2012 +0100
    49.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/BelowFunc.java	Mon Mar 19 22:06:59 2012 +0100
    49.3 @@ -1,37 +1,37 @@
    49.4 -/*
    49.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    49.6 - *
    49.7 - * Licensed under the Aduna BSD-style license.
    49.8 - */
    49.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   49.10 -
   49.11 -import java.math.BigDecimal;
   49.12 -import java.math.BigInteger;
   49.13 -
   49.14 -import org.openrdf.model.Literal;
   49.15 -import org.openrdf.model.URI;
   49.16 -import org.openrdf.model.Value;
   49.17 -import org.openrdf.model.ValueFactory;
   49.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   49.19 -import org.openrdf.model.vocabulary.XMLSchema;
   49.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   49.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   49.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   49.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   49.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   49.25 - 
   49.26 -/**
   49.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   49.28 - * 
   49.29 - * @author Arjohn Kampman
   49.30 - */
   49.31 -public class BelowFunc extends SpatialRelationshipFunc {
   49.32 -
   49.33 -	@Override
   49.34 -	public String getURI() {
   49.35 -		return StrabonPolyhedron.below;
   49.36 -	}
   49.37 -
   49.38 -	 
   49.39 - 
   49.40 -}
   49.41 +/*
   49.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   49.43 + *
   49.44 + * Licensed under the Aduna BSD-style license.
   49.45 + */
   49.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   49.47 +
   49.48 +import java.math.BigDecimal;
   49.49 +import java.math.BigInteger;
   49.50 +
   49.51 +import org.openrdf.model.Literal;
   49.52 +import org.openrdf.model.URI;
   49.53 +import org.openrdf.model.Value;
   49.54 +import org.openrdf.model.ValueFactory;
   49.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   49.56 +import org.openrdf.model.vocabulary.XMLSchema;
   49.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   49.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   49.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   49.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   49.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   49.62 + 
   49.63 +/**
   49.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   49.65 + * 
   49.66 + * @author Arjohn Kampman
   49.67 + */
   49.68 +public class BelowFunc extends SpatialRelationshipFunc {
   49.69 +
   49.70 +	@Override
   49.71 +	public String getURI() {
   49.72 +		return StrabonPolyhedron.below;
   49.73 +	}
   49.74 +
   49.75 +	 
   49.76 + 
   49.77 +}
    50.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    50.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/ContainsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    50.3 @@ -1,37 +1,37 @@
    50.4 -/*
    50.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    50.6 - *
    50.7 - * Licensed under the Aduna BSD-style license.
    50.8 - */
    50.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   50.10 -
   50.11 -import java.math.BigDecimal;
   50.12 -import java.math.BigInteger;
   50.13 -
   50.14 -import org.openrdf.model.Literal;
   50.15 -import org.openrdf.model.URI;
   50.16 -import org.openrdf.model.Value;
   50.17 -import org.openrdf.model.ValueFactory;
   50.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   50.19 -import org.openrdf.model.vocabulary.XMLSchema;
   50.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   50.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   50.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   50.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   50.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   50.25 - 
   50.26 -/**
   50.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   50.28 - * 
   50.29 - * @author Arjohn Kampman
   50.30 - */
   50.31 -public class ContainsFunc extends SpatialRelationshipFunc {
   50.32 -
   50.33 -	@Override
   50.34 -	public String getURI() {
   50.35 -		return StrabonPolyhedron.contains;
   50.36 -	}
   50.37 -
   50.38 -	 
   50.39 - 
   50.40 -}
   50.41 +/*
   50.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   50.43 + *
   50.44 + * Licensed under the Aduna BSD-style license.
   50.45 + */
   50.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   50.47 +
   50.48 +import java.math.BigDecimal;
   50.49 +import java.math.BigInteger;
   50.50 +
   50.51 +import org.openrdf.model.Literal;
   50.52 +import org.openrdf.model.URI;
   50.53 +import org.openrdf.model.Value;
   50.54 +import org.openrdf.model.ValueFactory;
   50.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   50.56 +import org.openrdf.model.vocabulary.XMLSchema;
   50.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   50.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   50.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   50.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   50.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   50.62 + 
   50.63 +/**
   50.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   50.65 + * 
   50.66 + * @author Arjohn Kampman
   50.67 + */
   50.68 +public class ContainsFunc extends SpatialRelationshipFunc {
   50.69 +
   50.70 +	@Override
   50.71 +	public String getURI() {
   50.72 +		return StrabonPolyhedron.contains;
   50.73 +	}
   50.74 +
   50.75 +	 
   50.76 + 
   50.77 +}
    51.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Mon Mar 19 21:57:30 2012 +0100
    51.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoveredByFunc.java	Mon Mar 19 22:06:59 2012 +0100
    51.3 @@ -1,36 +1,36 @@
    51.4 -/*
    51.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    51.6 - *
    51.7 - * Licensed under the Aduna BSD-style license.
    51.8 - */
    51.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   51.10 -
   51.11 -import java.math.BigDecimal;
   51.12 -import java.math.BigInteger;
   51.13 -
   51.14 -import org.openrdf.model.Literal;
   51.15 -import org.openrdf.model.URI;
   51.16 -import org.openrdf.model.Value;
   51.17 -import org.openrdf.model.ValueFactory;
   51.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   51.19 -import org.openrdf.model.vocabulary.XMLSchema;
   51.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   51.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   51.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   51.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   51.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   51.25 - 
   51.26 -/**
   51.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   51.28 - * 
   51.29 - * @author Arjohn Kampman
   51.30 - */
   51.31 -public class CoveredByFunc extends SpatialRelationshipFunc {
   51.32 -
   51.33 -	@Override
   51.34 -	public String getURI() {
   51.35 -		return StrabonPolyhedron.coveredBy;
   51.36 -	}
   51.37 -
   51.38 - 
   51.39 -}
   51.40 +/*
   51.41 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   51.42 + *
   51.43 + * Licensed under the Aduna BSD-style license.
   51.44 + */
   51.45 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   51.46 +
   51.47 +import java.math.BigDecimal;
   51.48 +import java.math.BigInteger;
   51.49 +
   51.50 +import org.openrdf.model.Literal;
   51.51 +import org.openrdf.model.URI;
   51.52 +import org.openrdf.model.Value;
   51.53 +import org.openrdf.model.ValueFactory;
   51.54 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   51.55 +import org.openrdf.model.vocabulary.XMLSchema;
   51.56 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   51.57 +import org.openrdf.query.algebra.evaluation.function.Function;
   51.58 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   51.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   51.60 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   51.61 + 
   51.62 +/**
   51.63 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   51.64 + * 
   51.65 + * @author Arjohn Kampman
   51.66 + */
   51.67 +public class CoveredByFunc extends SpatialRelationshipFunc {
   51.68 +
   51.69 +	@Override
   51.70 +	public String getURI() {
   51.71 +		return StrabonPolyhedron.coveredBy;
   51.72 +	}
   51.73 +
   51.74 + 
   51.75 +}
    52.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Mon Mar 19 21:57:30 2012 +0100
    52.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/CoversFunc.java	Mon Mar 19 22:06:59 2012 +0100
    52.3 @@ -1,36 +1,36 @@
    52.4 -/*
    52.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    52.6 - *
    52.7 - * Licensed under the Aduna BSD-style license.
    52.8 - */
    52.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   52.10 -
   52.11 -import java.math.BigDecimal;
   52.12 -import java.math.BigInteger;
   52.13 -
   52.14 -import org.openrdf.model.Literal;
   52.15 -import org.openrdf.model.URI;
   52.16 -import org.openrdf.model.Value;
   52.17 -import org.openrdf.model.ValueFactory;
   52.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   52.19 -import org.openrdf.model.vocabulary.XMLSchema;
   52.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   52.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   52.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   52.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   52.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   52.25 - 
   52.26 -/**
   52.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   52.28 - * 
   52.29 - * @author Arjohn Kampman
   52.30 - */
   52.31 -public class CoversFunc extends SpatialRelationshipFunc {
   52.32 -
   52.33 -	@Override
   52.34 -	public String getURI() {
   52.35 -		return StrabonPolyhedron.covers;
   52.36 -	}
   52.37 - 
   52.38 -
   52.39 -}
   52.40 +/*
   52.41 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   52.42 + *
   52.43 + * Licensed under the Aduna BSD-style license.
   52.44 + */
   52.45 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   52.46 +
   52.47 +import java.math.BigDecimal;
   52.48 +import java.math.BigInteger;
   52.49 +
   52.50 +import org.openrdf.model.Literal;
   52.51 +import org.openrdf.model.URI;
   52.52 +import org.openrdf.model.Value;
   52.53 +import org.openrdf.model.ValueFactory;
   52.54 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   52.55 +import org.openrdf.model.vocabulary.XMLSchema;
   52.56 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   52.57 +import org.openrdf.query.algebra.evaluation.function.Function;
   52.58 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   52.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   52.60 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   52.61 + 
   52.62 +/**
   52.63 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   52.64 + * 
   52.65 + * @author Arjohn Kampman
   52.66 + */
   52.67 +public class CoversFunc extends SpatialRelationshipFunc {
   52.68 +
   52.69 +	@Override
   52.70 +	public String getURI() {
   52.71 +		return StrabonPolyhedron.covers;
   52.72 +	}
   52.73 + 
   52.74 +
   52.75 +}
    53.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Mon Mar 19 21:57:30 2012 +0100
    53.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/DisjointFunc.java	Mon Mar 19 22:06:59 2012 +0100
    53.3 @@ -1,35 +1,35 @@
    53.4 -/*
    53.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    53.6 - *
    53.7 - * Licensed under the Aduna BSD-style license.
    53.8 - */
    53.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   53.10 -
   53.11 -import java.math.BigDecimal;
   53.12 -import java.math.BigInteger;
   53.13 -
   53.14 -import org.openrdf.model.Literal;
   53.15 -import org.openrdf.model.URI;
   53.16 -import org.openrdf.model.Value;
   53.17 -import org.openrdf.model.ValueFactory;
   53.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   53.19 -import org.openrdf.model.vocabulary.XMLSchema;
   53.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   53.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   53.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   53.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   53.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   53.25 - 
   53.26 -/**
   53.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   53.28 - * 
   53.29 - * @author Arjohn Kampman
   53.30 - */
   53.31 -public class DisjointFunc extends SpatialRelationshipFunc {
   53.32 -
   53.33 -	@Override
   53.34 -	public String getURI() {
   53.35 -		return StrabonPolyhedron.disjoint;
   53.36 -	}
   53.37 - 
   53.38 -}
   53.39 +/*
   53.40 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   53.41 + *
   53.42 + * Licensed under the Aduna BSD-style license.
   53.43 + */
   53.44 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   53.45 +
   53.46 +import java.math.BigDecimal;
   53.47 +import java.math.BigInteger;
   53.48 +
   53.49 +import org.openrdf.model.Literal;
   53.50 +import org.openrdf.model.URI;
   53.51 +import org.openrdf.model.Value;
   53.52 +import org.openrdf.model.ValueFactory;
   53.53 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   53.54 +import org.openrdf.model.vocabulary.XMLSchema;
   53.55 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   53.56 +import org.openrdf.query.algebra.evaluation.function.Function;
   53.57 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   53.58 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   53.59 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   53.60 + 
   53.61 +/**
   53.62 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   53.63 + * 
   53.64 + * @author Arjohn Kampman
   53.65 + */
   53.66 +public class DisjointFunc extends SpatialRelationshipFunc {
   53.67 +
   53.68 +	@Override
   53.69 +	public String getURI() {
   53.70 +		return StrabonPolyhedron.disjoint;
   53.71 +	}
   53.72 + 
   53.73 +}
    54.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Mon Mar 19 21:57:30 2012 +0100
    54.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/EqualsFunc.java	Mon Mar 19 22:06:59 2012 +0100
    54.3 @@ -1,37 +1,37 @@
    54.4 -/*
    54.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    54.6 - *
    54.7 - * Licensed under the Aduna BSD-style license.
    54.8 - */
    54.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   54.10 -
   54.11 -import java.math.BigDecimal;
   54.12 -import java.math.BigInteger;
   54.13 -
   54.14 -import org.openrdf.model.Literal;
   54.15 -import org.openrdf.model.URI;
   54.16 -import org.openrdf.model.Value;
   54.17 -import org.openrdf.model.ValueFactory;
   54.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   54.19 -import org.openrdf.model.vocabulary.XMLSchema;
   54.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   54.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   54.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   54.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   54.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   54.25 -
   54.26 - 
   54.27 -/**
   54.28 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   54.29 - * 
   54.30 - * @author Arjohn Kampman
   54.31 - */
   54.32 -public class EqualsFunc extends SpatialRelationshipFunc {
   54.33 -
   54.34 -	@Override
   54.35 -	public String getURI() {
   54.36 -		return StrabonPolyhedron.equals;
   54.37 -	}
   54.38 - 
   54.39 - 
   54.40 -}
   54.41 +/*
   54.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   54.43 + *
   54.44 + * Licensed under the Aduna BSD-style license.
   54.45 + */
   54.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   54.47 +
   54.48 +import java.math.BigDecimal;
   54.49 +import java.math.BigInteger;
   54.50 +
   54.51 +import org.openrdf.model.Literal;
   54.52 +import org.openrdf.model.URI;
   54.53 +import org.openrdf.model.Value;
   54.54 +import org.openrdf.model.ValueFactory;
   54.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   54.56 +import org.openrdf.model.vocabulary.XMLSchema;
   54.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   54.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   54.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   54.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   54.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   54.62 +
   54.63 + 
   54.64 +/**
   54.65 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   54.66 + * 
   54.67 + * @author Arjohn Kampman
   54.68 + */
   54.69 +public class EqualsFunc extends SpatialRelationshipFunc {
   54.70 +
   54.71 +	@Override
   54.72 +	public String getURI() {
   54.73 +		return StrabonPolyhedron.equals;
   54.74 +	}
   54.75 + 
   54.76 + 
   54.77 +}
    55.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Mon Mar 19 21:57:30 2012 +0100
    55.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Mon Mar 19 22:06:59 2012 +0100
    55.3 @@ -1,36 +1,36 @@
    55.4 -/*
    55.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    55.6 - *
    55.7 - * Licensed under the Aduna BSD-style license.
    55.8 - */
    55.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   55.10 -
   55.11 -import java.math.BigDecimal;
   55.12 -import java.math.BigInteger;
   55.13 -
   55.14 -import org.openrdf.model.Literal;
   55.15 -import org.openrdf.model.URI;
   55.16 -import org.openrdf.model.Value;
   55.17 -import org.openrdf.model.ValueFactory;
   55.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   55.19 -import org.openrdf.model.vocabulary.XMLSchema;
   55.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   55.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   55.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   55.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   55.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   55.25 - 
   55.26 -/**
   55.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   55.28 - * 
   55.29 - * @author Arjohn Kampman
   55.30 - */
   55.31 -public class InsideFunc extends SpatialRelationshipFunc {
   55.32 -
   55.33 -	@Override
   55.34 -	public String getURI() {
   55.35 -		return StrabonPolyhedron.inside;
   55.36 -	}
   55.37 - 
   55.38 - 
   55.39 -}
   55.40 +/*
   55.41 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   55.42 + *
   55.43 + * Licensed under the Aduna BSD-style license.
   55.44 + */
   55.45 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   55.46 +
   55.47 +import java.math.BigDecimal;
   55.48 +import java.math.BigInteger;
   55.49 +
   55.50 +import org.openrdf.model.Literal;
   55.51 +import org.openrdf.model.URI;
   55.52 +import org.openrdf.model.Value;
   55.53 +import org.openrdf.model.ValueFactory;
   55.54 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   55.55 +import org.openrdf.model.vocabulary.XMLSchema;
   55.56 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   55.57 +import org.openrdf.query.algebra.evaluation.function.Function;
   55.58 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   55.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   55.60 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   55.61 + 
   55.62 +/**
   55.63 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   55.64 + * 
   55.65 + * @author Arjohn Kampman
   55.66 + */
   55.67 +public class InsideFunc extends SpatialRelationshipFunc {
   55.68 +
   55.69 +	@Override
   55.70 +	public String getURI() {
   55.71 +		return StrabonPolyhedron.inside;
   55.72 +	}
   55.73 + 
   55.74 + 
   55.75 +}
    56.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Mon Mar 19 21:57:30 2012 +0100
    56.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/LeftFunc.java	Mon Mar 19 22:06:59 2012 +0100
    56.3 @@ -1,37 +1,37 @@
    56.4 -/*
    56.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    56.6 - *
    56.7 - * Licensed under the Aduna BSD-style license.
    56.8 - */
    56.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   56.10 -
   56.11 -import java.math.BigDecimal;
   56.12 -import java.math.BigInteger;
   56.13 -
   56.14 -import org.openrdf.model.Literal;
   56.15 -import org.openrdf.model.URI;
   56.16 -import org.openrdf.model.Value;
   56.17 -import org.openrdf.model.ValueFactory;
   56.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   56.19 -import org.openrdf.model.vocabulary.XMLSchema;
   56.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   56.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   56.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   56.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   56.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   56.25 - 
   56.26 -/**
   56.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   56.28 - * 
   56.29 - * @author Arjohn Kampman
   56.30 - */
   56.31 -public class LeftFunc extends SpatialRelationshipFunc {
   56.32 -
   56.33 -	@Override
   56.34 -	public String getURI() {
   56.35 -		return StrabonPolyhedron.left;
   56.36 -	}
   56.37 -
   56.38 -	 
   56.39 - 
   56.40 -}
   56.41 +/*
   56.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   56.43 + *
   56.44 + * Licensed under the Aduna BSD-style license.
   56.45 + */
   56.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   56.47 +
   56.48 +import java.math.BigDecimal;
   56.49 +import java.math.BigInteger;
   56.50 +
   56.51 +import org.openrdf.model.Literal;
   56.52 +import org.openrdf.model.URI;
   56.53 +import org.openrdf.model.Value;
   56.54 +import org.openrdf.model.ValueFactory;
   56.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   56.56 +import org.openrdf.model.vocabulary.XMLSchema;
   56.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   56.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   56.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   56.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   56.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   56.62 + 
   56.63 +/**
   56.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   56.65 + * 
   56.66 + * @author Arjohn Kampman
   56.67 + */
   56.68 +public class LeftFunc extends SpatialRelationshipFunc {
   56.69 +
   56.70 +	@Override
   56.71 +	public String getURI() {
   56.72 +		return StrabonPolyhedron.left;
   56.73 +	}
   56.74 +
   56.75 +	 
   56.76 + 
   56.77 +}
    57.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Mon Mar 19 21:57:30 2012 +0100
    57.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/OverlapFunc.java	Mon Mar 19 22:06:59 2012 +0100
    57.3 @@ -1,35 +1,35 @@
    57.4 -/*
    57.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    57.6 - *
    57.7 - * Licensed under the Aduna BSD-style license.
    57.8 - */
    57.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   57.10 -
   57.11 -import java.math.BigDecimal;
   57.12 -import java.math.BigInteger;
   57.13 -
   57.14 -import org.openrdf.model.Literal;
   57.15 -import org.openrdf.model.URI;
   57.16 -import org.openrdf.model.Value;
   57.17 -import org.openrdf.model.ValueFactory;
   57.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   57.19 -import org.openrdf.model.vocabulary.XMLSchema;
   57.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   57.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   57.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   57.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   57.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   57.25 - 
   57.26 -/**
   57.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   57.28 - * 
   57.29 - * @author Arjohn Kampman
   57.30 - */
   57.31 -public class OverlapFunc extends SpatialRelationshipFunc {
   57.32 -
   57.33 -	@Override
   57.34 -	public String getURI() {
   57.35 -		return StrabonPolyhedron.overlap;
   57.36 -	}
   57.37 - 
   57.38 -}
   57.39 +/*
   57.40 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   57.41 + *
   57.42 + * Licensed under the Aduna BSD-style license.
   57.43 + */
   57.44 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   57.45 +
   57.46 +import java.math.BigDecimal;
   57.47 +import java.math.BigInteger;
   57.48 +
   57.49 +import org.openrdf.model.Literal;
   57.50 +import org.openrdf.model.URI;
   57.51 +import org.openrdf.model.Value;
   57.52 +import org.openrdf.model.ValueFactory;
   57.53 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   57.54 +import org.openrdf.model.vocabulary.XMLSchema;
   57.55 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   57.56 +import org.openrdf.query.algebra.evaluation.function.Function;
   57.57 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   57.58 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   57.59 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   57.60 + 
   57.61 +/**
   57.62 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   57.63 + * 
   57.64 + * @author Arjohn Kampman
   57.65 + */
   57.66 +public class OverlapFunc extends SpatialRelationshipFunc {
   57.67 +
   57.68 +	@Override
   57.69 +	public String getURI() {
   57.70 +		return StrabonPolyhedron.overlap;
   57.71 +	}
   57.72 + 
   57.73 +}
    58.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Mon Mar 19 21:57:30 2012 +0100
    58.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RelateFunc.java	Mon Mar 19 22:06:59 2012 +0100
    58.3 @@ -1,98 +1,98 @@
    58.4 -/*
    58.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    58.6 - *
    58.7 - * Licensed under the Aduna BSD-style license.
    58.8 - */
    58.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   58.10 -
   58.11 -import java.math.BigDecimal;
   58.12 -import java.math.BigInteger;
   58.13 -
   58.14 -import org.openrdf.model.Literal;
   58.15 -import org.openrdf.model.URI;
   58.16 -import org.openrdf.model.Value;
   58.17 -import org.openrdf.model.ValueFactory;
   58.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   58.19 -import org.openrdf.model.vocabulary.XMLSchema;
   58.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   58.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   58.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   58.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   58.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   58.25 -
   58.26 -//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
   58.27 -
   58.28 -/**
   58.29 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   58.30 - * 
   58.31 - * @author Arjohn Kampman
   58.32 - */
   58.33 -public class RelateFunc extends SpatialRelationshipFunc {
   58.34 -
   58.35 -	@Override
   58.36 -	public String getURI() {
   58.37 -		return StrabonPolyhedron.relate;
   58.38 -		}
   58.39 -
   58.40 -	
   58.41 -
   58.42 -//	public Literal evaluate(ValueFactory valueFactory, Value... args)
   58.43 -//		throws ValueExprEvaluationException
   58.44 -//	{
   58.45 -//		if (args.length != 1) {
   58.46 -//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
   58.47 -//					+ args.length);
   58.48 -//		}
   58.49 -//
   58.50 -//		if (args[0] instanceof Literal) {
   58.51 -//			Literal literal = (Literal)args[0];
   58.52 -//			URI datatype = literal.getDatatype();
   58.53 -//
   58.54 -//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
   58.55 -//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
   58.56 -//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
   58.57 -//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
   58.58 -//				}
   58.59 -//			}
   58.60 -//			else if (datatype != null) {
   58.61 -//				if (datatype.equals(XMLSchema.BOOLEAN)) {
   58.62 -//					return literal;
   58.63 -//				}
   58.64 -//				else {
   58.65 -//					Boolean booleanValue = null;
   58.66 -//
   58.67 -//					try {
   58.68 -//						if (datatype.equals(XMLSchema.FLOAT)) {
   58.69 -//							float floatValue = literal.floatValue();
   58.70 -//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
   58.71 -//						}
   58.72 -//						else if (datatype.equals(XMLSchema.DOUBLE)) {
   58.73 -//							double doubleValue = literal.doubleValue();
   58.74 -//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
   58.75 -//						}
   58.76 -//						else if (datatype.equals(XMLSchema.DECIMAL)) {
   58.77 -//							BigDecimal decimalValue = literal.decimalValue();
   58.78 -//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
   58.79 -//						}
   58.80 -//						else if (datatype.equals(XMLSchema.INTEGER)) {
   58.81 -//							BigInteger integerValue = literal.integerValue();
   58.82 -//							booleanValue = !integerValue.equals(BigInteger.ZERO);
   58.83 -//						}
   58.84 -//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
   58.85 -//							booleanValue = literal.longValue() != 0L;
   58.86 -//						}
   58.87 -//					}
   58.88 -//					catch (NumberFormatException e) {
   58.89 -//						throw new ValueExprEvaluationException(e.getMessage(), e);
   58.90 -//					}
   58.91 -//
   58.92 -//					if (booleanValue != null) {
   58.93 -//						return valueFactory.createLiteral(booleanValue);
   58.94 -//					}
   58.95 -//				}
   58.96 -//			}
   58.97 -//		}
   58.98 -//
   58.99 -//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  58.100 -//	}
  58.101 -}
  58.102 +/*
  58.103 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
  58.104 + *
  58.105 + * Licensed under the Aduna BSD-style license.
  58.106 + */
  58.107 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
  58.108 +
  58.109 +import java.math.BigDecimal;
  58.110 +import java.math.BigInteger;
  58.111 +
  58.112 +import org.openrdf.model.Literal;
  58.113 +import org.openrdf.model.URI;
  58.114 +import org.openrdf.model.Value;
  58.115 +import org.openrdf.model.ValueFactory;
  58.116 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
  58.117 +import org.openrdf.model.vocabulary.XMLSchema;
  58.118 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
  58.119 +import org.openrdf.query.algebra.evaluation.function.Function;
  58.120 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
  58.121 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
  58.122 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
  58.123 +
  58.124 +//import eu.ist.semsorgrid4env.strabon.structures.StrabonPolyhedron;
  58.125 +
  58.126 +/**
  58.127 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
  58.128 + * 
  58.129 + * @author Arjohn Kampman
  58.130 + */
  58.131 +public class RelateFunc extends SpatialRelationshipFunc {
  58.132 +
  58.133 +	@Override
  58.134 +	public String getURI() {
  58.135 +		return StrabonPolyhedron.relate;
  58.136 +		}
  58.137 +
  58.138 +	
  58.139 +
  58.140 +//	public Literal evaluate(ValueFactory valueFactory, Value... args)
  58.141 +//		throws ValueExprEvaluationException
  58.142 +//	{
  58.143 +//		if (args.length != 1) {
  58.144 +//			throw new ValueExprEvaluationException("xsd:boolean cast requires exactly 1 argument, got "
  58.145 +//					+ args.length);
  58.146 +//		}
  58.147 +//
  58.148 +//		if (args[0] instanceof Literal) {
  58.149 +//			Literal literal = (Literal)args[0];
  58.150 +//			URI datatype = literal.getDatatype();
  58.151 +//
  58.152 +//			if (QueryEvaluationUtil.isStringLiteral(literal)) {
  58.153 +//				String booleanValue = XMLDatatypeUtil.collapseWhiteSpace(literal.getLabel());
  58.154 +//				if (XMLDatatypeUtil.isValidBoolean(booleanValue)) {
  58.155 +//					return valueFactory.createLiteral(booleanValue, XMLSchema.BOOLEAN);
  58.156 +//				}
  58.157 +//			}
  58.158 +//			else if (datatype != null) {
  58.159 +//				if (datatype.equals(XMLSchema.BOOLEAN)) {
  58.160 +//					return literal;
  58.161 +//				}
  58.162 +//				else {
  58.163 +//					Boolean booleanValue = null;
  58.164 +//
  58.165 +//					try {
  58.166 +//						if (datatype.equals(XMLSchema.FLOAT)) {
  58.167 +//							float floatValue = literal.floatValue();
  58.168 +//							booleanValue = floatValue != 0.0f && Float.isNaN(floatValue);
  58.169 +//						}
  58.170 +//						else if (datatype.equals(XMLSchema.DOUBLE)) {
  58.171 +//							double doubleValue = literal.doubleValue();
  58.172 +//							booleanValue = doubleValue != 0.0 && Double.isNaN(doubleValue);
  58.173 +//						}
  58.174 +//						else if (datatype.equals(XMLSchema.DECIMAL)) {
  58.175 +//							BigDecimal decimalValue = literal.decimalValue();
  58.176 +//							booleanValue = !decimalValue.equals(BigDecimal.ZERO);
  58.177 +//						}
  58.178 +//						else if (datatype.equals(XMLSchema.INTEGER)) {
  58.179 +//							BigInteger integerValue = literal.integerValue();
  58.180 +//							booleanValue = !integerValue.equals(BigInteger.ZERO);
  58.181 +//						}
  58.182 +//						else if (XMLDatatypeUtil.isIntegerDatatype(datatype)) {
  58.183 +//							booleanValue = literal.longValue() != 0L;
  58.184 +//						}
  58.185 +//					}
  58.186 +//					catch (NumberFormatException e) {
  58.187 +//						throw new ValueExprEvaluationException(e.getMessage(), e);
  58.188 +//					}
  58.189 +//
  58.190 +//					if (booleanValue != null) {
  58.191 +//						return valueFactory.createLiteral(booleanValue);
  58.192 +//					}
  58.193 +//				}
  58.194 +//			}
  58.195 +//		}
  58.196 +//
  58.197 +//		throw new ValueExprEvaluationException("Invalid argument for xsd:boolean cast: " + args[0]);
  58.198 +//	}
  58.199 +}
    59.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Mon Mar 19 21:57:30 2012 +0100
    59.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/RightFunc.java	Mon Mar 19 22:06:59 2012 +0100
    59.3 @@ -1,37 +1,37 @@
    59.4 -/*
    59.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    59.6 - *
    59.7 - * Licensed under the Aduna BSD-style license.
    59.8 - */
    59.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   59.10 -
   59.11 -import java.math.BigDecimal;
   59.12 -import java.math.BigInteger;
   59.13 -
   59.14 -import org.openrdf.model.Literal;
   59.15 -import org.openrdf.model.URI;
   59.16 -import org.openrdf.model.Value;
   59.17 -import org.openrdf.model.ValueFactory;
   59.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   59.19 -import org.openrdf.model.vocabulary.XMLSchema;
   59.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   59.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   59.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   59.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   59.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   59.25 - 
   59.26 -/**
   59.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   59.28 - * 
   59.29 - * @author Arjohn Kampman
   59.30 - */
   59.31 -public class RightFunc extends SpatialRelationshipFunc {
   59.32 -
   59.33 -	@Override
   59.34 -	public String getURI() {
   59.35 -		return StrabonPolyhedron.right;
   59.36 -	}
   59.37 -
   59.38 -	 
   59.39 - 
   59.40 -}
   59.41 +/*
   59.42 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   59.43 + *
   59.44 + * Licensed under the Aduna BSD-style license.
   59.45 + */
   59.46 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   59.47 +
   59.48 +import java.math.BigDecimal;
   59.49 +import java.math.BigInteger;
   59.50 +
   59.51 +import org.openrdf.model.Literal;
   59.52 +import org.openrdf.model.URI;
   59.53 +import org.openrdf.model.Value;
   59.54 +import org.openrdf.model.ValueFactory;
   59.55 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   59.56 +import org.openrdf.model.vocabulary.XMLSchema;
   59.57 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   59.58 +import org.openrdf.query.algebra.evaluation.function.Function;
   59.59 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   59.60 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   59.61 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   59.62 + 
   59.63 +/**
   59.64 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   59.65 + * 
   59.66 + * @author Arjohn Kampman
   59.67 + */
   59.68 +public class RightFunc extends SpatialRelationshipFunc {
   59.69 +
   59.70 +	@Override
   59.71 +	public String getURI() {
   59.72 +		return StrabonPolyhedron.right;
   59.73 +	}
   59.74 +
   59.75 +	 
   59.76 + 
   59.77 +}
    60.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Mon Mar 19 21:57:30 2012 +0100
    60.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/TouchFunc.java	Mon Mar 19 22:06:59 2012 +0100
    60.3 @@ -1,36 +1,36 @@
    60.4 -/*
    60.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
    60.6 - *
    60.7 - * Licensed under the Aduna BSD-style license.
    60.8 - */
    60.9 -package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   60.10 -
   60.11 -import java.math.BigDecimal;
   60.12 -import java.math.BigInteger;
   60.13 -
   60.14 -import org.openrdf.model.Literal;
   60.15 -import org.openrdf.model.URI;
   60.16 -import org.openrdf.model.Value;
   60.17 -import org.openrdf.model.ValueFactory;
   60.18 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   60.19 -import org.openrdf.model.vocabulary.XMLSchema;
   60.20 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   60.21 -import org.openrdf.query.algebra.evaluation.function.Function;
   60.22 -import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   60.23 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   60.24 -import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   60.25 - 
   60.26 -/**
   60.27 - * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   60.28 - * 
   60.29 - * @author Arjohn Kampman
   60.30 - */
   60.31 -public class TouchFunc extends SpatialRelationshipFunc {
   60.32 -
   60.33 -	@Override
   60.34 -	public String getURI() {
   60.35 -		return StrabonPolyhedron.touch;
   60.36 -	}
   60.37 -
   60.38 - 
   60.39 -}
   60.40 +/*
   60.41 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   60.42 + *
   60.43 + * Licensed under the Aduna BSD-style license.
   60.44 + */
   60.45 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
   60.46 +
   60.47 +import java.math.BigDecimal;
   60.48 +import java.math.BigInteger;
   60.49 +
   60.50 +import org.openrdf.model.Literal;
   60.51 +import org.openrdf.model.URI;
   60.52 +import org.openrdf.model.Value;
   60.53 +import org.openrdf.model.ValueFactory;
   60.54 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
   60.55 +import org.openrdf.model.vocabulary.XMLSchema;
   60.56 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   60.57 +import org.openrdf.query.algebra.evaluation.function.Function;
   60.58 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
   60.59 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   60.60 +import org.openrdf.query.algebra.evaluation.util.QueryEvaluationUtil;
   60.61 + 
   60.62 +/**
   60.63 + * A {@link Function} that tries to cast its argument to an <tt>xsd:boolean</tt>.
   60.64 + * 
   60.65 + * @author Arjohn Kampman
   60.66 + */
   60.67 +public class TouchFunc extends SpatialRelationshipFunc {
   60.68 +
   60.69 +	@Override
   60.70 +	public String getURI() {
   60.71 +		return StrabonPolyhedron.touch;
   60.72 +	}
   60.73 +
   60.74 + 
   60.75 +}
    61.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Mon Mar 19 21:57:30 2012 +0100
    61.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/iterator/StSPARQLGroupIterator.java	Mon Mar 19 22:06:59 2012 +0100
    61.3 @@ -1,1014 +1,1014 @@
    61.4 -/*
    61.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 1997-2007.
    61.6 - *
    61.7 - * Licensed under the Aduna BSD-style license.
    61.8 - */
    61.9 -package org.openrdf.query.algebra.evaluation.iterator;
   61.10 -
   61.11 -import java.util.Collection;
   61.12 -import java.util.HashSet;
   61.13 -import java.util.Iterator;
   61.14 -import java.util.LinkedHashMap;
   61.15 -import java.util.LinkedList;
   61.16 -import java.util.Map;
   61.17 -import java.util.NoSuchElementException;
   61.18 -import java.util.Set;
   61.19 -
   61.20 -import info.aduna.iteration.CloseableIteration;
   61.21 -import info.aduna.iteration.CloseableIteratorIteration;
   61.22 -import info.aduna.lang.ObjectUtil;
   61.23 -
   61.24 -import org.openrdf.model.URI;
   61.25 -import org.openrdf.model.Literal;
   61.26 -import org.openrdf.model.Value;
   61.27 -import org.openrdf.model.datatypes.XMLDatatypeUtil;
   61.28 -import org.openrdf.model.impl.LiteralImpl;
   61.29 -import org.openrdf.model.impl.NumericLiteralImpl;
   61.30 -import org.openrdf.model.impl.URIImpl;
   61.31 -import org.openrdf.model.impl.ValueFactoryImpl;
   61.32 -import org.openrdf.model.vocabulary.XMLSchema;
   61.33 -import org.openrdf.query.BindingSet;
   61.34 -import org.openrdf.query.QueryEvaluationException;
   61.35 -import org.openrdf.query.algebra.AggregateOperator;
   61.36 -import org.openrdf.query.algebra.AggregateOperatorBase;
   61.37 -import org.openrdf.query.algebra.Avg;
   61.38 -import org.openrdf.query.algebra.Compare;
   61.39 -import org.openrdf.query.algebra.Count;
   61.40 -import org.openrdf.query.algebra.FunctionCall;
   61.41 -import org.openrdf.query.algebra.Group;
   61.42 -import org.openrdf.query.algebra.GroupConcat;
   61.43 -import org.openrdf.query.algebra.GroupElem;
   61.44 -import org.openrdf.query.algebra.MathExpr.MathOp;
   61.45 -import org.openrdf.query.algebra.Max;
   61.46 -import org.openrdf.query.algebra.Min;
   61.47 -import org.openrdf.query.algebra.Sample;
   61.48 -import org.openrdf.query.algebra.Sum;
   61.49 -import org.openrdf.query.algebra.ValueConstant;
   61.50 -import org.openrdf.query.algebra.ValueExpr;
   61.51 -import org.openrdf.query.algebra.Var;
   61.52 -import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
   61.53 -import org.openrdf.query.algebra.evaluation.QueryBindingSet;
   61.54 -import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
   61.55 -import org.openrdf.query.algebra.evaluation.function.Function;
   61.56 -import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
   61.57 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
   61.58 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc;
   61.59 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc;
   61.60 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc;
   61.61 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc;
   61.62 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc;
   61.63 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc;
   61.64 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc;
   61.65 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc;
   61.66 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc;
   61.67 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc;
   61.68 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc;
   61.69 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc;
   61.70 -import org.openrdf.query.algebra.evaluation.util.MathUtil;
   61.71 -import org.openrdf.query.algebra.evaluation.util.ValueComparator;
   61.72 -import org.openrdf.query.impl.EmptyBindingSet;
   61.73 -
   61.74 -import com.vividsolutions.jts.geom.Geometry;
   61.75 -
   61.76 -/**
   61.77 - * @author David Huynh
   61.78 - * @author Arjohn Kampman
   61.79 - * @author Jeen Broekstra
   61.80 - * @author James Leigh
   61.81 - */
   61.82 -public class StSPARQLGroupIterator extends CloseableIteratorIteration<BindingSet, QueryEvaluationException> {
   61.83 -
   61.84 -	/*-----------*
   61.85 -	 * Constants *
   61.86 -	 *-----------*/
   61.87 -
   61.88 -	private final ValueFactoryImpl vf = ValueFactoryImpl.getInstance();
   61.89 -
   61.90 -	private final EvaluationStrategy strategy;
   61.91 -
   61.92 -	private final BindingSet parentBindings;
   61.93 -
   61.94 -	private final Group group;
   61.95 -
   61.96 -	/*--------------*
   61.97 -	 * Constructors *
   61.98 -	 *--------------*/
   61.99 -
  61.100 -	public StSPARQLGroupIterator(EvaluationStrategy strategy, Group group, BindingSet parentBindings)
  61.101 -		throws QueryEvaluationException
  61.102 -	{
  61.103 -		this.strategy = strategy;
  61.104 -		this.group = group;
  61.105 -		this.parentBindings = parentBindings;
  61.106 -		super.setIterator(createIterator());
  61.107 -	}
  61.108 -
  61.109 -	/*---------*
  61.110 -	 * Methods *
  61.111 -	 *---------*/
  61.112 -
  61.113 -	private Iterator<BindingSet> createIterator()
  61.114 -		throws QueryEvaluationException
  61.115 -	{
  61.116 -		Collection<Entry> entries = buildEntries();
  61.117 -		Collection<BindingSet> bindingSets = new LinkedList<BindingSet>();
  61.118 -
  61.119 -		for (Entry entry : entries) {
  61.120 -			QueryBindingSet sol = new QueryBindingSet(parentBindings);
  61.121 -
  61.122 -			for (String name : group.getGroupBindingNames()) {
  61.123 -				BindingSet prototype = entry.getPrototype();
  61.124 -				if (prototype != null) {
  61.125 -					Value value = prototype.getValue(name);
  61.126 -					if (value != null) {
  61.127 -						// Potentially overwrites bindings from super
  61.128 -						sol.setBinding(name, value);
  61.129 -					}
  61.130 -				}
  61.131 -			}
  61.132 -			//XXX added bindings to enable the evaluation of order by!! 
  61.133 -			//Must probably find a way to remove them afterwards!!
  61.134 -			for(String name : entry.getPrototype().getBindingNames())
  61.135 -			{
  61.136 -				if(name.startsWith("-mbb-"))
  61.137 -				{
  61.138 -					sol.setBinding(name,entry.getPrototype().getValue(name));
  61.139 -				}
  61.140 -			}
  61.141 -
  61.142 -			entry.bindSolution(sol);
  61.143 -
  61.144 -			bindingSets.add(sol);
  61.145 -		}
  61.146 -
  61.147 -		return bindingSets.iterator();
  61.148 -	}
  61.149 -
  61.150 -	private Collection<Entry> buildEntries()
  61.151 -		throws QueryEvaluationException
  61.152 -	{
  61.153 -		CloseableIteration<BindingSet, QueryEvaluationException> iter;
  61.154 -		iter = strategy.evaluate(group.getArg(), parentBindings);
  61.155 -
  61.156 -		try {
  61.157 -			Map<Key, Entry> entries = new LinkedHashMap<Key, Entry>();
  61.158 -
  61.159 -			if (!iter.hasNext()) {
  61.160 -				// no solutions, still need to process aggregates to produce a
  61.161 -				// zero-result.
  61.162 -				entries.put(new Key(new EmptyBindingSet()), new Entry(new EmptyBindingSet()));
  61.163 -			}
  61.164 -
  61.165 -			while (iter.hasNext()) {
  61.166 -				BindingSet sol;
  61.167 -				try {
  61.168 -					sol = iter.next();
  61.169 -				}
  61.170 -				catch (NoSuchElementException e) {
  61.171 -					break; // closed
  61.172 -				}
  61.173 -				Key key = new Key(sol);
  61.174 -				Entry entry = entries.get(key);
  61.175 -
  61.176 -				if (entry == null) {
  61.177 -					entry = new Entry(sol);
  61.178 -					entries.put(key, entry);
  61.179 -				}
  61.180 -
  61.181 -				entry.addSolution(sol);
  61.182 -			}
  61.183 -
  61.184 -			return entries.values();
  61.185 -		}
  61.186 -		finally {
  61.187 -			iter.close();
  61.188 -		}
  61.189 -
  61.190 -	}
  61.191 -
  61.192 -	/**
  61.193 -	 * A unique key for a set of existing bindings.
  61.194 -	 * 
  61.195 -	 * @author David Huynh
  61.196 -	 */
  61.197 -	protected class Key {
  61.198 -
  61.199 -		private BindingSet bindingSet;
  61.200 -
  61.201 -		private int hash;
  61.202 -
  61.203 -		public Key(BindingSet bindingSet) {
  61.204 -			this.bindingSet = bindingSet;
  61.205 -
  61.206 -			for (String name : group.getGroupBindingNames()) {
  61.207 -				Value value = bindingSet.getValue(name);
  61.208 -				if (value != null) {
  61.209 -					this.hash ^= value.hashCode();
  61.210 -				}
  61.211 -			}
  61.212 -		}
  61.213 -
  61.214 -		@Override
  61.215 -		public int hashCode() {
  61.216 -			return hash;
  61.217 -		}
  61.218 -
  61.219 -		@Override
  61.220 -		public boolean equals(Object other) {
  61.221 -			if (other instanceof Key && other.hashCode() == hash) {
  61.222 -				BindingSet otherSolution = ((Key)other).bindingSet;
  61.223 -
  61.224 -				for (String name : group.getGroupBindingNames()) {
  61.225 -					Value v1 = bindingSet.getValue(name);
  61.226 -					Value v2 = otherSolution.getValue(name);
  61.227 -
  61.228 -					if (!ObjectUtil.nullEquals(v1, v2)) {
  61.229 -						return false;
  61.230 -					}
  61.231 -				}
  61.232 -
  61.233 -				return true;
  61.234 -			}
  61.235 -
  61.236 -			return false;
  61.237 -		}
  61.238 -	}
  61.239 -
  61.240 -	private class Entry {
  61.241 -
  61.242 -		private BindingSet prototype;
  61.243 -
  61.244 -		private Map<String, Aggregate> aggregates;
  61.245 -
  61.246 -		private Map<String, FunctionCall> spatialAggregates;
  61.247 -
  61.248 -		private Map<FunctionCall, Geometry> spatialAggregatesResult;
  61.249 -
  61.250 -		public Entry(BindingSet prototype)
  61.251 -			throws ValueExprEvaluationException, QueryEvaluationException
  61.252 -		{
  61.253 -			this.prototype = prototype;
  61.254 -			this.aggregates = new LinkedHashMap<String, Aggregate>();
  61.255 -			this.spatialAggregates = new LinkedHashMap<String, FunctionCall>();
  61.256 -			this.spatialAggregatesResult = new LinkedHashMap<FunctionCall, Geometry>();
  61.257 -
  61.258 -			for (GroupElem ge : group.getGroupElements()) {
  61.259 -				if(ge.getName().endsWith("-aggregateInside-"))
  61.260 -				{
  61.261 -					//System.out.println("Placeholder");
  61.262 -					String name = ge.getName();
  61.263 -					if(!ge.getName().startsWith("havingCondition"))
  61.264 -					{
  61.265 -						name = name.replace("-aggregateInside-","");
  61.266 -					}
  61.267 -					if(((Avg) ge.getOperator()).getArg() instanceof FunctionCall)
  61.268 -					{
  61.269 -						spatialAggregates.put(name, (FunctionCall) ((Avg)ge.getOperator()).getArg());
  61.270 -					}
  61.271 -					if(((Avg) ge.getOperator()).getArg() instanceof Compare)
  61.272 -					{
  61.273 -						//						Compare tmp = (Compare) ((Avg) ge.getOperator()).getArg();
  61.274 -						//						if(tmp.getLeftArg() instanceof FunctionCall)
  61.275 -						//						{
  61.276 -						//							
  61.277 -						//						}
  61.278 -						//						if(tmp.getRightArg() instanceof FunctionCall)
  61.279 -						//						{
  61.280 -						//							
  61.281 -						//						}
  61.282 -					}
  61.283 -
  61.284 -				}
  61.285 -				else
  61.286 -				{
  61.287 -					Aggregate create = create(ge.getOperator());
  61.288 -					if (create != null) {
  61.289 -						aggregates.put(ge.getName(), create);
  61.290 -					}
  61.291 -				}
  61.292 -			}
  61.293 -		}
  61.294 -
  61.295 -		public BindingSet getPrototype() {
  61.296 -			return prototype;
  61.297 -		}
  61.298 -
  61.299 -		public void addSolution(BindingSet bindingSet)
  61.300 -			throws QueryEvaluationException
  61.301 -		{
  61.302 -			for (Aggregate aggregate : aggregates.values()) {
  61.303 -				aggregate.processAggregate(bindingSet);
  61.304 -			}
  61.305 -			for (FunctionCall spatialAggregate : spatialAggregates.values()) {
  61.306 -				processSpatialAggregate(spatialAggregate, bindingSet);
  61.307 -				//spatialAggregates.processAggregate(bindingSet);
  61.308 -			}
  61.309 -		}
  61.310 -
  61.311 -		public void bindSolution(QueryBindingSet sol)
  61.312 -			throws QueryEvaluationException
  61.313 -		{
  61.314 -			for (String name : aggregates.keySet()) {
  61.315 -				try {
  61.316 -					Value value = aggregates.get(name).getValue();
  61.317 -					if (value != null) {
  61.318 -						// Potentially overwrites bindings from super
  61.319 -						sol.setBinding(name, value);
  61.320 -					}
  61.321 -				}
  61.322 -				catch (ValueExprEvaluationException ex) {
  61.323 -					// There was a type error when calculating the value of the
  61.324 -					// aggregate.
  61.325 -					// We silently ignore the error, resulting in no result value
  61.326 -					// being bound.
  61.327 -				}
  61.328 -			}
  61.329 -
  61.330 -			//			for(String name : spatialAggregates.keySet())
  61.331 -			//			{
  61.332 -			//				//Must compute the spatial construct at this point
  61.333 -			//				ValueExpr expr = spatialAggregates.get(name);
  61.334 -			//				
  61.335 -			//				
  61.336 -			//				//the names are no longer the same
  61.337 -			//				Geometry geom = spatialAggregatesResult.get(spatialAggregates.get(name));
  61.338 -			//				StrabonPolyhedron poly = null;
  61.339 -			//				try {
  61.340 -			//					poly = new StrabonPolyhedron(geom);
  61.341 -			//				} catch (Exception e) {
  61.342 -			//					e.printStackTrace();
  61.343 -			//				}
  61.344 -			//				sol.setBinding(name,poly);
  61.345 -			//
  61.346 -			//			}
  61.347 -
  61.348 -			for(String name : spatialAggregates.keySet())
  61.349 -			{
  61.350 -				//Must compute the spatial construct at this point
  61.351 -				ValueExpr expr = spatialAggregates.get(name);
  61.352 -
  61.353 -				Value val = null;
  61.354 -				try {
  61.355 -					val = evaluateConstruct(expr, this.prototype);
  61.356 -					} catch (Exception e) {
  61.357 -					e.printStackTrace();
  61.358 -				}
  61.359 -				if (val != null) {
  61.360 -					if(val instanceof StrabonPolyhedron)
  61.361 -					{
  61.362 -						String label = val.toString()+";http://www.opengis.net/def/crs/EPSG/0/"+((StrabonPolyhedron)val).getGeometry().getSRID();
  61.363 -						Literal wkt = new LiteralImpl(label,new URIImpl(StrabonPolyhedron.ogcGeometry));
  61.364 -						sol.setBinding(name,wkt);
  61.365 -					}
  61.366 -					else
  61.367 -					{
  61.368 -						sol.setBinding(name, val);
  61.369 -					}
  61.370 -				}
  61.371 -
  61.372 -			}
  61.373 -
  61.374 -
  61.375 -
  61.376 -
  61.377 -		}
  61.378 -
  61.379 -		/**
  61.380 -		 * XXX addition
  61.381 -		 */
  61.382 -
  61.383 -		/**
  61.384 -		 * Code added in order to evaluate spatial constructs present in select that contain a spatial aggregate (e.g. Union(?geo1))
  61.385 -		 * @param expr a spatial construct or a spatial var
  61.386 -		 * @param prototype the bindings needed to retrieve values for the Vars
  61.387 -		 * @return The evaluated stSPARQL construct
  61.388 -		 * @throws Exception 
  61.389 -		 */
  61.390 -		private Value evaluateConstruct(ValueExpr expr, BindingSet prototype) throws Exception
  61.391 -		{
  61.392 -			if(prototype instanceof EmptyBindingSet)
  61.393 -			{
  61.394 -				return null;
  61.395 -			}
  61.396 -			if(expr instanceof FunctionCall)
  61.397 -			{
  61.398 -				StrabonPolyhedron leftArg = null;
  61.399 -				StrabonPolyhedron rightArg = null;
  61.400 -
  61.401 -				Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI());
  61.402 -
  61.403 -				if(function instanceof UnionFunc)
  61.404 -				{
  61.405 -					if(((FunctionCall) expr).getArgs().size()==1)
  61.406 -					{
  61.407 -						//Aggregate!!! => Value ready in spatialAggregatesResults
  61.408 -						return new StrabonPolyhedron(spatialAggregatesResult.get(expr));
  61.409 -					}
  61.410 -					else
  61.411 -					{
  61.412 -						leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.413 -						rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
  61.414 -						return StrabonPolyhedron.union(leftArg, rightArg);
  61.415 -					}
  61.416 -				}
  61.417 -				else if(function instanceof ExtentFunc)
  61.418 -				{
  61.419 -					//Aggregate!!! => Value ready in spatialAggregatesResults
  61.420 -					return new StrabonPolyhedron(spatialAggregatesResult.get(expr));
  61.421 -				}
  61.422 -				else if(function instanceof BufferFunc)
  61.423 -				{
  61.424 -					//FIXME Still haven't run example when 2nd argument is a Var
  61.425 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.426 -					Value radius = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype);
  61.427 -					LiteralImpl lit = (LiteralImpl) radius;
  61.428 -					return StrabonPolyhedron.buffer(leftArg,lit.doubleValue());
  61.429 -				}
  61.430 -				else if(function instanceof TransformFunc)
  61.431 -				{
  61.432 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.433 -					Value sridCoarse = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype);
  61.434 -					URIImpl srid = (URIImpl) sridCoarse;
  61.435 -					return StrabonPolyhedron.transform(leftArg,srid);
  61.436 -				}
  61.437 -				else if(function instanceof EnvelopeFunc)
  61.438 -				{
  61.439 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.440 -					return StrabonPolyhedron.envelope(leftArg);
  61.441 -				}
  61.442 -				else if(function instanceof ConvexHullFunc)
  61.443 -				{
  61.444 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.445 -					return StrabonPolyhedron.convexHull(leftArg);
  61.446 -				}
  61.447 -				else if(function instanceof BoundaryFunc)
  61.448 -				{
  61.449 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.450 -					return StrabonPolyhedron.boundary(leftArg);
  61.451 -				}
  61.452 -				else if(function instanceof IntersectionFunc)
  61.453 -				{
  61.454 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.455 -					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
  61.456 -					return StrabonPolyhedron.intersection(leftArg, rightArg);
  61.457 -				}
  61.458 -				else if(function instanceof DifferenceFunc)
  61.459 -				{
  61.460 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.461 -					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
  61.462 -					return StrabonPolyhedron.difference(leftArg, rightArg);
  61.463 -				}
  61.464 -				else if(function instanceof SymDifferenceFunc)
  61.465 -				{
  61.466 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.467 -					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
  61.468 -					return StrabonPolyhedron.symDifference(leftArg, rightArg);
  61.469 -				}
  61.470 -				//FOR HAVING!!
  61.471 -				else if(function instanceof AreaFunc)
  61.472 -				{
  61.473 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.474 -					return vf.createLiteral(""+StrabonPolyhedron.area(leftArg), XMLSchema.DOUBLE);
  61.475 -				}
  61.476 -				else if(function instanceof DistanceFunc)
  61.477 -				{
  61.478 -					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
  61.479 -					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
  61.480 -					return vf.createLiteral(""+StrabonPolyhedron.distance(leftArg, rightArg), XMLSchema.DOUBLE);
  61.481 -				}
  61.482 -				else
  61.483 -				{
  61.484 -					throw new Exception("Function "+function.getURI().toString()+" not currently supported");
  61.485 -				}
  61.486 -
  61.487 -			}
  61.488 -			else if(expr instanceof Var)
  61.489 -			{
  61.490 -				//				Value tmp =  prototype.getValue(((Var) expr).getName().replace("?spatial",""));
  61.491 -				//				return tmp.;
  61.492 -				Var tmp = (Var) expr;
  61.493 -				if(tmp.getName().contains("?spatial"))
  61.494 -				{
  61.495 -					tmp.setName(tmp.getName().replace("?spatial","?forGroupBy"));
  61.496 -				}
  61.497 -				else
  61.498 -				{
  61.499 -					tmp.setName(tmp.getName()+"?forGroupBy");
  61.500 -				}
  61.501 -				return strategy.evaluate(tmp,prototype);
  61.502 -			}
  61.503 -			else
  61.504 -			{
  61.505 -				throw new Exception("Functionality required for this aggregate not currently included");
  61.506 -			}
  61.507 -
  61.508 -		}
  61.509 -
  61.510 -		private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet)
  61.511 -		{
  61.512 -			computeAggregateFunctions(fc, bindingSet);
  61.513 -		}
  61.514 -
  61.515 -		//Currently: Either Union OR Extent
  61.516 -		private void computeAggregateFunctions(ValueExpr expr, BindingSet bindingSet)
  61.517 -		{
  61.518 -			if(expr instanceof FunctionCall)
  61.519 -			{
  61.520 -				Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI());
  61.521 -				boolean condition = ((!(function instanceof UnionFunc) || !(((FunctionCall) expr).getArgs().size()==1))
  61.522 -						&&!(function instanceof ExtentFunc));
  61.523 -				if(condition)
  61.524 -				{
  61.525 -					//Recursively check arguments
  61.526 -					for(int i = 0 ; i< ((FunctionCall) expr).getArgs().size(); i++)
  61.527 -					{
  61.528 -						computeAggregateFunctions(((FunctionCall) expr).getArgs().get(i), bindingSet);
  61.529 -					}
  61.530 -				}
  61.531 -				else
  61.532 -				{
  61.533 -					//Need to compute spatial aggregate
  61.534 -					//Will add result to spatialAggregatesResult and utilize it when the spatialAggregates are iterated
  61.535 -
  61.536 -					ValueExpr onlyArg = ((FunctionCall) expr).getArgs().get(0);
  61.537 -					Value val = null;
  61.538 -					StrabonPolyhedron poly = null;
  61.539 -					if(onlyArg instanceof Var)
  61.540 -					{
  61.541 -						try {
  61.542 -							String previousName = ((Var) onlyArg).getName();
  61.543 -							Var copy = (Var) onlyArg.clone();
  61.544 -							if(previousName.contains("?spatial"))
  61.545 -							{
  61.546 -								copy.setName(previousName.replace("?spatial","?forGroupBy"));
  61.547 -							}
  61.548 -							else
  61.549 -							{
  61.550 -								copy.setName(previousName+"?forGroupBy");
  61.551 -							}
  61.552 -							val = strategy.evaluate(copy,bindingSet);
  61.553 -						} catch (ValueExprEvaluationException e) {
  61.554 -							e.printStackTrace();
  61.555 -						} catch (QueryEvaluationException e) {
  61.556 -							e.printStackTrace();
  61.557 -						}
  61.558 -					}
  61.559 -					else //FunctionCall again
  61.560 -					{
  61.561 -						try {
  61.562 -							val = strategy.evaluate(onlyArg, bindingSet);
  61.563 -
  61.564 -						} catch (ValueExprEvaluationException e) {
  61.565 -							e.printStackTrace();
  61.566 -						} catch (QueryEvaluationException e) {
  61.567 -							e.printStackTrace();
  61.568 -						}
  61.569 -					}
  61.570 -					poly = (StrabonPolyhedron) val;
  61.571 -					Geometry aggr = this.spatialAggregatesResult.get(expr);
  61.572 -					if(aggr==null)
  61.573 -					{
  61.574 -
  61.575 -						if(function instanceof UnionFunc)
  61.576 -						{
  61.577 -							this.spatialAggregatesResult.put((FunctionCall) expr, poly.getGeometry());
  61.578 -						}
  61.579 -						else if(function instanceof ExtentFunc)
  61.580 -						{
  61.581 -							Geometry env = poly.getGeometry().getEnvelope();
  61.582 -							env.setSRID(poly.getGeometry().getSRID());
  61.583 -							this.spatialAggregatesResult.put((FunctionCall) expr, env);
  61.584 -						}
  61.585 -					}
  61.586 -					else
  61.587 -					{
  61.588 -						this.spatialAggregatesResult.remove(expr);
  61.589 -						if(function instanceof UnionFunc)
  61.590 -						{
  61.591 -							//XXX possible issue with expressions like 
  61.592 -							// ?x hasGeom sth^^4326
  61.593 -							// ?x hasGeom sthElse^^2100
  61.594 -							Geometry united = aggr.union(poly.getGeometry());
  61.595 -							united.setSRID(poly.getGeometry().getSRID());
  61.596 -							this.spatialAggregatesResult.put((FunctionCall) expr, united);
  61.597 -						}
  61.598 -						else if(function instanceof ExtentFunc)
  61.599 -						{
  61.600 -							//XXX possible issue with expressions like 
  61.601 -							// ?x hasGeom sth^^4326
  61.602 -							// ?x hasGeom sthElse^^2100
  61.603 -							Geometry env = aggr.union(poly.getGeometry().getEnvelope()).getEnvelope();
  61.604 -							env.setSRID(poly.getGeometry().getSRID());
  61.605 -							this.spatialAggregatesResult.put((FunctionCall) expr, env);
  61.606 -						}
  61.607 -					}
  61.608 -				}
  61.609 -			}
  61.610 -			else //Var
  61.611 -			{
  61.612 -				return;
  61.613 -			}
  61.614 -		}
  61.615 -
  61.616 -
  61.617 -
  61.618 -		/**
  61.619 -		 * XXX 24/11/11
  61.620 -		 * Keeping a backup before altering code in order to support nested strdf:union expressions 
  61.621 -		 */
  61.622 -		//		private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet)
  61.623 -		//		{
  61.624 -		//			ValueExpr expr = fc.getArgs().get(0);
  61.625 -		//			Value val = null;
  61.626 -		//			StrabonPolyhedron poly = null;
  61.627 -		//				if(expr instanceof Var)
  61.628 -		//				{
  61.629 -		//					try {
  61.630 -		//						String previousName = ((Var) expr).getName();
  61.631 -		//						Var copy = (Var) expr.clone();
  61.632 -		////						copy.setName(previousName.replace("?spatial","?forGroupBy"));
  61.633 -		//						if(previousName.contains("?spatial"))
  61.634 -		//						{
  61.635 -		//							copy.setName(previousName.replace("?spatial","?forGroupBy"));
  61.636 -		//						}
  61.637 -		//						else
  61.638 -		//						{
  61.639 -		//							copy.setName(previousName+"?forGroupBy");
  61.640 -		//						}
  61.641 -		//						//((Var) expr).setName(previousName.replace("?spatial","?forGroupBy"));
  61.642 -		//						
  61.643 -		//						val = strategy.evaluate(copy,bindingSet);
  61.644 -		//						//poly = (StrabonPolyhedron) val;
  61.645 -		//					} catch (ValueExprEvaluationException e) {
  61.646 -		//						e.printStackTrace();
  61.647 -		//					} catch (QueryEvaluationException e) {
  61.648 -		//						e.printStackTrace();
  61.649 -		//					}
  61.650 -		//					
  61.651 -		//				}
  61.652 -		//				else //FunctionCall again
  61.653 -		//				{
  61.654 -		//					try {
  61.655 -		//						val = strategy.evaluate(expr, bindingSet);
  61.656 -		//						
  61.657 -		//					} catch (ValueExprEvaluationException e) {
  61.658 -		//						e.printStackTrace();
  61.659 -		//					} catch (QueryEvaluationException e) {
  61.660 -		//						e.printStackTrace();
  61.661 -		//					}
  61.662 -		//				}
  61.663 -		//				poly = (StrabonPolyhedron) val;
  61.664 -		//				Geometry aggr = this.spatialAggregatesResult.get(fc);
  61.665 -		//				if(aggr==null)
  61.666 -		//				{
  61.667 -		//					this.spatialAggregatesResult.put(fc, poly.getGeometry());
  61.668 -		//				}
  61.669 -		//				else
  61.670 -		//				{
  61.671 -		//					this.spatialAggregatesResult.remove(fc);
  61.672 -		//					this.spatialAggregatesResult.put(fc, aggr.union(poly.getGeometry()));
  61.673 -		//					//aggr.union(poly.getGeometry());
  61.674 -		//				}
  61.675 -		//				//System.out.println("placeholder");
  61.676 -		//			
  61.677 -		//		}
  61.678 -
  61.679 -		private Aggregate create(AggregateOperator operator)
  61.680 -			throws ValueExprEvaluationException, QueryEvaluationException
  61.681 -		{
  61.682 -			if (operator instanceof Count) {
  61.683 -				return new CountAggregate((Count)operator);
  61.684 -			}
  61.685 -			else if (operator instanceof Min) {
  61.686 -				return new MinAggregate((Min)operator);
  61.687 -			}
  61.688 -			else if (operator instanceof Max) {
  61.689 -				return new MaxAggregate((Max)operator);
  61.690 -			}
  61.691 -			else if (operator instanceof Sum) {
  61.692 -				return new SumAggregate((Sum)operator);
  61.693 -			}
  61.694 -			else if (operator instanceof Avg) {
  61.695 -				return new AvgAggregate((Avg)operator);
  61.696 -			}
  61.697 -			else if (operator instanceof Sample) {
  61.698 -				return new SampleAggregate((Sample)operator);
  61.699 -			}
  61.700 -			else if (operator instanceof GroupConcat) {
  61.701 -				return new ConcatAggregate((GroupConcat)operator);
  61.702 -			}
  61.703 -			return null;
  61.704 -		}
  61.705 -	}
  61.706 -
  61.707 -	private abstract class Aggregate {
  61.708 -
  61.709 -		private final Set<Value> distinct;
  61.710 -
  61.711 -		private final ValueExpr arg;
  61.712 -
  61.713 -		public Aggregate(AggregateOperatorBase operator) {
  61.714 -			this.arg = operator.getArg();
  61.715 -			if (operator.isDistinct()) {
  61.716 -				distinct = new HashSet<Value>();
  61.717 -			}
  61.718 -			else {
  61.719 -				distinct = null;
  61.720 -			}
  61.721 -		}
  61.722 -
  61.723 -		public abstract Value getValue()
  61.724 -				throws ValueExprEvaluationException;
  61.725 -
  61.726 -		public abstract void processAggregate(BindingSet bindingSet)
  61.727 -				throws QueryEvaluationException;
  61.728 -
  61.729 -		protected boolean distinct(Value value) {
  61.730 -			return distinct == null || distinct.add(value);
  61.731 -		}
  61.732 -
  61.733 -		protected ValueExpr getArg() {
  61.734 -			return arg;
  61.735 -		}
  61.736 -
  61.737 -		protected Value evaluate(BindingSet s)
  61.738 -			throws QueryEvaluationException
  61.739 -		{
  61.740 -			try {
  61.741 -				return strategy.evaluate(getArg(), s);
  61.742 -			}
  61.743 -			catch (ValueExprEvaluationException e) {
  61.744 -				return null; // treat missing or invalid expressions as null
  61.745 -			}
  61.746 -		}
  61.747 -	}
  61.748 -
  61.749 -	private class CountAggregate extends Aggregate {
  61.750 -
  61.751 -		private long count = 0;
  61.752 -
  61.753 -		public CountAggregate(Count operator) {
  61.754 -			super(operator);
  61.755 -		}
  61.756 -
  61.757 -		@Override
  61.758 -		public void processAggregate(BindingSet s)
  61.759 -			throws QueryEvaluationException
  61.760 -		{
  61.761 -			if (getArg() != null) {
  61.762 -				Value value = evaluate(s);
  61.763 -				if (value != null && distinct(value)) {
  61.764 -					count++;
  61.765 -				}
  61.766 -			}
  61.767 -			else {
  61.768 -				count++;
  61.769 -			}
  61.770 -		}
  61.771 -
  61.772 -		@Override
  61.773 -		public Value getValue() {
  61.774 -			return vf.createLiteral(Long.toString(count), XMLSchema.INTEGER);
  61.775 -		}
  61.776 -	}
  61.777 -
  61.778 -	private class MinAggregate extends Aggregate {
  61.779 -
  61.780 -		private final ValueComparator comparator = new ValueComparator();
  61.781 -
  61.782 -		private Value min = null;
  61.783 -
  61.784 -		public MinAggregate(Min operator) {
  61.785 -			super(operator);
  61.786 -		}
  61.787 -
  61.788 -		@Override
  61.789 -		public void processAggregate(BindingSet s)
  61.790 -			throws QueryEvaluationException
  61.791 -		{
  61.792 -			Value v = evaluate(s);
  61.793 -			if (distinct(v)) {
  61.794 -				if (min == null) {
  61.795 -					min = v;
  61.796 -				}
  61.797 -				else if (comparator.compare(v, min) < 0) {
  61.798 -					min = v;
  61.799 -				}
  61.800 -			}
  61.801 -		}
  61.802 -
  61.803 -		@Override
  61.804 -		public Value getValue() {
  61.805 -			return min;
  61.806 -		}
  61.807 -	}
  61.808 -
  61.809 -	private class MaxAggregate extends Aggregate {
  61.810 -
  61.811 -		private final ValueComparator comparator = new ValueComparator();
  61.812 -
  61.813 -		private Value max = null;
  61.814 -
  61.815 -		public MaxAggregate(Max operator) {
  61.816 -			super(operator);
  61.817 -		}
  61.818 -
  61.819 -		@Override
  61.820 -		public void processAggregate(BindingSet s)
  61.821 -			throws QueryEvaluationException
  61.822 -		{
  61.823 -			Value v = evaluate(s);
  61.824 -			if (distinct(v)) {
  61.825 -				if (max == null) {
  61.826 -					max = v;
  61.827 -				}
  61.828 -				else if (comparator.compare(v, max) > 0) {
  61.829 -					max = v;
  61.830 -				}
  61.831 -			}
  61.832 -		}
  61.833 -
  61.834 -		@Override
  61.835 -		public Value getValue() {
  61.836 -			return max;
  61.837 -		}
  61.838 -	}
  61.839 -
  61.840 -	private class SumAggregate extends Aggregate {
  61.841 -
  61.842 -		private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER);
  61.843 -
  61.844 -		private ValueExprEvaluationException typeError = null;
  61.845 -
  61.846 -		public SumAggregate(Sum operator) {
  61.847 -			super(operator);
  61.848 -		}
  61.849 -
  61.850 -		@Override
  61.851 -		public void processAggregate(BindingSet s)
  61.852 -			throws QueryEvaluationException
  61.853 -		{
  61.854 -			if (typeError != null) {
  61.855 -				// halt further processing if a type error has been raised
  61.856 -				return;
  61.857 -			}
  61.858 -
  61.859 -			Value v = evaluate(s);
  61.860 -			if (distinct(v)) {
  61.861 -				if (v instanceof Literal) {
  61.862 -					Literal nextLiteral = (Literal)v;
  61.863 -					// check if the literal is numeric, if not, skip it. This is
  61.864 -					// strictly speaking not spec-compliant, but a whole lot more
  61.865 -					// useful.
  61.866 -					if (nextLiteral.getDatatype() != null
  61.867 -							&& XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype()))
  61.868 -					{
  61.869 -						sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS);
  61.870 -					}
  61.871 -				}
  61.872 -				else if (v != null) {
  61.873 -					typeError = new ValueExprEvaluationException("not a number: " + v);
  61.874 -				}
  61.875 -			}
  61.876 -		}
  61.877 -
  61.878 -		@Override
  61.879 -		public Value getValue()
  61.880 -			throws ValueExprEvaluationException
  61.881 -		{
  61.882 -			if (typeError != null) {
  61.883 -				throw typeError;
  61.884 -			}
  61.885 -
  61.886 -			return sum;
  61.887 -		}
  61.888 -	}
  61.889 -
  61.890 -	private class AvgAggregate extends Aggregate {
  61.891 -
  61.892 -		private long count = 0;
  61.893 -
  61.894 -		private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER);
  61.895 -
  61.896 -		private ValueExprEvaluationException typeError = null;
  61.897 -
  61.898 -		public AvgAggregate(Avg operator) {
  61.899 -			super(operator);
  61.900 -		}
  61.901 -
  61.902 -		@Override
  61.903 -		public void processAggregate(BindingSet s)
  61.904 -			throws QueryEvaluationException
  61.905 -		{
  61.906 -			if (typeError != null) {
  61.907 -				// Prevent calculating the aggregate further if a type error has
  61.908 -				// occured.
  61.909 -				return;
  61.910 -			}
  61.911 -
  61.912 -			Value v = evaluate(s);
  61.913 -			if (distinct(v)) {
  61.914 -				if (v instanceof Literal) {
  61.915 -					Literal nextLiteral = (Literal)v;
  61.916 -					// check if the literal is numeric, if not, skip it. This is
  61.917 -					// strictly speaking not spec-compliant, but a whole lot more
  61.918 -					// useful.
  61.919 -					if (nextLiteral.getDatatype() != null
  61.920 -							&& XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype()))
  61.921 -					{
  61.922 -						sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS);
  61.923 -					}
  61.924 -					count++;
  61.925 -				}
  61.926 -				else if (v != null) {
  61.927 -					// we do not actually throw the exception yet, but record it and
  61.928 -					// stop further processing. The exception will be thrown when
  61.929 -					// getValue() is invoked.
  61.930 -					typeError = new ValueExprEvaluationException("not a number: " + v);
  61.931 -				}
  61.932 -			}
  61.933 -		}
  61.934 -
  61.935 -		@Override
  61.936 -		public Value getValue()
  61.937 -			throws ValueExprEvaluationException
  61.938 -		{
  61.939 -			if (typeError != null) {
  61.940 -				// a type error occurred while processing the aggregate, throw it
  61.941 -				// now.
  61.942 -				throw typeError;
  61.943 -			}
  61.944 -
  61.945 -			if (count == 0) {
  61.946 -				return vf.createLiteral(0.0d);
  61.947 -			}
  61.948 -
  61.949 -			Literal sizeLit = vf.createLiteral(count);
  61.950 -			return MathUtil.compute(sum, sizeLit, MathOp.DIVIDE);
  61.951 -		}
  61.952 -	}
  61.953 -
  61.954 -	private class SampleAggregate extends Aggregate {
  61.955 -
  61.956 -		private Value sample = null;
  61.957 -
  61.958 -		public SampleAggregate(Sample operator) {
  61.959 -			super(operator);
  61.960 -		}
  61.961 -
  61.962 -		@Override
  61.963 -		public void processAggregate(BindingSet s)
  61.964 -			throws QueryEvaluationException
  61.965 -		{
  61.966 -			if (sample == null) {
  61.967 -				sample = evaluate(s);
  61.968 -			}
  61.969 -		}
  61.970 -
  61.971 -		@Override
  61.972 -		public Value getValue() {
  61.973 -			return sample;
  61.974 -		}
  61.975 -	}
  61.976 -
  61.977 -	private class ConcatAggregate extends Aggregate {
  61.978 -
  61.979 -		private StringBuilder concatenated = new StringBuilder();
  61.980 -
  61.981 -		private String separator = " ";
  61.982 -
  61.983 -		public ConcatAggregate(GroupConcat groupConcatOp)
  61.984 -				throws ValueExprEvaluationException, QueryEvaluationException
  61.985 -		{
  61.986 -			super(groupConcatOp);
  61.987 -			ValueExpr separatorExpr = groupConcatOp.getSeparator();
  61.988 -			if (separatorExpr != null) {
  61.989 -				Value separatorValue = strategy.evaluate(separatorExpr, parentBindings);
  61.990 -				separator = separatorValue.stringValue();
  61.991 -			}
  61.992 -		}
  61.993 -
  61.994 -		@Override
  61.995 -		public void processAggregate(BindingSet s)
  61.996 -			throws QueryEvaluationException
  61.997 -		{
  61.998 -			Value v = evaluate(s);
  61.999 -			if (v != null && distinct(v)) {
 61.1000 -				concatenated.append(v.stringValue());
 61.1001 -				concatenated.append(separator);
 61.1002 -			}
 61.1003 -		}
 61.1004 -
 61.1005 -		@Override
 61.1006 -		public Value getValue() {
 61.1007 -			if (concatenated.length() == 0) {
 61.1008 -				return vf.createLiteral("");
 61.1009 -			}
 61.1010 -
 61.1011 -			// remove separator at the end.
 61.1012 -			int len = concatenated.length() - separator.length();
 61.1013 -			return vf.createLiteral(concatenated.substring(0, len));
 61.1014 -		}
 61.1015 -	}
 61.1016 -
 61.1017 +/*
 61.1018 + * Copyright Aduna (http://www.aduna-software.com/) (c) 1997-2007.
 61.1019 + *
 61.1020 + * Licensed under the Aduna BSD-style license.
 61.1021 + */
 61.1022 +package org.openrdf.query.algebra.evaluation.iterator;
 61.1023 +
 61.1024 +import java.util.Collection;
 61.1025 +import java.util.HashSet;
 61.1026 +import java.util.Iterator;
 61.1027 +import java.util.LinkedHashMap;
 61.1028 +import java.util.LinkedList;
 61.1029 +import java.util.Map;
 61.1030 +import java.util.NoSuchElementException;
 61.1031 +import java.util.Set;
 61.1032 +
 61.1033 +import info.aduna.iteration.CloseableIteration;
 61.1034 +import info.aduna.iteration.CloseableIteratorIteration;
 61.1035 +import info.aduna.lang.ObjectUtil;
 61.1036 +
 61.1037 +import org.openrdf.model.URI;
 61.1038 +import org.openrdf.model.Literal;
 61.1039 +import org.openrdf.model.Value;
 61.1040 +import org.openrdf.model.datatypes.XMLDatatypeUtil;
 61.1041 +import org.openrdf.model.impl.LiteralImpl;
 61.1042 +import org.openrdf.model.impl.NumericLiteralImpl;
 61.1043 +import org.openrdf.model.impl.URIImpl;
 61.1044 +import org.openrdf.model.impl.ValueFactoryImpl;
 61.1045 +import org.openrdf.model.vocabulary.XMLSchema;
 61.1046 +import org.openrdf.query.BindingSet;
 61.1047 +import org.openrdf.query.QueryEvaluationException;
 61.1048 +import org.openrdf.query.algebra.AggregateOperator;
 61.1049 +import org.openrdf.query.algebra.AggregateOperatorBase;
 61.1050 +import org.openrdf.query.algebra.Avg;
 61.1051 +import org.openrdf.query.algebra.Compare;
 61.1052 +import org.openrdf.query.algebra.Count;
 61.1053 +import org.openrdf.query.algebra.FunctionCall;
 61.1054 +import org.openrdf.query.algebra.Group;
 61.1055 +import org.openrdf.query.algebra.GroupConcat;
 61.1056 +import org.openrdf.query.algebra.GroupElem;
 61.1057 +import org.openrdf.query.algebra.MathExpr.MathOp;
 61.1058 +import org.openrdf.query.algebra.Max;
 61.1059 +import org.openrdf.query.algebra.Min;
 61.1060 +import org.openrdf.query.algebra.Sample;
 61.1061 +import org.openrdf.query.algebra.Sum;
 61.1062 +import org.openrdf.query.algebra.ValueConstant;
 61.1063 +import org.openrdf.query.algebra.ValueExpr;
 61.1064 +import org.openrdf.query.algebra.Var;
 61.1065 +import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
 61.1066 +import org.openrdf.query.algebra.evaluation.QueryBindingSet;
 61.1067 +import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException;
 61.1068 +import org.openrdf.query.algebra.evaluation.function.Function;
 61.1069 +import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
 61.1070 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
 61.1071 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc;
 61.1072 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc;
 61.1073 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc;
 61.1074 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc;
 61.1075 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc;
 61.1076 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc;
 61.1077 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc;
 61.1078 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc;
 61.1079 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc;
 61.1080 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc;
 61.1081 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc;
 61.1082 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc;
 61.1083 +import org.openrdf.query.algebra.evaluation.util.MathUtil;
 61.1084 +import org.openrdf.query.algebra.evaluation.util.ValueComparator;
 61.1085 +import org.openrdf.query.impl.EmptyBindingSet;
 61.1086 +
 61.1087 +import com.vividsolutions.jts.geom.Geometry;
 61.1088 +
 61.1089 +/**
 61.1090 + * @author David Huynh
 61.1091 + * @author Arjohn Kampman
 61.1092 + * @author Jeen Broekstra
 61.1093 + * @author James Leigh
 61.1094 + */
 61.1095 +public class StSPARQLGroupIterator extends CloseableIteratorIteration<BindingSet, QueryEvaluationException> {
 61.1096 +
 61.1097 +	/*-----------*
 61.1098 +	 * Constants *
 61.1099 +	 *-----------*/
 61.1100 +
 61.1101 +	private final ValueFactoryImpl vf = ValueFactoryImpl.getInstance();
 61.1102 +
 61.1103 +	private final EvaluationStrategy strategy;
 61.1104 +
 61.1105 +	private final BindingSet parentBindings;
 61.1106 +
 61.1107 +	private final Group group;
 61.1108 +
 61.1109 +	/*--------------*
 61.1110 +	 * Constructors *
 61.1111 +	 *--------------*/
 61.1112 +
 61.1113 +	public StSPARQLGroupIterator(EvaluationStrategy strategy, Group group, BindingSet parentBindings)
 61.1114 +		throws QueryEvaluationException
 61.1115 +	{
 61.1116 +		this.strategy = strategy;
 61.1117 +		this.group = group;
 61.1118 +		this.parentBindings = parentBindings;
 61.1119 +		super.setIterator(createIterator());
 61.1120 +	}
 61.1121 +
 61.1122 +	/*---------*
 61.1123 +	 * Methods *
 61.1124 +	 *---------*/
 61.1125 +
 61.1126 +	private Iterator<BindingSet> createIterator()
 61.1127 +		throws QueryEvaluationException
 61.1128 +	{
 61.1129 +		Collection<Entry> entries = buildEntries();
 61.1130 +		Collection<BindingSet> bindingSets = new LinkedList<BindingSet>();
 61.1131 +
 61.1132 +		for (Entry entry : entries) {
 61.1133 +			QueryBindingSet sol = new QueryBindingSet(parentBindings);
 61.1134 +
 61.1135 +			for (String name : group.getGroupBindingNames()) {
 61.1136 +				BindingSet prototype = entry.getPrototype();
 61.1137 +				if (prototype != null) {
 61.1138 +					Value value = prototype.getValue(name);
 61.1139 +					if (value != null) {
 61.1140 +						// Potentially overwrites bindings from super
 61.1141 +						sol.setBinding(name, value);
 61.1142 +					}
 61.1143 +				}
 61.1144 +			}
 61.1145 +			//XXX added bindings to enable the evaluation of order by!! 
 61.1146 +			//Must probably find a way to remove them afterwards!!
 61.1147 +			for(String name : entry.getPrototype().getBindingNames())
 61.1148 +			{
 61.1149 +				if(name.startsWith("-mbb-"))
 61.1150 +				{
 61.1151 +					sol.setBinding(name,entry.getPrototype().getValue(name));
 61.1152 +				}
 61.1153 +			}
 61.1154 +
 61.1155 +			entry.bindSolution(sol);
 61.1156 +
 61.1157 +			bindingSets.add(sol);
 61.1158 +		}
 61.1159 +
 61.1160 +		return bindingSets.iterator();
 61.1161 +	}
 61.1162 +
 61.1163 +	private Collection<Entry> buildEntries()
 61.1164 +		throws QueryEvaluationException
 61.1165 +	{
 61.1166 +		CloseableIteration<BindingSet, QueryEvaluationException> iter;
 61.1167 +		iter = strategy.evaluate(group.getArg(), parentBindings);
 61.1168 +
 61.1169 +		try {
 61.1170 +			Map<Key, Entry> entries = new LinkedHashMap<Key, Entry>();
 61.1171 +
 61.1172 +			if (!iter.hasNext()) {
 61.1173 +				// no solutions, still need to process aggregates to produce a
 61.1174 +				// zero-result.
 61.1175 +				entries.put(new Key(new EmptyBindingSet()), new Entry(new EmptyBindingSet()));
 61.1176 +			}
 61.1177 +
 61.1178 +			while (iter.hasNext()) {
 61.1179 +				BindingSet sol;
 61.1180 +				try {
 61.1181 +					sol = iter.next();
 61.1182 +				}
 61.1183 +				catch (NoSuchElementException e) {
 61.1184 +					break; // closed
 61.1185 +				}
 61.1186 +				Key key = new Key(sol);
 61.1187 +				Entry entry = entries.get(key);
 61.1188 +
 61.1189 +				if (entry == null) {
 61.1190 +					entry = new Entry(sol);
 61.1191 +					entries.put(key, entry);
 61.1192 +				}
 61.1193 +
 61.1194 +				entry.addSolution(sol);
 61.1195 +			}
 61.1196 +
 61.1197 +			return entries.values();
 61.1198 +		}
 61.1199 +		finally {
 61.1200 +			iter.close();
 61.1201 +		}
 61.1202 +
 61.1203 +	}
 61.1204 +
 61.1205 +	/**
 61.1206 +	 * A unique key for a set of existing bindings.
 61.1207 +	 * 
 61.1208 +	 * @author David Huynh
 61.1209 +	 */
 61.1210 +	protected class Key {
 61.1211 +
 61.1212 +		private BindingSet bindingSet;
 61.1213 +
 61.1214 +		private int hash;
 61.1215 +
 61.1216 +		public Key(BindingSet bindingSet) {
 61.1217 +			this.bindingSet = bindingSet;
 61.1218 +
 61.1219 +			for (String name : group.getGroupBindingNames()) {
 61.1220 +				Value value = bindingSet.getValue(name);
 61.1221 +				if (value != null) {
 61.1222 +					this.hash ^= value.hashCode();
 61.1223 +				}
 61.1224 +			}
 61.1225 +		}
 61.1226 +
 61.1227 +		@Override
 61.1228 +		public int hashCode() {
 61.1229 +			return hash;
 61.1230 +		}
 61.1231 +
 61.1232 +		@Override
 61.1233 +		public boolean equals(Object other) {
 61.1234 +			if (other instanceof Key && other.hashCode() == hash) {
 61.1235 +				BindingSet otherSolution = ((Key)other).bindingSet;
 61.1236 +
 61.1237 +				for (String name : group.getGroupBindingNames()) {
 61.1238 +					Value v1 = bindingSet.getValue(name);
 61.1239 +					Value v2 = otherSolution.getValue(name);
 61.1240 +
 61.1241 +					if (!ObjectUtil.nullEquals(v1, v2)) {
 61.1242 +						return false;
 61.1243 +					}
 61.1244 +				}
 61.1245 +
 61.1246 +				return true;
 61.1247 +			}
 61.1248 +
 61.1249 +			return false;
 61.1250 +		}
 61.1251 +	}
 61.1252 +
 61.1253 +	private class Entry {
 61.1254 +
 61.1255 +		private BindingSet prototype;
 61.1256 +
 61.1257 +		private Map<String, Aggregate> aggregates;
 61.1258 +
 61.1259 +		private Map<String, FunctionCall> spatialAggregates;
 61.1260 +
 61.1261 +		private Map<FunctionCall, Geometry> spatialAggregatesResult;
 61.1262 +
 61.1263 +		public Entry(BindingSet prototype)
 61.1264 +			throws ValueExprEvaluationException, QueryEvaluationException
 61.1265 +		{
 61.1266 +			this.prototype = prototype;
 61.1267 +			this.aggregates = new LinkedHashMap<String, Aggregate>();
 61.1268 +			this.spatialAggregates = new LinkedHashMap<String, FunctionCall>();
 61.1269 +			this.spatialAggregatesResult = new LinkedHashMap<FunctionCall, Geometry>();
 61.1270 +
 61.1271 +			for (GroupElem ge : group.getGroupElements()) {
 61.1272 +				if(ge.getName().endsWith("-aggregateInside-"))
 61.1273 +				{
 61.1274 +					//System.out.println("Placeholder");
 61.1275 +					String name = ge.getName();
 61.1276 +					if(!ge.getName().startsWith("havingCondition"))
 61.1277 +					{
 61.1278 +						name = name.replace("-aggregateInside-","");
 61.1279 +					}
 61.1280 +					if(((Avg) ge.getOperator()).getArg() instanceof FunctionCall)
 61.1281 +					{
 61.1282 +						spatialAggregates.put(name, (FunctionCall) ((Avg)ge.getOperator()).getArg());
 61.1283 +					}
 61.1284 +					if(((Avg) ge.getOperator()).getArg() instanceof Compare)
 61.1285 +					{
 61.1286 +						//						Compare tmp = (Compare) ((Avg) ge.getOperator()).getArg();
 61.1287 +						//						if(tmp.getLeftArg() instanceof FunctionCall)
 61.1288 +						//						{
 61.1289 +						//							
 61.1290 +						//						}
 61.1291 +						//						if(tmp.getRightArg() instanceof FunctionCall)
 61.1292 +						//						{
 61.1293 +						//							
 61.1294 +						//						}
 61.1295 +					}
 61.1296 +
 61.1297 +				}
 61.1298 +				else
 61.1299 +				{
 61.1300 +					Aggregate create = create(ge.getOperator());
 61.1301 +					if (create != null) {
 61.1302 +						aggregates.put(ge.getName(), create);
 61.1303 +					}
 61.1304 +				}
 61.1305 +			}
 61.1306 +		}
 61.1307 +
 61.1308 +		public BindingSet getPrototype() {
 61.1309 +			return prototype;
 61.1310 +		}
 61.1311 +
 61.1312 +		public void addSolution(BindingSet bindingSet)
 61.1313 +			throws QueryEvaluationException
 61.1314 +		{
 61.1315 +			for (Aggregate aggregate : aggregates.values()) {
 61.1316 +				aggregate.processAggregate(bindingSet);
 61.1317 +			}
 61.1318 +			for (FunctionCall spatialAggregate : spatialAggregates.values()) {
 61.1319 +				processSpatialAggregate(spatialAggregate, bindingSet);
 61.1320 +				//spatialAggregates.processAggregate(bindingSet);
 61.1321 +			}
 61.1322 +		}
 61.1323 +
 61.1324 +		public void bindSolution(QueryBindingSet sol)
 61.1325 +			throws QueryEvaluationException
 61.1326 +		{
 61.1327 +			for (String name : aggregates.keySet()) {
 61.1328 +				try {
 61.1329 +					Value value = aggregates.get(name).getValue();
 61.1330 +					if (value != null) {
 61.1331 +						// Potentially overwrites bindings from super
 61.1332 +						sol.setBinding(name, value);
 61.1333 +					}
 61.1334 +				}
 61.1335 +				catch (ValueExprEvaluationException ex) {
 61.1336 +					// There was a type error when calculating the value of the
 61.1337 +					// aggregate.
 61.1338 +					// We silently ignore the error, resulting in no result value
 61.1339 +					// being bound.
 61.1340 +				}
 61.1341 +			}
 61.1342 +
 61.1343 +			//			for(String name : spatialAggregates.keySet())
 61.1344 +			//			{
 61.1345 +			//				//Must compute the spatial construct at this point
 61.1346 +			//				ValueExpr expr = spatialAggregates.get(name);
 61.1347 +			//				
 61.1348 +			//				
 61.1349 +			//				//the names are no longer the same
 61.1350 +			//				Geometry geom = spatialAggregatesResult.get(spatialAggregates.get(name));
 61.1351 +			//				StrabonPolyhedron poly = null;
 61.1352 +			//				try {
 61.1353 +			//					poly = new StrabonPolyhedron(geom);
 61.1354 +			//				} catch (Exception e) {
 61.1355 +			//					e.printStackTrace();
 61.1356 +			//				}
 61.1357 +			//				sol.setBinding(name,poly);
 61.1358 +			//
 61.1359 +			//			}
 61.1360 +
 61.1361 +			for(String name : spatialAggregates.keySet())
 61.1362 +			{
 61.1363 +				//Must compute the spatial construct at this point
 61.1364 +				ValueExpr expr = spatialAggregates.get(name);
 61.1365 +
 61.1366 +				Value val = null;
 61.1367 +				try {
 61.1368 +					val = evaluateConstruct(expr, this.prototype);
 61.1369 +					} catch (Exception e) {
 61.1370 +					e.printStackTrace();
 61.1371 +				}
 61.1372 +				if (val != null) {
 61.1373 +					if(val instanceof StrabonPolyhedron)
 61.1374 +					{
 61.1375 +						String label = val.toString()+";http://www.opengis.net/def/crs/EPSG/0/"+((StrabonPolyhedron)val).getGeometry().getSRID();
 61.1376 +						Literal wkt = new LiteralImpl(label,new URIImpl(StrabonPolyhedron.ogcGeometry));
 61.1377 +						sol.setBinding(name,wkt);
 61.1378 +					}
 61.1379 +					else
 61.1380 +					{
 61.1381 +						sol.setBinding(name, val);
 61.1382 +					}
 61.1383 +				}
 61.1384 +
 61.1385 +			}
 61.1386 +
 61.1387 +
 61.1388 +
 61.1389 +
 61.1390 +		}
 61.1391 +
 61.1392 +		/**
 61.1393 +		 * XXX addition
 61.1394 +		 */
 61.1395 +
 61.1396 +		/**
 61.1397 +		 * Code added in order to evaluate spatial constructs present in select that contain a spatial aggregate (e.g. Union(?geo1))
 61.1398 +		 * @param expr a spatial construct or a spatial var
 61.1399 +		 * @param prototype the bindings needed to retrieve values for the Vars
 61.1400 +		 * @return The evaluated stSPARQL construct
 61.1401 +		 * @throws Exception 
 61.1402 +		 */
 61.1403 +		private Value evaluateConstruct(ValueExpr expr, BindingSet prototype) throws Exception
 61.1404 +		{
 61.1405 +			if(prototype instanceof EmptyBindingSet)
 61.1406 +			{
 61.1407 +				return null;
 61.1408 +			}
 61.1409 +			if(expr instanceof FunctionCall)
 61.1410 +			{
 61.1411 +				StrabonPolyhedron leftArg = null;
 61.1412 +				StrabonPolyhedron rightArg = null;
 61.1413 +
 61.1414 +				Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI());
 61.1415 +
 61.1416 +				if(function instanceof UnionFunc)
 61.1417 +				{
 61.1418 +					if(((FunctionCall) expr).getArgs().size()==1)
 61.1419 +					{
 61.1420 +						//Aggregate!!! => Value ready in spatialAggregatesResults
 61.1421 +						return new StrabonPolyhedron(spatialAggregatesResult.get(expr));
 61.1422 +					}
 61.1423 +					else
 61.1424 +					{
 61.1425 +						leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1426 +						rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1427 +						return StrabonPolyhedron.union(leftArg, rightArg);
 61.1428 +					}
 61.1429 +				}
 61.1430 +				else if(function instanceof ExtentFunc)
 61.1431 +				{
 61.1432 +					//Aggregate!!! => Value ready in spatialAggregatesResults
 61.1433 +					return new StrabonPolyhedron(spatialAggregatesResult.get(expr));
 61.1434 +				}
 61.1435 +				else if(function instanceof BufferFunc)
 61.1436 +				{
 61.1437 +					//FIXME Still haven't run example when 2nd argument is a Var
 61.1438 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1439 +					Value radius = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1440 +					LiteralImpl lit = (LiteralImpl) radius;
 61.1441 +					return StrabonPolyhedron.buffer(leftArg,lit.doubleValue());
 61.1442 +				}
 61.1443 +				else if(function instanceof TransformFunc)
 61.1444 +				{
 61.1445 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1446 +					Value sridCoarse = strategy.evaluate(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1447 +					URIImpl srid = (URIImpl) sridCoarse;
 61.1448 +					return StrabonPolyhedron.transform(leftArg,srid);
 61.1449 +				}
 61.1450 +				else if(function instanceof EnvelopeFunc)
 61.1451 +				{
 61.1452 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1453 +					return StrabonPolyhedron.envelope(leftArg);
 61.1454 +				}
 61.1455 +				else if(function instanceof ConvexHullFunc)
 61.1456 +				{
 61.1457 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1458 +					return StrabonPolyhedron.convexHull(leftArg);
 61.1459 +				}
 61.1460 +				else if(function instanceof BoundaryFunc)
 61.1461 +				{
 61.1462 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1463 +					return StrabonPolyhedron.boundary(leftArg);
 61.1464 +				}
 61.1465 +				else if(function instanceof IntersectionFunc)
 61.1466 +				{
 61.1467 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1468 +					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1469 +					return StrabonPolyhedron.intersection(leftArg, rightArg);
 61.1470 +				}
 61.1471 +				else if(function instanceof DifferenceFunc)
 61.1472 +				{
 61.1473 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1474 +					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1475 +					return StrabonPolyhedron.difference(leftArg, rightArg);
 61.1476 +				}
 61.1477 +				else if(function instanceof SymDifferenceFunc)
 61.1478 +				{
 61.1479 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1480 +					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1481 +					return StrabonPolyhedron.symDifference(leftArg, rightArg);
 61.1482 +				}
 61.1483 +				//FOR HAVING!!
 61.1484 +				else if(function instanceof AreaFunc)
 61.1485 +				{
 61.1486 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1487 +					return vf.createLiteral(""+StrabonPolyhedron.area(leftArg), XMLSchema.DOUBLE);
 61.1488 +				}
 61.1489 +				else if(function instanceof DistanceFunc)
 61.1490 +				{
 61.1491 +					leftArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(0),prototype);
 61.1492 +					rightArg = (StrabonPolyhedron) evaluateConstruct(((FunctionCall) expr).getArgs().get(1),prototype);
 61.1493 +					return vf.createLiteral(""+StrabonPolyhedron.distance(leftArg, rightArg), XMLSchema.DOUBLE);
 61.1494 +				}
 61.1495 +				else
 61.1496 +				{
 61.1497 +					throw new Exception("Function "+function.getURI().toString()+" not currently supported");
 61.1498 +				}
 61.1499 +
 61.1500 +			}
 61.1501 +			else if(expr instanceof Var)
 61.1502 +			{
 61.1503 +				//				Value tmp =  prototype.getValue(((Var) expr).getName().replace("?spatial",""));
 61.1504 +				//				return tmp.;
 61.1505 +				Var tmp = (Var) expr;
 61.1506 +				if(tmp.getName().contains("?spatial"))
 61.1507 +				{
 61.1508 +					tmp.setName(tmp.getName().replace("?spatial","?forGroupBy"));
 61.1509 +				}
 61.1510 +				else
 61.1511 +				{
 61.1512 +					tmp.setName(tmp.getName()+"?forGroupBy");
 61.1513 +				}
 61.1514 +				return strategy.evaluate(tmp,prototype);
 61.1515 +			}
 61.1516 +			else
 61.1517 +			{
 61.1518 +				throw new Exception("Functionality required for this aggregate not currently included");
 61.1519 +			}
 61.1520 +
 61.1521 +		}
 61.1522 +
 61.1523 +		private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet)
 61.1524 +		{
 61.1525 +			computeAggregateFunctions(fc, bindingSet);
 61.1526 +		}
 61.1527 +
 61.1528 +		//Currently: Either Union OR Extent
 61.1529 +		private void computeAggregateFunctions(ValueExpr expr, BindingSet bindingSet)
 61.1530 +		{
 61.1531 +			if(expr instanceof FunctionCall)
 61.1532 +			{
 61.1533 +				Function function = FunctionRegistry.getInstance().get(((FunctionCall) expr).getURI());
 61.1534 +				boolean condition = ((!(function instanceof UnionFunc) || !(((FunctionCall) expr).getArgs().size()==1))
 61.1535 +						&&!(function instanceof ExtentFunc));
 61.1536 +				if(condition)
 61.1537 +				{
 61.1538 +					//Recursively check arguments
 61.1539 +					for(int i = 0 ; i< ((FunctionCall) expr).getArgs().size(); i++)
 61.1540 +					{
 61.1541 +						computeAggregateFunctions(((FunctionCall) expr).getArgs().get(i), bindingSet);
 61.1542 +					}
 61.1543 +				}
 61.1544 +				else
 61.1545 +				{
 61.1546 +					//Need to compute spatial aggregate
 61.1547 +					//Will add result to spatialAggregatesResult and utilize it when the spatialAggregates are iterated
 61.1548 +
 61.1549 +					ValueExpr onlyArg = ((FunctionCall) expr).getArgs().get(0);
 61.1550 +					Value val = null;
 61.1551 +					StrabonPolyhedron poly = null;
 61.1552 +					if(onlyArg instanceof Var)
 61.1553 +					{
 61.1554 +						try {
 61.1555 +							String previousName = ((Var) onlyArg).getName();
 61.1556 +							Var copy = (Var) onlyArg.clone();
 61.1557 +							if(previousName.contains("?spatial"))
 61.1558 +							{
 61.1559 +								copy.setName(previousName.replace("?spatial","?forGroupBy"));
 61.1560 +							}
 61.1561 +							else
 61.1562 +							{
 61.1563 +								copy.setName(previousName+"?forGroupBy");
 61.1564 +							}
 61.1565 +							val = strategy.evaluate(copy,bindingSet);
 61.1566 +						} catch (ValueExprEvaluationException e) {
 61.1567 +							e.printStackTrace();
 61.1568 +						} catch (QueryEvaluationException e) {
 61.1569 +							e.printStackTrace();
 61.1570 +						}
 61.1571 +					}
 61.1572 +					else //FunctionCall again
 61.1573 +					{
 61.1574 +						try {
 61.1575 +							val = strategy.evaluate(onlyArg, bindingSet);
 61.1576 +
 61.1577 +						} catch (ValueExprEvaluationException e) {
 61.1578 +							e.printStackTrace();
 61.1579 +						} catch (QueryEvaluationException e) {
 61.1580 +							e.printStackTrace();
 61.1581 +						}
 61.1582 +					}
 61.1583 +					poly = (StrabonPolyhedron) val;
 61.1584 +					Geometry aggr = this.spatialAggregatesResult.get(expr);
 61.1585 +					if(aggr==null)
 61.1586 +					{
 61.1587 +
 61.1588 +						if(function instanceof UnionFunc)
 61.1589 +						{
 61.1590 +							this.spatialAggregatesResult.put((FunctionCall) expr, poly.getGeometry());
 61.1591 +						}
 61.1592 +						else if(function instanceof ExtentFunc)
 61.1593 +						{
 61.1594 +							Geometry env = poly.getGeometry().getEnvelope();
 61.1595 +							env.setSRID(poly.getGeometry().getSRID());
 61.1596 +							this.spatialAggregatesResult.put((FunctionCall) expr, env);
 61.1597 +						}
 61.1598 +					}
 61.1599 +					else
 61.1600 +					{
 61.1601 +						this.spatialAggregatesResult.remove(expr);
 61.1602 +						if(function instanceof UnionFunc)
 61.1603 +						{
 61.1604 +							//XXX possible issue with expressions like 
 61.1605 +							// ?x hasGeom sth^^4326
 61.1606 +							// ?x hasGeom sthElse^^2100
 61.1607 +							Geometry united = aggr.union(poly.getGeometry());
 61.1608 +							united.setSRID(poly.getGeometry().getSRID());
 61.1609 +							this.spatialAggregatesResult.put((FunctionCall) expr, united);
 61.1610 +						}
 61.1611 +						else if(function instanceof ExtentFunc)
 61.1612 +						{
 61.1613 +							//XXX possible issue with expressions like 
 61.1614 +							// ?x hasGeom sth^^4326
 61.1615 +							// ?x hasGeom sthElse^^2100
 61.1616 +							Geometry env = aggr.union(poly.getGeometry().getEnvelope()).getEnvelope();
 61.1617 +							env.setSRID(poly.getGeometry().getSRID());
 61.1618 +							this.spatialAggregatesResult.put((FunctionCall) expr, env);
 61.1619 +						}
 61.1620 +					}
 61.1621 +				}
 61.1622 +			}
 61.1623 +			else //Var
 61.1624 +			{
 61.1625 +				return;
 61.1626 +			}
 61.1627 +		}
 61.1628 +
 61.1629 +
 61.1630 +
 61.1631 +		/**
 61.1632 +		 * XXX 24/11/11
 61.1633 +		 * Keeping a backup before altering code in order to support nested strdf:union expressions 
 61.1634 +		 */
 61.1635 +		//		private void processSpatialAggregate(FunctionCall fc, BindingSet bindingSet)
 61.1636 +		//		{
 61.1637 +		//			ValueExpr expr = fc.getArgs().get(0);
 61.1638 +		//			Value val = null;
 61.1639 +		//			StrabonPolyhedron poly = null;
 61.1640 +		//				if(expr instanceof Var)
 61.1641 +		//				{
 61.1642 +		//					try {
 61.1643 +		//						String previousName = ((Var) expr).getName();
 61.1644 +		//						Var copy = (Var) expr.clone();
 61.1645 +		////						copy.setName(previousName.replace("?spatial","?forGroupBy"));
 61.1646 +		//						if(previousName.contains("?spatial"))
 61.1647 +		//						{
 61.1648 +		//							copy.setName(previousName.replace("?spatial","?forGroupBy"));
 61.1649 +		//						}
 61.1650 +		//						else
 61.1651 +		//						{
 61.1652 +		//							copy.setName(previousName+"?forGroupBy");
 61.1653 +		//						}
 61.1654 +		//						//((Var) expr).setName(previousName.replace("?spatial","?forGroupBy"));
 61.1655 +		//						
 61.1656 +		//						val = strategy.evaluate(copy,bindingSet);
 61.1657 +		//						//poly = (StrabonPolyhedron) val;
 61.1658 +		//					} catch (ValueExprEvaluationException e) {
 61.1659 +		//						e.printStackTrace();
 61.1660 +		//					} catch (QueryEvaluationException e) {
 61.1661 +		//						e.printStackTrace();
 61.1662 +		//					}
 61.1663 +		//					
 61.1664 +		//				}
 61.1665 +		//				else //FunctionCall again
 61.1666 +		//				{
 61.1667 +		//					try {
 61.1668 +		//						val = strategy.evaluate(expr, bindingSet);
 61.1669 +		//						
 61.1670 +		//					} catch (ValueExprEvaluationException e) {
 61.1671 +		//						e.printStackTrace();
 61.1672 +		//					} catch (QueryEvaluationException e) {
 61.1673 +		//						e.printStackTrace();
 61.1674 +		//					}
 61.1675 +		//				}
 61.1676 +		//				poly = (StrabonPolyhedron) val;
 61.1677 +		//				Geometry aggr = this.spatialAggregatesResult.get(fc);
 61.1678 +		//				if(aggr==null)
 61.1679 +		//				{
 61.1680 +		//					this.spatialAggregatesResult.put(fc, poly.getGeometry());
 61.1681 +		//				}
 61.1682 +		//				else
 61.1683 +		//				{
 61.1684 +		//					this.spatialAggregatesResult.remove(fc);
 61.1685 +		//					this.spatialAggregatesResult.put(fc, aggr.union(poly.getGeometry()));
 61.1686 +		//					//aggr.union(poly.getGeometry());
 61.1687 +		//				}
 61.1688 +		//				//System.out.println("placeholder");
 61.1689 +		//			
 61.1690 +		//		}
 61.1691 +
 61.1692 +		private Aggregate create(AggregateOperator operator)
 61.1693 +			throws ValueExprEvaluationException, QueryEvaluationException
 61.1694 +		{
 61.1695 +			if (operator instanceof Count) {
 61.1696 +				return new CountAggregate((Count)operator);
 61.1697 +			}
 61.1698 +			else if (operator instanceof Min) {
 61.1699 +				return new MinAggregate((Min)operator);
 61.1700 +			}
 61.1701 +			else if (operator instanceof Max) {
 61.1702 +				return new MaxAggregate((Max)operator);
 61.1703 +			}
 61.1704 +			else if (operator instanceof Sum) {
 61.1705 +				return new SumAggregate((Sum)operator);
 61.1706 +			}
 61.1707 +			else if (operator instanceof Avg) {
 61.1708 +				return new AvgAggregate((Avg)operator);
 61.1709 +			}
 61.1710 +			else if (operator instanceof Sample) {
 61.1711 +				return new SampleAggregate((Sample)operator);
 61.1712 +			}
 61.1713 +			else if (operator instanceof GroupConcat) {
 61.1714 +				return new ConcatAggregate((GroupConcat)operator);
 61.1715 +			}
 61.1716 +			return null;
 61.1717 +		}
 61.1718 +	}
 61.1719 +
 61.1720 +	private abstract class Aggregate {
 61.1721 +
 61.1722 +		private final Set<Value> distinct;
 61.1723 +
 61.1724 +		private final ValueExpr arg;
 61.1725 +
 61.1726 +		public Aggregate(AggregateOperatorBase operator) {
 61.1727 +			this.arg = operator.getArg();
 61.1728 +			if (operator.isDistinct()) {
 61.1729 +				distinct = new HashSet<Value>();
 61.1730 +			}
 61.1731 +			else {
 61.1732 +				distinct = null;
 61.1733 +			}
 61.1734 +		}
 61.1735 +
 61.1736 +		public abstract Value getValue()
 61.1737 +				throws ValueExprEvaluationException;
 61.1738 +
 61.1739 +		public abstract void processAggregate(BindingSet bindingSet)
 61.1740 +				throws QueryEvaluationException;
 61.1741 +
 61.1742 +		protected boolean distinct(Value value) {
 61.1743 +			return distinct == null || distinct.add(value);
 61.1744 +		}
 61.1745 +
 61.1746 +		protected ValueExpr getArg() {
 61.1747 +			return arg;
 61.1748 +		}
 61.1749 +
 61.1750 +		protected Value evaluate(BindingSet s)
 61.1751 +			throws QueryEvaluationException
 61.1752 +		{
 61.1753 +			try {
 61.1754 +				return strategy.evaluate(getArg(), s);
 61.1755 +			}
 61.1756 +			catch (ValueExprEvaluationException e) {
 61.1757 +				return null; // treat missing or invalid expressions as null
 61.1758 +			}
 61.1759 +		}
 61.1760 +	}
 61.1761 +
 61.1762 +	private class CountAggregate extends Aggregate {
 61.1763 +
 61.1764 +		private long count = 0;
 61.1765 +
 61.1766 +		public CountAggregate(Count operator) {
 61.1767 +			super(operator);
 61.1768 +		}
 61.1769 +
 61.1770 +		@Override
 61.1771 +		public void processAggregate(BindingSet s)
 61.1772 +			throws QueryEvaluationException
 61.1773 +		{
 61.1774 +			if (getArg() != null) {
 61.1775 +				Value value = evaluate(s);
 61.1776 +				if (value != null && distinct(value)) {
 61.1777 +					count++;
 61.1778 +				}
 61.1779 +			}
 61.1780 +			else {
 61.1781 +				count++;
 61.1782 +			}
 61.1783 +		}
 61.1784 +
 61.1785 +		@Override
 61.1786 +		public Value getValue() {
 61.1787 +			return vf.createLiteral(Long.toString(count), XMLSchema.INTEGER);
 61.1788 +		}
 61.1789 +	}
 61.1790 +
 61.1791 +	private class MinAggregate extends Aggregate {
 61.1792 +
 61.1793 +		private final ValueComparator comparator = new ValueComparator();
 61.1794 +
 61.1795 +		private Value min = null;
 61.1796 +
 61.1797 +		public MinAggregate(Min operator) {
 61.1798 +			super(operator);
 61.1799 +		}
 61.1800 +
 61.1801 +		@Override
 61.1802 +		public void processAggregate(BindingSet s)
 61.1803 +			throws QueryEvaluationException
 61.1804 +		{
 61.1805 +			Value v = evaluate(s);
 61.1806 +			if (distinct(v)) {
 61.1807 +				if (min == null) {
 61.1808 +					min = v;
 61.1809 +				}
 61.1810 +				else if (comparator.compare(v, min) < 0) {
 61.1811 +					min = v;
 61.1812 +				}
 61.1813 +			}
 61.1814 +		}
 61.1815 +
 61.1816 +		@Override
 61.1817 +		public Value getValue() {
 61.1818 +			return min;
 61.1819 +		}
 61.1820 +	}
 61.1821 +
 61.1822 +	private class MaxAggregate extends Aggregate {
 61.1823 +
 61.1824 +		private final ValueComparator comparator = new ValueComparator();
 61.1825 +
 61.1826 +		private Value max = null;
 61.1827 +
 61.1828 +		public MaxAggregate(Max operator) {
 61.1829 +			super(operator);
 61.1830 +		}
 61.1831 +
 61.1832 +		@Override
 61.1833 +		public void processAggregate(BindingSet s)
 61.1834 +			throws QueryEvaluationException
 61.1835 +		{
 61.1836 +			Value v = evaluate(s);
 61.1837 +			if (distinct(v)) {
 61.1838 +				if (max == null) {
 61.1839 +					max = v;
 61.1840 +				}
 61.1841 +				else if (comparator.compare(v, max) > 0) {
 61.1842 +					max = v;
 61.1843 +				}
 61.1844 +			}
 61.1845 +		}
 61.1846 +
 61.1847 +		@Override
 61.1848 +		public Value getValue() {
 61.1849 +			return max;
 61.1850 +		}
 61.1851 +	}
 61.1852 +
 61.1853 +	private class SumAggregate extends Aggregate {
 61.1854 +
 61.1855 +		private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER);
 61.1856 +
 61.1857 +		private ValueExprEvaluationException typeError = null;
 61.1858 +
 61.1859 +		public SumAggregate(Sum operator) {
 61.1860 +			super(operator);
 61.1861 +		}
 61.1862 +
 61.1863 +		@Override
 61.1864 +		public void processAggregate(BindingSet s)
 61.1865 +			throws QueryEvaluationException
 61.1866 +		{
 61.1867 +			if (typeError != null) {
 61.1868 +				// halt further processing if a type error has been raised
 61.1869 +				return;
 61.1870 +			}
 61.1871 +
 61.1872 +			Value v = evaluate(s);
 61.1873 +			if (distinct(v)) {
 61.1874 +				if (v instanceof Literal) {
 61.1875 +					Literal nextLiteral = (Literal)v;
 61.1876 +					// check if the literal is numeric, if not, skip it. This is
 61.1877 +					// strictly speaking not spec-compliant, but a whole lot more
 61.1878 +					// useful.
 61.1879 +					if (nextLiteral.getDatatype() != null
 61.1880 +							&& XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype()))
 61.1881 +					{
 61.1882 +						sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS);
 61.1883 +					}
 61.1884 +				}
 61.1885 +				else if (v != null) {
 61.1886 +					typeError = new ValueExprEvaluationException("not a number: " + v);
 61.1887 +				}
 61.1888 +			}
 61.1889 +		}
 61.1890 +
 61.1891 +		@Override
 61.1892 +		public Value getValue()
 61.1893 +			throws ValueExprEvaluationException
 61.1894 +		{
 61.1895 +			if (typeError != null) {
 61.1896 +				throw typeError;
 61.1897 +			}
 61.1898 +
 61.1899 +			return sum;
 61.1900 +		}
 61.1901 +	}
 61.1902 +
 61.1903 +	private class AvgAggregate extends Aggregate {
 61.1904 +
 61.1905 +		private long count = 0;
 61.1906 +
 61.1907 +		private Literal sum = vf.createLiteral("0", XMLSchema.INTEGER);
 61.1908 +
 61.1909 +		private ValueExprEvaluationException typeError = null;
 61.1910 +
 61.1911 +		public AvgAggregate(Avg operator) {
 61.1912 +			super(operator);
 61.1913 +		}
 61.1914 +
 61.1915 +		@Override
 61.1916 +		public void processAggregate(BindingSet s)
 61.1917 +			throws QueryEvaluationException
 61.1918 +		{
 61.1919 +			if (typeError != null) {
 61.1920 +				// Prevent calculating the aggregate further if a type error has
 61.1921 +				// occured.
 61.1922 +				return;
 61.1923 +			}
 61.1924 +
 61.1925 +			Value v = evaluate(s);
 61.1926 +			if (distinct(v)) {
 61.1927 +				if (v instanceof Literal) {
 61.1928 +					Literal nextLiteral = (Literal)v;
 61.1929 +					// check if the literal is numeric, if not, skip it. This is
 61.1930 +					// strictly speaking not spec-compliant, but a whole lot more
 61.1931 +					// useful.
 61.1932 +					if (nextLiteral.getDatatype() != null
 61.1933 +							&& XMLDatatypeUtil.isNumericDatatype(nextLiteral.getDatatype()))
 61.1934 +					{
 61.1935 +						sum = MathUtil.compute(sum, nextLiteral, MathOp.PLUS);
 61.1936 +					}
 61.1937 +					count++;
 61.1938 +				}
 61.1939 +				else if (v != null) {
 61.1940 +					// we do not actually throw the exception yet, but record it and
 61.1941 +					// stop further processing. The exception will be thrown when
 61.1942 +					// getValue() is invoked.
 61.1943 +					typeError = new ValueExprEvaluationException("not a number: " + v);
 61.1944 +				}
 61.1945 +			}
 61.1946 +		}
 61.1947 +
 61.1948 +		@Override
 61.1949 +		public Value getValue()
 61.1950 +			throws ValueExprEvaluationException
 61.1951 +		{
 61.1952 +			if (typeError != null) {
 61.1953 +				// a type error occurred while processing the aggregate, throw it
 61.1954 +				// now.
 61.1955 +				throw typeError;
 61.1956 +			}
 61.1957 +
 61.1958 +			if (count == 0) {
 61.1959 +				return vf.createLiteral(0.0d);
 61.1960 +			}
 61.1961 +
 61.1962 +			Literal sizeLit = vf.createLiteral(count);
 61.1963 +			return MathUtil.compute(sum, sizeLit, MathOp.DIVIDE);
 61.1964 +		}
 61.1965 +	}
 61.1966 +
 61.1967 +	private class SampleAggregate extends Aggregate {
 61.1968 +
 61.1969 +		private Value sample = null;
 61.1970 +
 61.1971 +		public SampleAggregate(Sample operator) {
 61.1972 +			super(operator);
 61.1973 +		}
 61.1974 +
 61.1975 +		@Override
 61.1976 +		public void processAggregate(BindingSet s)
 61.1977 +			throws QueryEvaluationException
 61.1978 +		{
 61.1979 +			if (sample == null) {
 61.1980 +				sample = evaluate(s);
 61.1981 +			}
 61.1982 +		}
 61.1983 +
 61.1984 +		@Override
 61.1985 +		public Value getValue() {
 61.1986 +			return sample;
 61.1987 +		}
 61.1988 +	}
 61.1989 +
 61.1990 +	private class ConcatAggregate extends Aggregate {
 61.1991 +
 61.1992 +		private StringBuilder concatenated = new StringBuilder();
 61.1993 +
 61.1994 +		private String separator = " ";
 61.1995 +
 61.1996 +		public ConcatAggregate(GroupConcat groupConcatOp)
 61.1997 +				throws ValueExprEvaluationException, QueryEvaluationException
 61.1998 +		{
 61.1999 +			super(groupConcatOp);
 61.2000 +			ValueExpr separatorExpr = groupConcatOp.getSeparator();
 61.2001 +			if (separatorExpr != null) {
 61.2002 +				Value separatorValue = strategy.evaluate(separatorExpr, parentBindings);
 61.2003 +				separator = separatorValue.stringValue();
 61.2004 +			}
 61.2005 +		}
 61.2006 +
 61.2007 +		@Override
 61.2008 +		public void processAggregate(BindingSet s)
 61.2009 +			throws QueryEvaluationException
 61.2010 +		{
 61.2011 +			Value v = evaluate(s);
 61.2012 +			if (v != null && distinct(v)) {
 61.2013 +				concatenated.append(v.stringValue());
 61.2014 +				concatenated.append(separator);
 61.2015 +			}
 61.2016 +		}
 61.2017 +
 61.2018 +		@Override
 61.2019 +		public Value getValue() {
 61.2020 +			if (concatenated.length() == 0) {
 61.2021 +				return vf.createLiteral("");
 61.2022 +			}
 61.2023 +
 61.2024 +			// remove separator at the end.
 61.2025 +			int len = concatenated.length() - separator.length();
 61.2026 +			return vf.createLiteral(concatenated.substring(0, len));
 61.2027 +		}
 61.2028 +	}
 61.2029 +
 61.2030  }
 61.2031 \ No newline at end of file
    62.1 --- a/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Mon Mar 19 21:57:30 2012 +0100
    62.2 +++ b/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Mon Mar 19 22:06:59 2012 +0100
    62.3 @@ -1,73 +1,73 @@
    62.4 -org.openrdf.query.algebra.evaluation.function.StringCast
    62.5 -org.openrdf.query.algebra.evaluation.function.FloatCast
    62.6 -org.openrdf.query.algebra.evaluation.function.DoubleCast
    62.7 -org.openrdf.query.algebra.evaluation.function.DecimalCast
    62.8 -org.openrdf.query.algebra.evaluation.function.IntegerCast
    62.9 -org.openrdf.query.algebra.evaluation.function.BooleanCast
   62.10 -org.openrdf.query.algebra.evaluation.function.DateTimeCast
   62.11 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc
   62.12 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.ContainsFunc
   62.13 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoveredByFunc
   62.14 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoversFunc
   62.15 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.DisjointFunc
   62.16 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc
   62.17 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.InsideFunc
   62.18 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.OverlapFunc
   62.19 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.TouchFunc
   62.20 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RelateFunc
   62.21 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.LeftFunc
   62.22 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RightFunc
   62.23 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AboveFunc
   62.24 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.BelowFunc
   62.25 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc
   62.26 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc
   62.27 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc
   62.28 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc
   62.29 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc
   62.30 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc
   62.31 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc
   62.32 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc
   62.33 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc
   62.34 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc
   62.35 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc
   62.36 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc
   62.37 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.GeometryTypeFunc
   62.38 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc
   62.39 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc
   62.40 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc
   62.41 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc
   62.42 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc
   62.43 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc
   62.44 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBufferFunc
   62.45 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc
   62.46 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDifferenceFunc
   62.47 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDistanceFunc
   62.48 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc
   62.49 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlIntersectionFunc
   62.50 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlSymmetricDifferenceFunc
   62.51 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlUnionFunc
   62.52 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc
   62.53 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferContainsFunc
   62.54 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoveredByFunc
   62.55 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoversFunc
   62.56 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferDisjointFunc
   62.57 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferEqualsFunc
   62.58 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferInsideFunc
   62.59 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferMeetFunc
   62.60 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferOverlapFunc
   62.61 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8DisconnectedFunc
   62.62 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8EqualsFunc
   62.63 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8ExternallyConnectedFunc
   62.64 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartFunc
   62.65 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartInverseFunc
   62.66 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8PartiallyOverlappingFunc
   62.67 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartFunc
   62.68 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartInverseFunc
   62.69 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesContainsFunc
   62.70 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesCrossesFunc
   62.71 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesDisjointFunc
   62.72 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesEqualsFunc
   62.73 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesIntersectsFunc
   62.74 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesOverlapsFunc
   62.75 -org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesWithinFunc
   62.76 +org.openrdf.query.algebra.evaluation.function.StringCast
   62.77 +org.openrdf.query.algebra.evaluation.function.FloatCast
   62.78 +org.openrdf.query.algebra.evaluation.function.DoubleCast
   62.79 +org.openrdf.query.algebra.evaluation.function.DecimalCast
   62.80 +org.openrdf.query.algebra.evaluation.function.IntegerCast
   62.81 +org.openrdf.query.algebra.evaluation.function.BooleanCast
   62.82 +org.openrdf.query.algebra.evaluation.function.DateTimeCast
   62.83 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AnyInteractFunc
   62.84 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.ContainsFunc
   62.85 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoveredByFunc
   62.86 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.CoversFunc
   62.87 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.DisjointFunc
   62.88 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.EqualsFunc
   62.89 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.InsideFunc
   62.90 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.OverlapFunc
   62.91 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.TouchFunc
   62.92 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RelateFunc
   62.93 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.LeftFunc
   62.94 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RightFunc
   62.95 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.AboveFunc
   62.96 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.BelowFunc
   62.97 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BufferFunc
   62.98 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc
   62.99 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc
  62.100 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.IntersectionFunc
  62.101 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.DifferenceFunc
  62.102 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.SymDifferenceFunc
  62.103 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc
  62.104 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc
  62.105 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc
  62.106 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.DistanceFunc
  62.107 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc
  62.108 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.DimensionFunc
  62.109 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.GeometryTypeFunc
  62.110 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsTextFunc
  62.111 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.SridFunc
  62.112 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsEmptyFunc
  62.113 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.IsSimpleFunc
  62.114 +org.openrdf.query.algebra.evaluation.function.spatial.stsparql.aggregate.ExtentFunc
  62.115 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBoundaryFunc
  62.116 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlBufferFunc
  62.117 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlConvexHullFunc
  62.118 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDifferenceFunc
  62.119 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlDistanceFunc
  62.120 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlEnvelopeFunc
  62.121 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlIntersectionFunc
  62.122 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlSymmetricDifferenceFunc
  62.123 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.nontopological.GeoSparqlUnionFunc
  62.124 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.GeoSparqlRelateFunc
  62.125 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferContainsFunc
  62.126 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoveredByFunc
  62.127 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferCoversFunc
  62.128 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferDisjointFunc
  62.129 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferEqualsFunc
  62.130 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferInsideFunc
  62.131 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferMeetFunc
  62.132 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.egenhofer.EgenhoferOverlapFunc
  62.133 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8DisconnectedFunc
  62.134 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8EqualsFunc
  62.135 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8ExternallyConnectedFunc
  62.136 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartFunc
  62.137 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8NonTangentialProperPartInverseFunc
  62.138 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8PartiallyOverlappingFunc
  62.139 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartFunc
  62.140 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.rcc8.RCC8TangentialProperPartInverseFunc
  62.141 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesContainsFunc
  62.142 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesCrossesFunc
  62.143 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesDisjointFunc
  62.144 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesEqualsFunc
  62.145 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesIntersectsFunc
  62.146 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesOverlapsFunc
  62.147 +org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeaturesWithinFunc
  62.148  org.openrdf.query.algebra.evaluation.function.spatial.geosparql.sf.SimpleFeatureTouchesFunc
  62.149 \ No newline at end of file
    63.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAbove.java	Mon Mar 19 21:57:30 2012 +0100
    63.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAbove.java	Mon Mar 19 22:06:59 2012 +0100
    63.3 @@ -1,19 +1,19 @@
    63.4 -/*
    63.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    63.6 - *
    63.7 - * Licensed under the Aduna BSD-style license.
    63.8 - */
    63.9 -package org.openrdf.sail.generaldb.algebra;
   63.10 -
   63.11 - 
   63.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   63.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   63.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   63.15 -
   63.16 -public class GeneralDBSqlAbove extends GeneralDBSqlGeoSpatial{
   63.17 -
   63.18 -	public GeneralDBSqlAbove(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   63.19 -		super(left, right);
   63.20 -	}
   63.21 - 
   63.22 +/*
   63.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   63.24 + *
   63.25 + * Licensed under the Aduna BSD-style license.
   63.26 + */
   63.27 +package org.openrdf.sail.generaldb.algebra;
   63.28 +
   63.29 + 
   63.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   63.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   63.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   63.33 +
   63.34 +public class GeneralDBSqlAbove extends GeneralDBSqlGeoSpatial{
   63.35 +
   63.36 +	public GeneralDBSqlAbove(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   63.37 +		super(left, right);
   63.38 +	}
   63.39 + 
   63.40  }
   63.41 \ No newline at end of file
    64.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAnyInteract.java	Mon Mar 19 21:57:30 2012 +0100
    64.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlAnyInteract.java	Mon Mar 19 22:06:59 2012 +0100
    64.3 @@ -1,19 +1,19 @@
    64.4 -/*
    64.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    64.6 - *
    64.7 - * Licensed under the Aduna BSD-style license.
    64.8 - */
    64.9 -package org.openrdf.sail.generaldb.algebra;
   64.10 -
   64.11 - 
   64.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   64.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   64.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   64.15 -
   64.16 -public class GeneralDBSqlAnyInteract extends GeneralDBSqlGeoSpatial{
   64.17 -
   64.18 -	public GeneralDBSqlAnyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   64.19 -		super(left, right);
   64.20 -	}
   64.21 -
   64.22 +/*
   64.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   64.24 + *
   64.25 + * Licensed under the Aduna BSD-style license.
   64.26 + */
   64.27 +package org.openrdf.sail.generaldb.algebra;
   64.28 +
   64.29 + 
   64.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   64.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   64.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   64.33 +
   64.34 +public class GeneralDBSqlAnyInteract extends GeneralDBSqlGeoSpatial{
   64.35 +
   64.36 +	public GeneralDBSqlAnyInteract(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   64.37 +		super(left, right);
   64.38 +	}
   64.39 +
   64.40  }
   64.41 \ No newline at end of file
    65.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlBelow.java	Mon Mar 19 21:57:30 2012 +0100
    65.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlBelow.java	Mon Mar 19 22:06:59 2012 +0100
    65.3 @@ -1,19 +1,19 @@
    65.4 -/*
    65.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    65.6 - *
    65.7 - * Licensed under the Aduna BSD-style license.
    65.8 - */
    65.9 -package org.openrdf.sail.generaldb.algebra;
   65.10 -
   65.11 - 
   65.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   65.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   65.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   65.15 -
   65.16 -public class GeneralDBSqlBelow extends GeneralDBSqlGeoSpatial{
   65.17 -
   65.18 -	public GeneralDBSqlBelow(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   65.19 -		super(left, right);
   65.20 -	}
   65.21 - 
   65.22 +/*
   65.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   65.24 + *
   65.25 + * Licensed under the Aduna BSD-style license.
   65.26 + */
   65.27 +package org.openrdf.sail.generaldb.algebra;
   65.28 +
   65.29 + 
   65.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   65.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   65.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   65.33 +
   65.34 +public class GeneralDBSqlBelow extends GeneralDBSqlGeoSpatial{
   65.35 +
   65.36 +	public GeneralDBSqlBelow(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   65.37 +		super(left, right);
   65.38 +	}
   65.39 + 
   65.40  }
   65.41 \ No newline at end of file
    66.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlContains.java	Mon Mar 19 21:57:30 2012 +0100
    66.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlContains.java	Mon Mar 19 22:06:59 2012 +0100
    66.3 @@ -1,19 +1,19 @@
    66.4 -/*
    66.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    66.6 - *
    66.7 - * Licensed under the Aduna BSD-style license.
    66.8 - */
    66.9 -package org.openrdf.sail.generaldb.algebra;
   66.10 -
   66.11 - 
   66.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   66.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   66.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   66.15 -
   66.16 -public class GeneralDBSqlContains extends GeneralDBSqlGeoSpatial{
   66.17 -
   66.18 -	public GeneralDBSqlContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   66.19 -		super(left, right);
   66.20 -	}
   66.21 - 
   66.22 +/*
   66.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   66.24 + *
   66.25 + * Licensed under the Aduna BSD-style license.
   66.26 + */
   66.27 +package org.openrdf.sail.generaldb.algebra;
   66.28 +
   66.29 + 
   66.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   66.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   66.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   66.33 +
   66.34 +public class GeneralDBSqlContains extends GeneralDBSqlGeoSpatial{
   66.35 +
   66.36 +	public GeneralDBSqlContains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   66.37 +		super(left, right);
   66.38 +	}
   66.39 + 
   66.40  }
   66.41 \ No newline at end of file
    67.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCoveredBy.java	Mon Mar 19 21:57:30 2012 +0100
    67.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCoveredBy.java	Mon Mar 19 22:06:59 2012 +0100
    67.3 @@ -1,20 +1,20 @@
    67.4 -/*
    67.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    67.6 - *
    67.7 - * Licensed under the Aduna BSD-style license.
    67.8 - */
    67.9 -package org.openrdf.sail.generaldb.algebra;
   67.10 -
   67.11 - 
   67.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   67.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   67.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   67.15 -
   67.16 -public class GeneralDBSqlCoveredBy extends GeneralDBSqlGeoSpatial{
   67.17 -
   67.18 -	public GeneralDBSqlCoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   67.19 -		super(left, right);
   67.20 -	}
   67.21 - 
   67.22 -
   67.23 +/*
   67.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   67.25 + *
   67.26 + * Licensed under the Aduna BSD-style license.
   67.27 + */
   67.28 +package org.openrdf.sail.generaldb.algebra;
   67.29 +
   67.30 + 
   67.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   67.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   67.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   67.34 +
   67.35 +public class GeneralDBSqlCoveredBy extends GeneralDBSqlGeoSpatial{
   67.36 +
   67.37 +	public GeneralDBSqlCoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   67.38 +		super(left, right);
   67.39 +	}
   67.40 + 
   67.41 +
   67.42  }
   67.43 \ No newline at end of file
    68.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCovers.java	Mon Mar 19 21:57:30 2012 +0100
    68.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlCovers.java	Mon Mar 19 22:06:59 2012 +0100
    68.3 @@ -1,20 +1,20 @@
    68.4 -/*
    68.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    68.6 - *
    68.7 - * Licensed under the Aduna BSD-style license.
    68.8 - */
    68.9 -package org.openrdf.sail.generaldb.algebra;
   68.10 -
   68.11 - 
   68.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   68.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   68.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   68.15 -
   68.16 -public class GeneralDBSqlCovers extends GeneralDBSqlGeoSpatial{
   68.17 -
   68.18 -	public GeneralDBSqlCovers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   68.19 -		super(left, right);
   68.20 -	}
   68.21 -
   68.22 - 
   68.23 +/*
   68.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   68.25 + *
   68.26 + * Licensed under the Aduna BSD-style license.
   68.27 + */
   68.28 +package org.openrdf.sail.generaldb.algebra;
   68.29 +
   68.30 + 
   68.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   68.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   68.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   68.34 +
   68.35 +public class GeneralDBSqlCovers extends GeneralDBSqlGeoSpatial{
   68.36 +
   68.37 +	public GeneralDBSqlCovers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   68.38 +		super(left, right);
   68.39 +	}
   68.40 +
   68.41 + 
   68.42  }
   68.43 \ No newline at end of file
    69.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlDisjoint.java	Mon Mar 19 21:57:30 2012 +0100
    69.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlDisjoint.java	Mon Mar 19 22:06:59 2012 +0100
    69.3 @@ -1,20 +1,20 @@
    69.4 -/*
    69.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    69.6 - *
    69.7 - * Licensed under the Aduna BSD-style license.
    69.8 - */
    69.9 -package org.openrdf.sail.generaldb.algebra;
   69.10 -
   69.11 - 
   69.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   69.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   69.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   69.15 -
   69.16 -public class GeneralDBSqlDisjoint extends GeneralDBSqlGeoSpatial{
   69.17 -
   69.18 -	public GeneralDBSqlDisjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   69.19 -		super(left, right);
   69.20 -	}
   69.21 -
   69.22 - 
   69.23 +/*
   69.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   69.25 + *
   69.26 + * Licensed under the Aduna BSD-style license.
   69.27 + */
   69.28 +package org.openrdf.sail.generaldb.algebra;
   69.29 +
   69.30 + 
   69.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   69.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   69.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   69.34 +
   69.35 +public class GeneralDBSqlDisjoint extends GeneralDBSqlGeoSpatial{
   69.36 +
   69.37 +	public GeneralDBSqlDisjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   69.38 +		super(left, right);
   69.39 +	}
   69.40 +
   69.41 + 
   69.42  }
   69.43 \ No newline at end of file
    70.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlEqualsSpatial.java	Mon Mar 19 21:57:30 2012 +0100
    70.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlEqualsSpatial.java	Mon Mar 19 22:06:59 2012 +0100
    70.3 @@ -1,20 +1,20 @@
    70.4 -/*
    70.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    70.6 - *
    70.7 - * Licensed under the Aduna BSD-style license.
    70.8 - */
    70.9 -package org.openrdf.sail.generaldb.algebra;
   70.10 -
   70.11 - 
   70.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   70.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   70.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   70.15 -
   70.16 -public class GeneralDBSqlEqualsSpatial extends GeneralDBSqlGeoSpatial{
   70.17 -
   70.18 -	public GeneralDBSqlEqualsSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   70.19 -		super(left, right);
   70.20 -	}
   70.21 -
   70.22 -
   70.23 +/*
   70.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   70.25 + *
   70.26 + * Licensed under the Aduna BSD-style license.
   70.27 + */
   70.28 +package org.openrdf.sail.generaldb.algebra;
   70.29 +
   70.30 + 
   70.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   70.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   70.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   70.34 +
   70.35 +public class GeneralDBSqlEqualsSpatial extends GeneralDBSqlGeoSpatial{
   70.36 +
   70.37 +	public GeneralDBSqlEqualsSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   70.38 +		super(left, right);
   70.39 +	}
   70.40 +
   70.41 +
   70.42  }
   70.43 \ No newline at end of file
    71.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoArea.java	Mon Mar 19 21:57:30 2012 +0100
    71.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoArea.java	Mon Mar 19 22:06:59 2012 +0100
    71.3 @@ -1,25 +1,25 @@
    71.4 -/*
    71.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    71.6 - *
    71.7 - * Licensed under the Aduna BSD-style license.
    71.8 - */
    71.9 -package org.openrdf.sail.generaldb.algebra;
   71.10 -
   71.11 -  
   71.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   71.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   71.14 -
   71.15 -public class GeneralDBSqlGeoArea extends GeneralDBSqlSpatialMetricUnary{
   71.16 -
   71.17 -	public GeneralDBSqlGeoArea(GeneralDBSqlExpr expr) {
   71.18 -		super(expr);
   71.19 -	}
   71.20 -
   71.21 -	@Override
   71.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   71.23 -		throws X
   71.24 -	{
   71.25 -		visitor.meet(this);
   71.26 -	}
   71.27 -
   71.28 +/*
   71.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   71.30 + *
   71.31 + * Licensed under the Aduna BSD-style license.
   71.32 + */
   71.33 +package org.openrdf.sail.generaldb.algebra;
   71.34 +
   71.35 +  
   71.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   71.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   71.38 +
   71.39 +public class GeneralDBSqlGeoArea extends GeneralDBSqlSpatialMetricUnary{
   71.40 +
   71.41 +	public GeneralDBSqlGeoArea(GeneralDBSqlExpr expr) {
   71.42 +		super(expr);
   71.43 +	}
   71.44 +
   71.45 +	@Override
   71.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   71.47 +		throws X
   71.48 +	{
   71.49 +		visitor.meet(this);
   71.50 +	}
   71.51 +
   71.52  }
   71.53 \ No newline at end of file
    72.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java	Mon Mar 19 21:57:30 2012 +0100
    72.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsText.java	Mon Mar 19 22:06:59 2012 +0100
    72.3 @@ -1,25 +1,25 @@
    72.4 -/*
    72.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    72.6 - *
    72.7 - * Licensed under the Aduna BSD-style license.
    72.8 - */
    72.9 -package org.openrdf.sail.generaldb.algebra;
   72.10 -
   72.11 -  
   72.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   72.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   72.14 -
   72.15 -public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty{
   72.16 -
   72.17 -	public GeneralDBSqlGeoAsText(GeneralDBSqlExpr expr) {
   72.18 -		super(expr);
   72.19 -	}
   72.20 -
   72.21 -	@Override
   72.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   72.23 -		throws X
   72.24 -	{
   72.25 -		visitor.meet(this);
   72.26 -	}
   72.27 -
   72.28 +/*
   72.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   72.30 + *
   72.31 + * Licensed under the Aduna BSD-style license.
   72.32 + */
   72.33 +package org.openrdf.sail.generaldb.algebra;
   72.34 +
   72.35 +  
   72.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   72.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   72.38 +
   72.39 +public class GeneralDBSqlGeoAsText extends GeneralDBSqlSpatialProperty{
   72.40 +
   72.41 +	public GeneralDBSqlGeoAsText(GeneralDBSqlExpr expr) {
   72.42 +		super(expr);
   72.43 +	}
   72.44 +
   72.45 +	@Override
   72.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   72.47 +		throws X
   72.48 +	{
   72.49 +		visitor.meet(this);
   72.50 +	}
   72.51 +
   72.52  }
   72.53 \ No newline at end of file
    73.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBoundary.java	Mon Mar 19 21:57:30 2012 +0100
    73.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBoundary.java	Mon Mar 19 22:06:59 2012 +0100
    73.3 @@ -1,25 +1,25 @@
    73.4 -/*
    73.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    73.6 - *
    73.7 - * Licensed under the Aduna BSD-style license.
    73.8 - */
    73.9 -package org.openrdf.sail.generaldb.algebra;
   73.10 -
   73.11 -  
   73.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   73.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   73.14 -
   73.15 -public class GeneralDBSqlGeoBoundary extends GeneralDBSqlSpatialConstructUnary{
   73.16 -
   73.17 -	public GeneralDBSqlGeoBoundary(GeneralDBSqlExpr expr) {
   73.18 -		super(expr);
   73.19 -	}
   73.20 -
   73.21 -	@Override
   73.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   73.23 -		throws X
   73.24 -	{
   73.25 -		visitor.meet(this);
   73.26 -	}
   73.27 -
   73.28 +/*
   73.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   73.30 + *
   73.31 + * Licensed under the Aduna BSD-style license.
   73.32 + */
   73.33 +package org.openrdf.sail.generaldb.algebra;
   73.34 +
   73.35 +  
   73.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   73.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   73.38 +
   73.39 +public class GeneralDBSqlGeoBoundary extends GeneralDBSqlSpatialConstructUnary{
   73.40 +
   73.41 +	public GeneralDBSqlGeoBoundary(GeneralDBSqlExpr expr) {
   73.42 +		super(expr);
   73.43 +	}
   73.44 +
   73.45 +	@Override
   73.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   73.47 +		throws X
   73.48 +	{
   73.49 +		visitor.meet(this);
   73.50 +	}
   73.51 +
   73.52  }
   73.53 \ No newline at end of file
    74.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java	Mon Mar 19 21:57:30 2012 +0100
    74.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoBuffer.java	Mon Mar 19 22:06:59 2012 +0100
    74.3 @@ -1,25 +1,25 @@
    74.4 -/*
    74.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    74.6 - *
    74.7 - * Licensed under the Aduna BSD-style license.
    74.8 - */
    74.9 -package org.openrdf.sail.generaldb.algebra;
   74.10 -
   74.11 -  
   74.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   74.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   74.14 -
   74.15 -public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructBinary{
   74.16 -
   74.17 -	public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   74.18 -		super(left, right);
   74.19 -	}
   74.20 -
   74.21 -	@Override
   74.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   74.23 -		throws X
   74.24 -	{
   74.25 -		visitor.meet(this);
   74.26 -	}
   74.27 -
   74.28 +/*
   74.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   74.30 + *
   74.31 + * Licensed under the Aduna BSD-style license.
   74.32 + */
   74.33 +package org.openrdf.sail.generaldb.algebra;
   74.34 +
   74.35 +  
   74.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   74.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   74.38 +
   74.39 +public class GeneralDBSqlGeoBuffer extends GeneralDBSqlSpatialConstructBinary{
   74.40 +
   74.41 +	public GeneralDBSqlGeoBuffer(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   74.42 +		super(left, right);
   74.43 +	}
   74.44 +
   74.45 +	@Override
   74.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   74.47 +		throws X
   74.48 +	{
   74.49 +		visitor.meet(this);
   74.50 +	}
   74.51 +
   74.52  }
   74.53 \ No newline at end of file
    75.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoConvexHull.java	Mon Mar 19 21:57:30 2012 +0100
    75.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoConvexHull.java	Mon Mar 19 22:06:59 2012 +0100
    75.3 @@ -1,25 +1,25 @@
    75.4 -/*
    75.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    75.6 - *
    75.7 - * Licensed under the Aduna BSD-style license.
    75.8 - */
    75.9 -package org.openrdf.sail.generaldb.algebra;
   75.10 -
   75.11 -  
   75.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   75.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   75.14 -
   75.15 -public class GeneralDBSqlGeoConvexHull extends GeneralDBSqlSpatialConstructUnary{
   75.16 -
   75.17 -	public GeneralDBSqlGeoConvexHull(GeneralDBSqlExpr expr) {
   75.18 -		super(expr);
   75.19 -	}
   75.20 -
   75.21 -	@Override
   75.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   75.23 -		throws X
   75.24 -	{
   75.25 -		visitor.meet(this);
   75.26 -	}
   75.27 -
   75.28 +/*
   75.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   75.30 + *
   75.31 + * Licensed under the Aduna BSD-style license.
   75.32 + */
   75.33 +package org.openrdf.sail.generaldb.algebra;
   75.34 +
   75.35 +  
   75.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   75.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   75.38 +
   75.39 +public class GeneralDBSqlGeoConvexHull extends GeneralDBSqlSpatialConstructUnary{
   75.40 +
   75.41 +	public GeneralDBSqlGeoConvexHull(GeneralDBSqlExpr expr) {
   75.42 +		super(expr);
   75.43 +	}
   75.44 +
   75.45 +	@Override
   75.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   75.47 +		throws X
   75.48 +	{
   75.49 +		visitor.meet(this);
   75.50 +	}
   75.51 +
   75.52  }
   75.53 \ No newline at end of file
    76.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDifference.java	Mon Mar 19 21:57:30 2012 +0100
    76.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDifference.java	Mon Mar 19 22:06:59 2012 +0100
    76.3 @@ -1,25 +1,25 @@
    76.4 -/*
    76.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    76.6 - *
    76.7 - * Licensed under the Aduna BSD-style license.
    76.8 - */
    76.9 -package org.openrdf.sail.generaldb.algebra;
   76.10 -
   76.11 -  
   76.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   76.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   76.14 -
   76.15 -public class GeneralDBSqlGeoDifference extends GeneralDBSqlSpatialConstructBinary{
   76.16 -
   76.17 -	public GeneralDBSqlGeoDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   76.18 -		super(left, right);
   76.19 -	}
   76.20 -
   76.21 -	@Override
   76.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   76.23 -		throws X
   76.24 -	{
   76.25 -		visitor.meet(this);
   76.26 -	}
   76.27 -
   76.28 +/*
   76.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   76.30 + *
   76.31 + * Licensed under the Aduna BSD-style license.
   76.32 + */
   76.33 +package org.openrdf.sail.generaldb.algebra;
   76.34 +
   76.35 +  
   76.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   76.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   76.38 +
   76.39 +public class GeneralDBSqlGeoDifference extends GeneralDBSqlSpatialConstructBinary{
   76.40 +
   76.41 +	public GeneralDBSqlGeoDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   76.42 +		super(left, right);
   76.43 +	}
   76.44 +
   76.45 +	@Override
   76.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   76.47 +		throws X
   76.48 +	{
   76.49 +		visitor.meet(this);
   76.50 +	}
   76.51 +
   76.52  }
   76.53 \ No newline at end of file
    77.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java	Mon Mar 19 21:57:30 2012 +0100
    77.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDimension.java	Mon Mar 19 22:06:59 2012 +0100
    77.3 @@ -1,25 +1,25 @@
    77.4 -/*
    77.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    77.6 - *
    77.7 - * Licensed under the Aduna BSD-style license.
    77.8 - */
    77.9 -package org.openrdf.sail.generaldb.algebra;
   77.10 -
   77.11 -  
   77.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   77.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   77.14 -
   77.15 -public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty{
   77.16 -
   77.17 -	public GeneralDBSqlGeoDimension(GeneralDBSqlExpr expr) {
   77.18 -		super(expr);
   77.19 -	}
   77.20 -
   77.21 -	@Override
   77.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   77.23 -		throws X
   77.24 -	{
   77.25 -		visitor.meet(this);
   77.26 -	}
   77.27 -
   77.28 +/*
   77.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   77.30 + *
   77.31 + * Licensed under the Aduna BSD-style license.
   77.32 + */
   77.33 +package org.openrdf.sail.generaldb.algebra;
   77.34 +
   77.35 +  
   77.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   77.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   77.38 +
   77.39 +public class GeneralDBSqlGeoDimension extends GeneralDBSqlSpatialProperty{
   77.40 +
   77.41 +	public GeneralDBSqlGeoDimension(GeneralDBSqlExpr expr) {
   77.42 +		super(expr);
   77.43 +	}
   77.44 +
   77.45 +	@Override
   77.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   77.47 +		throws X
   77.48 +	{
   77.49 +		visitor.meet(this);
   77.50 +	}
   77.51 +
   77.52  }
   77.53 \ No newline at end of file
    78.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java	Mon Mar 19 21:57:30 2012 +0100
    78.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoDistance.java	Mon Mar 19 22:06:59 2012 +0100
    78.3 @@ -1,25 +1,25 @@
    78.4 -/*
    78.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    78.6 - *
    78.7 - * Licensed under the Aduna BSD-style license.
    78.8 - */
    78.9 -package org.openrdf.sail.generaldb.algebra;
   78.10 -
   78.11 -  
   78.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   78.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   78.14 -
   78.15 -public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricBinary{
   78.16 -
   78.17 -	public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   78.18 -		super(left, right);
   78.19 -	}
   78.20 -
   78.21 -	@Override
   78.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   78.23 -		throws X
   78.24 -	{
   78.25 -		visitor.meet(this);
   78.26 -	}
   78.27 -
   78.28 +/*
   78.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   78.30 + *
   78.31 + * Licensed under the Aduna BSD-style license.
   78.32 + */
   78.33 +package org.openrdf.sail.generaldb.algebra;
   78.34 +
   78.35 +  
   78.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   78.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   78.38 +
   78.39 +public class GeneralDBSqlGeoDistance extends GeneralDBSqlSpatialMetricBinary{
   78.40 +
   78.41 +	public GeneralDBSqlGeoDistance(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   78.42 +		super(left, right);
   78.43 +	}
   78.44 +
   78.45 +	@Override
   78.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   78.47 +		throws X
   78.48 +	{
   78.49 +		visitor.meet(this);
   78.50 +	}
   78.51 +
   78.52  }
   78.53 \ No newline at end of file
    79.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoEnvelope.java	Mon Mar 19 21:57:30 2012 +0100
    79.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoEnvelope.java	Mon Mar 19 22:06:59 2012 +0100
    79.3 @@ -1,25 +1,25 @@
    79.4 -/*
    79.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    79.6 - *
    79.7 - * Licensed under the Aduna BSD-style license.
    79.8 - */
    79.9 -package org.openrdf.sail.generaldb.algebra;
   79.10 -
   79.11 -  
   79.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   79.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   79.14 -
   79.15 -public class GeneralDBSqlGeoEnvelope extends GeneralDBSqlSpatialConstructUnary{
   79.16 -
   79.17 -	public GeneralDBSqlGeoEnvelope(GeneralDBSqlExpr expr) {
   79.18 -		super(expr);
   79.19 -	}
   79.20 -
   79.21 -	@Override
   79.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   79.23 -		throws X
   79.24 -	{
   79.25 -		visitor.meet(this);
   79.26 -	}
   79.27 -
   79.28 +/*
   79.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   79.30 + *
   79.31 + * Licensed under the Aduna BSD-style license.
   79.32 + */
   79.33 +package org.openrdf.sail.generaldb.algebra;
   79.34 +
   79.35 +  
   79.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   79.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   79.38 +
   79.39 +public class GeneralDBSqlGeoEnvelope extends GeneralDBSqlSpatialConstructUnary{
   79.40 +
   79.41 +	public GeneralDBSqlGeoEnvelope(GeneralDBSqlExpr expr) {
   79.42 +		super(expr);
   79.43 +	}
   79.44 +
   79.45 +	@Override
   79.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   79.47 +		throws X
   79.48 +	{
   79.49 +		visitor.meet(this);
   79.50 +	}
   79.51 +
   79.52  }
   79.53 \ No newline at end of file
    80.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoGeometryType.java	Mon Mar 19 21:57:30 2012 +0100
    80.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoGeometryType.java	Mon Mar 19 22:06:59 2012 +0100
    80.3 @@ -1,25 +1,25 @@
    80.4 -/*
    80.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    80.6 - *
    80.7 - * Licensed under the Aduna BSD-style license.
    80.8 - */
    80.9 -package org.openrdf.sail.generaldb.algebra;
   80.10 -
   80.11 -  
   80.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   80.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   80.14 -
   80.15 -public class GeneralDBSqlGeoGeometryType extends GeneralDBSqlSpatialProperty{
   80.16 -
   80.17 -	public GeneralDBSqlGeoGeometryType(GeneralDBSqlExpr expr) {
   80.18 -		super(expr);
   80.19 -	}
   80.20 -
   80.21 -	@Override
   80.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   80.23 -		throws X
   80.24 -	{
   80.25 -		visitor.meet(this);
   80.26 -	}
   80.27 -
   80.28 +/*
   80.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   80.30 + *
   80.31 + * Licensed under the Aduna BSD-style license.
   80.32 + */
   80.33 +package org.openrdf.sail.generaldb.algebra;
   80.34 +
   80.35 +  
   80.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   80.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   80.38 +
   80.39 +public class GeneralDBSqlGeoGeometryType extends GeneralDBSqlSpatialProperty{
   80.40 +
   80.41 +	public GeneralDBSqlGeoGeometryType(GeneralDBSqlExpr expr) {
   80.42 +		super(expr);
   80.43 +	}
   80.44 +
   80.45 +	@Override
   80.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   80.47 +		throws X
   80.48 +	{
   80.49 +		visitor.meet(this);
   80.50 +	}
   80.51 +
   80.52  }
   80.53 \ No newline at end of file
    81.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIntersection.java	Mon Mar 19 21:57:30 2012 +0100
    81.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIntersection.java	Mon Mar 19 22:06:59 2012 +0100
    81.3 @@ -1,25 +1,25 @@
    81.4 -/*
    81.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    81.6 - *
    81.7 - * Licensed under the Aduna BSD-style license.
    81.8 - */
    81.9 -package org.openrdf.sail.generaldb.algebra;
   81.10 -
   81.11 -  
   81.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   81.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   81.14 -
   81.15 -public class GeneralDBSqlGeoIntersection extends GeneralDBSqlSpatialConstructBinary{
   81.16 -
   81.17 -	public GeneralDBSqlGeoIntersection(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   81.18 -		super(left, right);
   81.19 -	}
   81.20 -
   81.21 -	@Override
   81.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   81.23 -		throws X
   81.24 -	{
   81.25 -		visitor.meet(this);
   81.26 -	}
   81.27 -
   81.28 +/*
   81.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   81.30 + *
   81.31 + * Licensed under the Aduna BSD-style license.
   81.32 + */
   81.33 +package org.openrdf.sail.generaldb.algebra;
   81.34 +
   81.35 +  
   81.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   81.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   81.38 +
   81.39 +public class GeneralDBSqlGeoIntersection extends GeneralDBSqlSpatialConstructBinary{
   81.40 +
   81.41 +	public GeneralDBSqlGeoIntersection(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   81.42 +		super(left, right);
   81.43 +	}
   81.44 +
   81.45 +	@Override
   81.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   81.47 +		throws X
   81.48 +	{
   81.49 +		visitor.meet(this);
   81.50 +	}
   81.51 +
   81.52  }
   81.53 \ No newline at end of file
    82.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java	Mon Mar 19 21:57:30 2012 +0100
    82.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsEmpty.java	Mon Mar 19 22:06:59 2012 +0100
    82.3 @@ -1,25 +1,25 @@
    82.4 -/*
    82.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    82.6 - *
    82.7 - * Licensed under the Aduna BSD-style license.
    82.8 - */
    82.9 -package org.openrdf.sail.generaldb.algebra;
   82.10 -
   82.11 -  
   82.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   82.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   82.14 -
   82.15 -public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty{
   82.16 -
   82.17 -	public GeneralDBSqlGeoIsEmpty(GeneralDBSqlExpr expr) {
   82.18 -		super(expr);
   82.19 -	}
   82.20 -
   82.21 -	@Override
   82.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   82.23 -		throws X
   82.24 -	{
   82.25 -		visitor.meet(this);
   82.26 -	}
   82.27 -
   82.28 +/*
   82.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   82.30 + *
   82.31 + * Licensed under the Aduna BSD-style license.
   82.32 + */
   82.33 +package org.openrdf.sail.generaldb.algebra;
   82.34 +
   82.35 +  
   82.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   82.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   82.38 +
   82.39 +public class GeneralDBSqlGeoIsEmpty extends GeneralDBSqlSpatialProperty{
   82.40 +
   82.41 +	public GeneralDBSqlGeoIsEmpty(GeneralDBSqlExpr expr) {
   82.42 +		super(expr);
   82.43 +	}
   82.44 +
   82.45 +	@Override
   82.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   82.47 +		throws X
   82.48 +	{
   82.49 +		visitor.meet(this);
   82.50 +	}
   82.51 +
   82.52  }
   82.53 \ No newline at end of file
    83.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java	Mon Mar 19 21:57:30 2012 +0100
    83.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoIsSimple.java	Mon Mar 19 22:06:59 2012 +0100
    83.3 @@ -1,25 +1,25 @@
    83.4 -/*
    83.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    83.6 - *
    83.7 - * Licensed under the Aduna BSD-style license.
    83.8 - */
    83.9 -package org.openrdf.sail.generaldb.algebra;
   83.10 -
   83.11 -  
   83.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   83.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   83.14 -
   83.15 -public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty{
   83.16 -
   83.17 -	public GeneralDBSqlGeoIsSimple(GeneralDBSqlExpr expr) {
   83.18 -		super(expr);
   83.19 -	}
   83.20 -
   83.21 -	@Override
   83.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   83.23 -		throws X
   83.24 -	{
   83.25 -		visitor.meet(this);
   83.26 -	}
   83.27 -
   83.28 +/*
   83.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   83.30 + *
   83.31 + * Licensed under the Aduna BSD-style license.
   83.32 + */
   83.33 +package org.openrdf.sail.generaldb.algebra;
   83.34 +
   83.35 +  
   83.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   83.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   83.38 +
   83.39 +public class GeneralDBSqlGeoIsSimple extends GeneralDBSqlSpatialProperty{
   83.40 +
   83.41 +	public GeneralDBSqlGeoIsSimple(GeneralDBSqlExpr expr) {
   83.42 +		super(expr);
   83.43 +	}
   83.44 +
   83.45 +	@Override
   83.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   83.47 +		throws X
   83.48 +	{
   83.49 +		visitor.meet(this);
   83.50 +	}
   83.51 +
   83.52  }
   83.53 \ No newline at end of file
    84.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSpatial.java	Mon Mar 19 21:57:30 2012 +0100
    84.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSpatial.java	Mon Mar 19 22:06:59 2012 +0100
    84.3 @@ -1,21 +1,21 @@
    84.4 -package org.openrdf.sail.generaldb.algebra;
    84.5 -
    84.6 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
    84.7 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
    84.8 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
    84.9 -
   84.10 -public abstract class GeneralDBSqlGeoSpatial extends BinaryGeneralDBOperator
   84.11 -{
   84.12 -
   84.13 -	public GeneralDBSqlGeoSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   84.14 -		super(left, right);
   84.15 -	}
   84.16 -
   84.17 -	@Override
   84.18 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   84.19 -		throws X
   84.20 -	{
   84.21 -		visitor.meet(this);
   84.22 -	}
   84.23 -
   84.24 -}
   84.25 +package org.openrdf.sail.generaldb.algebra;
   84.26 +
   84.27 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
   84.28 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   84.29 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   84.30 +
   84.31 +public abstract class GeneralDBSqlGeoSpatial extends BinaryGeneralDBOperator
   84.32 +{
   84.33 +
   84.34 +	public GeneralDBSqlGeoSpatial(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   84.35 +		super(left, right);
   84.36 +	}
   84.37 +
   84.38 +	@Override
   84.39 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   84.40 +		throws X
   84.41 +	{
   84.42 +		visitor.meet(this);
   84.43 +	}
   84.44 +
   84.45 +}
    85.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java	Mon Mar 19 21:57:30 2012 +0100
    85.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSrid.java	Mon Mar 19 22:06:59 2012 +0100
    85.3 @@ -1,25 +1,25 @@
    85.4 -/*
    85.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    85.6 - *
    85.7 - * Licensed under the Aduna BSD-style license.
    85.8 - */
    85.9 -package org.openrdf.sail.generaldb.algebra;
   85.10 -
   85.11 -  
   85.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   85.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   85.14 -
   85.15 -public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty{
   85.16 -
   85.17 -	public GeneralDBSqlGeoSrid(GeneralDBSqlExpr expr) {
   85.18 -		super(expr);
   85.19 -	}
   85.20 -
   85.21 -	@Override
   85.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   85.23 -		throws X
   85.24 -	{
   85.25 -		visitor.meet(this);
   85.26 -	}
   85.27 -
   85.28 +/*
   85.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   85.30 + *
   85.31 + * Licensed under the Aduna BSD-style license.
   85.32 + */
   85.33 +package org.openrdf.sail.generaldb.algebra;
   85.34 +
   85.35 +  
   85.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   85.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   85.38 +
   85.39 +public class GeneralDBSqlGeoSrid extends GeneralDBSqlSpatialProperty{
   85.40 +
   85.41 +	public GeneralDBSqlGeoSrid(GeneralDBSqlExpr expr) {
   85.42 +		super(expr);
   85.43 +	}
   85.44 +
   85.45 +	@Override
   85.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   85.47 +		throws X
   85.48 +	{
   85.49 +		visitor.meet(this);
   85.50 +	}
   85.51 +
   85.52  }
   85.53 \ No newline at end of file
    86.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSymDifference.java	Mon Mar 19 21:57:30 2012 +0100
    86.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoSymDifference.java	Mon Mar 19 22:06:59 2012 +0100
    86.3 @@ -1,25 +1,25 @@
    86.4 -/*
    86.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    86.6 - *
    86.7 - * Licensed under the Aduna BSD-style license.
    86.8 - */
    86.9 -package org.openrdf.sail.generaldb.algebra;
   86.10 -
   86.11 -  
   86.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   86.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   86.14 -
   86.15 -public class GeneralDBSqlGeoSymDifference extends GeneralDBSqlSpatialConstructBinary{
   86.16 -
   86.17 -	public GeneralDBSqlGeoSymDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   86.18 -		super(left, right);
   86.19 -	}
   86.20 -
   86.21 -	@Override
   86.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   86.23 -		throws X
   86.24 -	{
   86.25 -		visitor.meet(this);
   86.26 -	}
   86.27 -
   86.28 +/*
   86.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   86.30 + *
   86.31 + * Licensed under the Aduna BSD-style license.
   86.32 + */
   86.33 +package org.openrdf.sail.generaldb.algebra;
   86.34 +
   86.35 +  
   86.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   86.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   86.38 +
   86.39 +public class GeneralDBSqlGeoSymDifference extends GeneralDBSqlSpatialConstructBinary{
   86.40 +
   86.41 +	public GeneralDBSqlGeoSymDifference(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   86.42 +		super(left, right);
   86.43 +	}
   86.44 +
   86.45 +	@Override
   86.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   86.47 +		throws X
   86.48 +	{
   86.49 +		visitor.meet(this);
   86.50 +	}
   86.51 +
   86.52  }
   86.53 \ No newline at end of file
    87.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoTransform.java	Mon Mar 19 21:57:30 2012 +0100
    87.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoTransform.java	Mon Mar 19 22:06:59 2012 +0100
    87.3 @@ -1,25 +1,25 @@
    87.4 -/*
    87.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    87.6 - *
    87.7 - * Licensed under the Aduna BSD-style license.
    87.8 - */
    87.9 -package org.openrdf.sail.generaldb.algebra;
   87.10 -
   87.11 -  
   87.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   87.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   87.14 -
   87.15 -public class GeneralDBSqlGeoTransform extends GeneralDBSqlSpatialConstructBinary{
   87.16 -
   87.17 -	public GeneralDBSqlGeoTransform(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   87.18 -		super(left, right);
   87.19 -	}
   87.20 -
   87.21 -	@Override
   87.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   87.23 -		throws X
   87.24 -	{
   87.25 -		visitor.meet(this);
   87.26 -	}
   87.27 -
   87.28 +/*
   87.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   87.30 + *
   87.31 + * Licensed under the Aduna BSD-style license.
   87.32 + */
   87.33 +package org.openrdf.sail.generaldb.algebra;
   87.34 +
   87.35 +  
   87.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   87.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   87.38 +
   87.39 +public class GeneralDBSqlGeoTransform extends GeneralDBSqlSpatialConstructBinary{
   87.40 +
   87.41 +	public GeneralDBSqlGeoTransform(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   87.42 +		super(left, right);
   87.43 +	}
   87.44 +
   87.45 +	@Override
   87.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   87.47 +		throws X
   87.48 +	{
   87.49 +		visitor.meet(this);
   87.50 +	}
   87.51 +
   87.52  }
   87.53 \ No newline at end of file
    88.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoUnion.java	Mon Mar 19 21:57:30 2012 +0100
    88.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoUnion.java	Mon Mar 19 22:06:59 2012 +0100
    88.3 @@ -1,25 +1,25 @@
    88.4 -/*
    88.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    88.6 - *
    88.7 - * Licensed under the Aduna BSD-style license.
    88.8 - */
    88.9 -package org.openrdf.sail.generaldb.algebra;
   88.10 -
   88.11 -  
   88.12 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   88.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   88.14 -
   88.15 -public class GeneralDBSqlGeoUnion extends GeneralDBSqlSpatialConstructBinary{
   88.16 -
   88.17 -	public GeneralDBSqlGeoUnion(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   88.18 -		super(left, right);
   88.19 -	}
   88.20 -
   88.21 -	@Override
   88.22 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   88.23 -		throws X
   88.24 -	{
   88.25 -		visitor.meet(this);
   88.26 -	}
   88.27 -
   88.28 +/*
   88.29 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   88.30 + *
   88.31 + * Licensed under the Aduna BSD-style license.
   88.32 + */
   88.33 +package org.openrdf.sail.generaldb.algebra;
   88.34 +
   88.35 +  
   88.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   88.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   88.38 +
   88.39 +public class GeneralDBSqlGeoUnion extends GeneralDBSqlSpatialConstructBinary{
   88.40 +
   88.41 +	public GeneralDBSqlGeoUnion(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   88.42 +		super(left, right);
   88.43 +	}
   88.44 +
   88.45 +	@Override
   88.46 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   88.47 +		throws X
   88.48 +	{
   88.49 +		visitor.meet(this);
   88.50 +	}
   88.51 +
   88.52  }
   88.53 \ No newline at end of file
    89.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlInside.java	Mon Mar 19 21:57:30 2012 +0100
    89.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlInside.java	Mon Mar 19 22:06:59 2012 +0100
    89.3 @@ -1,21 +1,21 @@
    89.4 -/*
    89.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    89.6 - *
    89.7 - * Licensed under the Aduna BSD-style license.
    89.8 - */
    89.9 -package org.openrdf.sail.generaldb.algebra;
   89.10 -
   89.11 - 
   89.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   89.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   89.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   89.15 -
   89.16 -public class GeneralDBSqlInside extends GeneralDBSqlGeoSpatial{
   89.17 -
   89.18 -	public GeneralDBSqlInside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   89.19 -		super(left, right);
   89.20 -	}
   89.21 -
   89.22 -	 
   89.23 -
   89.24 +/*
   89.25 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   89.26 + *
   89.27 + * Licensed under the Aduna BSD-style license.
   89.28 + */
   89.29 +package org.openrdf.sail.generaldb.algebra;
   89.30 +
   89.31 + 
   89.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   89.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   89.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   89.35 +
   89.36 +public class GeneralDBSqlInside extends GeneralDBSqlGeoSpatial{
   89.37 +
   89.38 +	public GeneralDBSqlInside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   89.39 +		super(left, right);
   89.40 +	}
   89.41 +
   89.42 +	 
   89.43 +
   89.44  }
   89.45 \ No newline at end of file
    90.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlLeft.java	Mon Mar 19 21:57:30 2012 +0100
    90.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlLeft.java	Mon Mar 19 22:06:59 2012 +0100
    90.3 @@ -1,18 +1,18 @@
    90.4 -/*
    90.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    90.6 - *
    90.7 - * Licensed under the Aduna BSD-style license.
    90.8 - */
    90.9 -package org.openrdf.sail.generaldb.algebra;
   90.10 -
   90.11 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   90.12 -
   90.13 - 
   90.14 -
   90.15 -public class GeneralDBSqlLeft extends GeneralDBSqlGeoSpatial{
   90.16 -
   90.17 -	public GeneralDBSqlLeft(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   90.18 -		super(left, right);
   90.19 -	}
   90.20 - 
   90.21 +/*
   90.22 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   90.23 + *
   90.24 + * Licensed under the Aduna BSD-style license.
   90.25 + */
   90.26 +package org.openrdf.sail.generaldb.algebra;
   90.27 +
   90.28 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   90.29 +
   90.30 + 
   90.31 +
   90.32 +public class GeneralDBSqlLeft extends GeneralDBSqlGeoSpatial{
   90.33 +
   90.34 +	public GeneralDBSqlLeft(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   90.35 +		super(left, right);
   90.36 +	}
   90.37 + 
   90.38  }
   90.39 \ No newline at end of file
    91.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlOverlap.java	Mon Mar 19 21:57:30 2012 +0100
    91.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlOverlap.java	Mon Mar 19 22:06:59 2012 +0100
    91.3 @@ -1,20 +1,20 @@
    91.4 -/*
    91.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    91.6 - *
    91.7 - * Licensed under the Aduna BSD-style license.
    91.8 - */
    91.9 -package org.openrdf.sail.generaldb.algebra;
   91.10 -
   91.11 - 
   91.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   91.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   91.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   91.15 -
   91.16 -public class GeneralDBSqlOverlap extends GeneralDBSqlGeoSpatial{
   91.17 -
   91.18 -	public GeneralDBSqlOverlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   91.19 -		super(left, right);
   91.20 -	}
   91.21 -
   91.22 -	 
   91.23 +/*
   91.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   91.25 + *
   91.26 + * Licensed under the Aduna BSD-style license.
   91.27 + */
   91.28 +package org.openrdf.sail.generaldb.algebra;
   91.29 +
   91.30 + 
   91.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   91.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   91.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   91.34 +
   91.35 +public class GeneralDBSqlOverlap extends GeneralDBSqlGeoSpatial{
   91.36 +
   91.37 +	public GeneralDBSqlOverlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   91.38 +		super(left, right);
   91.39 +	}
   91.40 +
   91.41 +	 
   91.42  }
   91.43 \ No newline at end of file
    92.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRelate.java	Mon Mar 19 21:57:30 2012 +0100
    92.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRelate.java	Mon Mar 19 22:06:59 2012 +0100
    92.3 @@ -1,26 +1,26 @@
    92.4 -/*
    92.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    92.6 - *
    92.7 - * Licensed under the Aduna BSD-style license.
    92.8 - */
    92.9 -package org.openrdf.sail.generaldb.algebra;
   92.10 -
   92.11 - 
   92.12 -import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator; 
   92.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   92.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   92.15 -
   92.16 -public class GeneralDBSqlRelate extends TripleGeneralDBOperator{
   92.17 -
   92.18 -	public GeneralDBSqlRelate(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) {
   92.19 -		super(left, right, third);
   92.20 -	}
   92.21 -
   92.22 -	@Override
   92.23 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   92.24 -		throws X
   92.25 -	{
   92.26 -		visitor.meet(this);
   92.27 -	}
   92.28 -
   92.29 +/*
   92.30 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   92.31 + *
   92.32 + * Licensed under the Aduna BSD-style license.
   92.33 + */
   92.34 +package org.openrdf.sail.generaldb.algebra;
   92.35 +
   92.36 + 
   92.37 +import org.openrdf.sail.generaldb.algebra.base.TripleGeneralDBOperator; 
   92.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   92.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   92.40 +
   92.41 +public class GeneralDBSqlRelate extends TripleGeneralDBOperator{
   92.42 +
   92.43 +	public GeneralDBSqlRelate(GeneralDBSqlExpr left, GeneralDBSqlExpr right, GeneralDBSqlExpr third) {
   92.44 +		super(left, right, third);
   92.45 +	}
   92.46 +
   92.47 +	@Override
   92.48 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   92.49 +		throws X
   92.50 +	{
   92.51 +		visitor.meet(this);
   92.52 +	}
   92.53 +
   92.54  }
   92.55 \ No newline at end of file
    93.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRight.java	Mon Mar 19 21:57:30 2012 +0100
    93.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlRight.java	Mon Mar 19 22:06:59 2012 +0100
    93.3 @@ -1,19 +1,19 @@
    93.4 -/*
    93.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    93.6 - *
    93.7 - * Licensed under the Aduna BSD-style license.
    93.8 - */
    93.9 -package org.openrdf.sail.generaldb.algebra;
   93.10 -
   93.11 - 
   93.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   93.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   93.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   93.15 -
   93.16 -public class GeneralDBSqlRight extends GeneralDBSqlGeoSpatial{
   93.17 -
   93.18 -	public GeneralDBSqlRight(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   93.19 -		super(left, right);
   93.20 -	}
   93.21 - 
   93.22 +/*
   93.23 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   93.24 + *
   93.25 + * Licensed under the Aduna BSD-style license.
   93.26 + */
   93.27 +package org.openrdf.sail.generaldb.algebra;
   93.28 +
   93.29 + 
   93.30 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   93.31 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   93.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   93.33 +
   93.34 +public class GeneralDBSqlRight extends GeneralDBSqlGeoSpatial{
   93.35 +
   93.36 +	public GeneralDBSqlRight(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   93.37 +		super(left, right);
   93.38 +	}
   93.39 + 
   93.40  }
   93.41 \ No newline at end of file
    94.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java	Mon Mar 19 21:57:30 2012 +0100
    94.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructBinary.java	Mon Mar 19 22:06:59 2012 +0100
    94.3 @@ -1,29 +1,29 @@
    94.4 -package org.openrdf.sail.generaldb.algebra;
    94.5 -
    94.6 -import java.util.ArrayList;
    94.7 -
    94.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
    94.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   94.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   94.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   94.12 -
   94.13 -public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator
   94.14 -{
   94.15 -
   94.16 -
   94.17 -	/*CONSTRUCTOR*/
   94.18 -
   94.19 -	public GeneralDBSqlSpatialConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   94.20 -		super(left, right);
   94.21 -	}
   94.22 -
   94.23 -	@Override
   94.24 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   94.25 -	throws X
   94.26 -	{
   94.27 -		visitor.meet(this);
   94.28 -	}
   94.29 -
   94.30 -}
   94.31 -
   94.32 -
   94.33 +package org.openrdf.sail.generaldb.algebra;
   94.34 +
   94.35 +import java.util.ArrayList;
   94.36 +
   94.37 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
   94.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   94.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   94.40 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   94.41 +
   94.42 +public class GeneralDBSqlSpatialConstructBinary extends BinaryGeneralDBOperator
   94.43 +{
   94.44 +
   94.45 +
   94.46 +	/*CONSTRUCTOR*/
   94.47 +
   94.48 +	public GeneralDBSqlSpatialConstructBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   94.49 +		super(left, right);
   94.50 +	}
   94.51 +
   94.52 +	@Override
   94.53 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   94.54 +	throws X
   94.55 +	{
   94.56 +		visitor.meet(this);
   94.57 +	}
   94.58 +
   94.59 +}
   94.60 +
   94.61 +
    95.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructUnary.java	Mon Mar 19 21:57:30 2012 +0100
    95.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialConstructUnary.java	Mon Mar 19 22:06:59 2012 +0100
    95.3 @@ -1,27 +1,27 @@
    95.4 -package org.openrdf.sail.generaldb.algebra;
    95.5 -
    95.6 -import java.util.ArrayList;
    95.7 -
    95.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
    95.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   95.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   95.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   95.12 -
   95.13 -public class GeneralDBSqlSpatialConstructUnary extends UnaryGeneralDBOperator
   95.14 -{
   95.15 -	
   95.16 -
   95.17 -	/*CONSTRUCTOR*/
   95.18 -	
   95.19 -	public GeneralDBSqlSpatialConstructUnary(GeneralDBSqlExpr expr) {
   95.20 -		super(expr);
   95.21 -	}
   95.22 -
   95.23 -	@Override
   95.24 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   95.25 -		throws X
   95.26 -	{
   95.27 -		visitor.meet(this);
   95.28 -	}
   95.29 -
   95.30 +package org.openrdf.sail.generaldb.algebra;
   95.31 +
   95.32 +import java.util.ArrayList;
   95.33 +
   95.34 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
   95.35 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   95.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   95.37 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   95.38 +
   95.39 +public class GeneralDBSqlSpatialConstructUnary extends UnaryGeneralDBOperator
   95.40 +{
   95.41 +	
   95.42 +
   95.43 +	/*CONSTRUCTOR*/
   95.44 +	
   95.45 +	public GeneralDBSqlSpatialConstructUnary(GeneralDBSqlExpr expr) {
   95.46 +		super(expr);
   95.47 +	}
   95.48 +
   95.49 +	@Override
   95.50 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   95.51 +		throws X
   95.52 +	{
   95.53 +		visitor.meet(this);
   95.54 +	}
   95.55 +
   95.56  }
   95.57 \ No newline at end of file
    96.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricBinary.java	Mon Mar 19 21:57:30 2012 +0100
    96.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricBinary.java	Mon Mar 19 22:06:59 2012 +0100
    96.3 @@ -1,29 +1,29 @@
    96.4 -package org.openrdf.sail.generaldb.algebra;
    96.5 -
    96.6 -import java.util.ArrayList;
    96.7 -
    96.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
    96.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   96.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   96.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   96.12 -
   96.13 -public class GeneralDBSqlSpatialMetricBinary extends BinaryGeneralDBOperator
   96.14 -{
   96.15 -
   96.16 -
   96.17 -	/*CONSTRUCTOR*/
   96.18 -
   96.19 -	public GeneralDBSqlSpatialMetricBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   96.20 -		super(left, right);
   96.21 -	}
   96.22 -
   96.23 -	@Override
   96.24 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   96.25 -	throws X
   96.26 -	{
   96.27 -		visitor.meet(this);
   96.28 -	}
   96.29 -
   96.30 -}
   96.31 -
   96.32 -
   96.33 +package org.openrdf.sail.generaldb.algebra;
   96.34 +
   96.35 +import java.util.ArrayList;
   96.36 +
   96.37 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
   96.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   96.39 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   96.40 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   96.41 +
   96.42 +public class GeneralDBSqlSpatialMetricBinary extends BinaryGeneralDBOperator
   96.43 +{
   96.44 +
   96.45 +
   96.46 +	/*CONSTRUCTOR*/
   96.47 +
   96.48 +	public GeneralDBSqlSpatialMetricBinary(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   96.49 +		super(left, right);
   96.50 +	}
   96.51 +
   96.52 +	@Override
   96.53 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   96.54 +	throws X
   96.55 +	{
   96.56 +		visitor.meet(this);
   96.57 +	}
   96.58 +
   96.59 +}
   96.60 +
   96.61 +
    97.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricUnary.java	Mon Mar 19 21:57:30 2012 +0100
    97.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialMetricUnary.java	Mon Mar 19 22:06:59 2012 +0100
    97.3 @@ -1,27 +1,27 @@
    97.4 -package org.openrdf.sail.generaldb.algebra;
    97.5 -
    97.6 -import java.util.ArrayList;
    97.7 -
    97.8 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
    97.9 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   97.10 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   97.11 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   97.12 -
   97.13 -public class GeneralDBSqlSpatialMetricUnary extends UnaryGeneralDBOperator
   97.14 -{
   97.15 -	
   97.16 -
   97.17 -	/*CONSTRUCTOR*/
   97.18 -	
   97.19 -	public GeneralDBSqlSpatialMetricUnary(GeneralDBSqlExpr expr) {
   97.20 -		super(expr);
   97.21 -	}
   97.22 -
   97.23 -	@Override
   97.24 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   97.25 -		throws X
   97.26 -	{
   97.27 -		visitor.meet(this);
   97.28 -	}
   97.29 -
   97.30 +package org.openrdf.sail.generaldb.algebra;
   97.31 +
   97.32 +import java.util.ArrayList;
   97.33 +
   97.34 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator;
   97.35 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   97.36 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   97.37 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   97.38 +
   97.39 +public class GeneralDBSqlSpatialMetricUnary extends UnaryGeneralDBOperator
   97.40 +{
   97.41 +	
   97.42 +
   97.43 +	/*CONSTRUCTOR*/
   97.44 +	
   97.45 +	public GeneralDBSqlSpatialMetricUnary(GeneralDBSqlExpr expr) {
   97.46 +		super(expr);
   97.47 +	}
   97.48 +
   97.49 +	@Override
   97.50 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   97.51 +		throws X
   97.52 +	{
   97.53 +		visitor.meet(this);
   97.54 +	}
   97.55 +
   97.56  }
   97.57 \ No newline at end of file
    98.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java	Mon Mar 19 21:57:30 2012 +0100
    98.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlSpatialProperty.java	Mon Mar 19 22:06:59 2012 +0100
    98.3 @@ -1,31 +1,31 @@
    98.4 -package org.openrdf.sail.generaldb.algebra;
    98.5 - 
    98.6 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
    98.7 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
    98.8 -import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
    98.9 -
   98.10 -/**
   98.11 - * 
   98.12 - * @author manolee
   98.13 - * The following functions have been defined for returning some properties of a
   98.14 - *geometry
   98.15 - */
   98.16 -
   98.17 -public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator
   98.18 -{
   98.19 -
   98.20 -
   98.21 -	/*CONSTRUCTOR*/
   98.22 -
   98.23 -	public GeneralDBSqlSpatialProperty(GeneralDBSqlExpr arg) {
   98.24 -		super(arg);
   98.25 -	}
   98.26 -
   98.27 -	@Override
   98.28 -	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   98.29 -	throws X
   98.30 -	{
   98.31 -		visitor.meet(this);
   98.32 -	}
   98.33 -
   98.34 -}
   98.35 +package org.openrdf.sail.generaldb.algebra;
   98.36 + 
   98.37 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   98.38 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   98.39 +import org.openrdf.sail.generaldb.algebra.base.UnaryGeneralDBOperator;
   98.40 +
   98.41 +/**
   98.42 + * 
   98.43 + * @author manolee
   98.44 + * The following functions have been defined for returning some properties of a
   98.45 + *geometry
   98.46 + */
   98.47 +
   98.48 +public class GeneralDBSqlSpatialProperty extends UnaryGeneralDBOperator
   98.49 +{
   98.50 +
   98.51 +
   98.52 +	/*CONSTRUCTOR*/
   98.53 +
   98.54 +	public GeneralDBSqlSpatialProperty(GeneralDBSqlExpr arg) {
   98.55 +		super(arg);
   98.56 +	}
   98.57 +
   98.58 +	@Override
   98.59 +	public <X extends Exception> void visit(GeneralDBQueryModelVisitorBase<X> visitor)
   98.60 +	throws X
   98.61 +	{
   98.62 +		visitor.meet(this);
   98.63 +	}
   98.64 +
   98.65 +}
    99.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlTouch.java	Mon Mar 19 21:57:30 2012 +0100
    99.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlTouch.java	Mon Mar 19 22:06:59 2012 +0100
    99.3 @@ -1,20 +1,20 @@
    99.4 -/*
    99.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
    99.6 - *
    99.7 - * Licensed under the Aduna BSD-style license.
    99.8 - */
    99.9 -package org.openrdf.sail.generaldb.algebra;
   99.10 -
   99.11 - 
   99.12 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   99.13 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   99.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   99.15 -
   99.16 -public class GeneralDBSqlTouch extends GeneralDBSqlGeoSpatial{
   99.17 -
   99.18 -	public GeneralDBSqlTouch(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   99.19 -		super(left, right);
   99.20 -	}
   99.21 -
   99.22 - 
   99.23 +/*
   99.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   99.25 + *
   99.26 + * Licensed under the Aduna BSD-style license.
   99.27 + */
   99.28 +package org.openrdf.sail.generaldb.algebra;
   99.29 +
   99.30 + 
   99.31 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
   99.32 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
   99.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
   99.34 +
   99.35 +public class GeneralDBSqlTouch extends GeneralDBSqlGeoSpatial{
   99.36 +
   99.37 +	public GeneralDBSqlTouch(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
   99.38 +		super(left, right);
   99.39 +	}
   99.40 +
   99.41 + 
   99.42  }
   99.43 \ No newline at end of file
   100.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Contains.java	Mon Mar 19 21:57:30 2012 +0100
   100.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Contains.java	Mon Mar 19 22:06:59 2012 +0100
   100.3 @@ -1,20 +1,20 @@
   100.4 -/*
   100.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   100.6 - *
   100.7 - * Licensed under the Aduna BSD-style license.
   100.8 - */
   100.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  100.10 -
  100.11 - 
  100.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  100.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  100.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  100.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  100.16 -
  100.17 -public class GeneralDBSqlEgenhofer_Contains extends GeneralDBSqlGeoSpatial{
  100.18 -
  100.19 -	public GeneralDBSqlEgenhofer_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  100.20 -		super(left, right);
  100.21 -	}
  100.22 - 
  100.23 +/*
  100.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  100.25 + *
  100.26 + * Licensed under the Aduna BSD-style license.
  100.27 + */
  100.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  100.29 +
  100.30 + 
  100.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  100.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  100.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  100.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  100.35 +
  100.36 +public class GeneralDBSqlEgenhofer_Contains extends GeneralDBSqlGeoSpatial{
  100.37 +
  100.38 +	public GeneralDBSqlEgenhofer_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  100.39 +		super(left, right);
  100.40 +	}
  100.41 + 
  100.42  }
  100.43 \ No newline at end of file
   101.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_CoveredBy.java	Mon Mar 19 21:57:30 2012 +0100
   101.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_CoveredBy.java	Mon Mar 19 22:06:59 2012 +0100
   101.3 @@ -1,20 +1,20 @@
   101.4 -/*
   101.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   101.6 - *
   101.7 - * Licensed under the Aduna BSD-style license.
   101.8 - */
   101.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  101.10 -
  101.11 - 
  101.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  101.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  101.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  101.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  101.16 -
  101.17 -public class GeneralDBSqlEgenhofer_CoveredBy extends GeneralDBSqlGeoSpatial{
  101.18 -
  101.19 -	public GeneralDBSqlEgenhofer_CoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  101.20 -		super(left, right);
  101.21 -	}
  101.22 - 
  101.23 +/*
  101.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  101.25 + *
  101.26 + * Licensed under the Aduna BSD-style license.
  101.27 + */
  101.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  101.29 +
  101.30 + 
  101.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  101.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  101.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  101.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  101.35 +
  101.36 +public class GeneralDBSqlEgenhofer_CoveredBy extends GeneralDBSqlGeoSpatial{
  101.37 +
  101.38 +	public GeneralDBSqlEgenhofer_CoveredBy(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  101.39 +		super(left, right);
  101.40 +	}
  101.41 + 
  101.42  }
  101.43 \ No newline at end of file
   102.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Covers.java	Mon Mar 19 21:57:30 2012 +0100
   102.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Covers.java	Mon Mar 19 22:06:59 2012 +0100
   102.3 @@ -1,20 +1,20 @@
   102.4 -/*
   102.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   102.6 - *
   102.7 - * Licensed under the Aduna BSD-style license.
   102.8 - */
   102.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  102.10 -
  102.11 - 
  102.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  102.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  102.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  102.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  102.16 -
  102.17 -public class GeneralDBSqlEgenhofer_Covers extends GeneralDBSqlGeoSpatial{
  102.18 -
  102.19 -	public GeneralDBSqlEgenhofer_Covers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  102.20 -		super(left, right);
  102.21 -	}
  102.22 - 
  102.23 +/*
  102.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  102.25 + *
  102.26 + * Licensed under the Aduna BSD-style license.
  102.27 + */
  102.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  102.29 +
  102.30 + 
  102.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  102.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  102.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  102.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  102.35 +
  102.36 +public class GeneralDBSqlEgenhofer_Covers extends GeneralDBSqlGeoSpatial{
  102.37 +
  102.38 +	public GeneralDBSqlEgenhofer_Covers(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  102.39 +		super(left, right);
  102.40 +	}
  102.41 + 
  102.42  }
  102.43 \ No newline at end of file
   103.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Disjoint.java	Mon Mar 19 21:57:30 2012 +0100
   103.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Disjoint.java	Mon Mar 19 22:06:59 2012 +0100
   103.3 @@ -1,20 +1,20 @@
   103.4 -/*
   103.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   103.6 - *
   103.7 - * Licensed under the Aduna BSD-style license.
   103.8 - */
   103.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  103.10 -
  103.11 - 
  103.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  103.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  103.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  103.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  103.16 -
  103.17 -public class GeneralDBSqlEgenhofer_Disjoint extends GeneralDBSqlGeoSpatial{
  103.18 -
  103.19 -	public GeneralDBSqlEgenhofer_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  103.20 -		super(left, right);
  103.21 -	}
  103.22 - 
  103.23 +/*
  103.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  103.25 + *
  103.26 + * Licensed under the Aduna BSD-style license.
  103.27 + */
  103.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  103.29 +
  103.30 + 
  103.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  103.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  103.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  103.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  103.35 +
  103.36 +public class GeneralDBSqlEgenhofer_Disjoint extends GeneralDBSqlGeoSpatial{
  103.37 +
  103.38 +	public GeneralDBSqlEgenhofer_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  103.39 +		super(left, right);
  103.40 +	}
  103.41 + 
  103.42  }
  103.43 \ No newline at end of file
   104.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Equals.java	Mon Mar 19 21:57:30 2012 +0100
   104.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Equals.java	Mon Mar 19 22:06:59 2012 +0100
   104.3 @@ -1,20 +1,20 @@
   104.4 -/*
   104.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   104.6 - *
   104.7 - * Licensed under the Aduna BSD-style license.
   104.8 - */
   104.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  104.10 -
  104.11 - 
  104.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  104.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  104.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  104.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  104.16 -
  104.17 -public class GeneralDBSqlEgenhofer_Equals extends GeneralDBSqlGeoSpatial{
  104.18 -
  104.19 -	public GeneralDBSqlEgenhofer_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  104.20 -		super(left, right);
  104.21 -	}
  104.22 - 
  104.23 +/*
  104.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  104.25 + *
  104.26 + * Licensed under the Aduna BSD-style license.
  104.27 + */
  104.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  104.29 +
  104.30 + 
  104.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  104.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  104.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  104.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  104.35 +
  104.36 +public class GeneralDBSqlEgenhofer_Equals extends GeneralDBSqlGeoSpatial{
  104.37 +
  104.38 +	public GeneralDBSqlEgenhofer_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  104.39 +		super(left, right);
  104.40 +	}
  104.41 + 
  104.42  }
  104.43 \ No newline at end of file
   105.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Inside.java	Mon Mar 19 21:57:30 2012 +0100
   105.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Inside.java	Mon Mar 19 22:06:59 2012 +0100
   105.3 @@ -1,20 +1,20 @@
   105.4 -/*
   105.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   105.6 - *
   105.7 - * Licensed under the Aduna BSD-style license.
   105.8 - */
   105.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  105.10 -
  105.11 - 
  105.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  105.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  105.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  105.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  105.16 -
  105.17 -public class GeneralDBSqlEgenhofer_Inside extends GeneralDBSqlGeoSpatial{
  105.18 -
  105.19 -	public GeneralDBSqlEgenhofer_Inside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  105.20 -		super(left, right);
  105.21 -	}
  105.22 - 
  105.23 +/*
  105.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  105.25 + *
  105.26 + * Licensed under the Aduna BSD-style license.
  105.27 + */
  105.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  105.29 +
  105.30 + 
  105.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  105.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  105.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  105.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  105.35 +
  105.36 +public class GeneralDBSqlEgenhofer_Inside extends GeneralDBSqlGeoSpatial{
  105.37 +
  105.38 +	public GeneralDBSqlEgenhofer_Inside(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  105.39 +		super(left, right);
  105.40 +	}
  105.41 + 
  105.42  }
  105.43 \ No newline at end of file
   106.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Meet.java	Mon Mar 19 21:57:30 2012 +0100
   106.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Meet.java	Mon Mar 19 22:06:59 2012 +0100
   106.3 @@ -1,20 +1,20 @@
   106.4 -/*
   106.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   106.6 - *
   106.7 - * Licensed under the Aduna BSD-style license.
   106.8 - */
   106.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  106.10 -
  106.11 - 
  106.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  106.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  106.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  106.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  106.16 -
  106.17 -public class GeneralDBSqlEgenhofer_Meet extends GeneralDBSqlGeoSpatial{
  106.18 -
  106.19 -	public GeneralDBSqlEgenhofer_Meet(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  106.20 -		super(left, right);
  106.21 -	}
  106.22 - 
  106.23 +/*
  106.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  106.25 + *
  106.26 + * Licensed under the Aduna BSD-style license.
  106.27 + */
  106.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  106.29 +
  106.30 + 
  106.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  106.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  106.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  106.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  106.35 +
  106.36 +public class GeneralDBSqlEgenhofer_Meet extends GeneralDBSqlGeoSpatial{
  106.37 +
  106.38 +	public GeneralDBSqlEgenhofer_Meet(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  106.39 +		super(left, right);
  106.40 +	}
  106.41 + 
  106.42  }
  106.43 \ No newline at end of file
   107.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Overlap.java	Mon Mar 19 21:57:30 2012 +0100
   107.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/egenhofer/GeneralDBSqlEgenhofer_Overlap.java	Mon Mar 19 22:06:59 2012 +0100
   107.3 @@ -1,20 +1,20 @@
   107.4 -/*
   107.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   107.6 - *
   107.7 - * Licensed under the Aduna BSD-style license.
   107.8 - */
   107.9 -package org.openrdf.sail.generaldb.algebra.egenhofer;
  107.10 -
  107.11 - 
  107.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  107.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  107.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  107.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  107.16 -
  107.17 -public class GeneralDBSqlEgenhofer_Overlap extends GeneralDBSqlGeoSpatial{
  107.18 -
  107.19 -	public GeneralDBSqlEgenhofer_Overlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  107.20 -		super(left, right);
  107.21 -	}
  107.22 - 
  107.23 +/*
  107.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  107.25 + *
  107.26 + * Licensed under the Aduna BSD-style license.
  107.27 + */
  107.28 +package org.openrdf.sail.generaldb.algebra.egenhofer;
  107.29 +
  107.30 + 
  107.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  107.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  107.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  107.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  107.35 +
  107.36 +public class GeneralDBSqlEgenhofer_Overlap extends GeneralDBSqlGeoSpatial{
  107.37 +
  107.38 +	public GeneralDBSqlEgenhofer_Overlap(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  107.39 +		super(left, right);
  107.40 +	}
  107.41 + 
  107.42  }
  107.43 \ No newline at end of file
   108.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Dc.java	Mon Mar 19 21:57:30 2012 +0100
   108.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Dc.java	Mon Mar 19 22:06:59 2012 +0100
   108.3 @@ -1,20 +1,20 @@
   108.4 -/*
   108.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   108.6 - *
   108.7 - * Licensed under the Aduna BSD-style license.
   108.8 - */
   108.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  108.10 -
  108.11 - 
  108.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  108.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  108.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  108.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  108.16 -
  108.17 -public class GeneralDBSqlRCC8_Dc extends GeneralDBSqlGeoSpatial{
  108.18 -
  108.19 -	public GeneralDBSqlRCC8_Dc(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  108.20 -		super(left, right);
  108.21 -	}
  108.22 - 
  108.23 +/*
  108.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  108.25 + *
  108.26 + * Licensed under the Aduna BSD-style license.
  108.27 + */
  108.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  108.29 +
  108.30 + 
  108.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  108.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  108.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  108.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  108.35 +
  108.36 +public class GeneralDBSqlRCC8_Dc extends GeneralDBSqlGeoSpatial{
  108.37 +
  108.38 +	public GeneralDBSqlRCC8_Dc(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  108.39 +		super(left, right);
  108.40 +	}
  108.41 + 
  108.42  }
  108.43 \ No newline at end of file
   109.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ec.java	Mon Mar 19 21:57:30 2012 +0100
   109.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ec.java	Mon Mar 19 22:06:59 2012 +0100
   109.3 @@ -1,20 +1,20 @@
   109.4 -/*
   109.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   109.6 - *
   109.7 - * Licensed under the Aduna BSD-style license.
   109.8 - */
   109.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  109.10 -
  109.11 - 
  109.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  109.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  109.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  109.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  109.16 -
  109.17 -public class GeneralDBSqlRCC8_Ec extends GeneralDBSqlGeoSpatial{
  109.18 -
  109.19 -	public GeneralDBSqlRCC8_Ec(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  109.20 -		super(left, right);
  109.21 -	}
  109.22 - 
  109.23 +/*
  109.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  109.25 + *
  109.26 + * Licensed under the Aduna BSD-style license.
  109.27 + */
  109.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  109.29 +
  109.30 + 
  109.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  109.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  109.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  109.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  109.35 +
  109.36 +public class GeneralDBSqlRCC8_Ec extends GeneralDBSqlGeoSpatial{
  109.37 +
  109.38 +	public GeneralDBSqlRCC8_Ec(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  109.39 +		super(left, right);
  109.40 +	}
  109.41 + 
  109.42  }
  109.43 \ No newline at end of file
   110.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Eq.java	Mon Mar 19 21:57:30 2012 +0100
   110.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Eq.java	Mon Mar 19 22:06:59 2012 +0100
   110.3 @@ -1,20 +1,20 @@
   110.4 -/*
   110.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   110.6 - *
   110.7 - * Licensed under the Aduna BSD-style license.
   110.8 - */
   110.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  110.10 -
  110.11 - 
  110.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  110.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  110.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  110.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  110.16 -
  110.17 -public class GeneralDBSqlRCC8_Eq extends GeneralDBSqlGeoSpatial{
  110.18 -
  110.19 -	public GeneralDBSqlRCC8_Eq(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  110.20 -		super(left, right);
  110.21 -	}
  110.22 - 
  110.23 +/*
  110.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  110.25 + *
  110.26 + * Licensed under the Aduna BSD-style license.
  110.27 + */
  110.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  110.29 +
  110.30 + 
  110.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  110.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  110.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  110.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  110.35 +
  110.36 +public class GeneralDBSqlRCC8_Eq extends GeneralDBSqlGeoSpatial{
  110.37 +
  110.38 +	public GeneralDBSqlRCC8_Eq(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  110.39 +		super(left, right);
  110.40 +	}
  110.41 + 
  110.42  }
  110.43 \ No newline at end of file
   111.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntpp.java	Mon Mar 19 21:57:30 2012 +0100
   111.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntpp.java	Mon Mar 19 22:06:59 2012 +0100
   111.3 @@ -1,20 +1,20 @@
   111.4 -/*
   111.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   111.6 - *
   111.7 - * Licensed under the Aduna BSD-style license.
   111.8 - */
   111.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  111.10 -
  111.11 - 
  111.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  111.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  111.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  111.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  111.16 -
  111.17 -public class GeneralDBSqlRCC8_Ntpp extends GeneralDBSqlGeoSpatial{
  111.18 -
  111.19 -	public GeneralDBSqlRCC8_Ntpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  111.20 -		super(left, right);
  111.21 -	}
  111.22 - 
  111.23 +/*
  111.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  111.25 + *
  111.26 + * Licensed under the Aduna BSD-style license.
  111.27 + */
  111.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  111.29 +
  111.30 + 
  111.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  111.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  111.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  111.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  111.35 +
  111.36 +public class GeneralDBSqlRCC8_Ntpp extends GeneralDBSqlGeoSpatial{
  111.37 +
  111.38 +	public GeneralDBSqlRCC8_Ntpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  111.39 +		super(left, right);
  111.40 +	}
  111.41 + 
  111.42  }
  111.43 \ No newline at end of file
   112.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntppi.java	Mon Mar 19 21:57:30 2012 +0100
   112.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Ntppi.java	Mon Mar 19 22:06:59 2012 +0100
   112.3 @@ -1,20 +1,20 @@
   112.4 -/*
   112.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   112.6 - *
   112.7 - * Licensed under the Aduna BSD-style license.
   112.8 - */
   112.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  112.10 -
  112.11 - 
  112.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  112.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  112.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  112.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  112.16 -
  112.17 -public class GeneralDBSqlRCC8_Ntppi extends GeneralDBSqlGeoSpatial{
  112.18 -
  112.19 -	public GeneralDBSqlRCC8_Ntppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  112.20 -		super(left, right);
  112.21 -	}
  112.22 - 
  112.23 +/*
  112.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  112.25 + *
  112.26 + * Licensed under the Aduna BSD-style license.
  112.27 + */
  112.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  112.29 +
  112.30 + 
  112.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  112.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  112.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  112.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  112.35 +
  112.36 +public class GeneralDBSqlRCC8_Ntppi extends GeneralDBSqlGeoSpatial{
  112.37 +
  112.38 +	public GeneralDBSqlRCC8_Ntppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  112.39 +		super(left, right);
  112.40 +	}
  112.41 + 
  112.42  }
  112.43 \ No newline at end of file
   113.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Po.java	Mon Mar 19 21:57:30 2012 +0100
   113.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Po.java	Mon Mar 19 22:06:59 2012 +0100
   113.3 @@ -1,20 +1,20 @@
   113.4 -/*
   113.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   113.6 - *
   113.7 - * Licensed under the Aduna BSD-style license.
   113.8 - */
   113.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  113.10 -
  113.11 - 
  113.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  113.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  113.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  113.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  113.16 -
  113.17 -public class GeneralDBSqlRCC8_Po extends GeneralDBSqlGeoSpatial{
  113.18 -
  113.19 -	public GeneralDBSqlRCC8_Po(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  113.20 -		super(left, right);
  113.21 -	}
  113.22 - 
  113.23 +/*
  113.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  113.25 + *
  113.26 + * Licensed under the Aduna BSD-style license.
  113.27 + */
  113.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  113.29 +
  113.30 + 
  113.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  113.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  113.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  113.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  113.35 +
  113.36 +public class GeneralDBSqlRCC8_Po extends GeneralDBSqlGeoSpatial{
  113.37 +
  113.38 +	public GeneralDBSqlRCC8_Po(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  113.39 +		super(left, right);
  113.40 +	}
  113.41 + 
  113.42  }
  113.43 \ No newline at end of file
   114.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tpp.java	Mon Mar 19 21:57:30 2012 +0100
   114.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tpp.java	Mon Mar 19 22:06:59 2012 +0100
   114.3 @@ -1,20 +1,20 @@
   114.4 -/*
   114.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   114.6 - *
   114.7 - * Licensed under the Aduna BSD-style license.
   114.8 - */
   114.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  114.10 -
  114.11 - 
  114.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  114.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  114.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  114.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  114.16 -
  114.17 -public class GeneralDBSqlRCC8_Tpp extends GeneralDBSqlGeoSpatial{
  114.18 -
  114.19 -	public GeneralDBSqlRCC8_Tpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  114.20 -		super(left, right);
  114.21 -	}
  114.22 - 
  114.23 +/*
  114.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  114.25 + *
  114.26 + * Licensed under the Aduna BSD-style license.
  114.27 + */
  114.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  114.29 +
  114.30 + 
  114.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  114.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  114.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  114.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  114.35 +
  114.36 +public class GeneralDBSqlRCC8_Tpp extends GeneralDBSqlGeoSpatial{
  114.37 +
  114.38 +	public GeneralDBSqlRCC8_Tpp(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  114.39 +		super(left, right);
  114.40 +	}
  114.41 + 
  114.42  }
  114.43 \ No newline at end of file
   115.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tppi.java	Mon Mar 19 21:57:30 2012 +0100
   115.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/rcc8/GeneralDBSqlRCC8_Tppi.java	Mon Mar 19 22:06:59 2012 +0100
   115.3 @@ -1,20 +1,20 @@
   115.4 -/*
   115.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   115.6 - *
   115.7 - * Licensed under the Aduna BSD-style license.
   115.8 - */
   115.9 -package org.openrdf.sail.generaldb.algebra.rcc8;
  115.10 -
  115.11 - 
  115.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  115.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  115.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  115.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  115.16 -
  115.17 -public class GeneralDBSqlRCC8_Tppi extends GeneralDBSqlGeoSpatial{
  115.18 -
  115.19 -	public GeneralDBSqlRCC8_Tppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  115.20 -		super(left, right);
  115.21 -	}
  115.22 - 
  115.23 +/*
  115.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  115.25 + *
  115.26 + * Licensed under the Aduna BSD-style license.
  115.27 + */
  115.28 +package org.openrdf.sail.generaldb.algebra.rcc8;
  115.29 +
  115.30 + 
  115.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  115.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  115.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  115.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  115.35 +
  115.36 +public class GeneralDBSqlRCC8_Tppi extends GeneralDBSqlGeoSpatial{
  115.37 +
  115.38 +	public GeneralDBSqlRCC8_Tppi(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  115.39 +		super(left, right);
  115.40 +	}
  115.41 + 
  115.42  }
  115.43 \ No newline at end of file
   116.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Contains.java	Mon Mar 19 21:57:30 2012 +0100
   116.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Contains.java	Mon Mar 19 22:06:59 2012 +0100
   116.3 @@ -1,20 +1,20 @@
   116.4 -/*
   116.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   116.6 - *
   116.7 - * Licensed under the Aduna BSD-style license.
   116.8 - */
   116.9 -package org.openrdf.sail.generaldb.algebra.sf;
  116.10 -
  116.11 - 
  116.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  116.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  116.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  116.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  116.16 -
  116.17 -public class GeneralDBSqlSF_Contains extends GeneralDBSqlGeoSpatial{
  116.18 -
  116.19 -	public GeneralDBSqlSF_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  116.20 -		super(left, right);
  116.21 -	}
  116.22 - 
  116.23 +/*
  116.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  116.25 + *
  116.26 + * Licensed under the Aduna BSD-style license.
  116.27 + */
  116.28 +package org.openrdf.sail.generaldb.algebra.sf;
  116.29 +
  116.30 + 
  116.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  116.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  116.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  116.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  116.35 +
  116.36 +public class GeneralDBSqlSF_Contains extends GeneralDBSqlGeoSpatial{
  116.37 +
  116.38 +	public GeneralDBSqlSF_Contains(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  116.39 +		super(left, right);
  116.40 +	}
  116.41 + 
  116.42  }
  116.43 \ No newline at end of file
   117.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Crosses.java	Mon Mar 19 21:57:30 2012 +0100
   117.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Crosses.java	Mon Mar 19 22:06:59 2012 +0100
   117.3 @@ -1,20 +1,20 @@
   117.4 -/*
   117.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   117.6 - *
   117.7 - * Licensed under the Aduna BSD-style license.
   117.8 - */
   117.9 -package org.openrdf.sail.generaldb.algebra.sf;
  117.10 -
  117.11 - 
  117.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  117.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  117.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  117.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  117.16 -
  117.17 -public class GeneralDBSqlSF_Crosses extends GeneralDBSqlGeoSpatial{
  117.18 -
  117.19 -	public GeneralDBSqlSF_Crosses(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  117.20 -		super(left, right);
  117.21 -	}
  117.22 - 
  117.23 +/*
  117.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  117.25 + *
  117.26 + * Licensed under the Aduna BSD-style license.
  117.27 + */
  117.28 +package org.openrdf.sail.generaldb.algebra.sf;
  117.29 +
  117.30 + 
  117.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  117.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  117.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  117.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  117.35 +
  117.36 +public class GeneralDBSqlSF_Crosses extends GeneralDBSqlGeoSpatial{
  117.37 +
  117.38 +	public GeneralDBSqlSF_Crosses(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  117.39 +		super(left, right);
  117.40 +	}
  117.41 + 
  117.42  }
  117.43 \ No newline at end of file
   118.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Disjoint.java	Mon Mar 19 21:57:30 2012 +0100
   118.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Disjoint.java	Mon Mar 19 22:06:59 2012 +0100
   118.3 @@ -1,20 +1,20 @@
   118.4 -/*
   118.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   118.6 - *
   118.7 - * Licensed under the Aduna BSD-style license.
   118.8 - */
   118.9 -package org.openrdf.sail.generaldb.algebra.sf;
  118.10 -
  118.11 - 
  118.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  118.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  118.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  118.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  118.16 -
  118.17 -public class GeneralDBSqlSF_Disjoint extends GeneralDBSqlGeoSpatial{
  118.18 -
  118.19 -	public GeneralDBSqlSF_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  118.20 -		super(left, right);
  118.21 -	}
  118.22 - 
  118.23 +/*
  118.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  118.25 + *
  118.26 + * Licensed under the Aduna BSD-style license.
  118.27 + */
  118.28 +package org.openrdf.sail.generaldb.algebra.sf;
  118.29 +
  118.30 + 
  118.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  118.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  118.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  118.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  118.35 +
  118.36 +public class GeneralDBSqlSF_Disjoint extends GeneralDBSqlGeoSpatial{
  118.37 +
  118.38 +	public GeneralDBSqlSF_Disjoint(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  118.39 +		super(left, right);
  118.40 +	}
  118.41 + 
  118.42  }
  118.43 \ No newline at end of file
   119.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Equals.java	Mon Mar 19 21:57:30 2012 +0100
   119.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Equals.java	Mon Mar 19 22:06:59 2012 +0100
   119.3 @@ -1,20 +1,20 @@
   119.4 -/*
   119.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   119.6 - *
   119.7 - * Licensed under the Aduna BSD-style license.
   119.8 - */
   119.9 -package org.openrdf.sail.generaldb.algebra.sf;
  119.10 -
  119.11 - 
  119.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  119.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  119.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  119.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  119.16 -
  119.17 -public class GeneralDBSqlSF_Equals extends GeneralDBSqlGeoSpatial{
  119.18 -
  119.19 -	public GeneralDBSqlSF_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  119.20 -		super(left, right);
  119.21 -	}
  119.22 - 
  119.23 +/*
  119.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  119.25 + *
  119.26 + * Licensed under the Aduna BSD-style license.
  119.27 + */
  119.28 +package org.openrdf.sail.generaldb.algebra.sf;
  119.29 +
  119.30 + 
  119.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  119.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  119.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  119.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  119.35 +
  119.36 +public class GeneralDBSqlSF_Equals extends GeneralDBSqlGeoSpatial{
  119.37 +
  119.38 +	public GeneralDBSqlSF_Equals(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  119.39 +		super(left, right);
  119.40 +	}
  119.41 + 
  119.42  }
  119.43 \ No newline at end of file
   120.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Intersects.java	Mon Mar 19 21:57:30 2012 +0100
   120.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Intersects.java	Mon Mar 19 22:06:59 2012 +0100
   120.3 @@ -1,20 +1,20 @@
   120.4 -/*
   120.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   120.6 - *
   120.7 - * Licensed under the Aduna BSD-style license.
   120.8 - */
   120.9 -package org.openrdf.sail.generaldb.algebra.sf;
  120.10 -
  120.11 - 
  120.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  120.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  120.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  120.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  120.16 -
  120.17 -public class GeneralDBSqlSF_Intersects extends GeneralDBSqlGeoSpatial{
  120.18 -
  120.19 -	public GeneralDBSqlSF_Intersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  120.20 -		super(left, right);
  120.21 -	}
  120.22 - 
  120.23 +/*
  120.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  120.25 + *
  120.26 + * Licensed under the Aduna BSD-style license.
  120.27 + */
  120.28 +package org.openrdf.sail.generaldb.algebra.sf;
  120.29 +
  120.30 + 
  120.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  120.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  120.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  120.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  120.35 +
  120.36 +public class GeneralDBSqlSF_Intersects extends GeneralDBSqlGeoSpatial{
  120.37 +
  120.38 +	public GeneralDBSqlSF_Intersects(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  120.39 +		super(left, right);
  120.40 +	}
  120.41 + 
  120.42  }
  120.43 \ No newline at end of file
   121.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Overlaps.java	Mon Mar 19 21:57:30 2012 +0100
   121.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Overlaps.java	Mon Mar 19 22:06:59 2012 +0100
   121.3 @@ -1,20 +1,20 @@
   121.4 -/*
   121.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   121.6 - *
   121.7 - * Licensed under the Aduna BSD-style license.
   121.8 - */
   121.9 -package org.openrdf.sail.generaldb.algebra.sf;
  121.10 -
  121.11 - 
  121.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  121.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  121.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  121.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  121.16 -
  121.17 -public class GeneralDBSqlSF_Overlaps extends GeneralDBSqlGeoSpatial{
  121.18 -
  121.19 -	public GeneralDBSqlSF_Overlaps(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  121.20 -		super(left, right);
  121.21 -	}
  121.22 - 
  121.23 +/*
  121.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  121.25 + *
  121.26 + * Licensed under the Aduna BSD-style license.
  121.27 + */
  121.28 +package org.openrdf.sail.generaldb.algebra.sf;
  121.29 +
  121.30 + 
  121.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  121.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  121.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  121.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  121.35 +
  121.36 +public class GeneralDBSqlSF_Overlaps extends GeneralDBSqlGeoSpatial{
  121.37 +
  121.38 +	public GeneralDBSqlSF_Overlaps(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  121.39 +		super(left, right);
  121.40 +	}
  121.41 + 
  121.42  }
  121.43 \ No newline at end of file
   122.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Touches.java	Mon Mar 19 21:57:30 2012 +0100
   122.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Touches.java	Mon Mar 19 22:06:59 2012 +0100
   122.3 @@ -1,20 +1,20 @@
   122.4 -/*
   122.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   122.6 - *
   122.7 - * Licensed under the Aduna BSD-style license.
   122.8 - */
   122.9 -package org.openrdf.sail.generaldb.algebra.sf;
  122.10 -
  122.11 - 
  122.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  122.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  122.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  122.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  122.16 -
  122.17 -public class GeneralDBSqlSF_Touches extends GeneralDBSqlGeoSpatial{
  122.18 -
  122.19 -	public GeneralDBSqlSF_Touches(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.20 -		super(left, right);
  122.21 -	}
  122.22 - 
  122.23 +/*
  122.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  122.25 + *
  122.26 + * Licensed under the Aduna BSD-style license.
  122.27 + */
  122.28 +package org.openrdf.sail.generaldb.algebra.sf;
  122.29 +
  122.30 + 
  122.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  122.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  122.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  122.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  122.35 +
  122.36 +public class GeneralDBSqlSF_Touches extends GeneralDBSqlGeoSpatial{
  122.37 +
  122.38 +	public GeneralDBSqlSF_Touches(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  122.39 +		super(left, right);
  122.40 +	}
  122.41 + 
  122.42  }
  122.43 \ No newline at end of file
   123.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Within.java	Mon Mar 19 21:57:30 2012 +0100
   123.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/sf/GeneralDBSqlSF_Within.java	Mon Mar 19 22:06:59 2012 +0100
   123.3 @@ -1,20 +1,20 @@
   123.4 -/*
   123.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
   123.6 - *
   123.7 - * Licensed under the Aduna BSD-style license.
   123.8 - */
   123.9 -package org.openrdf.sail.generaldb.algebra.sf;
  123.10 -
  123.11 - 
  123.12 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  123.13 -import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  123.14 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  123.15 -import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  123.16 -
  123.17 -public class GeneralDBSqlSF_Within extends GeneralDBSqlGeoSpatial{
  123.18 -
  123.19 -	public GeneralDBSqlSF_Within(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  123.20 -		super(left, right);
  123.21 -	}
  123.22 - 
  123.23 +/*
  123.24 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2008.
  123.25 + *
  123.26 + * Licensed under the Aduna BSD-style license.
  123.27 + */
  123.28 +package org.openrdf.sail.generaldb.algebra.sf;
  123.29 +
  123.30 + 
  123.31 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
  123.32 +import org.openrdf.sail.generaldb.algebra.base.BinaryGeneralDBOperator; 
  123.33 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBQueryModelVisitorBase;
  123.34 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
  123.35 +
  123.36 +public class GeneralDBSqlSF_Within extends GeneralDBSqlGeoSpatial{
  123.37 +
  123.38 +	public GeneralDBSqlSF_Within(GeneralDBSqlExpr left, GeneralDBSqlExpr right) {
  123.39 +		super(left, right);
  123.40 +	}
  123.41 + 
  123.42  }
  123.43 \ No newline at end of file
   124.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java	Mon Mar 19 21:57:30 2012 +0100
   124.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/model/GeneralDBPolyhedron.java	Mon Mar 19 22:06:59 2012 +0100
   124.3 @@ -1,119 +1,119 @@
   124.4 -package org.openrdf.sail.generaldb.model;
   124.5 -
   124.6 -import java.io.IOException;
   124.7 -
   124.8 -import org.openrdf.model.URI;
   124.9 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
  124.10 -import org.openrdf.sail.rdbms.model.RdbmsValue;
  124.11 -
  124.12 -import com.vividsolutions.jts.io.ParseException;
  124.13 -
  124.14 -
  124.15 -public class GeneralDBPolyhedron extends RdbmsValue{
  124.16 -
  124.17 -	private String polyhedronStringRep;
  124.18 -	private StrabonPolyhedron polyhedron;
  124.19 -	private URI datatype;
  124.20 -	/**
  124.21 -	 * CONSTRUCTOR
  124.22 -	 */
  124.23 -	public GeneralDBPolyhedron(Number id, Integer version, URI datatype, byte[] polyhedron, int srid) throws IOException, ClassNotFoundException {
  124.24 -		super(id, version);
  124.25 -
  124.26 -		try {
  124.27 -			this.polyhedron = new StrabonPolyhedron(polyhedron, srid);
  124.28 -		} catch (ParseException e) {
  124.29 -
  124.30 -			e.printStackTrace();
  124.31 -		} catch (Exception e) {
  124.32 -
  124.33 -			e.printStackTrace();
  124.34 -		}
  124.35 -		setPolyhedronStringRep(this.polyhedron);
  124.36 -		this.datatype = datatype;
  124.37 -	}
  124.38 -
  124.39 -	//	public GeneralDBPolyhedron(Number id, Integer version, URI datatype, String polyhedron) throws IOException, ClassNotFoundException {
  124.40 -	//		super(id, version);
  124.41 -	//
  124.42 -	//		try {
  124.43 -	//			this.polyhedron = new StrabonPolyhedron(polyhedron);
  124.44 -	//		} catch (ParseException e) {
  124.45 -	//
  124.46 -	//			e.printStackTrace();
  124.47 -	//		} catch (Exception e) {
  124.48 -	//
  124.49 -	//			e.printStackTrace();
  124.50 -	//		}
  124.51 -	//		setPolyhedronStringRep(this.polyhedron);
  124.52 -	//		this.datatype = datatype;
  124.53 -	//	}
  124.54 -	/**
  124.55 -	 * METHODS
  124.56 -	 */
  124.57 -
  124.58 -	public String getPolyhedronStringRep() {
  124.59 -		return polyhedronStringRep;
  124.60 -	}
  124.61 -
  124.62 -	public void setPolyhedronStringRep(StrabonPolyhedron polyhedron) throws  IOException, ClassNotFoundException {
  124.63 -		//TODO kkyzir prepares this method
  124.64 -
  124.65 -		if (StrabonPolyhedron.EnableConstraintRepresentation) {
  124.66 -			this.polyhedronStringRep = polyhedron.toConstraints();	
  124.67 -		} else {
  124.68 -			this.polyhedronStringRep = polyhedron.toWKT();
  124.69 -		}		
  124.70 -	}
  124.71 -
  124.72 -	public URI getDatatype() {
  124.73 -		return datatype;
  124.74 -	}
  124.75 -
  124.76 -	public void setDatatype(URI datatype) {
  124.77 -		this.datatype = datatype;
  124.78 -	}
  124.79 -
  124.80 -	public StrabonPolyhedron getPolyhedron() {
  124.81 -		return polyhedron;
  124.82 -	}
  124.83 -
  124.84 -
  124.85 -	public void setPolyhedron(StrabonPolyhedron polyhedron) {
  124.86 -		this.polyhedron = polyhedron;
  124.87 -	}
  124.88 -
  124.89 -
  124.90 -	public String stringValue() {
  124.91 -		return new String(this.polyhedronStringRep);
  124.92 -	}
  124.93 -
  124.94 -	@Override
  124.95 -	public String toString() {
  124.96 -		return new String("\""+this.polyhedronStringRep+";http://www.opengis.net/def/crs/EPSG/0/"
  124.97 -				+this.getPolyhedron().getGeometry().getSRID()+"\"" + "^^<" + 
  124.98 -				((StrabonPolyhedron.EnableConstraintRepresentation)  ? 
  124.99 -						StrabonPolyhedron.stRDFSemiLinearPointset : StrabonPolyhedron.ogcGeometry)
 124.100 -						+">");
 124.101 -	}
 124.102 -
 124.103 -	@Override
 124.104 -	public int hashCode() {
 124.105 -		return polyhedronStringRep.hashCode();
 124.106 -	}
 124.107 -
 124.108 -	@Override
 124.109 -	public boolean equals(Object other) {
 124.110 -
 124.111 -		if(other instanceof GeneralDBPolyhedron)
 124.112 -		{
 124.113 -			if (((GeneralDBPolyhedron) other).getPolyhedron().equals(this.getPolyhedron()))
 124.114 -			{
 124.115 -				return true;
 124.116 -			}
 124.117 -
 124.118 -		}
 124.119 -		return false;
 124.120 -	}
 124.121 -
 124.122 +package org.openrdf.sail.generaldb.model;
 124.123 +
 124.124 +import java.io.IOException;
 124.125 +
 124.126 +import org.openrdf.model.URI;
 124.127 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
 124.128 +import org.openrdf.sail.rdbms.model.RdbmsValue;
 124.129 +
 124.130 +import com.vividsolutions.jts.io.ParseException;
 124.131 +
 124.132 +
 124.133 +public class GeneralDBPolyhedron extends RdbmsValue{
 124.134 +
 124.135 +	private String polyhedronStringRep;
 124.136 +	private StrabonPolyhedron polyhedron;
 124.137 +	private URI datatype;
 124.138 +	/**
 124.139 +	 * CONSTRUCTOR
 124.140 +	 */
 124.141 +	public GeneralDBPolyhedron(Number id, Integer version, URI datatype, byte[] polyhedron, int srid) throws IOException, ClassNotFoundException {
 124.142 +		super(id, version);
 124.143 +
 124.144 +		try {
 124.145 +			this.polyhedron = new StrabonPolyhedron(polyhedron, srid);
 124.146 +		} catch (ParseException e) {
 124.147 +
 124.148 +			e.printStackTrace();
 124.149 +		} catch (Exception e) {
 124.150 +
 124.151 +			e.printStackTrace();
 124.152 +		}
 124.153 +		setPolyhedronStringRep(this.polyhedron);
 124.154 +		this.datatype = datatype;
 124.155 +	}
 124.156 +
 124.157 +	//	public GeneralDBPolyhedron(Number id, Integer version, URI datatype, String polyhedron) throws IOException, ClassNotFoundException {
 124.158 +	//		super(id, version);
 124.159 +	//
 124.160 +	//		try {
 124.161 +	//			this.polyhedron = new StrabonPolyhedron(polyhedron);
 124.162 +	//		} catch (ParseException e) {
 124.163 +	//
 124.164 +	//			e.printStackTrace();
 124.165 +	//		} catch (Exception e) {
 124.166 +	//
 124.167 +	//			e.printStackTrace();
 124.168 +	//		}
 124.169 +	//		setPolyhedronStringRep(this.polyhedron);
 124.170 +	//		this.datatype = datatype;
 124.171 +	//	}
 124.172 +	/**
 124.173 +	 * METHODS
 124.174 +	 */
 124.175 +
 124.176 +	public String getPolyhedronStringRep() {
 124.177 +		return polyhedronStringRep;
 124.178 +	}
 124.179 +
 124.180 +	public void setPolyhedronStringRep(StrabonPolyhedron polyhedron) throws  IOException, ClassNotFoundException {
 124.181 +		//TODO kkyzir prepares this method
 124.182 +
 124.183 +		if (StrabonPolyhedron.EnableConstraintRepresentation) {
 124.184 +			this.polyhedronStringRep = polyhedron.toConstraints();	
 124.185 +		} else {
 124.186 +			this.polyhedronStringRep = polyhedron.toWKT();
 124.187 +		}		
 124.188 +	}
 124.189 +
 124.190 +	public URI getDatatype() {
 124.191 +		return datatype;
 124.192 +	}
 124.193 +
 124.194 +	public void setDatatype(URI datatype) {
 124.195 +		this.datatype = datatype;
 124.196 +	}
 124.197 +
 124.198 +	public StrabonPolyhedron getPolyhedron() {
 124.199 +		return polyhedron;
 124.200 +	}
 124.201 +
 124.202 +
 124.203 +	public void setPolyhedron(StrabonPolyhedron polyhedron) {
 124.204 +		this.polyhedron = polyhedron;
 124.205 +	}
 124.206 +
 124.207 +
 124.208 +	public String stringValue() {
 124.209 +		return new String(this.polyhedronStringRep);
 124.210 +	}
 124.211 +
 124.212 +	@Override
 124.213 +	public String toString() {
 124.214 +		return new String("\""+this.polyhedronStringRep+";http://www.opengis.net/def/crs/EPSG/0/"
 124.215 +				+this.getPolyhedron().getGeometry().getSRID()+"\"" + "^^<" + 
 124.216 +				((StrabonPolyhedron.EnableConstraintRepresentation)  ? 
 124.217 +						StrabonPolyhedron.stRDFSemiLinearPointset : StrabonPolyhedron.ogcGeometry)
 124.218 +						+">");
 124.219 +	}
 124.220 +
 124.221 +	@Override
 124.222 +	public int hashCode() {
 124.223 +		return polyhedronStringRep.hashCode();
 124.224 +	}
 124.225 +
 124.226 +	@Override
 124.227 +	public boolean equals(Object other) {
 124.228 +
 124.229 +		if(other instanceof GeneralDBPolyhedron)
 124.230 +		{
 124.231 +			if (((GeneralDBPolyhedron) other).getPolyhedron().equals(this.getPolyhedron()))
 124.232 +			{
 124.233 +				return true;
 124.234 +			}
 124.235 +
 124.236 +		}
 124.237 +		return false;
 124.238 +	}
 124.239 +
 124.240  }
 124.241 \ No newline at end of file
   125.1 --- a/runtime/LICENSE.txt	Mon Mar 19 21:57:30 2012 +0100
   125.2 +++ b/runtime/LICENSE.txt	Mon Mar 19 22:06:59 2012 +0100
   125.3 @@ -1,25 +1,25 @@
   125.4 -Copyright Aduna (http://www.aduna-software.com/)  2001-2007
   125.5 -All rights reserved.
   125.6 -
   125.7 -Redistribution and use in source and binary forms, with or without modification,
   125.8 -are permitted provided that the following conditions are met:
   125.9 -
  125.10 -    * Redistributions of source code must retain the above copyright notice,
  125.11 -      this list of conditions and the following disclaimer.
  125.12 -    * Redistributions in binary form must reproduce the above copyright notice,
  125.13 -      this list of conditions and the following disclaimer in the documentation
  125.14 -      and/or other materials provided with the distribution.
  125.15 -    * Neither the name of the copyright holder nor the names of its contributors
  125.16 -      may be used to endorse or promote products derived from this software
  125.17 -      without specific prior written permission.
  125.18 -
  125.19 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  125.20 -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  125.21 -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  125.22 -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  125.23 -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  125.24 -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  125.25 -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  125.26 -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  125.27 -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  125.28 -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  125.29 +Copyright Aduna (http://www.aduna-software.com/)  2001-2007
  125.30 +All rights reserved.
  125.31 +
  125.32 +Redistribution and use in source and binary forms, with or without modification,
  125.33 +are permitted provided that the following conditions are met:
  125.34 +
  125.35 +    * Redistributions of source code must retain the above copyright notice,
  125.36 +      this list of conditions and the following disclaimer.
  125.37 +    * Redistributions in binary form must reproduce the above copyright notice,
  125.38 +      this list of conditions and the following disclaimer in the documentation
  125.39 +      and/or other materials provided with the distribution.
  125.40 +    * Neither the name of the copyright holder nor the names of its contributors
  125.41 +      may be used to endorse or promote products derived from this software
  125.42 +      without specific prior written permission.
  125.43 +
  125.44 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  125.45 +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  125.46 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  125.47 +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
  125.48 +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  125.49 +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  125.50 +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  125.51 +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  125.52 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  125.53 +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   126.1 --- a/runtime/README.txt	Mon Mar 19 21:57:30 2012 +0100
   126.2 +++ b/runtime/README.txt	Mon Mar 19 22:06:59 2012 +0100
   126.3 @@ -1,10 +1,10 @@
   126.4 -This software is copyright Aduna (http://www.aduna-software.com/)  2001-2007.
   126.5 -Licensed under the Aduna BSD-style license.
   126.6 -
   126.7 -For the full text of the license, see the file LICENSE.txt.
   126.8 -
   126.9 -By using, modifying or distributing this software you agree to be bound by the
  126.10 -terms of this license.
  126.11 -
  126.12 -This software may include 3rd-party components that are licensed under
  126.13 -different conditions. For details see the file NOTICE.txt.
  126.14 +This software is copyright Aduna (http://www.aduna-software.com/)  2001-2007.
  126.15 +Licensed under the Aduna BSD-style license.
  126.16 +
  126.17 +For the full text of the license, see the file LICENSE.txt.
  126.18 +
  126.19 +By using, modifying or distributing this software you agree to be bound by the
  126.20 +terms of this license.
  126.21 +
  126.22 +This software may include 3rd-party components that are licensed under
  126.23 +different conditions. For details see the file NOTICE.txt.
   127.1 --- a/runtime/src/main/java/eu/earthobservatory/Runtime.java	Mon Mar 19 21:57:30 2012 +0100
   127.2 +++ b/runtime/src/main/java/eu/earthobservatory/Runtime.java	Mon Mar 19 22:06:59 2012 +0100
   127.3 @@ -1,15 +1,15 @@
   127.4 -/*
   127.5 - * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
   127.6 - *
   127.7 - * Licensed under the Aduna BSD-style license.
   127.8 - */
   127.9 -package eu.earthobservatory;
  127.10 -
  127.11 -
  127.12 -/**
  127.13 - *
  127.14 - * @author Herko ter Horst
  127.15 - */
  127.16 -public interface Runtime {
  127.17 -	// FIXME: this is a DUMMY for Maven to have something to compile. We'll have to find a better solution for this.
  127.18 -}
  127.19 +/*
  127.20 + * Copyright Aduna (http://www.aduna-software.com/) (c) 2007.
  127.21 + *
  127.22 + * Licensed under the Aduna BSD-style license.
  127.23 + */
  127.24 +package eu.earthobservatory;
  127.25 +
  127.26 +
  127.27 +/**
  127.28 + *
  127.29 + * @author Herko ter Horst
  127.30 + */
  127.31 +public interface Runtime {
  127.32 +	// FIXME: this is a DUMMY for Maven to have something to compile. We'll have to find a better solution for this.
  127.33 +}
   128.1 --- a/runtime/src/main/resources/META-INF/templates/memory-rdfs-dt.ttl	Mon Mar 19 21:57:30 2012 +0100
   128.2 +++ b/runtime/src/main/resources/META-INF/templates/memory-rdfs-dt.ttl	Mon Mar 19 22:06:59 2012 +0100
   128.3 @@ -1,26 +1,26 @@
   128.4 -#
   128.5 -# Sesame configuration template for a main-memory repository with
   128.6 -# RDF Schema and direct type hierarchy inferencing
   128.7 -#
   128.8 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
   128.9 -@prefix rep: <http://www.openrdf.org/config/repository#>.
  128.10 -@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  128.11 -@prefix sail: <http://www.openrdf.org/config/sail#>.
  128.12 -@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  128.13 -
  128.14 -[] a rep:Repository ;
  128.15 -   rep:repositoryTitle "Memory store with RDF Schema and direct type inferencing" ;
  128.16 -   rep:repositoryImpl [
  128.17 -      rep:repositoryType "openrdf:SailRepository" ;
  128.18 -      sr:sailImpl [
  128.19 -         sail:sailType "openrdf:DirectTypeHierarchyInferencer" ;
  128.20 -         sail:delegate [
  128.21 -            sail:sailType "openrdf:ForwardChainingRDFSInferencer" ;
  128.22 -            sail:delegate [
  128.23 -               sail:sailType "openrdf:MemoryStore" ;
  128.24 -               ms:persist true ;
  128.25 -               ms:syncDelay 0
  128.26 -            ]
  128.27 -         ]
  128.28 -      ]
  128.29 -   ].
  128.30 +#
  128.31 +# Sesame configuration template for a main-memory repository with
  128.32 +# RDF Schema and direct type hierarchy inferencing
  128.33 +#
  128.34 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
  128.35 +@prefix rep: <http://www.openrdf.org/config/repository#>.
  128.36 +@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  128.37 +@prefix sail: <http://www.openrdf.org/config/sail#>.
  128.38 +@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  128.39 +
  128.40 +[] a rep:Repository ;
  128.41 +   rep:repositoryTitle "Memory store with RDF Schema and direct type inferencing" ;
  128.42 +   rep:repositoryImpl [
  128.43 +      rep:repositoryType "openrdf:SailRepository" ;
  128.44 +      sr:sailImpl [
  128.45 +         sail:sailType "openrdf:DirectTypeHierarchyInferencer" ;
  128.46 +         sail:delegate [
  128.47 +            sail:sailType "openrdf:ForwardChainingRDFSInferencer" ;
  128.48 +            sail:delegate [
  128.49 +               sail:sailType "openrdf:MemoryStore" ;
  128.50 +               ms:persist true ;
  128.51 +               ms:syncDelay 0
  128.52 +            ]
  128.53 +         ]
  128.54 +      ]
  128.55 +   ].
   129.1 --- a/runtime/src/main/resources/META-INF/templates/memory-rdfs.ttl	Mon Mar 19 21:57:30 2012 +0100
   129.2 +++ b/runtime/src/main/resources/META-INF/templates/memory-rdfs.ttl	Mon Mar 19 22:06:59 2012 +0100
   129.3 @@ -1,23 +1,23 @@
   129.4 -#
   129.5 -# Sesame configuration template for a main-memory repository with
   129.6 -# RDF Schema inferencing
   129.7 -#
   129.8 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
   129.9 -@prefix rep: <http://www.openrdf.org/config/repository#>.
  129.10 -@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  129.11 -@prefix sail: <http://www.openrdf.org/config/sail#>.
  129.12 -@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  129.13 -
  129.14 -[] a rep:Repository ;
  129.15 -   rep:repositoryTitle "Memory store with RDF Schema inferencing" ;
  129.16 -   rep:repositoryImpl [
  129.17 -      rep:repositoryType "openrdf:SailRepository" ;
  129.18 -      sr:sailImpl [
  129.19 -         sail:sailType "openrdf:ForwardChainingRDFSInferencer" ;
  129.20 -         sail:delegate [
  129.21 -            sail:sailType "openrdf:MemoryStore" ;
  129.22 -            ms:persist true ;
  129.23 -            ms:syncDelay 0
  129.24 -         ]
  129.25 -      ]
  129.26 -   ].
  129.27 +#
  129.28 +# Sesame configuration template for a main-memory repository with
  129.29 +# RDF Schema inferencing
  129.30 +#
  129.31 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
  129.32 +@prefix rep: <http://www.openrdf.org/config/repository#>.
  129.33 +@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  129.34 +@prefix sail: <http://www.openrdf.org/config/sail#>.
  129.35 +@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  129.36 +
  129.37 +[] a rep:Repository ;
  129.38 +   rep:repositoryTitle "Memory store with RDF Schema inferencing" ;
  129.39 +   rep:repositoryImpl [
  129.40 +      rep:repositoryType "openrdf:SailRepository" ;
  129.41 +      sr:sailImpl [
  129.42 +         sail:sailType "openrdf:ForwardChainingRDFSInferencer" ;
  129.43 +         sail:delegate [
  129.44 +            sail:sailType "openrdf:MemoryStore" ;
  129.45 +            ms:persist true ;
  129.46 +            ms:syncDelay 0
  129.47 +         ]
  129.48 +      ]
  129.49 +   ].
   130.1 --- a/runtime/src/main/resources/META-INF/templates/memory.ttl	Mon Mar 19 21:57:30 2012 +0100
   130.2 +++ b/runtime/src/main/resources/META-INF/templates/memory.ttl	Mon Mar 19 22:06:59 2012 +0100
   130.3 @@ -1,19 +1,19 @@
   130.4 -#
   130.5 -# Sesame configuration template for a main-memory repository
   130.6 -#
   130.7 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
   130.8 -@prefix rep: <http://www.openrdf.org/config/repository#>.
   130.9 -@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  130.10 -@prefix sail: <http://www.openrdf.org/config/sail#>.
  130.11 -@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  130.12 -
  130.13 -[] a rep:Repository ;
  130.14 -   rep:repositoryTitle "Memory store" ;
  130.15 -   rep:repositoryImpl [
  130.16 -      rep:repositoryType "openrdf:SailRepository" ;
  130.17 -      sr:sailImpl [
  130.18 -         sail:sailType "openrdf:MemoryStore" ;
  130.19 -         ms:persist true ;
  130.20 -         ms:syncDelay 0
  130.21 -      ]
  130.22 -   ].
  130.23 +#
  130.24 +# Sesame configuration template for a main-memory repository
  130.25 +#
  130.26 +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
  130.27 +@prefix rep: <http://www.openrdf.org/config/repository#>.
  130.28 +@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  130.29 +@prefix sail: <http://www.openrdf.org/config/sail#>.
  130.30 +@prefix ms: <http://www.openrdf.org/config/sail/memory#>.
  130.31 +
  130.32 +[] a rep:Repository ;
  130.33 +   rep:repositoryTitle "Memory store" ;
  130.34 +   rep:repositoryImpl [
  130.35 +      rep:repositoryType "openrdf:SailRepository" ;
  130.36 +      sr:sailImpl [
  130.37 +         sail:sailType "openrdf:MemoryStore" ;
  130.38 +         ms:persist true ;
  130.39 +         ms:syncDelay 0
  130.40 +      ]
  130.41 +   ].
   131.1 --- a/runtime/src/main/resources/META-INF/templates/native-rdfs-dt.ttl	Mon Mar 19 21:57:30 2012 +0100
   131.2 +++ b/runtime/src/main/resources/META-INF/templates/native-rdfs-dt.ttl	Mon Mar 19 22:06:59 2012 +0100
   131.3 @@ -1,25 +1,25 @@
   131.4 -#
   131.5 -# Sesame configuration template for a native RDF repository with
   131.6 -# RDF Schema and direct type hierarchy inferencing
   131.7 -#
   131.8 -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
   131.9 -@prefix rep: <http://www.openrdf.org/config/repository#>.
  131.10 -@prefix sr: <http://www.openrdf.org/config/repository/sail#>.
  131.11 -@prefix sail: <http://www.openrdf.org/config/sail#>.
  131.12 -@prefix ns: <http://www.openrdf.org/config/sail/native#>.
  131.13 -
  131.14 -[] a rep:Repository ;
  131.15 -   rep:repositoryTitle "Native store with RDF Schema and direct type inferencing" ;
  131.16 -   rep:repositoryImpl [
  131.17 -      rep:repositoryType "openrdf:SailRepository" ;
  131.18 -      sr:sailImpl [
  131.19 -         sail:sailType "openrdf:DirectTypeHierarchyInferencer" ;
  131.20 -         sail:delegate [
  131.21 -            sail:sailType "openrdf:ForwardChainingRDFSInferencer" ;
  131.22 -            sail:delegate [
  131.23 -               sail:sailType "openrdf:NativeStore" ;
  131.24 -               ns:tripleIndexes "spoc,posc"
  131.25 -            ]
  131.26 -         ]
  131.27 -      ]
  131.28 -   ].
  131.29 +#
  131.30 +# Sesame configuration template for a native RDF repository with
  131.31 +# RDF Schema and direct type hierarchy inferencing
  1