Strabon
changeset 26:dbc0ec959bfa
Minor fix related to a declared static variable. Different variables used for system's default SRID and stSPARQL SRID function
| author | Manos Karpathiotakis <mk@di.uoa.gr> |
|---|---|
| date | Fri Feb 24 18:45:08 2012 +0200 (2012-02-24) |
| parents | 47efa6a1ae1e |
| children | 4caa89c66104 |
| files | evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.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 Fri Feb 24 18:14:01 2012 +0200 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java Fri Feb 24 18:45:08 2012 +0200 1.3 @@ -75,8 +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 Integer srid=4326; //default srid. chainged this-constant 1.9 + public static final String srid="http://strdf.di.uoa.gr/ontology#srid"; 1.10 + public static final Integer defaultSRID=4326; //default srid. 1.11 public static final String isEmpty="http://strdf.di.uoa.gr/ontology#isEmpty"; 1.12 public static final String isSimple="http://strdf.di.uoa.gr/ontology#isSimple"; 1.13 //Spatial Aggregate Functions
2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java Fri Feb 24 18:14:01 2012 +0200 2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/schema/GeoValueTable.java Fri Feb 24 18:45:08 2012 +0200 2.3 @@ -138,7 +138,7 @@ 2.4 //Normal One sb.append(" (id, interval_start, interval_end, strdfgeo) VALUES (?,?,?,?)"); 2.5 //sb.append(" (id, interval_start, interval_end, strdfgeo) VALUES (?,?,?,ST_GeomFromWKB(?,4326))"); 2.6 //sb.append(" (id, strdfgeo) VALUES (?,ST_GeomFromWKB(?,32630))"); 2.7 - Integer srid= StrabonPolyhedron.srid; 2.8 + Integer srid= StrabonPolyhedron.defaultSRID; 2.9 sb.append(" (id, strdfgeo,srid) VALUES (?,ST_Transform(ST_GeomFromWKB(?,?),").append(srid).append("),?)"); 2.10 INSERT = sb.toString(); 2.11 sb.delete(0, sb.length());