diff flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java @ 5175:cfc5540a4eec mapgenfix

Re-add layer generation for floodmap layers (somewhat buggy though).
author Christian Lins <christian.lins@intevation.de>
date Wed, 06 Mar 2013 14:14:15 +0100
parents cc50e1b9fc60
children
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Mon Feb 25 11:55:34 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Wed Mar 06 14:14:15 2013 +0100
@@ -3,7 +3,6 @@
 import com.vividsolutions.jts.geom.Envelope;
 
 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
-import de.intevation.artifactdatabase.state.Facet;
 import de.intevation.artifactdatabase.state.Settings;
 import de.intevation.artifacts.Artifact;
 import de.intevation.artifacts.CallContext;
@@ -17,6 +16,7 @@
 import de.intevation.flys.collections.FLYSArtifactCollection;
 import de.intevation.flys.mapserver.ArtifactMapfileGenerator;
 import de.intevation.flys.utils.GeometryUtils;
+import de.intevation.flys.utils.ThemeUtil;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -83,7 +83,7 @@
         logger.debug("MapGenerator.doOut: " +
             artifactFacet.getArtifact().identifier() + " | " + name);
         FLYSArtifact flys = (FLYSArtifact) artifactFacet.getArtifact();
-
+        /*
         Facet nativeFacet = artifactFacet.getFacet();
 
         if (nativeFacet instanceof WMSLayerFacet) {
@@ -112,6 +112,13 @@
         }
         else {
             logger.warn("Facet not supported: " + nativeFacet.getClass());
+        }*/
+        ArtifactMapfileGenerator amfg = new ArtifactMapfileGenerator();
+        try {
+            amfg.generate(ThemeUtil.createDynamicMapserverStyle(attr), context, flys);
+        }
+        catch (IOException e) {
+            logger.error(e.getMessage(), e);
         }
     }
 
@@ -124,11 +131,11 @@
         //try {
             if(wms instanceof WSPLGENLayerFacet) {
                 ArtifactMapfileGenerator mfg = new ArtifactMapfileGenerator();
-                /*mfg.createUeskLayer(
+               /* mfg.createUeskLayer(
                     flys,
                     (WSPLGENLayerFacet) wms,
                     ThemeUtil.createDynamicMapserverStyle(attr),
-                    context);*/ // FIXME
+                    context);*/
             }
             else {
                 logger.warn("Cannot create WSPLGEN layer from: " +

http://dive4elements.wald.intevation.org