Changeset 4063

Timestamp:

08/27/07 17:03:28 (1 year ago)

Author:

tschaub

Message:

Properly destroy features in the point, path, and polygon handlers. Patch with tests from fredj - thank you for the catch and the great patch. (Closes #931)

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Path.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Handler/Point.js (modified) (2 diffs)
• trunk/openlayers/tests/Handler/test_Path.html (modified) (1 diff)
• trunk/openlayers/tests/Handler/test_Point.html (modified) (1 diff)

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

@@ -79 +79 @@
-     */
-    destroyFeature: function() {
+        OpenLayers.Handler.Point.prototype.destroyFeature.apply(this);
-        this.line.destroy();
-point.destroy()
+line = null
-    },
-    

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

@@ -117 +117 @@
-        this.map.removeLayer(this.layer, false);
-        this.layer.destroy();
+        this.layer = null;
-        return true;
-    },
@@ -126 +127 @@
-    destroyFeature: function() {
-        this.point.destroy();
+        this.point = null;
-    },
-

trunk/openlayers/tests/Handler/test_Path.html

@@ -67 +67 @@
-    }     
-        
+    function test_Handler_Path_destroy(t) {
+        t.plan(6);
+        var map = new OpenLayers.Map('map');
+        map.addLayer(new OpenLayers.Layer.WMS("", "", {}));
+        map.zoomToMaxExtent();
+        var control = new OpenLayers.Control();
+        map.addControl(control);
+        var handler = new OpenLayers.Handler.Path(control, {foo: 'bar'});
+
+        handler.activate();
+        var evt = {xy: new OpenLayers.Pixel(150, 75), which: 1};
+        handler.mousedown(evt);
+
+        t.ok(handler.layer,
+             "handler has a layer prior to destroy");
+        t.ok(handler.point,
+             "handler has a point prior to destroy");
+        t.ok(handler.line,
+             "handler has a line prior to destroy");
+        handler.destroy();
+        t.eq(handler.layer, null,
+             "handler.layer is null after destroy");
+        t.eq(handler.point, null,
+             "handler.point is null after destroy");
+        t.eq(handler.line, null,
+             "handler.line is null after destroy");
+    }
-    
-

trunk/openlayers/tests/Handler/test_Point.html

@@ -63 +63 @@
-    }     
-        
+    function test_Handler_Point_destroy(t) {
+        t.plan(4);
+        var map = new OpenLayers.Map('map');
+        map.addLayer(new OpenLayers.Layer.WMS("", "", {}));
+        map.zoomToMaxExtent();
+        var control = new OpenLayers.Control();
+        map.addControl(control);
+        var handler = new OpenLayers.Handler.Point(control, {foo: 'bar'});
+
+        handler.activate();
+        var evt = {xy: new OpenLayers.Pixel(150, 75), which: 1};
+        handler.mousedown(evt);
+
+        t.ok(handler.layer,
+             "handler has a layer prior to destroy");
+        t.ok(handler.point,
+             "handler has a point prior to destroy");
+        handler.destroy();
+        t.eq(handler.layer, null,
+             "handler.layer is null after destroy");
+        t.eq(handler.point, null,
+             "handler.point is null after destroy");
+    }
-    
-