diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java @ 5088:2b24073e80d9 mapgenfix

Merge with default branch
author Christian Lins <christian.lins@intevation.de>
date Mon, 25 Feb 2013 11:55:34 +0100
parents 1da61095040c 9c529b9de6b5
children 61bf64b102bc
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Mon Feb 25 11:51:17 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java	Mon Feb 25 11:55:34 2013 +0100
@@ -409,8 +409,9 @@
         File         dir,
         WSPLGENJob   job
     ) {
+        String river   = artifact.getDataAsString("river");
         String geoJSON = artifact.getDataAsString("uesk.barriers");
-        String srid    = FLYSUtils.getRiverSrid(artifact);
+        String srid    = FLYSUtils.getRiverDGMSrid(river);
         String srs     = "EPSG:" + srid;
 
         if (geoJSON == null || geoJSON.length() == 0) {
@@ -712,7 +713,7 @@
         }
 
         String river = artifact.getDataAsString("river");
-        String srid  = FLYSUtils.getRiverSrid(artifact);
+        String srid  = FLYSUtils.getRiverDGMSrid(river);
         String srs   = "EPSG:" + srid;
 
         Floodplain plain = Floodplain.getFloodplain(river);

http://dive4elements.wald.intevation.org