changing 'minor' parameter name to 'dragging' for consistency
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1538 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -55,7 +55,7 @@ Instantiate class {OpenLayers.Map} in order to create a map. This is the central
|
|||||||
changebaselayer -- the current base layer changes
|
changebaselayer -- the current base layer changes
|
||||||
movestart -- start of a movement in the map
|
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.
|
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
|
zoomend -- end of a zoom action
|
||||||
mouseover -- map is moused over
|
mouseover -- map is moused over
|
||||||
mouseout -- map is no longer mousedout
|
mouseout -- map is no longer mousedout
|
||||||
|
|||||||
@@ -177,9 +177,9 @@ OpenLayers.Layer.prototype = {
|
|||||||
* @param {OpenLayers.Bounds} bound
|
* @param {OpenLayers.Bounds} bound
|
||||||
* @param {Boolean} zoomChanged tells when zoom has changed, as layers
|
* @param {Boolean} zoomChanged tells when zoom has changed, as layers
|
||||||
* have to do some init work in that case.
|
* 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.
|
//this function can be implemented by subclasses.
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -46,9 +46,9 @@ OpenLayers.Layer.Canvas.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @param {Boolean} zoomChanged
|
||||||
* @param {Boolean} minor
|
* @param {Boolean} dragging
|
||||||
*/
|
*/
|
||||||
moveTo:function(bounds, zoomChanged, minor) {
|
moveTo:function(bounds, zoomChanged, dragging) {
|
||||||
this.redraw();
|
this.redraw();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -73,9 +73,9 @@ OpenLayers.Layer.Google.prototype =
|
|||||||
*
|
*
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @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)) {
|
if ((this.gmap != null) && (!this.dragging)) {
|
||||||
|
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ OpenLayers.Layer.Markers.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @param {Boolean} zoomChanged
|
||||||
* @param {Boolean} minor
|
* @param {Boolean} dragging
|
||||||
*/
|
*/
|
||||||
moveTo:function(bounds, zoomChanged, minor) {
|
moveTo:function(bounds, zoomChanged, dragging) {
|
||||||
if (zoomChanged) {
|
if (zoomChanged) {
|
||||||
this.redraw();
|
this.redraw();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,9 +44,9 @@ OpenLayers.Layer.MultiMap.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @param {Boolean} zoomChanged
|
||||||
* @param {Boolean} minor
|
* @param {Boolean} dragging
|
||||||
*/
|
*/
|
||||||
moveTo:function(bounds, zoomChanged, minor) {
|
moveTo:function(bounds, zoomChanged, dragging) {
|
||||||
|
|
||||||
if (this.multimap != null) {
|
if (this.multimap != null) {
|
||||||
var olCenter = this.map.getCenter();
|
var olCenter = this.map.getCenter();
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ OpenLayers.Layer.VirtualEarth.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @param {Boolean} zoomChanged
|
||||||
* @param {Boolean} minor
|
* @param {Boolean} dragging
|
||||||
*/
|
*/
|
||||||
moveTo:function(bounds, zoomChanged, minor) {
|
moveTo:function(bounds, zoomChanged, dragging) {
|
||||||
|
|
||||||
if (this.vemap != null) {
|
if (this.vemap != null) {
|
||||||
|
|
||||||
|
|||||||
@@ -94,9 +94,9 @@ OpenLayers.Layer.WFS.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @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.Grid.prototype.moveTo.apply(this, arguments);
|
||||||
OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
|
OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -99,16 +99,16 @@ OpenLayers.Layer.WMS.Untiled.prototype =
|
|||||||
this.loadImageDiv();
|
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.
|
* reload and recenter the div.
|
||||||
*
|
*
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @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) {
|
if (bounds == null) {
|
||||||
bounds = this.map.getExtent();
|
bounds = this.map.getExtent();
|
||||||
|
|||||||
@@ -44,9 +44,9 @@ OpenLayers.Layer.Yahoo.prototype =
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.Bounds} bounds
|
* @param {OpenLayers.Bounds} bounds
|
||||||
* @param {Boolean} zoomChanged
|
* @param {Boolean} zoomChanged
|
||||||
* @param {Boolean} minor
|
* @param {Boolean} dragging
|
||||||
*/
|
*/
|
||||||
moveTo:function(bounds, zoomChanged, minor) {
|
moveTo:function(bounds, zoomChanged, dragging) {
|
||||||
|
|
||||||
if (this.yahoomap != null) {
|
if (this.yahoomap != null) {
|
||||||
var olCenter = this.map.getCenter();
|
var olCenter = this.map.getCenter();
|
||||||
|
|||||||
@@ -575,10 +575,10 @@ OpenLayers.Map.prototype = {
|
|||||||
/**
|
/**
|
||||||
* @param {OpenLayers.LonLat} lonlat
|
* @param {OpenLayers.LonLat} lonlat
|
||||||
* @param {int} zoom
|
* @param {int} zoom
|
||||||
* @param {Boolean} minor Specifies whether or not to
|
* @param {Boolean} dragging Specifies whether or not to
|
||||||
* trigger movestart/end events
|
* trigger movestart/end events
|
||||||
*/
|
*/
|
||||||
setCenter: function (lonlat, zoom, minor) {
|
setCenter: function (lonlat, zoom, dragging) {
|
||||||
var zoomChanged = (this.isValidZoomLevel(zoom)) &&
|
var zoomChanged = (this.isValidZoomLevel(zoom)) &&
|
||||||
(zoom != this.getZoom());
|
(zoom != this.getZoom());
|
||||||
|
|
||||||
@@ -587,9 +587,9 @@ OpenLayers.Map.prototype = {
|
|||||||
|
|
||||||
|
|
||||||
// if neither center nor zoom will change, no need to do anything
|
// 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 (centerChanged) {
|
||||||
if ((!zoomChanged) && (this.center)) {
|
if ((!zoomChanged) && (this.center)) {
|
||||||
@@ -621,7 +621,7 @@ OpenLayers.Map.prototype = {
|
|||||||
for (var i = 0; i < this.layers.length; i++) {
|
for (var i = 0; i < this.layers.length; i++) {
|
||||||
var layer = this.layers[i];
|
var layer = this.layers[i];
|
||||||
if (layer.getVisibility()) {
|
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
|
// 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
|
/** This function takes care to recenter the layerContainerDiv
|
||||||
|
|||||||
Reference in New Issue
Block a user