add mapboxAccessToken config arg:

etpinard · etpinard · commit b0c9681ef07f · 2016-06-07T16:57:07.000-04:00
- use it upon instantiating mapbox subplots
- throw error if not set (mapboxAccessToken is null by default)
diff --git a/src/plot_api/plot_config.js b/src/plot_api/plot_config.js
@@ -83,7 +83,10 @@ module.exports = {
     setBackground: defaultSetBackground,
 
     // URL to topojson files used in geo charts
-    topojsonURL: 'https://cdn.plot.ly/'
+    topojsonURL: 'https://cdn.plot.ly/',
+
+    // Mapbox access token (required to plot mapbox trace types)
+    mapboxAccessToken: null
 
 };
 
diff --git a/src/plots/mapbox/constants.js b/src/plots/mapbox/constants.js
@@ -12,5 +12,13 @@
 
 module.exports = {
     styleUrlPrefix: 'mapbox://styles/mapbox/',
-    styleUrlSuffix: 'v9'
+    styleUrlSuffix: 'v9',
+
+    noAccessTokenErrorMsg: [
+        'Missing Mapbox access token.',
+        'Mapbox trace type require a Mapbox access token to be registered.',
+        'For example:',
+        'Plotly.plot(gd, data, layout, { mapboxAccessToken: \'my-access-token\' });',
+        'More info here: https://www.mapbox.com/help/define-access-token/'
+    ].join('\n')
 };
diff --git a/src/plots/mapbox/index.js b/src/plots/mapbox/index.js
@@ -12,10 +12,10 @@
 var mapboxgl = require('mapbox-gl');
 
 var Plots = require('../plots');
-var createMapbox = require('./mapbox');
 var xmlnsNamespaces = require('../../constants/xmlns_namespaces');
 
-var CREDS = require('../../../../creds.json');
+var createMapbox = require('./mapbox');
+var constants = require('./constants');
 
 
 exports.name = 'mapbox';
@@ -48,8 +48,12 @@ exports.supplyLayoutDefaults = require('./layout_defaults');
 
 exports.plot = function plotMapbox(gd) {
 
-    // TODO maybe this should be a config argument?
-    mapboxgl.accessToken = CREDS.accessToken;
+    if(!gd._context.mapboxAccessToken) {
+        throw new Error(constants.noAccessTokenErrorMsg);
+    }
+    else {
+        mapboxgl.accessToken = gd._context.mapboxAccessToken;
+    }
 
     var fullLayout = gd._fullLayout,
         calcData = gd.calcdata,
