Persisted features not correctly removed in Handler.Path and freehand mode, p=jorix,me, r=erilem

git-svn-id: http://svn.openlayers.org/trunk/openlayers@12083 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
pgiraud
2011-06-15 07:21:18 +00:00
parent e8960054a9
commit 3d27981146
2 changed files with 45 additions and 0 deletions

View File

@@ -339,6 +339,9 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
up: function (evt) {
if (this.mouseDown && (!this.lastUp || !this.lastUp.equals(evt.xy))) {
if(this.stoppedDown && this.freehandMode(evt)) {
if (this.persist) {
this.destroyPersistedFeature();
}
this.removePoint();
this.finalize();
} else {

View File

@@ -959,6 +959,48 @@
map.destroy();
}
function test_persist_one_click_freehand(t) {
t.plan(3);
var map = new OpenLayers.Map("map", {
resolutions: [1]
});
var layer = new OpenLayers.Layer.Vector("foo", {
maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10),
isBaseLayer: true
});
map.addLayer(layer);
var control = new OpenLayers.Control({});
var handler = new OpenLayers.Handler.Path(control, {}, {persist: true});
control.handler = handler;
map.addControl(control);
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
handler.activate();
handler.mousemove(
{type: "mousemove", xy: new OpenLayers.Pixel(0, 0)});
handler.mousedown(
{type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true});
var feature1 = handler.line;
handler.mousemove(
{type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true});
handler.mouseup(
{type: "mouseup", xy: new OpenLayers.Pixel(1, 1), shiftKey: true});
t.ok(feature1.layer != null, "a) feature1 not destroyed");
// one click freehand
handler.mousemove(
{type: "mousemove", xy: new OpenLayers.Pixel(2, 2)});
handler.mousedown(
{type: "mousedown", xy: new OpenLayers.Pixel(2, 2), shiftKey: true});
var feature2 = handler.line;
handler.mouseup(
{type: "mouseup", xy: new OpenLayers.Pixel(2, 2), shiftKey: true});
t.ok(feature2.layer != null, "b) feature2 not destroyed");
t.ok(feature1.layer == null, "b) feature1 destroyed");
map.destroy();
}
</script>
</head>
<body>