[fusion-commits] r2929 - trunk/lib/OpenLayers

[svn_fusion at osgeo.org]

Author: jng
Date: 2016-04-18 04:28:46 -0700 (Mon, 18 Apr 2016)
New Revision: 2929

Modified:
   trunk/lib/OpenLayers/OpenLayers.js
Log:
This incorporates r2928 into the single-file OpenLayers.js (which is a fresh uncompressed build of OL2 using our fusion.cfg with custom modifications in lib/OpenLayers/ext overlaid on top)

Modified: trunk/lib/OpenLayers/OpenLayers.js
===================================================================
--- trunk/lib/OpenLayers/OpenLayers.js	2016-04-18 11:27:09 UTC (rev 2928)
+++ trunk/lib/OpenLayers/OpenLayers.js	2016-04-18 11:28:46 UTC (rev 2929)
@@ -8727,7 +8727,7 @@
             
             var bounds = this.getExtent();
             
-            //send the move call to the baselayer and all the overlays
+            //send the move call to the baselayer and all the overlays    
             if (zoom && this.baseLayer.CLASS_NAME != "OpenLayers.Layer.MapGuide") {
                 if (zoom >= this.baseLayer.MAX_ZOOM_LEVEL)
                     this.baseLayer.setVisibility(false);
@@ -41136,22 +41136,28 @@
             if (visible === true) {
                 if (container.parentNode !== map.div) {
                     if (!cache.rendered) {
+                        container.style.visibility = 'hidden';
                         var me = this;
                         google.maps.event.addListenerOnce(this.mapObject, 'tilesloaded', function() {
                             cache.rendered = true;
-                            me.setGMapVisibility(me.getVisibility());
+                            container.style.visibility = '';
+                            me.setGMapVisibility(true);
                             me.moveTo(me.map.getCenter());
+                            cache.googleControl.appendChild(map.viewPortDiv);
+                            me.setGMapVisibility(me.visible);
                         });
                     } else {
-                        map.div.appendChild(container);
                         cache.googleControl.appendChild(map.viewPortDiv);
-                        google.maps.event.trigger(this.mapObject, 'resize');
                     }
+                    map.div.appendChild(container);
+                    google.maps.event.trigger(this.mapObject, 'resize');
                 }
-                this.mapObject.setMapTypeId(type);                
+                this.mapObject.setMapTypeId(type);
             } else if (cache.googleControl.hasChildNodes()) {
                 map.div.appendChild(map.viewPortDiv);
-                map.div.removeChild(container);
+                if (map.div.contains(container)) {
+                    map.div.removeChild(container);
+                }
             }
         }
     },