fixes for mapbox with Plotly.react

alexcjohnson · alexcjohnson · commit 4b98be6cedc2 · 2018-02-08T17:41:32.000-05:00
diff --git a/src/plots/mapbox/index.js b/src/plots/mapbox/index.js
@@ -62,9 +62,6 @@ exports.plot = function plotMapbox(gd) {
             opts = fullLayout[id],
             mapbox = opts._subplot;
 
-        // copy access token to fullLayout (to handle the context case)
-        opts.accesstoken = accessToken;
-
         if(!mapbox) {
             mapbox = createMapbox({
                 gd: gd,
@@ -136,24 +133,17 @@ function findAccessToken(gd, mapboxIds) {
     // special case for Mapbox Atlas users
     if(context.mapboxAccessToken === '') return '';
 
-    // first look for access token in context
-    var accessToken = context.mapboxAccessToken;
-
-    // allow mapbox layout options to override it
+    // Take the first token we find in a mapbox subplot.
+    // These default to the context value but may be overridden.
     for(var i = 0; i < mapboxIds.length; i++) {
         var opts = fullLayout[mapboxIds[i]];
 
         if(opts.accesstoken) {
-            accessToken = opts.accesstoken;
-            break;
+            return opts.accesstoken;
         }
     }
 
-    if(!accessToken) {
-        throw new Error(constants.noAccessTokenErrorMsg);
-    }
-
-    return accessToken;
+    throw new Error(constants.noAccessTokenErrorMsg);
 }
 
 exports.updateFx = function(fullLayout) {
diff --git a/src/plots/mapbox/layout_defaults.js b/src/plots/mapbox/layout_defaults.js
@@ -20,12 +20,13 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
         type: 'mapbox',
         attributes: layoutAttributes,
         handleDefaults: handleDefaults,
-        partition: 'y'
+        partition: 'y',
+        accessToken: layoutOut._mapboxAccessToken
     });
 };
 
-function handleDefaults(containerIn, containerOut, coerce) {
-    coerce('accesstoken');
+function handleDefaults(containerIn, containerOut, coerce, opts) {
+    coerce('accesstoken', opts.accessToken);
     coerce('style');
     coerce('center.lon');
     coerce('center.lat');
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -295,6 +295,8 @@ plots.supplyDefaults = function(gd) {
     var newFullData = gd._fullData = [];
     var newData = gd.data || [];
 
+    var context = gd._context || {};
+
     var i;
 
     // Create all the storage space for frames, but only if doesn't already exist
@@ -322,6 +324,9 @@ plots.supplyDefaults = function(gd) {
 
     var formatObj = getFormatObj(gd, d3FormatKeys);
 
+    // stash the token from context so mapbox subplots can use it as default
+    newFullLayout._mapboxAccessToken = context.mapboxAccessToken;
+
     // first fill in what we can of layout without looking at data
     // because fullData needs a few things from layout
 
@@ -343,7 +348,7 @@ plots.supplyDefaults = function(gd) {
 
         var missingWidthOrHeight = (!newLayout.width || !newLayout.height),
             autosize = newFullLayout.autosize,
-            autosizable = gd._context && gd._context.autosizable,
+            autosizable = context.autosizable,
             initialAutoSize = missingWidthOrHeight && (autosize || autosizable);
 
         if(initialAutoSize) plots.plotAutoSize(gd, newLayout, newFullLayout);
diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
@@ -69,9 +69,7 @@ function handleLonLatDefaults(traceIn, traceOut, coerce) {
     var lon = coerce('lon') || [];
     var lat = coerce('lat') || [];
     var len = Math.min(lon.length, lat.length);
-
-    if(len < lon.length) traceOut.lon = lon.slice(0, len);
-    if(len < lat.length) traceOut.lat = lat.slice(0, len);
+    traceOut._length = len;
 
     return len;
 }
diff --git a/test/jasmine/tests/scattermapbox_test.js b/test/jasmine/tests/scattermapbox_test.js
@@ -38,24 +38,28 @@ describe('scattermapbox defaults', function() {
         return traceOut;
     }
 
-    it('should truncate \'lon\' if longer than \'lat\'', function() {
+    it('should not truncate \'lon\' if longer than \'lat\'', function() {
+        // this is handled at the calc step now via _length.
         var fullTrace = _supply({
             lon: [1, 2, 3],
             lat: [2, 3]
         });
 
-        expect(fullTrace.lon).toEqual([1, 2]);
+        expect(fullTrace.lon).toEqual([1, 2, 3]);
         expect(fullTrace.lat).toEqual([2, 3]);
+        expect(fullTrace._length).toBe(2);
     });
 
-    it('should truncate \'lat\' if longer than \'lon\'', function() {
+    it('should not truncate \'lat\' if longer than \'lon\'', function() {
+        // this is handled at the calc step now via _length.
         var fullTrace = _supply({
             lon: [1, 2, 3],
             lat: [2, 3, 3, 5]
         });
 
         expect(fullTrace.lon).toEqual([1, 2, 3]);
-        expect(fullTrace.lat).toEqual([2, 3, 3]);
+        expect(fullTrace.lat).toEqual([2, 3, 3, 5]);
+        expect(fullTrace._length).toBe(3);
     });
 
     it('should set \'visible\' to false if \'lat\' and/or \'lon\' has zero length', function() {
