From ee5796cb785836c5d8d87b36261df73820851929 Mon Sep 17 00:00:00 2001 From: Pierre GIRAUD Date: Mon, 3 Dec 2012 15:26:49 +0100 Subject: [PATCH 1/2] Send zoomChanged value when triggering movestart event --- lib/OpenLayers/Map.js | 4 +++- tests/Map.html | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index 50eb3bc8c9..cf5d1d0d97 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -1908,7 +1908,9 @@ OpenLayers.Map = OpenLayers.Class({ // if neither center nor zoom will change, no need to do anything if (zoomChanged || centerChanged || dragging) { - dragging || this.events.triggerEvent("movestart"); + dragging || this.events.triggerEvent("movestart", { + zoomChanged: zoomChanged + }); if (centerChanged) { if (!zoomChanged && this.center) { diff --git a/tests/Map.html b/tests/Map.html index ffa5234b61..b072585a2b 100644 --- a/tests/Map.html +++ b/tests/Map.html @@ -977,7 +977,7 @@ } function test_Map_moveTo(t) { - t.plan(8); + t.plan(12); map = new OpenLayers.Map('map'); var baseLayer = new OpenLayers.Layer.WMS("Test Layer", @@ -992,10 +992,15 @@ property: event.property }); }); - baseLayer.events.on({ + map.events.on({ move: function() { t.ok(true, "move listener called"); }, + movestart: function(e) { + t.eq(e.zoomChanged, true, "movestart listener called with expected value"); + } + }); + baseLayer.events.on({ moveend: function(e) { t.eq(e.zoomChanged, true, "moveend listener called with expected value"); } From 6c21c2043fac92e5c78cbe3835d3ca79cfe58028 Mon Sep 17 00:00:00 2001 From: Pierre GIRAUD Date: Mon, 17 Dec 2012 13:55:32 +0100 Subject: [PATCH 2/2] Completing the doc strings --- lib/OpenLayers/Map.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index cf5d1d0d97..ba7e7006fe 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -75,7 +75,9 @@ OpenLayers.Map = OpenLayers.Class({ * The *layer* property will be a reference to the changed layer. The * *property* property will be a key to the changed property (name, * order, opacity, params, visibility or attribution). - * movestart - triggered after the start of a drag, pan, or zoom + * movestart - triggered after the start of a drag, pan, or zoom. The event + * object may include a *zoomChanged* property that tells whether the + * zoom has changed. * move - triggered after each drag, pan, or zoom * moveend - triggered after a drag, pan, or zoom completes * zoomend - triggered after a zoom completes