Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3 from maesenka/master

Updates to latest versions of common/geom (0.5-SNAPSHOT)
  • Loading branch information...
commit 34d41d2d4171312a7c1885f5087aebb45e919c17 2 parents 235b6dd + c94eb88
@bertvh bertvh authored
View
7 pom.xml
@@ -25,7 +25,7 @@
<groupId>org.geolatte</groupId>
<artifactId>geolatte-featureserver</artifactId>
<packaging>war</packaging>
- <version>0.4-SNAPSHOT</version>
+ <version>0.5-SNAPSHOT</version>
<description>
geolatte-featureserver is designed to serve geometric features through a REST-based API.
</description>
@@ -115,12 +115,13 @@
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>1.3.3</version>
- <!--<scope>test</scope> -->
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.4-701.jdbc3</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -135,7 +136,7 @@
<dependency>
<groupId>org.geolatte</groupId>
<artifactId>geolatte-common-hibernate</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
View
5 src/main/java/org/geolatte/featureserver/dbase/StandardFeatureReader.java
@@ -21,7 +21,6 @@
package org.geolatte.featureserver.dbase;
-import com.vividsolutions.jts.geom.Envelope;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.geolatte.common.cql.hibernate.CqlHibernate;
@@ -29,6 +28,8 @@
import org.geolatte.common.geo.TypeConversionException;
import org.geolatte.common.reflection.EntityClassReader;
import org.geolatte.common.transformer.TransformerSource;
+import org.geolatte.geom.Envelope;
+import org.geolatte.geom.jts.JTS;
import org.hibernate.*;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
@@ -167,7 +168,7 @@ private void addBBoxConstraint(Class entityClass, String bboxString, Criteria cr
if (geomName != null) {
try {
Envelope bbox = new EnvelopeConverter().convert(bboxString);
- crit.add(SpatialRestrictions.filter(geomName, bbox, LAMBERT_72));
+ crit.add(SpatialRestrictions.filter(geomName, JTS.to(bbox), LAMBERT_72));
} catch (TypeConversionException e) {
// Ignore the bbox
}
Please sign in to comment.
Something went wrong with that request. Please try again.