From 188615391d48892954a55c82fcc055ee8edd476c Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Thu, 21 Jun 2012 19:33:33 +0200
Subject: [PATCH] Using a map for controls also.

---
 src/ol/Map.js                |  2 +-
 src/ol/control/Control.js    | 15 +++++----------
 src/ol/control/Navigation.js |  4 +++-
 src/ol/event/Events.js       |  6 +++---
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/ol/Map.js b/src/ol/Map.js
index dc91e4a4ac..42fa63a119 100644
--- a/src/ol/Map.js
+++ b/src/ol/Map.js
@@ -322,7 +322,7 @@ ol.Map.prototype.setControls = function(opt_controls) {
         for (var i=0, ii=opt_controls.length; i<ii; ++i) {
             control = opt_controls[i];
             if (!(control instanceof ol.control.Control)) {
-                control = new ol.control[control]();
+                control = new ol.control.CONTROL_MAP[control]();
             }
             control.setMap(this);
         }
diff --git a/src/ol/control/Control.js b/src/ol/control/Control.js
index e567342725..376118ce28 100644
--- a/src/ol/control/Control.js
+++ b/src/ol/control/Control.js
@@ -3,21 +3,16 @@ goog.provide('ol.control.Control');
 
 
 /**
- * @type {Object}
- * @private
+ * @enum {Object}
  */
-ol.control.registry_ = {};
+ol.control.CONTROL_MAP = {};
 
 /**
+ * @param {string} name
  * @param {Function} Control
- * @param {string} id
  */
-ol.control.register = function(Control, id) {
-    ol.control.registry_[id] = Control;
-};
-
-ol.control.fromRegistry = function(id) {
-    return ol.control.registry_[id];
+ol.control.addControl = function(name, Control) {
+    ol.control.CONTROL_MAP = Control;
 };
 
 /**
diff --git a/src/ol/control/Navigation.js b/src/ol/control/Navigation.js
index e7eadacd57..76bd899761 100644
--- a/src/ol/control/Navigation.js
+++ b/src/ol/control/Navigation.js
@@ -46,4 +46,6 @@ ol.control.Navigation.prototype.deactivate = function() {
  */
 ol.control.Navigation.prototype.moveMap = function(evt) {
     this.getMap().moveByPx(evt.dx, evt.dy);
-};
\ No newline at end of file
+};
+
+ol.control.addControl('navigation', ol.Control.Navigation);
\ No newline at end of file
diff --git a/src/ol/event/Events.js b/src/ol/event/Events.js
index 470b4b2a3e..2833cf053c 100644
--- a/src/ol/event/Events.js
+++ b/src/ol/event/Events.js
@@ -14,10 +14,10 @@ ol.event.SEQUENCE_PROVIDER_MAP = {};
 
 /**
  * @param {string} name
- * @param {Function} obj
+ * @param {Function} Sequence
  */
-ol.event.addSequenceProvider = function(name, obj) {
-    ol.event.SEQUENCE_PROVIDER_MAP[name] = obj;
+ol.event.addSequenceProvider = function(name, Sequence) {
+    ol.event.SEQUENCE_PROVIDER_MAP[name] = Sequence;
 };
 
 /**