Changeset 558
- Timestamp:
- 06/08/06 12:13:42 (3 years ago)
- Files:
-
- trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js (modified) (2 diffs)
- trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js (modified) (5 diffs)
- trunk/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js
r384 r558 71 71 size.h / 2 + deltaY); 72 72 var newCenter = this.map.getLonLatFromScreenPx( newXY ); 73 this.map.setCenter(newCenter );73 this.map.setCenter(newCenter, null, true); 74 74 this.mouseDragStart = evt.xy.copyOf(); 75 75 } … … 96 96 this.map.viewPortDiv.removeChild(document.getElementById("zoomBox")); 97 97 this.zoomBox = null; 98 } else { 99 this.map.setCenter(this.map.center); 98 100 } 99 101 this.mouseDragStart = null; trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js
r556 r558 35 35 var sz = new OpenLayers.Size(28,28); 36 36 var centered = this.position; 37 this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz );37 this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz, "Shift->Drag to zoom to area"); 38 38 centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0)); 39 this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz );39 this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan."); 40 40 centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0)); 41 this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz );41 this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz, "Hold alt when clicking to show distance between selected points"); 42 42 this.switchModeTo("pan"); 43 43 this.map.events.register("zoomend", this, function() { this.switchModeTo("pan"); }); … … 46 46 }, 47 47 48 _addButton:function(id, img, activeImg, xy, sz ) {48 _addButton:function(id, img, activeImg, xy, sz, title) { 49 49 var imgLocation = OpenLayers.Util.getImagesLocation() + img; 50 50 var activeImgLocation = OpenLayers.Util.getImagesLocation() + activeImg; 51 51 // var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz); 52 52 var btn = OpenLayers.Util.createAlphaImageDiv( 53 "OpenLayers_Control_ PanZoom_" + id,53 "OpenLayers_Control_MouseToolbar_" + id, 54 54 xy, sz, imgLocation, "absolute"); 55 55 … … 63 63 btn.events.register("mouseup", this, this.stopAction); 64 64 btn.action = id; 65 btn.title = title; 66 btn.alt = title; 65 67 btn.map = this.map; 66 68 … … 211 213 size.h / 2 + deltaY); 212 214 var newCenter = this.map.getLonLatFromScreenPx( newXY ); 213 this.map.setCenter(newCenter );215 this.map.setCenter(newCenter, null, true); 214 216 this.mouseDragStart = evt.xy.copyOf(); 215 217 } … … 239 241 this.leaveMode(); 240 242 break; 243 case "pan": 244 this.map.setCenter(this.map.center); 245 241 246 } 242 247 this.mouseDragStart = null; trunk/openlayers/lib/OpenLayers/Map.js
r545 r558 384 384 * @param {int} zoom 385 385 */ 386 setCenter: function (lonlat, zoom ) {386 setCenter: function (lonlat, zoom, minor) { 387 387 if (this.center) { // otherwise there's nothing to move yet 388 388 this.moveLayerContainer(lonlat); … … 396 396 } 397 397 398 this.events.triggerEvent("movestart");398 if (!minor) this.events.triggerEvent("movestart"); 399 399 this.moveToNewExtent(zoomChanged); 400 this.events.triggerEvent("moveend");400 if (!minor) this.events.triggerEvent("moveend"); 401 401 }, 402 402
