From f1cb71182a86445f732645b4ff4c58664be708c3 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 4 Mar 2010 12:59:15 -0500
Subject: [PATCH] Seperate null and horde geocoder objects into their own js
 file.

Avoid loading javascript we will never use.
---
 horde/js/hordemap/horde.js |  4 +++-
 horde/js/hordemap/map.js   | 25 ++++++-------------------
 horde/js/hordemap/null.js  | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 horde/js/hordemap/null.js

diff --git a/horde/js/hordemap/horde.js b/horde/js/hordemap/horde.js
index d0f8bb7c9..940713ad2 100644
--- a/horde/js/hordemap/horde.js
+++ b/horde/js/hordemap/horde.js
@@ -224,4 +224,6 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
         this.handler = new OpenLayers.Handler.Click(
             this, { 'click': options.onClick }, this.handlerOptions);
     }
-});
\ No newline at end of file
+});
+
+HordeMap.Geocoder.Horde = Class.create({});
\ No newline at end of file
diff --git a/horde/js/hordemap/map.js b/horde/js/hordemap/map.js
index db760a3b2..ff59d005e 100644
--- a/horde/js/hordemap/map.js
+++ b/horde/js/hordemap/map.js
@@ -40,7 +40,7 @@ HordeMap = {
         }
         this._addScript(path + this._opts.driver.toLowerCase() + '.js');
 
-        if (this._opts.geocoder && this._opts.geocoder != 'Null') {
+        if (this._opts.geocoder) {
             this._addScript(this._getProviderUrl(this._opts.geocoder));
             this._addScript(path + this._opts.geocoder.toLowerCase() + '.js');
         }
@@ -84,6 +84,9 @@ HordeMap = {
 
     _addScript: function(s)
     {
+        if (s.length == 0) {
+            return;
+        }
         var l = this._includes.length;
         for (var i = 0; i < l; i++) {
             if (this._includes[i] == s) {
@@ -127,6 +130,8 @@ HordeMap = {
             return 'http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.1';
         case 'SAPO':
             return 'http://js.sapo.pt/Bundles/SAPOMapsAPI-1.0.js';
+        default:
+            return '';
         }
     },
 
@@ -142,21 +147,3 @@ HordeMap = {
     Geocoder: {}
 };
 
-HordeMap.Geocoder.Horde = Class.create({});
-HordeMap.Geocoder.Null = Class.create({
-
-    initialize: function(opts)
-    {
-    },
-
-    geocode: function(address, callback, onErrorCallback)
-    {
-        return onErrorCallback('No geocoding support');
-    },
-
-    reverseGeocode: function(lonlat, completeCallback, errorCallback)
-    {
-        var ll = { lon: lonlat.lon, lat: lonlat.lat, address: lonlat.lon + ' ' + lonlat.lat};
-        return completeCallback([ll]);
-    }
-});
diff --git a/horde/js/hordemap/null.js b/horde/js/hordemap/null.js
new file mode 100644
index 000000000..ca6e1dacf
--- /dev/null
+++ b/horde/js/hordemap/null.js
@@ -0,0 +1,17 @@
+HordeMap.Geocoder.Null = Class.create({
+
+    initialize: function(opts)
+    {
+    },
+
+    geocode: function(address, callback, onErrorCallback)
+    {
+        return onErrorCallback('No geocoding support');
+    },
+
+    reverseGeocode: function(lonlat, completeCallback, errorCallback)
+    {
+        var ll = { lon: lonlat.lon, lat: lonlat.lat, address: lonlat.lon + ' ' + lonlat.lat};
+        return completeCallback([ll]);
+    }
+});
-- 
2.11.0