[OpenLayers-Commits] r5626 - trunk/openlayers/lib/OpenLayers/Layer

commits at openlayers.org commits at openlayers.org
Wed Jan 2 14:27:14 EST 2008


Author: crschmidt
Date: 2008-01-02 14:27:14 -0500 (Wed, 02 Jan 2008)
New Revision: 5626

Modified:
   trunk/openlayers/lib/OpenLayers/Layer/EventPane.js
Log:
Uncommit unrelated part of r5433.


Modified: trunk/openlayers/lib/OpenLayers/Layer/EventPane.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer/EventPane.js	2008-01-02 19:16:58 UTC (rev 5625)
+++ trunk/openlayers/lib/OpenLayers/Layer/EventPane.js	2008-01-02 19:27:14 UTC (rev 5626)
@@ -239,6 +239,8 @@
                 if ( !(newCenter.equals(oldCenter)) || 
                      !(newZoom == oldZoom) ) {
 
+                    var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
+
                     if (dragging && this.dragPanMapObject && 
                         this.smoothDragPan) {
                         var resolution = this.map.getResolution();
@@ -246,7 +248,6 @@
                         var dY = (newCenter.lat - oldCenter.lat) / resolution;
                         this.dragPanMapObject(dX, dY);
                     } else {
-                        var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
                         var zoom = this.getMapObjectZoomFromOLZoom(newZoom);
                         this.setMapObjectCenter(center, zoom, dragging);
                     }
@@ -281,18 +282,6 @@
             var moPixel = this.getMapObjectPixelFromOLPixel(viewPortPx);
             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;
     },



More information about the Commits mailing list