diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java @ 2683:f5af3adb3b95

Improved datacage configuration for floodmaps and maps and modified the WMS layer artifacts to support names for layers. flys-artifacts/trunk@4383 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 10 May 2012 11:14:17 +0000
parents ec458853f560
children 0ca00d547f35
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java	Thu May 10 10:04:12 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSLineArtifact.java	Thu May 10 11:14:17 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] + "'");
                 }
             }
 
@@ -105,14 +106,6 @@
         }
 
         @Override
-        protected String getTitle(CallMeta meta) {
-            return Resources.getMsg(
-                meta,
-                FLOODMAP_LINES,
-                FLOODMAP_LINES);
-        }
-
-        @Override
         protected String getUrl() {
             return FLYSUtils.getUserWMSUrl(artifact.identifier());
         }
@@ -125,7 +118,7 @@
 
         @Override
         protected Envelope getExtent() {
-            List<Line> lines = Line.getLines(getRiverId());
+            List<Line> lines = Line.getLines(getRiverId(), getName());
 
             Envelope max = null;
 
@@ -145,7 +138,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