Enable search box geocoder provider selection

src/api/create-vis.js

@@ -3,7 +3,6 @@ var VisView = require('../vis/vis-view');
 var VisModel = require('../vis/vis');
 var Loader = require('../core/loader');
 var VizJSON = require('./vizjson');
-var config = require('../cdb.config');
 
 var DEFAULT_OPTIONS = {
   tiles_loader: true,
@@ -58,10 +57,6 @@ var createVis = function (el, vizjson, options) {
     loadVizJSON(el, visModel, vizjson, options);
   }
 
-  if (options.mapzenApiKey) {
-    config.set('mapzenApiKey', options.mapzenApiKey);
-  }
-
   return visModel;
 };
 

src/geo/ui/search/search.js

@@ -67,11 +67,13 @@ var Search = View.extend({
   },
 
   _initializeGeocoder: function () {
-    this.geocoderService = this.options.geocoderService || DEFAULT_GEOCODER;
+    const injectedGeocoderConfig = this._getGeocodingInfoFromConfig();
+
+    this.geocoderService = this.options.geocoderService || injectedGeocoderConfig.provider || DEFAULT_GEOCODER;
     this.geocoder = GEOCODERS[this.geocoderService];
 
     const windowApiKey = GEOCODERS_WINDOW_API_KEYS[this.geocoderService];
-    this.token = this.options.token || window[windowApiKey];
+    this.token = this.options.token || injectedGeocoderConfig.token || window[windowApiKey];
   },
 
   render: function () {
@@ -209,6 +211,22 @@ var Search = View.extend({
     this.mapView.unbind('click', this._destroySearchPin, this);
   },
 
+  _getGeocodingInfoFromConfig () {
+    if (!window.geocoderConfiguration) {
+      return {};
+    }
+
+    const provider = window.geocoderConfiguration.provider;
+    let token;
+
+    if (provider) {
+      token = window.geocoderConfiguration[provider] &&
+        window.geocoderConfiguration[provider].search_bar_api_key;
+    }
+
+    return { provider, token };
+  },
+
   clean: function () {
     this._unbindEvents();
     this._destroySearchPin();

test/spec/geo/ui/search.spec.js

@@ -194,6 +194,87 @@ describe('geo/ui/search', function () {
     });
   });
 
+  describe('_initializeGeocoder', function () {
+    it('should set geocoder from options if available', function () {
+      this.view = new Search({
+        model: this.map,
+        mapView: this.mapView,
+        geocoderService: 'mapbox',
+        token: 'token_from_options'
+      });
+
+      expect(this.view.geocoderService).toBe('mapbox');
+      expect(this.view.token).toBe('token_from_options');
+    });
+
+    it('should set geocoder from injected configuration if available', function () {
+      spyOn(Search.prototype, '_getGeocodingInfoFromConfig').and.returnValue({
+        provider: 'tomtom_fake',
+        token: 'fakeAPIKey'
+      });
+
+      this.view = new Search({
+        model: this.map,
+        mapView: this.mapView
+      });
+
+      expect(this.view.geocoderService).toBe('tomtom_fake');
+      expect(this.view.token).toBe('fakeAPIKey');
+    });
+
+    it('should set default geocoder if no configurations are available', function () {
+      Object.defineProperty(window, 'tomtomApiKey', {
+        value: 'fake_tomtom_key',
+        writable: true
+      });
+
+      this.view = new Search({
+        model: this.map,
+        mapView: this.mapView
+      });
+
+      expect(this.view.geocoderService).toBe('tomtom');
+      expect(this.view.token).toBe('fake_tomtom_key');
+    });
+  });
+
+  describe('_getGeocodingInfoFromConfig', function () {
+    it('should return an empty object if there is no geocoderConfiguration', function () {
+      expect(this.view._getGeocodingInfoFromConfig()).toEqual({});
+    });
+
+    it('should return provider and token from geocoderConfiguration', function () {
+      var geocoderConfiguration = {
+        provider: 'tomtom',
+        tomtom: {
+          search_bar_api_key: 'fakeAPIKey'
+        }
+      };
+
+      Object.defineProperty(window, 'geocoderConfiguration', {
+        value: geocoderConfiguration,
+        writable: true
+      });
+
+      expect(this.view._getGeocodingInfoFromConfig()).toEqual({
+        provider: 'tomtom', token: 'fakeAPIKey'
+      });
+    });
+
+    it('should return undefined provider and token if no provider found in geocoderConfiguration', function () {
+      var geocoderConfiguration = {};
+
+      Object.defineProperty(window, 'geocoderConfiguration', {
+        value: geocoderConfiguration,
+        writable: true
+      });
+
+      expect(this.view._getGeocodingInfoFromConfig()).toEqual({
+        provider: undefined, token: undefined
+      });
+    });
+  });
+
   afterEach(function () {
     this.$el.remove();
   });