--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Fri Jan 06 12:55:01 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Fri Jan 06 14:19:35 2012 +0000
@@ -103,10 +103,7 @@
             setSrid(wms.getSrid());
 
             if (FLOODMAP_WSPLGEN.equals(name)) {
-                if (initialExtent == null) {
-                    setInitialExtent(extent);
-                }
-
+                setInitialExtent(extent);
                 createWSPLGENLayer(flys, wms);
             }
             else if (FLOODMAP_BARRIERS.equals(name)) {
@@ -226,30 +223,19 @@
 
         if (this.maxExtent == null) {
             logger.debug("Set max extent to: " + maxExtent);
-            this.maxExtent = maxExtent;
+            this.maxExtent = new Envelope(maxExtent);
             return;
         }
 
-        logger.debug("Expand max extent by: " + maxExtent);
-        logger.debug("Max extent before expanding: " + this.maxExtent);
         this.maxExtent.expandToInclude(maxExtent);
-        logger.debug("Max extent after expanding: " + this.maxExtent);
     }
 
 
     protected void setInitialExtent(Envelope initialExtent) {
-        if (initialExtent == null) {
-            return;
-        }
-
-        if (this.initialExtent == null) {
+        if (this.initialExtent == null && initialExtent != null) {
             logger.debug("Set initial extent to: " + initialExtent);
-            this.initialExtent = initialExtent;
-            return;
+            this.initialExtent = new Envelope(initialExtent);
         }
-
-        logger.debug("Set initial extent to: " + initialExtent);
-        this.initialExtent = initialExtent;
     }
 
 
@@ -264,16 +250,12 @@
 
     protected void appendMapInformation(Element parent, ElementCreator c) {
         String mE = GeometryUtils.jtsBoundsToOLBounds(this.maxExtent);
-        logger.debug("BUILD MAX EXTENT OF:" + this.maxExtent);
-        logger.debug("BUILD MAX EXTENT:" + mE);
 
         Element maxExtent = c.create("maxExtent");
         maxExtent.setTextContent(mE);
 
         if(this.initialExtent != null) {
             String iE = GeometryUtils.jtsBoundsToOLBounds(this.initialExtent);
-            logger.debug("BUILD INITIAL EXTENT OF: " + this.initialExtent);
-            logger.debug("BUILD INITIAL EXTENT: " + iE);
             Element initExtent = c.create("initialExtent");
             initExtent.setTextContent(iE);
             parent.appendChild(initExtent);