[OpenLayers-Commits] r11937 - in sandbox/elemoine/accel3d/lib/OpenLayers: . Layer

[commits-20090109 at openlayers.org]

Author: erilem
Date: 2011-04-29 12:05:58 -0700 (Fri, 29 Apr 2011)
New Revision: 11937

Modified:
   sandbox/elemoine/accel3d/lib/OpenLayers/Layer/Grid.js
   sandbox/elemoine/accel3d/lib/OpenLayers/Map.js
Log:
display tiles at correct positions while panning

Modified: sandbox/elemoine/accel3d/lib/OpenLayers/Layer/Grid.js
===================================================================
--- sandbox/elemoine/accel3d/lib/OpenLayers/Layer/Grid.js	2011-04-29 13:50:39 UTC (rev 11936)
+++ sandbox/elemoine/accel3d/lib/OpenLayers/Layer/Grid.js	2011-04-29 19:05:58 UTC (rev 11937)
@@ -487,8 +487,8 @@
 
         var rowidx = 0;
         
-        var layerContainerDivLeft = parseInt(this.map.layerContainerDiv.style.left);
-        var layerContainerDivTop = parseInt(this.map.layerContainerDiv.style.top);
+        var layerContainerDivLeft = parseInt(this.map.layerContainerPosition.left);
+        var layerContainerDivTop = parseInt(this.map.layerContainerPosition.top);
         
     
         do {
@@ -699,8 +699,8 @@
         var shifted = true;
         var buffer = this.buffer || 1;
         var tlLayer = this.grid[0][0].position;
-        var offsetX = parseInt(this.map.layerContainerDiv.style.left);
-        var offsetY = parseInt(this.map.layerContainerDiv.style.top);
+        var offsetX = parseInt(this.map.layerContainerPosition.left);
+        var offsetY = parseInt(this.map.layerContainerPosition.top);
         var tlViewPort = tlLayer.add(offsetX, offsetY);
         if (tlViewPort.x > -this.tileSize.w * (buffer - 1)) {
             this.shiftColumn(true);

Modified: sandbox/elemoine/accel3d/lib/OpenLayers/Map.js
===================================================================
--- sandbox/elemoine/accel3d/lib/OpenLayers/Map.js	2011-04-29 13:50:39 UTC (rev 11936)
+++ sandbox/elemoine/accel3d/lib/OpenLayers/Map.js	2011-04-29 19:05:58 UTC (rev 11937)
@@ -544,7 +544,7 @@
         this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE['Popup']-1;
         
         this.eventsDiv.appendChild(this.layerContainerDiv);
-
+        
         this.updateSize();
         if(this.eventListeners instanceof Object) {
             this.events.on(this.eventListeners);
@@ -1574,6 +1574,8 @@
                 this.layerContainerDiv.style['-webkit-transform'] = '';
                 this.layerContainerDiv.style.left = this.newPos.x + "px";
                 this.layerContainerDiv.style.top = this.newPos.y + "px";
+                this.layerContainerPosition.left = this.newPos.x;
+                this.layerContainerPosition.top = this.newPos.y;
                 this.newPos = null;
             }
 
@@ -1712,11 +1714,15 @@
                 var translateDx = this.newPos.x - left,
                     translateDy = this.newPos.y - top;
                 style['-webkit-transform'] = 'translate3d(' + translateDx + 'px, ' + translateDy + 'px, 0px)';
+                this.layerContainerPosition.left = this.newPos.x;
+                this.layerContainerPosition.top = this.newPos.y;
             }
             if (dx) {
                 if(!this.accel3d) {
                     this.layerContainerDiv.style.left =
                         parseInt(this.layerContainerDiv.style.left) - dx + "px";
+                    this.layerContainerPosition.left =
+                        parseInt(this.layerContainerDiv.style.left) - dx;
                 }
                 this.minPx.x -= dx;
                 this.maxPx.x -= dx;
@@ -1733,6 +1739,8 @@
                 if(!this.accel3d) {
                     this.layerContainerDiv.style.top =
                         parseInt(this.layerContainerDiv.style.top) - dy + "px";
+                    this.layerContainerPosition.top =
+                        parseInt(this.layerContainerDiv.style.top) - dy;
                 }
                 this.minPx.y -= dy;
                 this.maxPx.y -= dy;
@@ -1838,6 +1846,7 @@
                 this.layerContainerOrigin = this.getCachedCenter();
                 this.layerContainerDiv.style.left = "0px";
                 this.layerContainerDiv.style.top  = "0px";
+                this.layerContainerPosition = {left: 0, top: 0};
                 var maxExtent = this.getMaxExtent({restricted: true});
                 var maxExtentCenter = maxExtent.getCenterLonLat();
                 var lonDelta = this.center.lon - maxExtentCenter.lon;
@@ -1927,6 +1936,8 @@
             var newTop = Math.round(originPx.y - newPx.y);
             this.layerContainerDiv.style.left = newLeft + "px";
             this.layerContainerDiv.style.top  = newTop + "px";
+            this.layerContainerPosition.left = newLeft;
+            this.layerContainerPosition.tio = newTop;
             var dx = oldLeft - newLeft;
             var dy = oldTop - newTop;
             this.minPx.x -= dx;