[fusion-commits] r2140 - in sandbox/jxlib-3.0: layers/MapServer widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2010-04-14 13:34:06 -0400 (Wed, 14 Apr 2010)
New Revision: 2140

Modified:
   sandbox/jxlib-3.0/layers/MapServer/MapServer.js
   sandbox/jxlib-3.0/widgets/MapMenu.js
Log:
Fusion tweaks for platform MapMenu 

Modified: sandbox/jxlib-3.0/layers/MapServer/MapServer.js
===================================================================
--- sandbox/jxlib-3.0/layers/MapServer/MapServer.js	2010-04-12 16:39:07 UTC (rev 2139)
+++ sandbox/jxlib-3.0/layers/MapServer/MapServer.js	2010-04-14 17:34:06 UTC (rev 2140)
@@ -850,12 +850,14 @@
 
     getLayerInfoUrl: function(layerName) {
       var layer = this.getLayerByName(layerName);
-      var metadata = layer.metadata;
-      if (metadata && metadata["LAYERINFOURL"]) {
-        return metadata["LAYERINFOURL"];
-      } else {
-        return null;
+      var layerUrl = null;
+      if (layer) {
+        var metadata = layer.metadata;
+        if (metadata && metadata["LAYERINFOURL"]) {
+          layerUrl = metadata["LAYERINFOURL"];
+        }
       }
+      return layerUrl;
   },
 
     getLayerByName: function(name)

Modified: sandbox/jxlib-3.0/widgets/MapMenu.js
===================================================================
--- sandbox/jxlib-3.0/widgets/MapMenu.js	2010-04-12 16:39:07 UTC (rev 2139)
+++ sandbox/jxlib-3.0/widgets/MapMenu.js	2010-04-14 17:34:06 UTC (rev 2140)
@@ -119,7 +119,7 @@
                   // check for mapgroup data and if there is none,
                   // create a maptag that will be passed to the map
                   // widget constructor 
-                  data = {maps:[{'resourceId': resource.sMapResource,
+                  data = {maps:[{'resourceId': resource.sResourceId,
                           'singleTile':true,
                           'type': this.arch,
                           'extension':{