# HG changeset patch
# User Babis Nikolaou <charnik@di.uoa.gr>
# Date 1410898300 -10800
# Node ID d4105edb20225a2fc1080ea6e24f9a3766ae564a
# Parent  74808ea84aa3b2edc9d2429e9983dd9d87ebf598
introduced constant for the default SRID of MonetDB and PostGIS

diff -r 74808ea84aa3 -r d4105edb2022 monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java
--- a/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java	Tue Sep 16 23:09:31 2014 +0300
+++ b/monetdb/src/main/java/org/openrdf/sail/monetdb/MonetDBSqlTable.java	Tue Sep 16 23:11:40 2014 +0300
@@ -9,15 +9,16 @@
 
 import org.openrdf.sail.generaldb.GeneralDBSqlTable;
 
-import eu.earthobservatory.constants.GeoConstants;
-
 /**
  * 
+ * @author Charalampos Nikolaou <charnik@di.uoa.gr>
  * @author George Garbis <ggarbis@di.uoa.gr>
- * 
+ * @author Manos Karpathiotakis <mk@di.uoa.gr>
  */
 public class MonetDBSqlTable extends GeneralDBSqlTable {
 
+	public static final int DEFAULT_SRID = 4326;
+	
 	public MonetDBSqlTable(String name) {
 		super(name.toLowerCase());
 	}
@@ -48,8 +49,7 @@
 	
 	@Override
 	public String buildInsertGeometryValue() {
-		Integer srid=  GeoConstants.defaultSRID;
-		return " (id, strdfgeo,srid) VALUES (CAST(? AS INTEGER), Transform(GeomFromWKB(CAST(? AS BLOB),CAST(? AS INTEGER)),"+srid+"), CAST(? AS INTEGER))";
+		return " (id, strdfgeo, srid) VALUES (CAST(? AS INTEGER), Transform(GeomFromWKB(CAST(? AS BLOB), CAST(? AS INTEGER)),"+DEFAULT_SRID+"), CAST(? AS INTEGER))";
 	}
 	
 	@Override
diff -r 74808ea84aa3 -r d4105edb2022 postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java
--- a/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java	Tue Sep 16 23:09:31 2014 +0300
+++ b/postgis/src/main/java/org/openrdf/sail/postgis/PostGISSqlTable.java	Tue Sep 16 23:11:40 2014 +0300
@@ -9,8 +9,6 @@
 
 import org.openrdf.sail.generaldb.GeneralDBSqlTable;
 
-import eu.earthobservatory.constants.GeoConstants;
-
 /**
  * Converts table names to lower-case and include the analyse optimisation.
  * 
@@ -19,6 +17,8 @@
  */
 public class PostGISSqlTable extends GeneralDBSqlTable {
 
+	public static final int DEFAULT_SRID = 4326;
+	
 	public PostGISSqlTable(String name) {
 		super(name.toLowerCase());
 	}
@@ -37,7 +37,7 @@
 	
 	@Override
 	public String buildGeometryCollumn() {
-		return "SELECT AddGeometryColumn('','geo_values','strdfgeo',4326,'GEOMETRY',2)";
+		return "SELECT AddGeometryColumn('', 'geo_values', 'strdfgeo', " + DEFAULT_SRID + ", 'GEOMETRY', 2)";
 	}
 	
 	@Override
@@ -45,15 +45,21 @@
 		return "CREATE INDEX geoindex ON geo_values USING GIST (strdfgeo)";
 	}
 	
+	/**
+	 * SQL arguments
+	 * 	arg1: hash
+	 * 	arg2: geometry (binary)
+	 * 	arg3: SRID of the given geometry (used to transform it to PostGIS' 4326 long/lat CRS)
+	 * 	arg4: SRID of the given geometry to save to the database
+	 */
 	@Override
 	public String buildInsertGeometryValue() {
-		Integer srid=  GeoConstants.defaultSRID;
-		return " (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),"+srid+"),?)";
+		return " (id, strdfgeo, srid) VALUES (?, ST_Transform(ST_GeomFromWKB(?, ?),"+DEFAULT_SRID+"), ?)";
 	}
 	
 	@Override
 	public String buildInsertValue(String type) {
-		return " (id, value) VALUES ( ?, ?) ";
+		return " (id, value) VALUES (?, ?) ";
 	}
 	
 	@Override