--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java	Thu May 10 10:04:12 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSBuildingsArtifact.java	Thu May 10 11:14:17 2012 +0000
@@ -84,35 +84,12 @@
             riverId = 0;
         }
 
-        public int getRiverId() {
-            if (riverId == 0) {
-                String ids = artifact.getDataAsString("ids");
-
-                try {
-                    riverId = Integer.valueOf(ids);
-                }
-                catch (NumberFormatException nfe) {
-                    logger.error("Cannot parse river id from '" + ids + "'");
-                }
-            }
-
-            return riverId;
-        }
-
         @Override
         protected String getFacetType() {
             return FLOODMAP_BUILDINGS;
         }
 
         @Override
-        protected String getTitle(CallMeta meta) {
-            return Resources.getMsg(
-                meta,
-                FLOODMAP_BUILDINGS,
-                FLOODMAP_BUILDINGS);
-        }
-
-        @Override
         protected String getUrl() {
             return FLYSUtils.getUserWMSUrl(artifact.identifier());
         }
@@ -125,7 +102,8 @@
 
         @Override
         protected Envelope getExtent() {
-            List<Building> buildings = Building.getBuildings(getRiverId());
+            List<Building> buildings =
+                Building.getBuildings(getRiverId(), getName());
 
             Envelope max = null;
 
@@ -145,7 +123,8 @@
 
         @Override
         protected String getFilter() {
-            return "river_id=" + String.valueOf(getRiverId());
+            return "river_id=" + String.valueOf(getRiverId()) +
+                " AND name='" + getName() + "'";
         }
 
         @Override