[mapguide-commits] r5163 - trunk/MgDev/Server/src/Services/Mapping

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2010-09-20 20:15:35 +0000 (Mon, 20 Sep 2010)
New Revision: 5163

Modified:
   trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp
Log:
Fix for trac ticket 1428 - GETMAPLEGENDIMAGE should omit empty layer groups from being rendered
http://trac.osgeo.org/mapguide/ticket/1428

Notes:
- Use a more efficient check


Modified: trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp	2010-09-20 19:44:42 UTC (rev 5162)
+++ trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp	2010-09-20 20:15:35 UTC (rev 5163)
@@ -190,18 +190,19 @@
         Ptr<MgLayerGroup> mggroup = mggroups->GetItem(k);
 
         // Count number of visible layers in this group.
-        int visibleLayerCount = 0;
+        bool hasVisibleLayers = false;
         for (int l = 0; l < layers->GetCount(); l++)
         {
             Ptr<MgLayerBase> layer = layers->GetItem(l);
             Ptr<MgLayerGroup> layerGroup = layer->GetGroup();
             if ((layer->IsVisible()) && (layerGroup.p == mggroup.p))
             {
-                visibleLayerCount++;
+                hasVisibleLayers = true;
+                break;
             }
         }
-        if (visibleLayerCount == 0)
-        continue;
+        if (!hasVisibleLayers)
+            continue;
 
         if (mggroup == NULL)
         {