Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java @ 4654:861c47e0a8a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4653:a93699cb31eb 4654:861c47e0a8a0
14 import de.intevation.flys.artifacts.model.FacetTypes; 14 import de.intevation.flys.artifacts.model.FacetTypes;
15 import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet; 15 import de.intevation.flys.artifacts.model.map.WMSDBLayerFacet;
16 import de.intevation.flys.artifacts.model.map.WMSLayerFacet; 16 import de.intevation.flys.artifacts.model.map.WMSLayerFacet;
17 import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet; 17 import de.intevation.flys.artifacts.model.map.WSPLGENLayerFacet;
18 import de.intevation.flys.collections.FLYSArtifactCollection; 18 import de.intevation.flys.collections.FLYSArtifactCollection;
19 import de.intevation.flys.utils.ArtefactMapfileGenerator;
19 import de.intevation.flys.utils.GeometryUtils; 20 import de.intevation.flys.utils.GeometryUtils;
20 import de.intevation.flys.utils.MapfileGenerator;
21 import de.intevation.flys.utils.ThemeUtil; 21 import de.intevation.flys.utils.ThemeUtil;
22 22
23 import java.io.File; 23 import java.io.File;
24 import java.io.FileNotFoundException; 24 import java.io.FileNotFoundException;
25 import java.io.IOException; 25 import java.io.IOException;
131 WMSLayerFacet wms, 131 WMSLayerFacet wms,
132 Document attr 132 Document attr
133 ) { 133 ) {
134 try { 134 try {
135 if(wms instanceof WSPLGENLayerFacet) { 135 if(wms instanceof WSPLGENLayerFacet) {
136 MapfileGenerator mfg = MapfileGenerator.getInstance(); 136 ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator();
137 mfg.createUeskLayer( 137 mfg.createUeskLayer(
138 flys, 138 flys,
139 (WSPLGENLayerFacet) wms, 139 (WSPLGENLayerFacet) wms,
140 ThemeUtil.createDynamicMapserverStyle(attr), 140 ThemeUtil.createDynamicMapserverStyle(attr),
141 context); 141 context);
150 } 150 }
151 } 151 }
152 152
153 153
154 protected void createBarriersLayer(FLYSArtifact flys, WMSLayerFacet wms) { 154 protected void createBarriersLayer(FLYSArtifact flys, WMSLayerFacet wms) {
155 MapfileGenerator mfg = MapfileGenerator.getInstance(); 155 ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator();
156 156
157 try { 157 try {
158 mfg.createBarriersLayer(flys, wms); 158 mfg.createBarriersLayer(flys, wms);
159 } 159 }
160 catch (FileNotFoundException fnfe) { 160 catch (FileNotFoundException fnfe) {
165 } 165 }
166 } 166 }
167 167
168 168
169 protected void createUserShapeLayer(FLYSArtifact flys, WMSLayerFacet wms) { 169 protected void createUserShapeLayer(FLYSArtifact flys, WMSLayerFacet wms) {
170 MapfileGenerator mfg = MapfileGenerator.getInstance(); 170 ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator();
171 171
172 try { 172 try {
173 mfg.createUserShapeLayer(flys, wms); 173 mfg.createUserShapeLayer(flys, wms);
174 } 174 }
175 catch (FileNotFoundException fnfe) { 175 catch (FileNotFoundException fnfe) {
186 WMSLayerFacet wms, 186 WMSLayerFacet wms,
187 Document attr 187 Document attr
188 ) { 188 ) {
189 logger.debug("createDatabaseLayer for facet: " + wms.getName()); 189 logger.debug("createDatabaseLayer for facet: " + wms.getName());
190 190
191 MapfileGenerator mfg = MapfileGenerator.getInstance(); 191 ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator();
192 192
193 try { 193 try {
194 File baseDir = mfg.getShapefileBaseDir(); 194 File baseDir = mfg.getShapefileBaseDir();
195 File artDir = new File(baseDir, flys.identifier()); 195 File artDir = new File(baseDir, flys.identifier());
196 196
222 public void generate() 222 public void generate()
223 throws IOException 223 throws IOException
224 { 224 {
225 logger.debug("MapGenerator.generate"); 225 logger.debug("MapGenerator.generate");
226 226
227 MapfileGenerator.getInstance().update(); 227 ArtefactMapfileGenerator mfg = new ArtefactMapfileGenerator();
228 mfg.generate();
228 229
229 Document response = XMLUtils.newDocument(); 230 Document response = XMLUtils.newDocument();
230 ElementCreator c = new ElementCreator( 231 ElementCreator c = new ElementCreator(
231 response, 232 response,
232 ArtifactNamespaceContext.NAMESPACE_URI, 233 ArtifactNamespaceContext.NAMESPACE_URI,
http://dive4elements.wald.intevation.org