Changeset 1538
- Timestamp:
- 10/03/06 00:35:04 (2 years ago)
- Files:
-
- trunk/openlayers/doc/Map.txt (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/Canvas.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/Google.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/WFS.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js (modified) (1 diff)
- trunk/openlayers/lib/OpenLayers/Map.js (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/doc/Map.txt
r1519 r1538 56 56 movestart -- start of a movement in the map 57 57 move -- end of movement in a map. this happens while te mouse is dragging as well as for all other events. 58 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.58 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. 59 59 zoomend -- end of a zoom action 60 60 mouseover -- map is moused over trunk/openlayers/lib/OpenLayers/Layer.js
r1531 r1538 178 178 * @param {Boolean} zoomChanged tells when zoom has changed, as layers 179 179 * have to do some init work in that case. 180 * @param {Boolean} minor181 */ 182 moveTo:function(bounds, zoomChanged, minor) {180 * @param {Boolean} dragging 181 */ 182 moveTo:function(bounds, zoomChanged, dragging) { 183 183 //this function can be implemented by subclasses. 184 184 }, trunk/openlayers/lib/OpenLayers/Layer/Canvas.js
r1424 r1538 47 47 * @param {OpenLayers.Bounds} bounds 48 48 * @param {Boolean} zoomChanged 49 * @param {Boolean} minor49 * @param {Boolean} dragging 50 50 */ 51 moveTo:function(bounds, zoomChanged, minor) {51 moveTo:function(bounds, zoomChanged, dragging) { 52 52 this.redraw(); 53 53 }, trunk/openlayers/lib/OpenLayers/Layer/Google.js
r1424 r1538 74 74 * @param {OpenLayers.Bounds} bounds 75 75 * @param {Boolean} zoomChanged 76 * @param {Boolean} minor77 */ 78 moveTo:function(bounds, zoomChanged, minor) {76 * @param {Boolean} dragging 77 */ 78 moveTo:function(bounds, zoomChanged, dragging) { 79 79 80 80 if ((this.gmap != null) && (!this.dragging)) { trunk/openlayers/lib/OpenLayers/Layer/Markers.js
r1424 r1538 46 46 * @param {OpenLayers.Bounds} bounds 47 47 * @param {Boolean} zoomChanged 48 * @param {Boolean} minor48 * @param {Boolean} dragging 49 49 */ 50 moveTo:function(bounds, zoomChanged, minor) {50 moveTo:function(bounds, zoomChanged, dragging) { 51 51 if (zoomChanged) { 52 52 this.redraw(); trunk/openlayers/lib/OpenLayers/Layer/MultiMap.js
r1424 r1538 45 45 * @param {OpenLayers.Bounds} bounds 46 46 * @param {Boolean} zoomChanged 47 * @param {Boolean} minor48 */ 49 moveTo:function(bounds, zoomChanged, minor) {47 * @param {Boolean} dragging 48 */ 49 moveTo:function(bounds, zoomChanged, dragging) { 50 50 51 51 if (this.multimap != null) { trunk/openlayers/lib/OpenLayers/Layer/VirtualEarth.js
r1526 r1538 48 48 * @param {OpenLayers.Bounds} bounds 49 49 * @param {Boolean} zoomChanged 50 * @param {Boolean} minor51 */ 52 moveTo:function(bounds, zoomChanged, minor) {50 * @param {Boolean} dragging 51 */ 52 moveTo:function(bounds, zoomChanged, dragging) { 53 53 54 54 if (this.vemap != null) { trunk/openlayers/lib/OpenLayers/Layer/WFS.js
r1424 r1538 95 95 * @param {OpenLayers.Bounds} bounds 96 96 * @param {Boolean} zoomChanged 97 * @param {Boolean} minor98 */ 99 moveTo:function(bounds, zoomChanged, minor) {97 * @param {Boolean} dragging 98 */ 99 moveTo:function(bounds, zoomChanged, dragging) { 100 100 OpenLayers.Layer.Grid.prototype.moveTo.apply(this, arguments); 101 101 OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments); trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js
r1522 r1538 100 100 }, 101 101 102 /** When it is not a minor move (ie when panning orwhen done dragging)102 /** When it is not a dragging move (ie when done dragging) 103 103 * reload and recenter the div. 104 104 * 105 105 * @param {OpenLayers.Bounds} bounds 106 106 * @param {Boolean} zoomChanged 107 * @param {Boolean} minor108 */ 109 moveTo:function(bounds, zoomChanged, minor) {110 111 if (! minor|| zoomChanged) {107 * @param {Boolean} dragging 108 */ 109 moveTo:function(bounds, zoomChanged, dragging) { 110 111 if (!dragging || zoomChanged) { 112 112 113 113 if (bounds == null) { trunk/openlayers/lib/OpenLayers/Layer/Yahoo.js
r1424 r1538 45 45 * @param {OpenLayers.Bounds} bounds 46 46 * @param {Boolean} zoomChanged 47 * @param {Boolean} minor48 */ 49 moveTo:function(bounds, zoomChanged, minor) {47 * @param {Boolean} dragging 48 */ 49 moveTo:function(bounds, zoomChanged, dragging) { 50 50 51 51 if (this.yahoomap != null) { trunk/openlayers/lib/OpenLayers/Map.js
r1536 r1538 576 576 * @param {OpenLayers.LonLat} lonlat 577 577 * @param {int} zoom 578 * @param {Boolean} minorSpecifies whether or not to579 * trigger movestart/end events580 */ 581 setCenter: function (lonlat, zoom, minor) {578 * @param {Boolean} dragging Specifies whether or not to 579 * trigger movestart/end events 580 */ 581 setCenter: function (lonlat, zoom, dragging) { 582 582 var zoomChanged = (this.isValidZoomLevel(zoom)) && 583 583 (zoom != this.getZoom()); … … 588 588 589 589 // if neither center nor zoom will change, no need to do anything 590 if (zoomChanged || centerChanged || ! minor) {591 592 if (! minor) { this.events.triggerEvent("movestart"); }590 if (zoomChanged || centerChanged || !dragging) { 591 592 if (!dragging) { this.events.triggerEvent("movestart"); } 593 593 594 594 if (centerChanged) { … … 622 622 var layer = this.layers[i]; 623 623 if (layer.getVisibility()) { 624 layer.moveTo(bounds, zoomChanged, minor);624 layer.moveTo(bounds, zoomChanged, dragging); 625 625 } 626 626 } … … 632 632 633 633 // even if nothing was done, we want to notify of this 634 if (! minor) { this.events.triggerEvent("moveend"); }634 if (!dragging) { this.events.triggerEvent("moveend"); } 635 635 }, 636 636
