Strabon

changeset 356:0d7dbda7c52b

renamed ogcGeometry to WKT and gml to GML
author Babis Nikolaou <charnik@di.uoa.gr>
date Mon Jun 25 19:47:25 2012 +0300 (2012-06-25)
parents ae895563802f
children 28025a51cab6
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Mon Jun 25 19:46:57 2012 +0300
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/StrabonPolyhedron.java	Mon Jun 25 19:47:25 2012 +0300
     1.3 @@ -28,6 +28,11 @@
     1.4  import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
     1.5  import com.vividsolutions.jts.io.ParseException;
     1.6  
     1.7 +/**
     1.8 + * @author Manos Karpathiotakis <mk@di.uoa.gr>
     1.9 + * @author Kostis Kyzirakos <kk@di.uoa.gr>
    1.10 + *
    1.11 + */
    1.12  public class StrabonPolyhedron implements Value {
    1.13  
    1.14  	private static final long serialVersionUID = 894529468109904724L;
    1.15 @@ -42,11 +47,11 @@
    1.16  
    1.17  	public static final String stRDF="http://strdf.di.uoa.gr/ontology#";
    1.18  	public static final String stRDFSemiLinearPointset="http://strdf.di.uoa.gr/ontology#SemiLinearPointSet";
    1.19 -	public static final String ogcGeometry="http://strdf.di.uoa.gr/ontology#WKT";
    1.20 +	public static final String WKT="http://strdf.di.uoa.gr/ontology#WKT";
    1.21  	public static final String geof="http://www.opengis.net/def/queryLanguage/OGC-GeoSPARQL/1.0/function/";
    1.22  	//Extended functions
    1.23  	//Spatial Relationships
    1.24 -	public static final String gml="http://www.opengis.net/def/geometryType/OGC-GML/3.2/";
    1.25 +	public static final String GML="http://www.opengis.net/def/geometryType/OGC-GML/3.2/";
    1.26  	public static final String anyInteract="http://strdf.di.uoa.gr/ontology#anyInteract";
    1.27  	public static final String contains="http://strdf.di.uoa.gr/ontology#contains";
    1.28  	public static final String coveredBy="http://strdf.di.uoa.gr/ontology#coveredBy";
    1.29 @@ -134,10 +139,13 @@
    1.30  	private static int MAX_POINTS = Integer.MAX_VALUE;//40000;//Integer.MAX_VALUE;//10000;
    1.31  
    1.32  	/**
    1.33 -	 * Get JTS singleton instance.
    1.34 +	 * Get Java Topology Suite wrapper instance.
    1.35  	 */
    1.36  	private static JTSWrapper jts = JTSWrapper.getInstance();
    1.37  	
    1.38 +	/**
    1.39 +	 * The underlying geometry
    1.40 +	 */
    1.41  	private Geometry geometry;
    1.42  
    1.43  	public StrabonPolyhedron() {
    1.44 @@ -145,7 +153,6 @@
    1.45  
    1.46  	}
    1.47  
    1.48 -
    1.49  	public void setGeometry(Geometry geometry) {
    1.50  		this.geometry = geometry;
    1.51  	}
    1.52 @@ -159,8 +166,6 @@
    1.53  	//	this.geometry = jts.WKTread(poly.toWKT());
    1.54  	//}
    1.55  
    1.56 -
    1.57 -
    1.58  	public StrabonPolyhedron(Geometry geo) throws Exception {
    1.59  		this.geometry = new StrabonPolyhedron(geo, 1).geometry;
    1.60  		this.geometry.setSRID(geo.getSRID());