Merge vector-2.4 branch back to trunk.

svn merge sandbox/vector-2.4/@2307 sandbox/vector-2.4/@HEAD trunk/openlayers/ git-svn-id: http://svn.openlayers.org/trunk/openlayers@2803 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
2007-03-16 13:23:56 +00:00
parent 8b9d974dc2
commit 3ca974acec
159 changed files with 10193 additions and 343 deletions
--- a/lib/OpenLayers/Control/Navigation.js
+++ b/lib/OpenLayers/Control/Navigation.js
@@ -0,0 +1,80 @@
+/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * for the full text of the license. */
+
+/**
+ * @class
+ * 
+ * @requires OpenLayers/Control/ZoomBox.js
+ * @requires OpenLayers/Control/DragPan.js
+ * @requires OpenLayers/Handler/MouseWheel.js
+ */
+OpenLayers.Control.Navigation = OpenLayers.Class.create();
+OpenLayers.Control.Navigation.prototype = 
+  OpenLayers.Class.inherit( OpenLayers.Control, {
+
+    /** @type OpenLayers.Control.ZoomBox */
+    dragPan: null,
+
+    /** @type OpenLayers.Control.ZoomBox */
+    zoomBox: null,
+
+    /** @type OpenLayers.Handler.MouseWheel */
+    wheelHandler: null,
+
+    activate: function() {
+        this.dragPan.activate();
+        this.wheelHandler.activate();
+        this.zoomBox.activate();
+        return OpenLayers.Control.prototype.activate.apply(this,arguments);
+    },
+
+    deactivate: function() {
+        this.zoomBox.deactivate();
+        this.dragPan.deactivate();
+        this.wheelHandler.deactivate();
+        return OpenLayers.Control.prototype.deactivate.apply(this,arguments);
+    },
+    
+    draw: function() {
+        this.map.events.register( "dblclick", this, this.defaultDblClick );
+        this.dragPan = new OpenLayers.Control.DragPan({map: this.map});
+        this.zoomBox = new OpenLayers.Control.ZoomBox(
+                    {map: this.map, keyMask: OpenLayers.Handler.MOD_SHIFT});
+        this.dragPan.draw();
+        this.zoomBox.draw();
+        this.wheelHandler = new OpenLayers.Handler.MouseWheel(
+                                    this, {"up"  : this.wheelUp,
+                                           "down": this.wheelDown} );
+        this.activate();
+    },
+
+    /**
+    * @param {Event} evt
+    */
+    defaultDblClick: function (evt) {
+        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
+        this.map.setCenter(newCenter, this.map.zoom + 1);
+        OpenLayers.Event.stop(evt);
+        return false;
+    },
+
+    /** User spun scroll wheel up
+     * 
+     */
+    wheelUp: function(evt) {
+        this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
+                           this.map.getZoom() + 1);
+    },
+
+    /** User spun scroll wheel down
+     * 
+     */
+    wheelDown: function(evt) {
+        this.map.setCenter(this.map.getLonLatFromPixel(evt.xy),
+                           this.map.getZoom() - 1);
+    },
+    
+    /** @final @type String */
+    CLASS_NAME: "OpenLayers.Control.Navigation"
+});