diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java @ 2672:5afccab9aac1

Modified floodmap specific datacage configuration and improved WMS hws layer. flys-artifacts/trunk@4361 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 08 May 2012 13:55:59 +0000
parents b4798f15edc7
children f5af3adb3b95
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java	Tue May 08 12:14:55 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java	Tue May 08 13:55:59 2012 +0000
@@ -86,13 +86,14 @@
 
         public int getRiverId() {
             if (riverId == 0) {
-                String ids = artifact.getDataAsString("ids");
+                String   ids   = artifact.getDataAsString("ids");
+                String[] parts = ids.split(";");
 
                 try {
-                    riverId = Integer.valueOf(ids);
+                    riverId = Integer.valueOf(parts[0]);
                 }
                 catch (NumberFormatException nfe) {
-                    logger.error("Cannot parse river id from '" + ids + "'");
+                    logger.error("Cannot parse river id from '" + parts[0] + "'");
                 }
             }
 
@@ -125,7 +126,7 @@
 
         @Override
         protected Envelope getExtent() {
-            List<Hws> hws = Hws.getHws(getRiverId());
+            List<Hws> hws = Hws.getHws(getRiverId(), getName());
 
             Envelope max = null;
 
@@ -145,7 +146,8 @@
 
         @Override
         protected String getFilter() {
-            return "river_id=" + String.valueOf(getRiverId());
+            return "river_id=" + String.valueOf(getRiverId())
+                + " AND name='" + getName() + "'";
         }
 
         @Override

http://dive4elements.wald.intevation.org