[fusion-commits] r1504 - in trunk: MapGuide lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-09-05 16:31:28 -0400 (Fri, 05 Sep 2008)
New Revision: 1504

Modified:
   trunk/MapGuide/MapGuide.js
   trunk/lib/Map.js
Log:
re #113: small changes to fix this, most was already fixed in rev 1464 for #108

Modified: trunk/MapGuide/MapGuide.js
===================================================================
--- trunk/MapGuide/MapGuide.js	2008-09-05 19:55:29 UTC (rev 1503)
+++ trunk/MapGuide/MapGuide.js	2008-09-05 20:31:28 UTC (rev 1504)
@@ -493,7 +493,10 @@
       if (this.maxScale != Infinity) {
         layerOptions.minScale = this.maxScale;    //OL interpretation of min/max scale is reversed from Fusion
       }
-      layerOptions.maxScale = this.minScale;
+      //only set both max and min scale when not using scales array
+      if (!this.map.scales && !this.scales) {
+        layerOptions.maxScale = this.minScale;  
+      }
 
       layerOptions.singleTile = bSingleTile;   
       

Modified: trunk/lib/Map.js
===================================================================
--- trunk/lib/Map.js	2008-09-05 19:55:29 UTC (rev 1503)
+++ trunk/lib/Map.js	2008-09-05 20:31:28 UTC (rev 1504)
@@ -528,7 +528,7 @@
         for (var i=0; i<this.aMaps.length; i++ ) {
           this.aMaps[i].oLayerOL.params.ts = (new Date()).getTime();
         }
-        this.oMapOL.zoomToExtent(oExtents);
+        this.oMapOL.zoomToExtent(oExtents,true);
         this._oCurrentExtents = this.oMapOL.getExtent();
     },