# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1330614424 0
# Node ID e0f4ea518d59260cdedd6a86a9c32a64eb2120cd
# Parent  18478c9baa67433f2282a72346391062757782d7
Query GetFeatureInfo for active layers only.

flys-client/trunk@4106 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 18478c9baa67 -r e0f4ea518d59 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Thu Mar 01 13:24:52 2012 +0000
+++ b/flys-client/ChangeLog	Thu Mar 01 15:07:04 2012 +0000
@@ -1,3 +1,11 @@
+2012-03-01  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/shared/model/ThemeList.java: New
+	  method getActiveThemes() that returns the active themes only.
+
+	* src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java:
+	  Query GetFeatureInfo for active layers only!
+
 2012-03-01  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/CollectionView.java:
diff -r 18478c9baa67 -r e0f4ea518d59 flys-client/src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java	Thu Mar 01 13:24:52 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/GetFeatureInfo.java	Thu Mar 01 15:07:04 2012 +0000
@@ -60,7 +60,7 @@
         Pixel  pixel  = map.getPixelFromLonLat(lonlat);
 
         gfiService.query(
-            themePanel.getThemeList().getThemes(),
+            themePanel.getThemeList().getActiveThemes(),
             infoFormat,
             map.getExtent().toString(),
             map.getProjection(),
diff -r 18478c9baa67 -r e0f4ea518d59 flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java	Thu Mar 01 13:24:52 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java	Thu Mar 01 15:07:04 2012 +0000
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -29,6 +30,24 @@
     }
 
 
+    public List<Theme> getActiveThemes() {
+        List<Theme> active = new ArrayList<Theme>();
+        List<Theme> all    = getThemes();
+
+        if (all == null || all.isEmpty()) {
+            return active;
+        }
+
+        for (Theme theme: all) {
+            if (theme.getActive() == 1) {
+                active.add(theme);
+            }
+        }
+
+        return active;
+    }
+
+
     public int getThemeCount() {
         return themes.size();
     }