Strabon

changeset 626:f4e410b430fb

Merge with default branch
author Kostis Kyzirakos <kkyzir@di.uoa.gr>
date Mon Oct 08 00:05:03 2012 +0300 (2012-10-08)
parents 1a1fb0a4981a c1c2701395be
children a1a5e82e6844 0e91d0e7274f
files
line diff
     1.1 --- a/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Mon Oct 08 00:04:10 2012 +0300
     1.2 +++ b/evaluation/src/main/resources/META-INF/services/org.openrdf.query.algebra.evaluation.function.Function	Mon Oct 08 00:05:03 2012 +0300
     1.3 @@ -8,7 +8,6 @@
     1.4  org.openrdf.query.algebra.evaluation.function.link.SimilarTermFunc
     1.5  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbIntersectsFunc
     1.6  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbContainsFunc
     1.7 -org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbWithinFunc
     1.8  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbInsideFunc
     1.9  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc
    1.10  org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.IntersectsFunc
     2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Mon Oct 08 00:04:10 2012 +0300
     2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Mon Oct 08 00:05:03 2012 +0300
     2.3 @@ -446,6 +446,7 @@
     2.4  					int targetSRID = leftGeom.getSRID();
     2.5  					int sourceSRID = rightGeom.getSRID();
     2.6  					Geometry rightConverted = JTSWrapper.getInstance().transform(rightGeom, sourceSRID, targetSRID);
     2.7 +					System.out.println("FUNCTION TOUCHFUNC CALLED AND JTS WILL BE USED!!!");
     2.8  					funcResult = leftGeom.touches(rightConverted);
     2.9  				}
    2.10  				else if(function instanceof MbbIntersectsFunc)