From 2f32158374c124e310fb86f2db6b07c3106fe978 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sun, 29 Jul 2012 17:17:49 +0200
Subject: [PATCH] Rename ol.control.DragZoom to ol.control.ShiftDragZoom

---
 src/ol/base/createmap.js                      |  4 ++--
 .../control/{dragzoom.js => shiftdragzoom.js} | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename src/ol/control/{dragzoom.js => shiftdragzoom.js} (55%)

diff --git a/src/ol/base/createmap.js b/src/ol/base/createmap.js
index df8f61813f..b4d6a97055 100644
--- a/src/ol/base/createmap.js
+++ b/src/ol/base/createmap.js
@@ -8,10 +8,10 @@ goog.require('ol.MapProperty');
 goog.require('ol.Projection');
 goog.require('ol.control.DblClickZoom');
 goog.require('ol.control.DragPan');
-goog.require('ol.control.DragZoom');
 goog.require('ol.control.KeyboardPan');
 goog.require('ol.control.KeyboardZoom');
 goog.require('ol.control.MouseWheelZoom');
+goog.require('ol.control.ShiftDragZoom');
 goog.require('ol.dom');
 goog.require('ol.dom.Map');
 goog.require('ol.webgl');
@@ -78,10 +78,10 @@ ol.createMap = function(target, opt_values, opt_rendererHints) {
     var controls = new ol.Array();
     controls.push(new ol.control.DblClickZoom());
     controls.push(new ol.control.DragPan());
-    controls.push(new ol.control.DragZoom());
     controls.push(new ol.control.KeyboardPan());
     controls.push(new ol.control.KeyboardZoom());
     controls.push(new ol.control.MouseWheelZoom());
+    controls.push(new ol.control.ShiftDragZoom());
     values[ol.MapProperty.CONTROLS] = controls;
   }
 
diff --git a/src/ol/control/dragzoom.js b/src/ol/control/shiftdragzoom.js
similarity index 55%
rename from src/ol/control/dragzoom.js
rename to src/ol/control/shiftdragzoom.js
index cdd6822147..0ac48bb5a2 100644
--- a/src/ol/control/dragzoom.js
+++ b/src/ol/control/shiftdragzoom.js
@@ -1,6 +1,6 @@
 // FIXME draw drag box
 
-goog.provide('ol.control.DragZoom');
+goog.provide('ol.control.ShiftDragZoom');
 
 goog.require('ol.Extent');
 goog.require('ol.MapBrowserEvent');
@@ -10,7 +10,14 @@ goog.require('ol.control.Drag');
 /**
  * @define {number} Hysterisis pixels.
  */
-ol.DRAG_ZOOM_HYSTERESIS_PIXELS = 8;
+ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS = 8;
+
+
+/**
+ * @const {number}
+ */
+ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
+    ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS * ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS;
 
 
 
@@ -18,18 +25,18 @@ ol.DRAG_ZOOM_HYSTERESIS_PIXELS = 8;
  * @constructor
  * @extends {ol.control.Drag}
  */
-ol.control.DragZoom = function() {
+ol.control.ShiftDragZoom = function() {
   goog.base(this);
 };
-goog.inherits(ol.control.DragZoom, ol.control.Drag);
+goog.inherits(ol.control.ShiftDragZoom, ol.control.Drag);
 
 
 /**
  * @inheritDoc
  */
-ol.control.DragZoom.prototype.handleDragEnd = function(mapBrowserEvent) {
+ol.control.ShiftDragZoom.prototype.handleDragEnd = function(mapBrowserEvent) {
   if (this.deltaX * this.deltaX + this.deltaY * this.deltaY >=
-      ol.DRAG_ZOOM_HYSTERESIS_PIXELS * ol.DRAG_ZOOM_HYSTERESIS_PIXELS) {
+      ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED) {
     var extent = ol.Extent.boundingExtent(
         this.startCoordinate,
         mapBrowserEvent.getCoordinate());
@@ -41,7 +48,7 @@ ol.control.DragZoom.prototype.handleDragEnd = function(mapBrowserEvent) {
 /**
  * @inheritDoc
  */
-ol.control.DragZoom.prototype.handleDragStart = function(mapBrowserEvent) {
+ol.control.ShiftDragZoom.prototype.handleDragStart = function(mapBrowserEvent) {
   var browserEvent = mapBrowserEvent.browserEvent;
   if (browserEvent.shiftKey) {
     browserEvent.preventDefault();