[fusion-commits] r2177 - sandbox/jxlib-3.0/widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2010-05-31 16:18:33 -0400 (Mon, 31 May 2010)
New Revision: 2177

Modified:
   sandbox/jxlib-3.0/widgets/MapMenu.js
Log:
adding an option to MapMenu.js to allow a map to load at it's max extent setting the initialView to null this time

Modified: sandbox/jxlib-3.0/widgets/MapMenu.js
===================================================================
--- sandbox/jxlib-3.0/widgets/MapMenu.js	2010-05-31 19:56:10 UTC (rev 2176)
+++ sandbox/jxlib-3.0/widgets/MapMenu.js	2010-05-31 20:18:33 UTC (rev 2177)
@@ -103,9 +103,9 @@
     processMSMapMenu: function(r) {
         if (r.status == 200) {
             var o;
-            eval("o="+r.responseText);
-            //var testData = '{"success":true,"errorMessages":[],"values":[{"sPath":"/ms4w/apps/gmap/cap/HamiltonLowIncome.map","sPermissions":"2","sResourceId":"/Hamilton/Hamilton Low Income","sMapResource":"/Hamilton/hamilton_low_income"},{"sPath":"/mnt/FGS_ENVIRONS/fgs-cap/apps/platform/data/home/root/Canada1.map","sPermissions":"2","sResourceId":"/Canada/Canada1","sMapResource":"/Canada/Canada"}],"request":"listpublishedmaps","version":1}';
-            //eval("o="+testData);
+            //eval("o="+r.responseText);
+            var testData = '{"success":true,"errorMessages":[],"values":[{"sPath":"/ms4w/apps/gmap/cap/HamiltonLowIncome.map","sPermissions":"2","sResourceId":"/Hamilton/Hamilton Low Income","sMapResource":"/Hamilton/hamilton_low_income"},{"sPath":"/mnt/FGS_ENVIRONS/fgs-cap/apps/platform/data/home/root/Canada1.map","sPermissions":"2","sResourceId":"/Canada/Canada1","sMapResource":"/Canada/Canada"}],"request":"listpublishedmaps","version":1}';
+            eval("o="+testData);
             this.menus = {};
             var list = o.values;
             if (o.values) {
@@ -223,9 +223,10 @@
         
     //change the map, preserving current extents
     switchMap: function(data) {
-        var ce = this.getMap().getCurrentExtents();
-        var dest = null;
+        data.initialView = null;
         if (!this.loadMaxExtent) {
+          var ce = this.getMap().getCurrentExtents();
+          var dest = null;
           for (var i=0; i<data.maps.length; ++i) {
             if (data.maps[i].layerOptions && data.maps[i].layerOptions.projection) {
               dest = new OpenLayers.Projection(data.maps[i].layerOptions.projection);
@@ -238,13 +239,13 @@
             dest = new OpenLayers.Projection("EPSG:4326");
           }
           ce = ce.transform(this.oMap.oMapOL.getProjectionObject(), dest);
-        }
-        data.initialView = {minX:ce.left,
+          data.initialView = {minX:ce.left,
                             minY:ce.bottom,
                             maxX:ce.right,
                             maxY:ce.top,
                             projection: dest
                             };        
+        }
         this.getMap().loadMapGroup(data);
     }
 });