Strabon

changeset 1067:460c3eda76b0

changed all SF functions of GeoSPARQL not to use ST_Relate PostGIS function
author Kallirroi Dogani <kallirroi@di.uoa.gr>
date Mon Apr 22 19:11:20 2013 +0300 (2013-04-22)
parents 9228a4f5b773
children 589bc43488c9
files endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithVirtuoso.java postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java
line diff
     1.1 --- a/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithVirtuoso.java	Mon Apr 22 16:24:30 2013 +0300
     1.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithVirtuoso.java	Mon Apr 22 19:11:20 2013 +0300
     1.3 @@ -59,9 +59,9 @@
     1.4  	@Test
     1.5  	public void testQuery() {
     1.6  			try {
     1.7 -				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.XML);
     1.8 +				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.TSV);
     1.9  				
    1.10 -				//System.out.println(response.getResponse());
    1.11 +			//	System.out.println(response.getResponse());
    1.12  				
    1.13  				if (response.getStatusCode() != 200) {
    1.14  					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
     2.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Mon Apr 22 16:24:30 2013 +0300
     2.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Mon Apr 22 19:11:20 2013 +0300
     2.3 @@ -521,7 +521,7 @@
     2.4  	protected void append(GeneralDBSqlSF_Contains expr, GeneralDBSqlExprBuilder filter)
     2.5  			throws UnsupportedRdbmsOperatorException
     2.6  			{
     2.7 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Contains);
     2.8 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Contains);
     2.9  			}
    2.10  
    2.11  	@Override
    2.12 @@ -537,21 +537,21 @@
    2.13  	protected void append(GeneralDBSqlSF_Disjoint expr, GeneralDBSqlExprBuilder filter)
    2.14  			throws UnsupportedRdbmsOperatorException
    2.15  			{
    2.16 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Disjoint);
    2.17 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Disjoint);
    2.18  			}
    2.19  
    2.20  	@Override
    2.21  	protected void append(GeneralDBSqlSF_Equals expr, GeneralDBSqlExprBuilder filter)
    2.22  			throws UnsupportedRdbmsOperatorException
    2.23  			{
    2.24 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Equals);
    2.25 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Equals);
    2.26  			}
    2.27  
    2.28  	@Override
    2.29  	protected void append(GeneralDBSqlSF_Intersects expr, GeneralDBSqlExprBuilder filter)
    2.30  			throws UnsupportedRdbmsOperatorException
    2.31  			{
    2.32 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Intersects);
    2.33 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Intersects);
    2.34  			}
    2.35  
    2.36  	@Override
    2.37 @@ -567,14 +567,14 @@
    2.38  	protected void append(GeneralDBSqlSF_Touches expr, GeneralDBSqlExprBuilder filter)
    2.39  			throws UnsupportedRdbmsOperatorException
    2.40  			{
    2.41 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Touches);
    2.42 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Touches);
    2.43  			}
    2.44  
    2.45  	@Override
    2.46  	protected void append(GeneralDBSqlSF_Within expr, GeneralDBSqlExprBuilder filter)
    2.47  			throws UnsupportedRdbmsOperatorException
    2.48  			{
    2.49 -		appendgeoSPARQLSpatialRelation(expr, filter,SpatialFunctionsPostGIS.SF_Within);
    2.50 +		appendGeneralDBSpatialFunctionBinary(expr, filter,SpatialFunctionsPostGIS.ST_Within);
    2.51  			}
    2.52  
    2.53  	//Egenhofer