Changeset 5433

Timestamp:

12/15/07 16:29:06 (1 year ago)

Author:

crschmidt

Message:

When trying to deactivate a control from within that control's featureAdded
event, a null exception is encountered. A null check fixes this bug. (Closes
#1143)

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Path.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Handler/Point.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Handler/Polygon.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/EventPane.js (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Handler/Path.js

@@ -80 +80 @@
-    destroyFeature: function() {
-        OpenLayers.Handler.Point.prototype.destroyFeature.apply(this);
-
+
+
+
-        this.line = null;
-    },

trunk/openlayers/lib/OpenLayers/Handler/Point.js

@@ -139 +139 @@
-     */
-    destroyFeature: function() {
-
+
+
+
-        this.point = null;
-    },

trunk/openlayers/lib/OpenLayers/Handler/Polygon.js

@@ -66 +66 @@
-    destroyFeature: function() {
-        OpenLayers.Handler.Path.prototype.destroyFeature.apply(this);
-
+
+
+
-        this.polygon = null;
-    },

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

@@ -238 +238 @@
-                     !(newZoom == oldZoom) ) {
-
-                    var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
-
-                    if (dragging && this.dragPanMapObject && 
-                        this.smoothDragPan) {
@@ -247 +245 @@
-                        this.dragPanMapObject(dX, dY);
-                    } else {
+                        var center = this.getMapObjectLonLatFromOLLonLat(newCenter);
-                        var zoom = this.getMapObjectZoomFromOLZoom(newZoom);
-                        this.setMapObjectCenter(center, zoom, dragging);
@@ -281 +280 @@
-            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;