diff --git a/examples/draw-feature.html b/examples/draw-feature.html index 8c589442a2..aac87c9472 100644 --- a/examples/draw-feature.html +++ b/examples/draw-feature.html @@ -64,6 +64,14 @@ } } } + + function allowPan(element) { + var stop = !element.checked; + for(var key in drawControls) { + drawControls[key].handler.stopDown = stop; + drawControls[key].handler.stopUp = stop; + } + } @@ -97,15 +105,20 @@ +
  • + + +
    • -

    With the point drawing control active, click on the map to add a point. You can drag the point - before letting the mouse up if you want to adjust the position.

    +

    With the point drawing control active, click on the map to add a point.

    With the line drawing control active, click on the map to add the points that make up your line. Double-click to finish drawing.

    With the polygon drawing control active, click on the map to add the points that make up your polygon. Double-click to finish drawing.

    +

    With any drawing control active, paning the map can still be achieved. Drag the map as + usual for that.

    Hold down the shift key while drawing to activate freehand mode. While drawing lines or polygons in freehand mode, hold the mouse down and a point will be added with every mouse movement.

    diff --git a/lib/OpenLayers/Control/Measure.js b/lib/OpenLayers/Control/Measure.js index ab63cf7f7a..172317c1ad 100644 --- a/lib/OpenLayers/Control/Measure.js +++ b/lib/OpenLayers/Control/Measure.js @@ -237,8 +237,8 @@ OpenLayers.Control.Measure = OpenLayers.Class(OpenLayers.Control, { * Parameters: point - {} The point at the * mouseposition. feature - {} The sketch feature. */ - measureImmediate : function(point, feature) { - if (this.delayedTrigger === null && + measureImmediate : function(point, feature, drawing) { + if (drawing && this.delayedTrigger === null && !this.handler.freehandMode(this.handler.evt)) { this.measure(feature.geometry, "measurepartial"); } diff --git a/lib/OpenLayers/Handler/Path.js b/lib/OpenLayers/Handler/Path.js index e552711840..3395c7a4e2 100644 --- a/lib/OpenLayers/Handler/Path.js +++ b/lib/OpenLayers/Handler/Path.js @@ -79,6 +79,9 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { * feature. */ createFeature: function(pixel) { + if(!pixel) { + pixel = new OpenLayers.Pixel(-50, -50); + } var lonlat = this.control.map.getLonLatFromPixel(pixel); this.point = new OpenLayers.Feature.Vector( new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat) @@ -100,6 +103,17 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { this.line = null; }, + /** + * Method: destroyPersistedFeature + * Destroy the persisted feature. + */ + destroyPersistedFeature: function() { + var layer = this.layer; + if(layer && layer.features.length > 2) { + this.layer.features[0].destroy(); + } + }, + /** * Method: removePoint * Destroy the temporary point. @@ -151,12 +165,13 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { * Parameters: * pixel - {} The updated pixel location for the latest * point. + * drawing - {Boolean} Indicate if we're currently drawing. */ - modifyFeature: function(pixel) { + modifyFeature: function(pixel, drawing) { var lonlat = this.control.map.getLonLatFromPixel(pixel); this.point.geometry.x = lonlat.lon; this.point.geometry.y = lonlat.lat; - this.callback("modify", [this.point.geometry, this.getSketch()]); + this.callback("modify", [this.point.geometry, this.getSketch(), drawing]); this.point.geometry.clearBounds(); this.drawFeature(); }, @@ -209,22 +224,17 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { * {Boolean} Allow event propagation */ mousedown: function(evt) { - // ignore double-clicks - if (this.lastDown && this.lastDown.equals(evt.xy)) { - return false; + var stopDown = this.stopDown; + if(this.freehandMode(evt)) { + stopDown = true; } - if(this.lastDown == null) { - if(this.persist) { - this.destroyFeature(); - } - this.createFeature(evt.xy); - } else if((this.lastUp == null) || !this.lastUp.equals(evt.xy)) { - this.addPoint(evt.xy); + if(!this.lastDown || !this.lastDown.equals(evt.xy)) { + this.modifyFeature(evt.xy, !!this.lastUp); } this.mouseDown = true; this.lastDown = evt.xy; - this.drawing = true; - return false; + this.stoppedDown = stopDown; + return !stopDown; }, /** @@ -239,12 +249,15 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { * {Boolean} Allow event propagation */ mousemove: function (evt) { - if(this.drawing) { - if(this.mouseDown && this.freehandMode(evt)) { - this.addPoint(evt.xy); - } else { - this.modifyFeature(evt.xy); + if(this.stoppedDown && this.freehandMode(evt)) { + if(this.persist) { + this.destroyPersistedFeature(); } + this.addPoint(evt.xy); + return false; + } + if(!this.mouseDown || this.stoppedDown) { + this.modifyFeature(evt.xy, !!this.lastUp); } return true; }, @@ -261,20 +274,23 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, { * {Boolean} Allow event propagation */ mouseup: function (evt) { - this.mouseDown = false; - if(this.drawing) { - if(this.freehandMode(evt)) { + if(this.mouseDown && (!this.lastUp || !this.lastUp.equals(evt.xy))) { + if(this.stoppedDown && this.freehandMode(evt)) { this.removePoint(); this.finalize(); } else { - if(this.lastUp == null) { - this.addPoint(evt.xy); + if(this.lastDown.equals(evt.xy)) { + if(this.lastUp == null && this.persist) { + this.destroyPersistedFeature(); + } + this.addPoint(evt.xy); + this.lastUp = evt.xy; } - this.lastUp = evt.xy; } - return false; } - return true; + this.stoppedDown = this.stopDown; + this.mouseDown = false; + return !this.stopUp; }, /** diff --git a/lib/OpenLayers/Handler/Point.js b/lib/OpenLayers/Handler/Point.js index b6a4cd125c..e29529d48a 100644 --- a/lib/OpenLayers/Handler/Point.js +++ b/lib/OpenLayers/Handler/Point.js @@ -11,9 +11,9 @@ /** * Class: OpenLayers.Handler.Point - * Handler to draw a point on the map. Point is displayed on mouse down, - * moves on mouse move, and is finished on mouse up. The handler triggers - * callbacks for 'done', 'cancel', and 'modify'. The modify callback is + * Handler to draw a point on the map. Point is displayed on activation, + * moves on mouse move, and is finished on mouse up. The handler triggers + * callbacks for 'done', 'cancel', and 'modify'. The modify callback is * called with each change in the sketch and will receive the latest point * drawn. Create a new instance with the * constructor. @@ -42,18 +42,19 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { */ multi: false, - /** - * Property: drawing - * {Boolean} A point is being drawn - */ - drawing: false, - /** * Property: mouseDown * {Boolean} The mouse is down */ mouseDown: false, + /** + * Property: stoppedDown + * {Boolean} Indicate whether the last mousedown stopped the event + * propagation. + */ + stoppedDown: null, + /** * Property: lastDown * {} Location of the last mouse down @@ -75,6 +76,20 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { */ persist: false, + /** + * APIProperty: stopDown + * {Boolean} Stop event propagation on mousedown. Must be false to + * allow "pan while drawing". Defaults to false. + */ + stopDown: false, + + /** + * APIPropery: stopUp + * {Boolean} Stop event propagation on mouse. Must be false to + * allow "pan while dragging". Defaults to fase. + */ + stopUp: false, + /** * Property: layerOptions * {Object} Any optional properties to be set on the sketch layer. @@ -130,6 +145,7 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { }, this.layerOptions); this.layer = new OpenLayers.Layer.Vector(this.CLASS_NAME, options); this.map.addLayer(this.layer); + this.createFeature(); return true; }, @@ -141,6 +157,9 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * pixel - {} A pixel location on the map. */ createFeature: function(pixel) { + if(!pixel) { + pixel = new OpenLayers.Pixel(-50, -50); + } var lonlat = this.map.getLonLatFromPixel(pixel); this.point = new OpenLayers.Feature.Vector( new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat) @@ -158,17 +177,14 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { if(!OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) { return false; } - // call the cancel callback if mid-drawing - if(this.drawing) { - this.cancel(); - } - this.destroyFeature(); + this.cancel(true); // If a layer's map property is set to null, it means that that layer // isn't added to the map. Since we ourself added the layer to the map // in activate(), we can assume that if this.layer.map is null it means // that the layer has been destroyed (as a result of map.destroy() for // example. if (this.layer.map != null) { + this.destroyFeature(); this.layer.destroy(false); } this.layer = null; @@ -186,6 +202,17 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { this.point = null; }, + /** + * Method: destroyPersistedFeature + * Destroy the persisted feature. + */ + destroyPersistedFeature: function() { + var layer = this.layer; + if(layer && layer.features.length > 1) { + this.layer.features[0].destroy(); + } + }, + /** * Method: finalize * Finish the geometry and call the "done" callback. @@ -193,8 +220,10 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * Parameters: * cancel - {Boolean} Call cancel instead of done callback. Default is * false. + * noNew - {Boolean} Do not create a new feature after + * finalization. Default is false. */ - finalize: function(cancel) { + finalize: function(cancel, noNew) { var key = cancel ? "cancel" : "done"; this.drawing = false; this.mouseDown = false; @@ -204,14 +233,21 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { if(cancel || !this.persist) { this.destroyFeature(); } + if(!noNew) { + this.createFeature(); + } }, /** * APIMethod: cancel * Finish the geometry and call the "cancel" callback. + * + * Parameters: + * noNew - {Boolean} Do not create a new feature after + * cancelation. Default is false. */ - cancel: function() { - this.finalize(true); + cancel: function(noNew) { + this.finalize(true, noNew); }, /** @@ -257,7 +293,7 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { var lonlat = this.map.getLonLatFromPixel(pixel); this.point.geometry.x = lonlat.lon; this.point.geometry.y = lonlat.lat; - this.callback("modify", [this.point.geometry, this.point]); + this.callback("modify", [this.point.geometry, this.point, false]); this.point.geometry.clearBounds(); this.drawFeature(); }, @@ -310,25 +346,11 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Allow event propagation */ mousedown: function(evt) { - // check keyboard modifiers - if(!this.checkModifiers(evt)) { - return true; - } - // ignore double-clicks - if(this.lastDown && this.lastDown.equals(evt.xy)) { - return true; - } - this.drawing = true; - if(this.lastDown == null) { - if(this.persist) { - this.destroyFeature(); - } - this.createFeature(evt.xy); - } else { - this.modifyFeature(evt.xy); - } + this.mouseDown = true; this.lastDown = evt.xy; - return false; + this.modifyFeature(evt.xy); + this.stoppedDown = this.stopDown; + return !this.stopDown; }, /** @@ -343,7 +365,7 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Allow event propagation */ mousemove: function (evt) { - if(this.drawing) { + if(!this.mouseDown || this.stoppedDown) { this.modifyFeature(evt.xy); } return true; @@ -361,13 +383,42 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Allow event propagation */ mouseup: function (evt) { - if(this.drawing) { + this.mouseDown = false; + this.stoppedDown = this.stopDown; + // check keyboard modifiers + if(!this.checkModifiers(evt)) { + return true; + } + // ignore double-clicks + if(this.lastUp && this.lastUp.equals(evt.xy)) { + return true; + } + if(this.lastDown && this.lastDown.equals(evt.xy)) { + if(this.persist) { + this.destroyPersistedFeature(); + } + this.lastUp = evt.xy; this.finalize(); - return false; + return !this.stopUp; } else { return true; } }, + /** + * Method: mouseout + * Handle mouse out. For better user experience reset mouseDown + * and stoppedDown when the mouse leaves the map viewport. + * + * Parameters: + * evt - {Event} The browser event + */ + mouseout: function(evt) { + if(OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) { + this.stoppedDown = this.stopDown; + this.mouseDown = false; + } + }, + CLASS_NAME: "OpenLayers.Handler.Point" }); diff --git a/lib/OpenLayers/Handler/Polygon.js b/lib/OpenLayers/Handler/Polygon.js index b2672982a6..105e0a9614 100644 --- a/lib/OpenLayers/Handler/Polygon.js +++ b/lib/OpenLayers/Handler/Polygon.js @@ -75,6 +75,9 @@ OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, { * feature. */ createFeature: function(pixel) { + if(!pixel) { + pixel = new OpenLayers.Pixel(-50, -50); + } var lonlat = this.control.map.getLonLatFromPixel(pixel); this.point = new OpenLayers.Feature.Vector( new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat) @@ -82,13 +85,27 @@ OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, { this.line = new OpenLayers.Feature.Vector( new OpenLayers.Geometry.LinearRing([this.point.geometry]) ); - - // check for hole digitizing - var polygon; - if (this.holeModifier && (this.evt[this.holeModifier])) { + this.polygon = new OpenLayers.Feature.Vector( + new OpenLayers.Geometry.Polygon([this.line.geometry]) + ); + this.callback("create", [this.point.geometry, this.getSketch()]); + this.point.geometry.clearBounds(); + this.layer.addFeatures([this.polygon, this.point], {silent: true}); + }, + + /** + * Method: addPoint + * Add point to geometry. + * + * Parameters: + * pixel - {} The pixel location for the new point. + */ + addPoint: function(pixel) { + if(!this.drawingHole && this.holeModifier && + this.evt && this.evt[this.holeModifier]) { var geometry = this.point.geometry; var features = this.control.layer.features; - var candidate; + var candidate, polygon; // look for intersections, last drawn gets priority for (var i=features.length-1; i>=0; --i) { candidate = features[i].geometry; @@ -110,15 +127,7 @@ OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, { } } } - if (!polygon) { - this.polygon = new OpenLayers.Feature.Vector( - new OpenLayers.Geometry.Polygon([this.line.geometry]) - ); - } - - this.callback("create", [this.point.geometry, this.getSketch()]); - this.point.geometry.clearBounds(); - this.layer.addFeatures([this.polygon, this.point], {silent: true}); + OpenLayers.Handler.Path.prototype.addPoint.apply(this, arguments); }, /** diff --git a/tests/Control/DrawFeature.html b/tests/Control/DrawFeature.html index ae2f8effa2..48c0051722 100644 --- a/tests/Control/DrawFeature.html +++ b/tests/Control/DrawFeature.html @@ -60,7 +60,7 @@ } function test_sketch_events(t) { - t.plan(6); + t.plan(12); var map = new OpenLayers.Map("map", { resolutions: [1] }); @@ -69,37 +69,62 @@ isBaseLayer: true }); var control = new OpenLayers.Control.DrawFeature( - layer, OpenLayers.Handler.Point + layer, OpenLayers.Handler.Path, { + handlerOptions: {persist: true} + } ); map.addLayer(layer); map.addControl(control); map.zoomToMaxExtent(); - control.activate(); - var log = {}; + var log; layer.events.on({ sketchstarted: function(event) { - log.event = event; + log['sketchstarted'] = event; }, sketchmodified: function(event) { - log.event = event; + log['sketchmodified'] = event; }, sketchcomplete: function(event) { - log.event = event; + log['sketchcomplete'] = event; } }); // mock up draw/modify of a point + log = {}; + control.activate(); + t.eq(log.sketchstarted.type, "sketchstarted", "[activate] sketchstarted triggered"); + t.geom_eq(log.sketchstarted.vertex, new OpenLayers.Geometry.Point(-250, 175), "[activate] correct vertex"); + + log = {}; + map.events.triggerEvent("mousemove", {xy: new OpenLayers.Pixel(0, 0)}); + t.eq(log.sketchmodified.type, "sketchmodified", "[mousemove] sketchmodified triggered"); + t.geom_eq(log.sketchmodified.vertex, new OpenLayers.Geometry.Point(-200, 125), "[mousemove] correct vertex"); + map.events.triggerEvent("mousedown", {xy: new OpenLayers.Pixel(0, 0)}); - t.eq(log.event.type, "sketchstarted", "[mousedown] sketchstarted triggered"); - t.geom_eq(log.event.vertex, new OpenLayers.Geometry.Point(-200, 125), "[mousedown] correct vertex"); + + log = {}; + map.events.triggerEvent("mouseup", {xy: new OpenLayers.Pixel(0, 0)}); + t.eq(log.sketchmodified.type, "sketchmodified", "[mouseup] sketchmodified triggered"); + t.geom_eq(log.sketchmodified.vertex, new OpenLayers.Geometry.Point(-200, 125), "[mouseup] correct vertex"); + + log = {}; map.events.triggerEvent("mousemove", {xy: new OpenLayers.Pixel(10, 10)}); - t.eq(log.event.type, "sketchmodified", "[mousemove] sketchmodified triggered"); - t.geom_eq(log.event.vertex, new OpenLayers.Geometry.Point(-190, 115), "[mousemove] correct vertex"); - map.events.triggerEvent("mouseup", {xy: new OpenLayers.Pixel(10, 10)}); - t.eq(log.event.type, "sketchcomplete", "[mouseup] sketchcomplete triggered"); - t.geom_eq(log.event.feature.geometry, new OpenLayers.Geometry.Point(-190, 115), "[mouseup] correct geometry"); - + t.eq(log.sketchmodified.type, "sketchmodified", "[mousemove] sketchmodified triggered"); + t.geom_eq(log.sketchmodified.vertex, new OpenLayers.Geometry.Point(-190, 115), "[mousemove] correct vertex"); + + log = {}; + map.events.triggerEvent("dblclick", {xy: new OpenLayers.Pixel(10, 10)}); + t.eq(log.sketchcomplete.type, "sketchcomplete", "[dblclick] sketchcomplete triggered"); + t.geom_eq(log.sketchcomplete.feature.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-200, 125), + new OpenLayers.Geometry.Point(-190, 115) + ]), + "[dblclick] correct geometry"); + t.eq(log.sketchstarted.type, "sketchstarted", "[dblclick] sketchstarted triggered"); + t.geom_eq(log.sketchstarted.vertex, new OpenLayers.Geometry.Point(-250, 175), "[dblclick] correct vertex"); + map.destroy(); } diff --git a/tests/Control/Measure.html b/tests/Control/Measure.html index 62a84d7094..c0c598cd9b 100644 --- a/tests/Control/Measure.html +++ b/tests/Control/Measure.html @@ -52,6 +52,7 @@ xy: new OpenLayers.Pixel(x, y) }) }; + trigger("mousemove", 0, 0); trigger("mousedown", 0, 0); trigger("mouseup", 0, 0); trigger("mousemove", 10, 10); @@ -60,9 +61,10 @@ // confirm that the sketch persists t.eq(control.handler.layer.features.length, 1, "feature persists"); - // cancel and see that sketch is gone + // cancel and see that sketch is gone (do not forget that + // cancel will create the new feature) control.cancel(); - t.eq(control.handler.layer.features.length, 0, "feature is gone after cancel"); + t.eq(control.handler.layer.features.length, 2, "feature is gone after cancel"); map.destroy(); @@ -112,6 +114,7 @@ var delay = control.partialDelay / 1000; // establish first point + trigger("mousemove", 0, 0); trigger("mousedown", 0, 0); trigger("mouseup", 0, 0); @@ -187,6 +190,7 @@ log = []; // f) establish first freehand point + trigger("mousemove", 0, 0); trigger("mousedown", 0, 0); t.eq(log.length, 0, "f) no event fired yet") @@ -203,14 +207,14 @@ t.eq(log.length, 2, "h) event logged"); t.ok(log[1] && log[1].type == "measurepartial", "h) correct type"); t.ok(log[1] && log[1].measure == 20, "h) correct measure"); - + // i) mouse up to finish trigger("mouseup", 20, 0); t.eq(log.length, 3, "i) event logged"); t.ok(log[2] && log[2].type == "measure", "i) correct type"); t.ok(log[2] && log[2].measure == 20, "i) correct measure"); - + // j) clean up log = []; map.destroy(); @@ -224,7 +228,7 @@ } function test_immediate(t) { - t.plan(29); + t.plan(32); var map = new OpenLayers.Map({ div: "map", @@ -237,7 +241,7 @@ ], center: new OpenLayers.LonLat(0, 0) }); - + var log = []; var control = new OpenLayers.Control.Measure( OpenLayers.Handler.Path, { @@ -255,7 +259,7 @@ ); map.addControl(control); control.activate(); - + // convenience function to trigger mouse events function trigger(type, x, y) { map.events.triggerEvent(type, { @@ -267,6 +271,7 @@ var delay = control.partialDelay / 1000; // a) establish first point + trigger("mousemove", 0, 0); trigger("mousedown", 0, 0); trigger("mouseup", 0, 0); @@ -274,7 +279,7 @@ trigger("mousemove", 0, 10); t.eq(log.length, 0, "a) no event fired yet"); - + t.delay_call( delay, function() { // confirm measurepartial is fired @@ -334,18 +339,21 @@ // i) double click to finish trigger("mousedown", 0, 60); + t.eq(log.length, 7, "i) event logged"); + t.eq(log[6] && log[6].type, "measurepartial", "i) correct type"); + t.eq(log[6] && log[6].measure, 60, "i) correct measure"); trigger("mouseup", 0, 60); - t.eq(log.length, 6, "i) no event fired yet"); + t.eq(log.length, 7, "i) no event fired yet"); }, delay, function() { - t.eq(log.length, 7, "i) event logged"); - t.ok(log[6] && log[6].type == "measurepartial", "i) correct type"); - t.ok(log[6] && log[6].measure == 60, "i) correct measure"); - - trigger("dblclick", 0, 60); t.eq(log.length, 8, "i) event logged"); - t.ok(log[7] && log[7].type == "measure", "i) correct type"); - t.ok(log[7] && log[7].measure == 60, "i) correct measure"); + t.eq(log[7] && log[7].type, "measurepartial", "i) correct type"); + t.eq(log[7] && log[7].measure, 60, "i) correct measure"); + + trigger("dblclick", 0, 60); + t.eq(log.length, 9, "i) event logged"); + t.eq(log[8] && log[8].type, "measure", "i) correct type"); + t.eq(log[8] && log[8].measure, 60, "i) correct measure"); // clear log log = []; diff --git a/tests/Control/Split.html b/tests/Control/Split.html index 339ee3bd54..a307bdd2c2 100644 --- a/tests/Control/Split.html +++ b/tests/Control/Split.html @@ -35,13 +35,20 @@ function test_setSource(t) { t.plan(5); - var layer1 = new OpenLayers.Layer.Vector(); - var layer2 = new OpenLayers.Layer.Vector(); + var layer1 = new OpenLayers.Layer.Vector("foo", { + maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10), + isBaseLayer: true + }); + var layer2 = new OpenLayers.Layer.Vector("foo", { + maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10), + isBaseLayer: true + }); var control = new OpenLayers.Control.Split({layer: layer1}); var map = new OpenLayers.Map("map"); map.addLayers([layer1, layer2]); + map.zoomToMaxExtent(); map.addControl(control); control.activate(); @@ -64,12 +71,16 @@ function test_activate(t) { t.plan(8); - var layer = new OpenLayers.Layer.Vector(); + var layer = new OpenLayers.Layer.Vector("foo", { + maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10), + isBaseLayer: true + }); var control = new OpenLayers.Control.Split({layer: layer}); var map = new OpenLayers.Map("map"); map.addLayer(layer); + map.zoomToMaxExtent(); map.addControl(control); - + // test activation with no source layer control.activate(); t.eq(control.active, true, "control is active"); @@ -93,12 +104,16 @@ t.plan(7); - var layer = new OpenLayers.Layer.Vector(); + var layer = new OpenLayers.Layer.Vector("foo", { + maxExtent: new OpenLayers.Bounds(-10, -10, 10, 10), + isBaseLayer: true + }); var control = new OpenLayers.Control.Split({layer: layer}); var map = new OpenLayers.Map("map"); map.addLayer(layer); + map.zoomToMaxExtent(); map.addControl(control); - + // activate and check sketch handler control.activate(); t.ok(control.handler, "sketch handler present"); diff --git a/tests/Handler/Path.html b/tests/Handler/Path.html index 7850938964..e5e009aa0a 100644 --- a/tests/Handler/Path.html +++ b/tests/Handler/Path.html @@ -25,52 +25,8 @@ } function test_Handler_Path_activation(t) { - t.plan(3); - var map = new OpenLayers.Map('map'); - var control = new OpenLayers.Control(); - map.addControl(control); - var handler = new OpenLayers.Handler.Path(control); - handler.active = true; - var activated = handler.activate(); - t.ok(!activated, - "activate returns false if the handler was already active"); - handler.active = false; - activated = handler.activate(); - t.ok(activated, - "activate returns true if the handler was not already active"); - activated = handler.deactivate(); - t.ok(activated, - "deactivate returns true if the handler was active already"); - map.destroy(); - } - - function test_Handler_Path_bounds(t) { - t.plan(2); - 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, {}); - var activated = handler.activate(); - var evt = {xy: new OpenLayers.Pixel(150, 75), which: 1}; - handler.mousedown(evt); - handler.mouseup(evt); - var evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; - handler.mousemove(evt); - handler.mousedown(evt); - handler.mouseup(evt); - t.ok(handler.line.geometry.getBounds().equals(new OpenLayers.Bounds(0,-35.15625,35.15625,0)), "Correct bounds"); - var evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; - handler.mousedown(evt); - var evt = {xy: new OpenLayers.Pixel(125, 100), which: 1}; - handler.mousemove(evt); - t.ok(!handler.line.geometry.getBounds().equals(new OpenLayers.Bounds(0,-35.15625,35.15625,0)), "Correct bounds after dragging without letting go. (Came out as "+handler.line.geometry.getBounds().toBBOX() + ".)"); - map.destroy(); - } - - function test_callbacks(t) { - t.plan(15); + t.plan(12); + var log = []; var map = new OpenLayers.Map("map", { resolutions: [1] }); @@ -79,73 +35,438 @@ isBaseLayer: true }); map.addLayer(layer); - var control = new OpenLayers.Control({ + var control = new OpenLayers.Control(); + var handler = new OpenLayers.Handler.Path(control, { + "create": function(g, f) { + log.push({geometry: g, feature: f}); + } }); - var log = {}; + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + handler.active = true; + + var activated = handler.activate(); + t.ok(!activated, + "activate returns false if the handler was already active"); + handler.active = false; + activated = handler.activate(); + t.ok(activated, + "activate returns true if the handler was not already active"); + t.ok(handler.layer instanceof OpenLayers.Layer.Vector, + "activate creates a vector layer"); + t.ok(handler.layer.map == map, + "activate adds the vector layer to the map"); + t.ok(handler.point instanceof OpenLayers.Feature.Vector, + "activate creates a point feature"); + t.ok(handler.point.layer == handler.layer, + "activate adds the point feature to the layer"); + t.ok(handler.line instanceof OpenLayers.Feature.Vector, + "acttivates creates a line feature"); + t.ok(handler.line.layer == handler.layer, + "activate adds the line feature to the layer"); + t.eq(log.length, 1, + "activate calls \"create\" once"); + t.geom_eq(log[0].geometry, handler.point.geometry, + "\"create\" called with expected geometry"); + t.ok(log[0].feature == handler.line, + "\"create\" called with expected feature"); + activated = handler.deactivate(); + t.ok(activated, + "deactivate returns true if the handler was active already"); + + map.destroy(); + } + + function test_bounds(t) { + t.plan(2); + var geometry; + 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, {}, + {stopDown: true, stopUp: true}); + var activated = handler.activate(); + // click on (150, 75) + var evt = {xy: new OpenLayers.Pixel(150, 75), which: 1}; + handler.mousemove(evt); + handler.mousedown(evt); + handler.mouseup(evt); + // click on (175, 100) + evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; + handler.mousemove(evt); + handler.mousedown(evt); + handler.mouseup(evt); + t.ok(handler.line.geometry.getBounds().equals( + new OpenLayers.Bounds(0,-35.15625,35.15625,0)), + "Correct bounds"); + // mousedown on (175, 100) + evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; + handler.mousedown(evt); + // mousemove to (125, 100) + evt = {xy: new OpenLayers.Pixel(125, 100), which: 1}; + handler.mousemove(evt); + // test that the bounds have changed + t.ok(!handler.line.geometry.getBounds().equals( + new OpenLayers.Bounds(0,-35.15625,35.15625,0)), + "Correct bounds after dragging without letting go. " + + "(Came out as " + handler.line.geometry.getBounds().toBBOX() + + ".)"); + map.destroy(); + } + + function test_callbacks(t) { + t.plan(45); + 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 logs = [], log; var handler = new OpenLayers.Handler.Path(control, { create: function() { - log.type = "create", - log.args = arguments + logs.push({type: "create", args: arguments}); + }, + point: function() { + logs.push({type: "point", args: arguments}); }, modify: function() { - log.type = "modify", - log.args = arguments + logs.push({type: "modify", args: arguments}); }, done: function() { - log.type = "done", - log.args = arguments + logs.push({type: "done", args: arguments}); }, cancel: function() { - log.type = "cancel", - log.args = arguments + logs.push({type: "cancel", args: arguments}); } }); control.handler = handler; map.addControl(control); map.setCenter(new OpenLayers.LonLat(0, 0), 0); - // mock up feature drawing + // create line handler.activate(); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - t.eq(log.type, "create", "[mousedown] create called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[mousedown] correct vertex"); - t.ok(log.args[1] === handler.line, "[mousedown] correct sketch feature"); + t.eq(logs.length, 1, "[activate] called back"); + log = logs.shift(); + t.eq(log.type, "create", "[activate] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[activate] correct point"); + t.ok(log.args[1] == handler.line, + "[activate] correct feature"); + // mouse move + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousemove] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.line, + "[mousemove] correct feature"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mousedown] correct point"); + t.ok(log.args[1] === handler.line, + "[mousedown] correct feature"); + // mouse up handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 2, "[mouseup] called back twice"); + log = logs.shift(); + t.eq(log.type, "point", "[mouseup] point called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mouseup] correct point"); + t.geom_eq(log.args[1], + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-150, 75), + new OpenLayers.Geometry.Point(-150, 75) + ]), "[mouseup] correct line"); + log = logs.shift(); t.eq(log.type, "modify", "[mouseup] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[mouseup] correct vertex"); - t.ok(log.args[1] === handler.line, "[mouseup] correct sketch feature"); - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mouseup] correct point"); + t.ok(log.args[1] == handler.line, + "[mouseup] correct feature"); + // mouse move + handler.mousemove({type: "mousemove", + xy: new OpenLayers.Pixel(1, 1)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); t.eq(log.type, "modify", "[mousemove] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-149, 74), "[mousemove] correct vertex"); - t.ok(log.args[1] === handler.line, "[mousemove] correct sketch feature"); - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-149, 74), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.line, + "[mousemove] correct feature"); + // mouse move + handler.mousemove({type: "mousemove", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); t.eq(log.type, "modify", "[mousemove] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), "[mousemove] correct vertex"); - t.ok(log.args[1] === handler.line, "[mousemove] correct sketch feature"); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); - handler.dblclick({type: "dblclick", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.line, + "[mousemove] correct feature"); + // mouse down + handler.mousedown({type: "mousedown", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), + "[mousedown] correct point"); + t.ok(log.args[1] === handler.line, + "[mousedown] correct feature"); + // mouse up ("point", "modify") + handler.mouseup({type: "mouseup", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 2, "[mouseup] called back twice"); + log = logs.shift(); + log = logs.shift(); + // mouse down + handler.mousedown({type: "mousedown", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 0, "[mousedown] called back"); + // mouse up + handler.mouseup({type: "mouseup", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 0, "[mouseup] not called back"); + // double click + handler.dblclick({type: "dblclick", + xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 2, "[dblclick] called back twice"); + log = logs.shift(); t.eq(log.type, "done", "[dblclick] done called"); - t.geom_eq( - log.args[0], + t.geom_eq(log.args[0], new OpenLayers.Geometry.LineString([ new OpenLayers.Geometry.Point(-150, 75), new OpenLayers.Geometry.Point(-140, 65) ]), "[dblclick] correct linestring" ); - - // mock up sketch cancel - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); - handler.deactivate(); - t.eq(log.type, "cancel", "[deactivate while drawing] cancel called"); - + log = logs.shift(); + t.eq(log.type, "create", "[dblclick] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[dblclick] correct point"); + t.ok(log.args[1] == handler.line, + "[dblclick] correct feature"); + // cancel + handler.cancel(); + t.eq(logs.length, 2, "[cancel] called back"); + log = logs.shift(); + t.eq(log.type, "cancel", "[cancel] canced called"); + t.geom_eq(log.args[0], + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-200, 125) + ]), + "[cancel] correct linestring" + ); + log = logs.shift(); + t.eq(log.type, "create", "[cancel] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[cancel] correct point"); + map.destroy(); - } + } + + function test_toggle_freehand(t) { + t.plan(2); + 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, { + done: function(g) { + log++; + } + }, {persist: true}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + log = 0; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.eq(log, 1, "feature drawn when shift pressed on mousedown"); + + log = 0; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: false}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.eq(log, 0, "feature not drawn when shift not pressed on mousedown"); + } + + function test_persist(t) { + t.plan(4); + 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, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + handler.persist = false; + var feature1 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(1, 1)}); + t.ok(feature1.layer == null, "a) feature1 destroyed"); + + handler.persist = true; + var feature2 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(1, 1)}); + t.ok(feature2.layer != null, "b) feature2 not destroyed"); + + var feature3 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(1, 1)}); + t.ok(feature3.layer != null, "c) feature3 not destroyed"); + t.ok(feature2.layer == null, "c) feature2 destroyed"); + + map.destroy(); + } + + function test_persist_freehand(t) { + t.plan(6); + 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, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + handler.persist = false; + var feature1 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.ok(feature1.layer == null, "a) feature1 destroyed"); + + handler.persist = true; + feature2 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.ok(feature2.layer != null, "b) feature2 not destroyed"); + + feature3 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.ok(feature3.layer != null, "c) feature3 not destroyed"); + t.ok(feature2.layer == null, "c) feature2 destroyed"); + + feature4 = handler.line; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: false}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.ok(feature4.layer != null, "d) feature4 not destroyed"); + t.ok(feature3.layer == null, "c) feature3 destroyed"); + + map.destroy(); + } function test_Handler_Path_destroy(t) { t.plan(6); @@ -175,8 +496,250 @@ "handler.line is null after destroy"); map.destroy(); } - + // + // Sequence tests + // + // Sequence tests basically involve executing a sequence of events + // and testing the resulting geometry. + // + // Below are tests for various drawing sequences. Tests can be + // added here each a non-working sequence is found. + // + + // stopDown:true, stopUp:true + // a) click on (0, 0) + // b) mousedown on (0.5, 0.5) + // c) mouseup on (1, 1) + // d) dblclick on (10, 10) + function test_sequence1(t) { + t.plan(1); + 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, + {done: function(g) { log.geometry = g; }}, + {stopDown: true, stopUp: true} + ); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + log = {}; + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) mousedown on (0.5, 0.5) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0.5, 0.5)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0.5, 0.5)}); + // c) mouseup on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // d) dblclick on (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]), "geometry is correct"); + } + + // stopDown:false, stopUp:false + // a) click on (0, 0) + // b) mousedown on (0.5, 0.5) + // c) mouseup on (1, 1) + // d) dblclick on (10, 10) + function test_sequence2(t) { + t.plan(1); + 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, + {done: function(g) { log.geometry = g; }}, + {stopDown: false, stopUp: false} + ); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + log = {}; + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) mousedown on (0.5, 0.5) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0.5, 0.5)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0.5, 0.5)}); + // c) mouseup on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // d) dblclick on (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]), "geometry is correct"); + } + + // a) click + // b) dblclick + // c) mousedown holding shift key + // d) mousemove holding shift key + function test_sequence3(t) { + t.plan(1); + 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, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) click on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // c) click on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // d) mousemove to (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10), shiftKey: true}); + t.geom_eq(handler.line.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-149, 74), // (1, 1) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]), "geometry is correct after mousemove"); + } + + // a) click + // b) dblclick + // c) mousedown holding shift key + // d) mousemove holding shift key + function test_sequence4(t) { + t.plan(2); + 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, + {done: function(g) { log.geometry = g; }}, + {stopDown: false, stopUp: false} + ); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + log = {}; + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) dblclick on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(1, 1)}); + t.geom_eq(log.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-149, 74) // (1, 1) + ]), "geometry is correct after dblclick"); + // c) mousedown holding shift key on (1, 1) + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + // d) mousemove holding shift key to (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10), shiftKey: true}); + t.geom_eq(handler.line.geometry, + new OpenLayers.Geometry.LineString([ + new OpenLayers.Geometry.Point(-149, 74), // (1, 1) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]), "geometry is correct after mousemove"); + } diff --git a/tests/Handler/Point.html b/tests/Handler/Point.html index 5e2cc7a3e9..4ae503001a 100644 --- a/tests/Handler/Point.html +++ b/tests/Handler/Point.html @@ -25,11 +25,26 @@ } function test_Handler_Point_activation(t) { - t.plan(3); - var map = new OpenLayers.Map('map'); + t.plan(10); + var log = []; + 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.Point(control, { + "create": function(g, f) { + log.push({geometry: g, feature: f}); + } + }); + control.handler = handler; map.addControl(control); - var handler = new OpenLayers.Handler.Point(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + handler.active = true; var activated = handler.activate(); t.ok(!activated, @@ -38,24 +53,52 @@ activated = handler.activate(); t.ok(activated, "activate returns true if the handler was not already active"); + t.ok(handler.layer instanceof OpenLayers.Layer.Vector, + "activate creates a vector layer"); + t.ok(handler.layer.map == map, + "activate adds the vector layer to the map"); + t.ok(handler.point instanceof OpenLayers.Feature.Vector, + "activate creates a feature"); + t.ok(handler.point.layer == handler.layer, + "activate adds the feature to the layer"); + t.eq(log.length, 1, + "activate calls \"create\" once"); + t.geom_eq(log[0].geometry, handler.point.geometry, + "\"create\" called with expected geometry"); + t.ok(log[0].feature == handler.point, + "\"create\" called with expected feature"); activated = handler.deactivate(); t.ok(activated, "deactivate returns true if the handler was active already"); + + map.destroy(); } function test_Handler_Point_events(t) { - t.plan(29); - - var map = new OpenLayers.Map('map'); - var control = { - map: map - }; - var handler = new OpenLayers.Handler.Point(control); + t.plan(34); + var log = []; + 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.Point(control, { + "create": function(g, f) { + log.push({geometry: g, feature: f}); + } + }); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); // list below events that should be handled (events) and those // that should not be handled (nonevents) by the handler - var events = ["click", "dblclick", "mousedown", "mouseup", "mousemove"]; - var nonevents = ["mouseout", "resize", "focus", "blur"]; + var events = ["click", "dblclick", "mousedown", "mouseup", "mousemove", "mouseout"]; + var nonevents = ["resize", "focus", "blur"]; map.events.registerPriority = function(type, obj, func) { var r = func(); if(typeof r == "string") { @@ -99,7 +142,7 @@ } function test_callbacks(t) { - t.plan(10); + t.plan(28); var map = new OpenLayers.Map("map", { resolutions: [1] }); @@ -108,68 +151,189 @@ isBaseLayer: true }); map.addLayer(layer); - var control = new OpenLayers.Control({ - }); - var log = {}; + var control = new OpenLayers.Control({}); + var logs = [], log; var handler = new OpenLayers.Handler.Point(control, { create: function() { - log.type = "create", - log.args = arguments + logs.push({type: "create", args: arguments}); }, modify: function() { - log.type = "modify", - log.args = arguments + logs.push({type: "modify", args: arguments}); }, done: function() { - log.type = "done", - log.args = arguments + logs.push({type: "done", args: arguments}); }, cancel: function() { - log.type = "cancel", - log.args = arguments + logs.push({type: "cancel", args: arguments}); } }); control.handler = handler; map.addControl(control); map.setCenter(new OpenLayers.LonLat(0, 0), 0); - // mock up feature drawing + // create point handler.activate(); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - t.eq(log.type, "create", "[mousedown] create called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[mousedown] correct point"); - t.geom_eq(log.args[1].geometry, new OpenLayers.Geometry.Point(-150, 75), "[mousedown] correct sketch feature"); - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(1, 0)}); - t.eq(log.type, "modify", "[mousemove] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-149, 75), "[mousemove] correct point"); - t.geom_eq(log.args[1].geometry, new OpenLayers.Geometry.Point(-149, 75), "[mousemove] correct sketch feature"); + t.eq(logs.length, 1, "[activate] called back"); + log = logs.shift(); + t.eq(log.type, "create", "[activate] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[activate] correct point"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mousedown] correct point"); + t.geom_eq(log.args[1].geometry, + new OpenLayers.Geometry.Point(-150, 75), + "[mousedown] correct feature"); + // mouse move + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 0)}); + t.eq(logs.length, 0, "[mousemove] not called back"); + // mouse up (no finalize - we moved) handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(1, 0)}); + t.eq(logs.length, 0, "[mouseup] not called back"); + // mouse move + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 0)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousemove] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-148, 75), + "[mousemove] correct point"); + t.geom_eq(log.args[1].geometry, + new OpenLayers.Geometry.Point(-148, 75), + "[mousemove] correct feature"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(2, 0)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-148, 75), + "[mousedown] correct point"); + t.geom_eq(log.args[1].geometry, + new OpenLayers.Geometry.Point(-148, 75), + "[mousedown] correct feature"); + // mouse up + handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(2, 0)}); + t.eq(logs.length, 2, "[mouseup] called back twice"); + log = logs.shift(); t.eq(log.type, "done", "[mouseup] done called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-149, 75), "[mouseup] correct point"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-148, 75), + "[mouseup] correct point"); + log = logs.shift(); + t.eq(log.type, "create", "[mouseup] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[activate] correct point"); + // mouse up on same pixel + handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(2, 0)}); + t.eq(logs.length, 0, "[mouseup] not called back"); + // cancel + handler.cancel(); + t.eq(logs.length, 2, "[cancel] called back"); + log = logs.shift(); + t.eq(log.type, "cancel", "[cancel] canced called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[cancel] correct point"); + log = logs.shift(); + t.eq(log.type, "create", "[cancel] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[cancel] correct point"); - // mock up feature drawing with a cancel - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - handler.deactivate(); - t.eq(log.type, "cancel", "[deactivate while drawing] cancel called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[deactivate while drawing] correct point"); + map.destroy(); + } + + function test_persist(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.Point(control, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + handler.activate(); + + handler.persist = false; + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(handler.layer.features.length, 1, + "feature destroyed on mouseup when persist is false"); + + handler.persist = true; + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 0)}); + t.eq(handler.layer.features.length, 2, + "feature not destroyed on mouseup when persist is true"); + var feature = handler.layer.features[0]; + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(2, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(2, 0)}); + t.ok(handler.layer.features[0] !== feature, + "persisted feature destroyed on next mouseup"); + map.destroy(); } function test_Handler_Point_deactivation(t) { - t.plan(1); - var map = new OpenLayers.Map('map'); + t.plan(5); + var log = []; + 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.Point(control, { + "cancel": function(g) { + log.push({geometry: g}); + } + }); + control.handler = handler; map.addControl(control); - - var handler = new OpenLayers.Handler.Point(control, {foo: 'bar'}); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + var _layer = handler.layer; + var _geometry = handler.point.geometry; + handler.deactivate(); + t.eq(_layer.map, null, + "deactivates removes the layer from the map"); + t.eq(handler.layer, null, + "deactivates sets its \"layer\" property to null"); + t.eq(log.length, 1, + "deactivates calls \"cancel\" once"); + t.ok(log[0].geometry.equals(_geometry), + "\"cancel\" called with expected geometry"); + handler.activate(); handler.layer.destroy(); handler.deactivate(); t.eq(handler.layer, null, "deactivate doesn't throw an error if layer was" + " previously destroyed"); + + map.destroy(); } function test_Handler_Point_bounds(t) { @@ -183,7 +347,7 @@ var activated = handler.activate(); var px = new OpenLayers.Pixel(150, 75); var evt = {xy: px, which: 1}; - handler.mousedown(evt); + handler.mousemove(evt); var lonlat = map.getLonLatFromPixel(px); t.eq(handler.point.geometry.x, lonlat.lon, "X is correct"); t.eq(handler.point.geometry.y, lonlat.lat, "Y is correct"); @@ -203,8 +367,6 @@ 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"); diff --git a/tests/Handler/Polygon.html b/tests/Handler/Polygon.html index d53afaf76c..e9b8e82c4d 100644 --- a/tests/Handler/Polygon.html +++ b/tests/Handler/Polygon.html @@ -25,12 +25,27 @@ } function test_Handler_Polygon_activation(t) { - t.plan(3); - var map = new OpenLayers.Map('map'); + t.plan(13); + var log = []; + 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.Polygon(control, { + "create": function(g, f) { + log.push({geometry: g, feature: f}); + } + }); + control.handler = handler; map.addControl(control); - var handler = new OpenLayers.Handler.Polygon(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); handler.active = true; + var activated = handler.activate(); t.ok(!activated, "activate returns false if the handler was already active"); @@ -38,41 +53,68 @@ activated = handler.activate(); t.ok(activated, "activate returns true if the handler was not already active"); + t.ok(handler.layer instanceof OpenLayers.Layer.Vector, + "activate creates a vector layer"); + t.ok(handler.layer.map == map, + "activate adds the vector layer to the map"); + t.ok(handler.point instanceof OpenLayers.Feature.Vector, + "activate creates a point feature"); + t.ok(handler.point.layer == handler.layer, + "activate adds the point feature to the layer"); + t.ok(handler.line instanceof OpenLayers.Feature.Vector, + "activates creates a line feature"); + t.ok(handler.polygon instanceof OpenLayers.Feature.Vector, + "acttivates creates a polygon feature"); + t.ok(handler.polygon.layer == handler.layer, + "activate adds the polygin feature to the layer"); + t.eq(log.length, 1, + "activate calls \"create\" once"); + t.geom_eq(log[0].geometry, handler.point.geometry, + "\"create\" called with expected geometry"); + t.ok(log[0].feature == handler.polygon, + "\"create\" called with expected feature"); activated = handler.deactivate(); t.ok(activated, "deactivate returns true if the handler was active already"); - map.destroy(); + + map.destroy(); } - function test_Handler_Polygon_bounds(t) { + function test_bounds_stopDown_true(t) { t.plan(2); 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.Polygon(control, {}); + var handler = new OpenLayers.Handler.Polygon(control, {}, + {stopDown: true, stopUp: true}); var activated = handler.activate(); - + // click on (150, 75) var evt = {xy: new OpenLayers.Pixel(150, 75), which: 1}; + handler.mousemove(evt); handler.mousedown(evt); handler.mouseup(evt); - var evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; + // click on (175, 100) + evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; handler.mousemove(evt); handler.mousedown(evt); handler.mouseup(evt); t.ok(handler.line.geometry.getBounds().equals(new OpenLayers.Bounds(0,-35.15625,35.15625,0)), "Correct bounds"); - var evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; + // mousedown on (175, 100) + evt = {xy: new OpenLayers.Pixel(175, 100), which: 1}; handler.mousedown(evt); - var evt = {xy: new OpenLayers.Pixel(125, 100), which: 1}; + // mousemove to (125, 100) + evt = {xy: new OpenLayers.Pixel(125, 100), which: 1}; handler.mousemove(evt); + // test that the bounds have changed t.ok(!handler.polygon.geometry.getBounds().equals(new OpenLayers.Bounds(0,-35.15625,35.15625,0)), "Correct bounds after dragging without letting go. (Came out as "+handler.line.geometry.getBounds().toBBOX() + ".)"); map.destroy(); } function test_callbacks(t) { - t.plan(15); + t.plan(45); var map = new OpenLayers.Map("map", { resolutions: [1] }); @@ -83,57 +125,141 @@ map.addLayer(layer); var control = new OpenLayers.Control({ }); - var log = {}; + var logs = [], log; var handler = new OpenLayers.Handler.Polygon(control, { create: function() { - log.type = "create", - log.args = arguments + logs.push({type: "create", args: arguments}); + }, + point: function() { + logs.push({type: "point", args: arguments}); }, modify: function() { - log.type = "modify", - log.args = arguments + logs.push({type: "modify", args: arguments}); }, done: function() { - log.type = "done", - log.args = arguments + logs.push({type: "done", args: arguments}); }, cancel: function() { - log.type = "cancel", - log.args = arguments + logs.push({type: "cancel", args: arguments}); } }); control.handler = handler; map.addControl(control); map.setCenter(new OpenLayers.LonLat(0, 0), 0); - // mock up feature drawing + // create polygon handler.activate(); - // click at 0, 0 - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - t.eq(log.type, "create", "[mousedown] create called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[mousedown] correct vertex"); - t.ok(log.args[1] === handler.polygon, "[mousedown] correct sketch feature"); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.activate(); + t.eq(logs.length, 1, "[activate] called back"); + log = logs.shift(); + t.eq(log.type, "create", "[activate] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[activate] correct point"); + t.ok(log.args[1] == handler.polygon, + "[activate] correct feature"); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousemove] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.polygon, + "[mousemove] correct feature"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mousedown] correct point"); + t.ok(log.args[1] === handler.polygon, + "[mousedown] correct feature"); + // mouse up + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + t.eq(logs.length, 2, "[mouseup] called back twice"); + log = logs.shift(); + t.eq(log.type, "point", "[mouseup] point called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mouseup] correct point"); + var geom = new OpenLayers.Geometry.Polygon([ + new OpenLayers.Geometry.LinearRing([ + new OpenLayers.Geometry.Point(-150, 75) + ]) + ]); + geom.components[0].addComponent( + new OpenLayers.Geometry.Point(-150, 75), + geom.components[0].components.length + ); + t.geom_eq(log.args[1], geom, "[mouseup] correct polygon"); + log = logs.shift(); t.eq(log.type, "modify", "[mouseup] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), "[mouseup] correct vertex"); - t.ok(log.args[1] === handler.polygon, "[mouseup] correct sketch feature"); - // move to 10, 10 and click - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 75), + "[mouseup] correct point"); + t.ok(log.args[1] == handler.polygon, + "[mouseup] correct feature"); + // mouse move + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); t.eq(log.type, "modify", "[mousemove] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), "[mousemove] correct vertex"); - t.ok(log.args[1] === handler.polygon, "[mouseup] correct sketch feature"); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.polygon, + "[mousemove] correct feature"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); + t.eq(logs.length, 1, "[mousedown] called back"); + log = logs.shift(); + t.eq(log.type, "modify", "[mousedown] modify called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-140, 65), + "[mousedown] correct point"); + t.ok(log.args[1] === handler.polygon, + "[mousedown] correct feature"); + // mouse up + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + log = logs.shift(); + log = logs.shift(); // move to 0, 10 and double click - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(0, 10)}); + // mouse move + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 1, "[mousemove] called back"); + log = logs.shift(); t.eq(log.type, "modify", "[mousemove] modify called"); - t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 65), "[mousemove] correct vertex"); - t.ok(log.args[1] === handler.polygon, "[mouseup] correct sketch feature"); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); - handler.dblclick({type: "dblclick", xy: new OpenLayers.Pixel(0, 10)}); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-150, 65), + "[mousemove] correct point"); + t.ok(log.args[1] === handler.polygon, + "[mousemove] correct feature"); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 1, "[mousedown] not called back"); + log = logs.shift(); + // mouse up + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 2, "[mouseup] called back"); + log = logs.shift(); + log = logs.shift(); + // mouse down + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 0, "[mousedown] not called back"); + // mouse up + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 0, "[mouseup] not called back"); + // dblclick + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(0, 10)}); + t.eq(logs.length, 2, "[dblclick] called back twice"); + log = logs.shift(); t.eq(log.type, "done", "[dblclick] done called"); t.geom_eq( log.args[0], @@ -147,17 +273,232 @@ ]), "[dblclick] correct polygon" ); - - // mock up sketch cancel - handler.mousedown({type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); - handler.mouseup({type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); - handler.mousemove({type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); - handler.deactivate(); - t.eq(log.type, "cancel", "[deactivate while drawing] cancel called"); - + log = logs.shift(); + t.eq(log.type, "create", "[dblclick] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[dblclick] correct point"); + t.ok(log.args[1] == handler.polygon, + "[dblclick] correct feature"); + // cancel + handler.cancel(); + t.eq(logs.length, 2, "[cancel] called back"); + log = logs.shift(); + t.eq(log.type, "cancel", "[cancel] canced called"); + log = logs.shift(); + t.eq(log.type, "create", "[cancel] create called"); + t.geom_eq(log.args[0], new OpenLayers.Geometry.Point(-200, 125), + "[cancel] correct point"); + map.destroy(); } + function test_toggle_freehand(t) { + t.plan(2); + 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.Polygon(control, { + done: function(g) { + log++; + } + }, {persist: true}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + log = 0; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.eq(log, 1, "feature drawn when shift pressed on mousedown"); + + log = 0; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: false}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.eq(log, 0, "feature not drawn when shift not pressed on mousedown"); + } + + function test_persist(t) { + t.plan(4); + 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.Polygon(control, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + handler.persist = false; + var feature1 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(2, 2)}); + t.ok(feature1.layer == null, "a) feature1 destroyed"); + + handler.persist = true; + var feature2 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(2, 2)}); + t.ok(feature2.layer != null, "b) feature2 not destroyed"); + + var feature3 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(2, 2)}); + t.ok(feature3.layer != null, "c) feature3 not destroyed"); + t.ok(feature2.layer == null, "c) feature2 destroyed"); + + map.destroy(); + } + + function test_persist_freehand(t) { + t.plan(6); + 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.Polygon(control, {}); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + + handler.persist = false; + var feature1 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + t.ok(feature1.layer == null, "a) feature1 destroyed"); + + handler.persist = true; + var feature2 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + t.ok(feature2.layer != null, "b) feature2 not destroyed"); + + var feature3 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + t.ok(feature3.layer != null, "c) feature3 not destroyed"); + t.ok(feature2.layer == null, "c) feature2 destroyed"); + + feature4 = handler.polygon; + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0), shiftKey: false}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1), shiftKey: true}); + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(2, 2), shiftKey: true}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0), shiftKey: true}); + t.ok(feature4.layer != null, "d) feature4 not destroyed"); + t.ok(feature3.layer == null, "c) feature3 destroyed"); + + map.destroy(); + } + function test_rings(t) { t.plan(12); @@ -204,6 +545,7 @@ log = []; // start at -9, 9 event = {xy: new OpenLayers.Pixel(-9, 9)}; + trigger("mousemove", event); trigger("mousedown", event); trigger("mouseup", event); // draw to -1, 9 @@ -228,7 +570,7 @@ trigger("dblclick", event); // make assertions - t.eq(log.length, 9, "a) correct number of events"); + t.eq(log.length, 14, "a) correct number of events"); t.eq(log[log.length-1].type, "featureadded", "a) featureadded event last"); t.eq(log[log.length-1].feature.geometry.getArea(), 64, "a) correct polygon area"); @@ -236,6 +578,7 @@ log = []; // start at -6, 6 event = {xy: new OpenLayers.Pixel(-6, 6), altKey: true}; + trigger("mousemove", event); trigger("mousedown", event); trigger("mouseup", event); // draw to -3, 6 @@ -260,7 +603,7 @@ trigger("dblclick", event); // make assertions - t.eq(log.length, 8, "b) correct number of events"); + t.eq(log.length, 13, "b) correct number of events"); t.eq(log[log.length-1].type, "sketchcomplete", "b) sketchcomplete event last"); t.eq(log[log.length-1].feature.geometry.getArea(), 55, "b) correct polygon area"); @@ -269,6 +612,7 @@ log = []; // start at -2, 2 event = {xy: new OpenLayers.Pixel(-2, 2)}; + trigger("mousemove", event); trigger("mousedown", event); trigger("mouseup", event); // draw to 2, 2 @@ -293,7 +637,7 @@ trigger("dblclick", event); // make assertions - t.eq(log.length, 9, "c) correct number of events"); + t.eq(log.length, 14, "c) correct number of events"); t.eq(log[log.length-1].type, "featureadded", "c) featureadded event last"); t.eq(log[log.length-1].feature.geometry.getArea(), 16, "c) correct polygon area"); @@ -301,6 +645,7 @@ log = []; // start at -1, 1 event = {xy: new OpenLayers.Pixel(-1, 1), altKey: true}; + trigger("mousemove", event); trigger("mousedown", event); trigger("mouseup", event); // draw to 1, 1 @@ -330,7 +675,7 @@ trigger("dblclick", event); // make assertions - t.eq(log.length, 11, "d) correct number of events"); + t.eq(log.length, 18, "d) correct number of events"); t.eq(log[log.length-1].type, "sketchcomplete", "d) sketchcomplete event last"); t.eq(log[log.length-1].feature.geometry.getArea(), 12, "d) correct polygon area"); @@ -338,7 +683,6 @@ map.destroy(); } - function test_Handler_Polygon_destroy(t) { t.plan(8); var map = new OpenLayers.Map('map'); @@ -372,7 +716,157 @@ map.destroy(); } + // + // Sequence tests + // + // Sequence tests basically involve executing a sequence of events + // and testing the resulting geometry. + // + // Below are tests for various drawing sequences. Tests can be + // added here each a non-working sequence is found. + // + // stopDown:true, stopUp:true + // a) click on (0, 0) + // b) mousedown on (0.5, 0.5) + // c) mouseup on (1, 1) + // d) click on (0, 10) + // e) dblclick on (10, 10) + function test_sequence1(t) { + t.plan(1); + 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.Polygon(control, + {done: function(g) { log.geometry = g; }}, + {stopDown: true, stopUp: true} + ); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + log = {}; + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) mousedown on (0.5, 0.5) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0.5, 0.5)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0.5, 0.5)}); + // c) mouseup on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // d) click on (0, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); + // e) dblclick on (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.geometry, + new OpenLayers.Geometry.Polygon([ + new OpenLayers.Geometry.LinearRing([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-150, 65), // (0, 10) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]) + ]), "geometry is correct"); + } + + // stopDown:false, stopUp:false + // a) click on (0, 0) + // b) mousedown on (0.5, 0.5) + // c) mouseup on (1, 1) + // d) click on (0, 10) + // e) dblclick on (10, 10) + function test_sequence2(t) { + t.plan(1); + 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.Polygon(control, + {done: function(g) { log.geometry = g; }}, + {stopDown: false, stopUp: false} + ); + control.handler = handler; + map.addControl(control); + map.setCenter(new OpenLayers.LonLat(0, 0), 0); + + handler.activate(); + log = {}; + + // a) click on (0, 0) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 0)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 0)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 0)}); + // b) mousedown on (0.5, 0.5) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0.5, 0.5)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0.5, 0.5)}); + // c) mouseup on (1, 1) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(1, 1)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(1, 1)}); + // d) click on (0, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(0, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(0, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(0, 10)}); + // e) dblclick on (10, 10) + handler.mousemove( + {type: "mousemove", xy: new OpenLayers.Pixel(10, 10)}); + handler.mousedown( + {type: "mousedown", xy: new OpenLayers.Pixel(10, 10)}); + handler.mouseup( + {type: "mouseup", xy: new OpenLayers.Pixel(10, 10)}); + handler.dblclick( + {type: "dblclick", xy: new OpenLayers.Pixel(10, 10)}); + t.geom_eq(log.geometry, + new OpenLayers.Geometry.Polygon([ + new OpenLayers.Geometry.LinearRing([ + new OpenLayers.Geometry.Point(-150, 75), // (0, 0) + new OpenLayers.Geometry.Point(-150, 65), // (0, 10) + new OpenLayers.Geometry.Point(-140, 65) // (10, 10) + ]) + ]), "geometry is correct"); + }