--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Thu Oct 27 14:04:04 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Fri Oct 28 05:54:25 2011 +0000
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.vividsolutions.jts.geom.Envelope;
+
 import de.intevation.artifacts.CallContext;
 
 import de.intevation.artifactdatabase.state.Facet;
@@ -66,7 +68,7 @@
         return FLYSUtils.getRiverSrid(artifact);
     }
 
-    protected String getWSPLGENBounds() {
+    protected Envelope getWSPLGENBounds() {
         String river = getRiver();
         double kms[] = FLYSUtils.getKmRange(artifact);
 
@@ -80,11 +82,16 @@
             return null;
         }
 
-        return GeometryUtils.createOLBounds(a.getGeom(), b.getGeom());
+        Envelope envA = a.getGeom().getEnvelopeInternal();
+        Envelope envB = b.getGeom().getEnvelopeInternal();
+
+        envA.expandToInclude(envB);
+
+        return envA;
     }
 
-    protected String getBounds() {
-        return GeometryUtils.getRiverBounds(getRiver());
+    protected Envelope getBounds() {
+        return GeometryUtils.getRiverBoundary(getRiver());
     }
 
     public List<Facet> getFacets() {
@@ -104,9 +111,9 @@
             hash,
             getUrl());
 
-        String bounds = getWSPLGENBounds();
+        Envelope bounds = getWSPLGENBounds();
 
-        if (bounds == null || bounds.length() == 0) {
+        if (bounds == null) {
             bounds = getBounds();
         }