[fusion-commits] r2902 - sandbox/adsk/3.0m/lib/OpenLayers

[svn_fusion at osgeo.org]

Author: liuar
Date: 2015-04-23 21:38:37 -0700 (Thu, 23 Apr 2015)
New Revision: 2902

Modified:
   sandbox/adsk/3.0m/lib/OpenLayers/OpenLayers.js
Log:
#631, set base layer's visibility only when zoom is defined and the base layer is not commercial layer.

Modified: sandbox/adsk/3.0m/lib/OpenLayers/OpenLayers.js
===================================================================
--- sandbox/adsk/3.0m/lib/OpenLayers/OpenLayers.js	2015-04-23 05:36:15 UTC (rev 2901)
+++ sandbox/adsk/3.0m/lib/OpenLayers/OpenLayers.js	2015-04-24 04:38:37 UTC (rev 2902)
@@ -8728,10 +8728,12 @@
             var bounds = this.getExtent();
             
             //send the move call to the baselayer and all the overlays
-            if (zoom >= this.baseLayer.MAX_ZOOM_LEVEL)
-                this.baseLayer.setVisibility(false);
-            else
-                this.baseLayer.setVisibility(this.baseLayer.visibility);
+            if (zoom && this.baseLayer.CLASS_NAME != "OpenLayers.Layer.MapGuide") {
+                if (zoom >= this.baseLayer.MAX_ZOOM_LEVEL)
+                    this.baseLayer.setVisibility(false);
+                else
+                    this.baseLayer.setVisibility(true);
+            }
             if(this.baseLayer.visibility) {
                 this.baseLayer.moveTo(bounds, zoomChanged, options.dragging);
                 options.dragging || this.baseLayer.events.triggerEvent(
@@ -9113,10 +9115,12 @@
             if (map.baseLayer.wrapDateLine) {
                 zoom = map.adjustZoom(zoom);
             }
-            if (zoom >= map.baseLayer.MAX_ZOOM_LEVEL)
-                map.baseLayer.setVisibility(false);
-            else
-                map.baseLayer.setVisibility(map.baseLayer.visibility);
+            if (zoom && map.baseLayer.CLASS_NAME != "OpenLayers.Layer.MapGuide") {
+                if (zoom >= map.baseLayer.MAX_ZOOM_LEVEL)
+                    map.baseLayer.setVisibility(false);
+                else
+                    map.baseLayer.setVisibility(true);
+            }
             if (map.zoomTween) {
                 var currentRes = map.getResolution(),
                     targetRes = map.getResolutionForZoom(zoom),