Changeset 2857
- Timestamp:
- 03/22/07 15:45:01 (2 years ago)
- Files:
-
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/DragPan.js (modified) (2 diffs)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js (modified) (1 diff)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/MouseDefaults.js (modified) (6 diffs)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/MouseToolbar.js (modified) (3 diffs)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/Navigation.js (modified) (3 diffs)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/PanZoom.js (modified) (1 diff)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/ZoomBox.js (modified) (1 diff)
- sandbox/elemoine/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
sandbox/elemoine/openlayers/lib/OpenLayers/Control/DragPan.js
r2838 r2857 33 33 size.h / 2 + deltaY); 34 34 var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 35 // create and record a memento before panning 36 var memento = this.map.createMemento(); 37 OpenLayers.History.getInstance().addMemento(memento); 35 // record map extent before panning 36 OpenLayers.Control.prototype.recordMapExtent.call(this); 38 37 this.map.setCenter(newCenter, null, true); 39 38 // this assumes xy won't be changed inside Handler.Drag … … 51 50 var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX, 52 51 size.h / 2 + deltaY); 53 var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 54 55 56 52 var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 57 53 this.map.setCenter(newCenter, null, false); 58 54 // this assumes xy won't be changed inside Handler.Drag sandbox/elemoine/openlayers/lib/OpenLayers/Control/KeyboardDefaults.js
r2838 r2857 37 37 */ 38 38 defaultKeyPress: function (code) { 39 this.recordMapExtent();39 OpenLayers.Control.prototype.recordMapExtent.call(this); 40 40 switch(code) { 41 41 case OpenLayers.Event.KEY_LEFT: sandbox/elemoine/openlayers/lib/OpenLayers/Control/MouseDefaults.js
r2838 r2857 73 73 defaultDblClick: function (evt) { 74 74 var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 75 this.recordMapExtent();75 OpenLayers.Control.prototype.recordMapExtent.call(this); 76 76 this.map.setCenter(newCenter, this.map.zoom + 1); 77 77 OpenLayers.Event.stop(evt); … … 131 131 size.h / 2 + deltaY); 132 132 var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 133 this.recordMapExtent();133 OpenLayers.Control.prototype.recordMapExtent.call(this); 134 134 this.map.setCenter(newCenter, null, true); 135 135 this.mouseDragStart = evt.xy.clone(); … … 149 149 } else { 150 150 if (this.performedDrag) { 151 this.recordMapExtent();151 OpenLayers.Control.prototype.recordMapExtent.call(this); 152 152 this.map.setCenter(this.map.center); 153 153 } … … 177 177 defaultWheelUp: function(evt) { 178 178 if (this.map.getZoom() <= this.map.getNumZoomLevels()) { 179 this.recordMapExtent();179 OpenLayers.Control.prototype.recordMapExtent.call(this); 180 180 this.map.setCenter(this.map.getLonLatFromPixel(evt.xy), 181 181 this.map.getZoom() + 1); … … 188 188 defaultWheelDown: function(evt) { 189 189 if (this.map.getZoom() > 0) { 190 this.recordMapExtent();190 OpenLayers.Control.prototype.recordMapExtent.call(this); 191 191 this.map.setCenter(this.map.getLonLatFromPixel(evt.xy), 192 192 this.map.getZoom() - 1); … … 211 211 } else { 212 212 var end = this.map.getLonLatFromViewPortPx( evt.xy ); 213 this.recordMapExtent();213 OpenLayers.Control.prototype.recordMapExtent.call(this); 214 214 this.map.setCenter(new OpenLayers.LonLat( 215 215 (end.lon), sandbox/elemoine/openlayers/lib/OpenLayers/Control/MouseToolbar.js
r2838 r2857 116 116 this.performedDrag = false; 117 117 var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 118 this.recordMapExtent();118 OpenLayers.Control.prototype.recordMapExtent.call(this); 119 119 this.map.setCenter(newCenter, this.map.zoom + 1); 120 120 OpenLayers.Event.stop(evt); … … 266 266 size.h / 2 + deltaY); 267 267 var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 268 this.recordMapExtent();268 OpenLayers.Control.prototype.recordMapExtent.call(this); 269 269 this.map.setCenter(newCenter, null, true); 270 270 this.mouseDragStart = evt.xy.clone(); … … 286 286 case "pan": 287 287 if (this.performedDrag) { 288 this.recordMapExtent();288 OpenLayers.Control.prototype.recordMapExtent.call(this); 289 289 this.map.setCenter(this.map.center); 290 290 } sandbox/elemoine/openlayers/lib/OpenLayers/Control/Navigation.js
r2838 r2857 55 55 defaultDblClick: function (evt) { 56 56 var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 57 this.recordMapExtent();57 OpenLayers.Control.prototype.recordMapExtent.call(this); 58 58 this.map.setCenter(newCenter, this.map.zoom + 1); 59 59 OpenLayers.Event.stop(evt); … … 65 65 */ 66 66 wheelUp: function(evt) { 67 this.recordMapExtent();67 OpenLayers.Control.prototype.recordMapExtent.call(this); 68 68 this.map.setCenter(this.map.getLonLatFromPixel(evt.xy), 69 69 this.map.getZoom() + 1); … … 74 74 */ 75 75 wheelDown: function(evt) { 76 this.recordMapExtent();76 OpenLayers.Control.prototype.recordMapExtent.call(this); 77 77 this.map.setCenter(this.map.getLonLatFromPixel(evt.xy), 78 78 this.map.getZoom() - 1); sandbox/elemoine/openlayers/lib/OpenLayers/Control/PanZoom.js
r2838 r2857 113 113 if (!OpenLayers.Event.isLeftClick(evt)) return; 114 114 115 this.recordMapExtent();115 OpenLayers.Control.prototype.recordMapExtent.call(this); 116 116 117 117 switch (this.action) { sandbox/elemoine/openlayers/lib/OpenLayers/Control/ZoomBox.js
r2838 r2857 24 24 25 25 zoomBox: function (position) { 26 this.recordMapExtent();26 OpenLayers.Control.prototype.recordMapExtent.call(this); 27 27 if (position instanceof OpenLayers.Bounds) { 28 28 var minXY = this.map.getLonLatFromPixel( sandbox/elemoine/openlayers/lib/OpenLayers/Control/ZoomToMaxExtent.js
r2838 r2857 17 17 trigger: function() { 18 18 if (this.map) { 19 this.recordMapExtent();19 OpenLayers.Control.prototype.recordMapExtent.call(this); 20 20 this.map.zoomToMaxExtent(); 21 21 }
