Changeset 5627

Timestamp:

01/02/08 14:36:12 (1 year ago)

Author:

tschaub

Message:

Oh please Google, give us some well named methods that solve this issue. We muddle around with obfuscated code trying in vein to solve your pesky setCenter flicker. This brings us a bit closer with even sized viewports but is still embarassingly wrong for users panning across the dateline with odd sized viewport. r=crschmidt (closes #1174)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/EventPane.js (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Layer/EventPane.js

@@ -240 +240 @@
-                     !(newZoom == oldZoom) ) {
-
-                    var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
-
-                    if (dragging && this.dragPanMapObject && 
-                        this.smoothDragPan) {
@@ -249 +247 @@
-                        this.dragPanMapObject(dX, dY);
-                    } else {
+                        var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
-                        var zoom = this.getMapObjectZoomFromOLZoom(newZoom);
-                        this.setMapObjectCenter(center, zoom, dragging);
@@ -283 +282 @@
-            var moLonLat = this.getMapObjectLonLatFromMapObjectPixel(moPixel);
-            lonlat = this.getOLLonLatFromMapObjectLonLat(moLonLat);
+            var xrem = this.map.size.w % 2;
+            var yrem = this.map.size.h % 2;
+            if(xrem != 0 || yrem != 0) {
+                // odd sized viewport
+                var olPx = viewPortPx.add(xrem, yrem);
+                var moPx = this.getMapObjectPixelFromOLPixel(olPx);
+                var moLoc = this.getMapObjectLonLatFromMapObjectPixel(moPx);
+                var olLoc = this.getOLLonLatFromMapObjectLonLat(moLoc);
+                // adjust by half a pixel in odd dimension(s)
+                lonlat.lon += (olLoc.lon - lonlat.lon) / 2;
+                lonlat.lat += (olLoc.lat - lonlat.lat) / 2;
+            }
-        }
-        return lonlat;