Strabon

changeset 23:e46020b5867f

SRID-minor change
author Konstantina Mpereta <grad1110@di.uoa.gr>
date Thu Feb 23 17:57:17 2012 +0200 (2012-02-23)
parents b11832da5ee5
children e8f9e1b518b4
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Wed Feb 22 17:31:02 2012 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Thu Feb 23 17:57:17 2012 +0200
     1.3 @@ -75,7 +75,8 @@
     1.4  	public static final String dimension="http://strdf.di.uoa.gr/ontology#dimension";
     1.5  	public static final String geometryType="http://strdf.di.uoa.gr/ontology#geometryType";
     1.6  	public static final String asText="http://strdf.di.uoa.gr/ontology#asText";
     1.7 -	public static final String srid="http://strdf.di.uoa.gr/ontology#srid";
     1.8 +	//public static final String srid="http://strdf.di.uoa.gr/ontology#srid";\
     1.9 +	public static final Integer srid=4326; //default srid. chainged this-constant
    1.10  	public static final String isEmpty="http://strdf.di.uoa.gr/ontology#isEmpty";
    1.11  	public static final String isSimple="http://strdf.di.uoa.gr/ontology#isSimple";
    1.12  	//Spatial Aggregate Functions
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Wed Feb 22 17:31:02 2012 +0200
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/SridFunc.java	Thu Feb 23 17:57:17 2012 +0200
     2.3 @@ -29,7 +29,7 @@
     2.4  
     2.5  	@Override
     2.6  	public String getURI() {
     2.7 -		return StrabonPolyhedron.srid;
     2.8 +		return StrabonPolyhedron.srid.toString(); //changed this-constant
     2.9  	}
    2.10  
    2.11  	 
     3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java	Wed Feb 22 17:31:02 2012 +0200
     3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java	Thu Feb 23 17:57:17 2012 +0200
     3.3 @@ -10,6 +10,7 @@
     3.4  import java.util.ArrayList;
     3.5  import java.util.List;
     3.6  import java.util.concurrent.BlockingQueue;
     3.7 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron;
     3.8  
     3.9  
    3.10  /**
    3.11 @@ -136,7 +137,8 @@
    3.12  		//Normal One sb.append(" (id, interval_start, interval_end, strdfgeo) VALUES (?,?,?,?)");
    3.13  		//sb.append(" (id, interval_start, interval_end, strdfgeo) VALUES (?,?,?,ST_GeomFromWKB(?,4326))");
    3.14  		//sb.append(" (id, strdfgeo) VALUES (?,ST_GeomFromWKB(?,32630))");
    3.15 -		sb.append(" (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),4326),?)"); 
    3.16 +		Integer srid=  StrabonPolyhedron.srid;
    3.17 +		sb.append(" (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),").append(srid).append("),?)"); 
    3.18  		INSERT = sb.toString();
    3.19  		sb.delete(0, sb.length());
    3.20  		sb.append("DELETE FROM ").append(table.getName()).append("\n");