1.1 --- a/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java	Tue Sep 16 23:09:31 2014 +0300
     1.2 +++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java	Tue Sep 16 23:11:40 2014 +0300
     1.3 @@ -9,15 +9,16 @@
     1.4  
     1.5  import org.openrdf.sail.generaldb.GeneralDBSqlTable;
     1.6  
     1.7 -import eu.earthobservatory.constants.GeoConstants;
     1.8 -
     1.9  /**
    1.10   * 
    1.11 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    1.12   * @author George Garbis <ggarbis@di.uoa.gr>
    1.13 - * 
    1.14 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
    1.15   */
    1.16  public class MonetDBSqlTable extends GeneralDBSqlTable {
    1.17  
    1.18 +	public static final int DEFAULT_SRID = 4326;
    1.19 +	
    1.20  	public MonetDBSqlTable(String name) {
    1.21  		super(name.toLowerCase());
    1.22  	}
    1.23 @@ -48,8 +49,7 @@
    1.24  	
    1.25  	@Override
    1.26  	public String buildInsertGeometryValue() {
    1.27 -		Integer srid=  GeoConstants.defaultSRID;
    1.28 -		return " (id, strdfgeo,srid) VALUES (CAST(? AS INTEGER), Transform(GeomFromWKB(CAST(? AS BLOB),CAST(? AS INTEGER)),"+srid+"), CAST(? AS INTEGER))";
    1.29 +		return " (id, strdfgeo, srid) VALUES (CAST(? AS INTEGER), Transform(GeomFromWKB(CAST(? AS BLOB), CAST(? AS INTEGER)),"+DEFAULT_SRID+"), CAST(? AS INTEGER))";
    1.30  	}
    1.31  	
    1.32  	@Override

     2.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java	Tue Sep 16 23:09:31 2014 +0300
     2.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java	Tue Sep 16 23:11:40 2014 +0300
     2.3 @@ -9,8 +9,6 @@
     2.4  
     2.5  import org.openrdf.sail.generaldb.GeneralDBSqlTable;
     2.6  
     2.7 -import eu.earthobservatory.constants.GeoConstants;
     2.8 -
     2.9  /**
    2.10   * Converts table names to lower-case and include the analyse optimisation.
    2.11   * 
    2.12 @@ -19,6 +17,8 @@
    2.13   */
    2.14  public class PostGISSqlTable extends GeneralDBSqlTable {
    2.15  
    2.16 +	public static final int DEFAULT_SRID = 4326;
    2.17 +	
    2.18  	public PostGISSqlTable(String name) {
    2.19  		super(name.toLowerCase());
    2.20  	}
    2.21 @@ -37,7 +37,7 @@
    2.22  	
    2.23  	@Override
    2.24  	public String buildGeometryCollumn() {
    2.25 -		return "SELECT AddGeometryColumn('','geo_values','strdfgeo',4326,'GEOMETRY',2)";
    2.26 +		return "SELECT AddGeometryColumn('', 'geo_values', 'strdfgeo', " + DEFAULT_SRID + ", 'GEOMETRY', 2)";
    2.27  	}
    2.28  	
    2.29  	@Override
    2.30 @@ -45,15 +45,21 @@
    2.31  		return "CREATE INDEX geoindex ON geo_values USING GIST (strdfgeo)";
    2.32  	}
    2.33  	
    2.34 +	/**
    2.35 +	 * SQL arguments
    2.36 +	 * 	arg1: hash
    2.37 +	 * 	arg2: geometry (binary)
    2.38 +	 * 	arg3: SRID of the given geometry (used to transform it to PostGIS' 4326 long/lat CRS)
    2.39 +	 * 	arg4: SRID of the given geometry to save to the database
    2.40 +	 */
    2.41  	@Override
    2.42  	public String buildInsertGeometryValue() {
    2.43 -		Integer srid=  GeoConstants.defaultSRID;
    2.44 -		return " (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),"+srid+"),?)";
    2.45 +		return " (id, strdfgeo, srid) VALUES (?, ST_Transform(ST_GeomFromWKB(?, ?),"+DEFAULT_SRID+"), ?)";
    2.46  	}
    2.47  	
    2.48  	@Override
    2.49  	public String buildInsertValue(String type) {
    2.50 -		return " (id, value) VALUES ( ?, ?) ";
    2.51 +		return " (id, value) VALUES (?, ?) ";
    2.52  	}
    2.53  	
    2.54  	@Override