diff --git a/doc/Map.txt b/doc/Map.txt index 630e27597b..a0f0e579ee 100644 --- a/doc/Map.txt +++ b/doc/Map.txt @@ -55,7 +55,7 @@ Instantiate class {OpenLayers.Map} in order to create a map. This is the central changebaselayer -- the current base layer changes movestart -- start of a movement in the map move -- end of movement in a map. this happens while te mouse is dragging as well as for all other events. - moveend -- end of movement in a map, but does not happen when the move is 'minor', as is the case when the move event is in the middle of a drag action. + moveend -- end of movement in a map, but does not happen when the 'dragging' flag is set, as is the case when the move event is in the middle of a drag action. zoomend -- end of a zoom action mouseover -- map is moused over mouseout -- map is no longer mousedout diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index d956981248..452edb504d 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -177,9 +177,9 @@ OpenLayers.Layer.prototype = { * @param {OpenLayers.Bounds} bound * @param {Boolean} zoomChanged tells when zoom has changed, as layers * have to do some init work in that case. - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { //this function can be implemented by subclasses. }, diff --git a/lib/OpenLayers/Layer/Canvas.js b/lib/OpenLayers/Layer/Canvas.js index 6c48a323ae..75a5a83a14 100644 --- a/lib/OpenLayers/Layer/Canvas.js +++ b/lib/OpenLayers/Layer/Canvas.js @@ -46,9 +46,9 @@ OpenLayers.Layer.Canvas.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { this.redraw(); }, diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js index 5025dd7344..9e939004b4 100644 --- a/lib/OpenLayers/Layer/Google.js +++ b/lib/OpenLayers/Layer/Google.js @@ -73,9 +73,9 @@ OpenLayers.Layer.Google.prototype = * * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { if ((this.gmap != null) && (!this.dragging)) { diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index 94297116e2..6839fc0f60 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -45,9 +45,9 @@ OpenLayers.Layer.Markers.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { if (zoomChanged) { this.redraw(); } diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js index 6a8b888b9f..084df8ea1e 100644 --- a/lib/OpenLayers/Layer/MultiMap.js +++ b/lib/OpenLayers/Layer/MultiMap.js @@ -44,9 +44,9 @@ OpenLayers.Layer.MultiMap.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { if (this.multimap != null) { var olCenter = this.map.getCenter(); diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js index c2ccb11ad0..eb91961a20 100644 --- a/lib/OpenLayers/Layer/VirtualEarth.js +++ b/lib/OpenLayers/Layer/VirtualEarth.js @@ -47,9 +47,9 @@ OpenLayers.Layer.VirtualEarth.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { if (this.vemap != null) { diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js index 6835d77497..43e2f70d63 100644 --- a/lib/OpenLayers/Layer/WFS.js +++ b/lib/OpenLayers/Layer/WFS.js @@ -94,9 +94,9 @@ OpenLayers.Layer.WFS.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { OpenLayers.Layer.Grid.prototype.moveTo.apply(this, arguments); OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments); }, diff --git a/lib/OpenLayers/Layer/WMS/Untiled.js b/lib/OpenLayers/Layer/WMS/Untiled.js index 97d1644982..a776f4fb08 100644 --- a/lib/OpenLayers/Layer/WMS/Untiled.js +++ b/lib/OpenLayers/Layer/WMS/Untiled.js @@ -99,16 +99,16 @@ OpenLayers.Layer.WMS.Untiled.prototype = this.loadImageDiv(); }, - /** When it is not a minor move (ie when panning or when done dragging) + /** When it is not a dragging move (ie when done dragging) * reload and recenter the div. * * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { - if (!minor || zoomChanged) { + if (!dragging || zoomChanged) { if (bounds == null) { bounds = this.map.getExtent(); diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js index f560ea72aa..331cc2883e 100644 --- a/lib/OpenLayers/Layer/Yahoo.js +++ b/lib/OpenLayers/Layer/Yahoo.js @@ -44,9 +44,9 @@ OpenLayers.Layer.Yahoo.prototype = /** * @param {OpenLayers.Bounds} bounds * @param {Boolean} zoomChanged - * @param {Boolean} minor + * @param {Boolean} dragging */ - moveTo:function(bounds, zoomChanged, minor) { + moveTo:function(bounds, zoomChanged, dragging) { if (this.yahoomap != null) { var olCenter = this.map.getCenter(); diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index 38d8d83164..f6368b5327 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -575,10 +575,10 @@ OpenLayers.Map.prototype = { /** * @param {OpenLayers.LonLat} lonlat * @param {int} zoom - * @param {Boolean} minor Specifies whether or not to - * trigger movestart/end events + * @param {Boolean} dragging Specifies whether or not to + * trigger movestart/end events */ - setCenter: function (lonlat, zoom, minor) { + setCenter: function (lonlat, zoom, dragging) { var zoomChanged = (this.isValidZoomLevel(zoom)) && (zoom != this.getZoom()); @@ -587,9 +587,9 @@ OpenLayers.Map.prototype = { // if neither center nor zoom will change, no need to do anything - if (zoomChanged || centerChanged || !minor) { + if (zoomChanged || centerChanged || !dragging) { - if (!minor) { this.events.triggerEvent("movestart"); } + if (!dragging) { this.events.triggerEvent("movestart"); } if (centerChanged) { if ((!zoomChanged) && (this.center)) { @@ -621,7 +621,7 @@ OpenLayers.Map.prototype = { for (var i = 0; i < this.layers.length; i++) { var layer = this.layers[i]; if (layer.getVisibility()) { - layer.moveTo(bounds, zoomChanged, minor); + layer.moveTo(bounds, zoomChanged, dragging); } } @@ -631,7 +631,7 @@ OpenLayers.Map.prototype = { } // even if nothing was done, we want to notify of this - if (!minor) { this.events.triggerEvent("moveend"); } + if (!dragging) { this.events.triggerEvent("moveend"); } }, /** This function takes care to recenter the layerContainerDiv