[fusion-commits] r2914 - in branches/fusion-mg30: . widgets

[svn_fusion at osgeo.org]

Author: jng
Date: 2015-06-04 07:22:45 -0700 (Thu, 04 Jun 2015)
New Revision: 2914

Modified:
   branches/fusion-mg30/
   branches/fusion-mg30/widgets/Legend.js
Log:
Merged revision(s) 2911 from sandbox/adsk/2.6l:
Fix an issue introduced by fix for #631.
The legend of raster layer is disabled after applying hot fix of #631. This issue only happens in AIMS 2015. It is because when creating a legend tree item, it will check if the layer has style in this scale range. If not, the legend will be disabled. But raster layers don't have style in any scale range. So we need to add a check for raster layers.
........



Property changes on: branches/fusion-mg30
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908
   + /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908

Modified: branches/fusion-mg30/widgets/Legend.js
===================================================================
--- branches/fusion-mg30/widgets/Legend.js	2015-06-04 14:22:34 UTC (rev 2913)
+++ branches/fusion-mg30/widgets/Legend.js	2015-06-04 14:22:45 UTC (rev 2914)
@@ -840,7 +840,15 @@
                 opt.image = layer.oMap.getLegendImageURL(scale, layer, style);
             }
         }
-
+        // MapGuide DWF and Raster layer
+        // MapGuide Raster and DWF layer
+        if(layer.layerTypes[0] == 4){
+            opt.image = this.imgLayerRasterIcon;
+            opt.enabled = true;
+        } else if(layer.layerTypes[0] == 5){
+            opt.image = this.imgLayerDWFIcon;
+            opt.enabled = true;
+        }
         var item;
         if (!layer.isBaseMapLayer&&checkbox) {
             // opt.contextMenu = this.getContextMenu();