Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java @ 4654:861c47e0a8a0
Refactor Mapserver mapfile generation.
Prepares the existing mapfile generation code for
a river axis mapfile generator.
Removes unused asynchronous mapfile generation to
reduce complexity.
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Sat, 08 Dec 2012 00:19:29 +0100 |
| parents | fc52ee878412 |
| children | 13abfb1bcb75 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java Fri Dec 07 11:26:53 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java Sat Dec 08 00:19:29 2012 +0100 @@ -16,8 +16,8 @@ import de.intevation.flys.artifacts.model.map.WMSLayerFacet; import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet; import de.intevation.flys.collections.FLYSArtifactCollection; +import de.intevation.flys.utils.ArtefactMapfileGenerator; import de.intevation.flys.utils.GeometryUtils; -import de.intevation.flys.utils.MapfileGenerator; import de.intevation.flys.utils.ThemeUtil; import java.io.File; @@ -133,7 +133,7 @@ ) { try { if(wms instanceof WSPLGENLayerFacet) { - MapfileGenerator mfg = MapfileGenerator.getInstance(); + ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator(); mfg.createUeskLayer( flys, (WSPLGENLayerFacet) wms, @@ -152,7 +152,7 @@ protected void createBarriersLayer(FLYSArtifact flys, WMSLayerFacet wms) { - MapfileGenerator mfg = MapfileGenerator.getInstance(); + ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator(); try { mfg.createBarriersLayer(flys, wms); @@ -167,7 +167,7 @@ protected void createUserShapeLayer(FLYSArtifact flys, WMSLayerFacet wms) { - MapfileGenerator mfg = MapfileGenerator.getInstance(); + ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator(); try { mfg.createUserShapeLayer(flys, wms); @@ -188,7 +188,7 @@ ) { logger.debug("createDatabaseLayer for facet: " + wms.getName()); - MapfileGenerator mfg = MapfileGenerator.getInstance(); + ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator(); try { File baseDir = mfg.getShapefileBaseDir(); @@ -224,7 +224,8 @@ { logger.debug("MapGenerator.generate"); - MapfileGenerator.getInstance().update(); + ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator(); + mfg.generate(); Document response = XMLUtils.newDocument(); ElementCreator c = new ElementCreator(