bring back mapbox in various places

Author: archmoj

.circleci/test.sh

@@ -95,6 +95,7 @@ case $1 in
     make-baselines-virtual-webgl)
         SUITE=$({\
                   find $ROOT/test/image/mocks/gl*     -type f -printf "%f\n"; \
+                  find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
                   find $ROOT/test/image/mocks/mapnew* -type f -printf "%f\n"; \
                 } | sed 's/\.json$//1' | circleci tests split)
         python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?

devtools/test_dashboard/devtools.js

@@ -4,6 +4,7 @@
 
 var Fuse = require('fuse.js/dist/fuse.common.js');
 var mocks = require('../../build/test_dashboard_mocks.json');
+var credentials = require('../../build/credentials.json');
 var Lib = require('../../src/lib');
 
 require('./perf');
@@ -18,6 +19,10 @@ var Tabs = {
             // use local topojson files
             topojsonURL: '../../node_modules/sane-topojson/dist/',
 
+            // register mapbox access token
+            // run `npm run preset` if you haven't yet
+            mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,
+
             // show all logs in console
             logging: 2
         });

draftlogs/7015_change.md

@@ -36,6 +36,9 @@ Plotly.register([
     require('./heatmapgl'),
     require('../src/traces/parcoords/strict'),
     require('./parcats'),
+    require('./scattermapbox'),
+    require('./choroplethmapbox'),
+    require('./densitymapbox'),
     require('./scattermapnew'),
     require('./choroplethmapnew'),
     require('./densitymapnew'),

lib/index-strict.js

@@ -74,6 +74,7 @@
     "@plotly/d3": "3.8.2",
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
+    "@plotly/mapbox-gl": "1.13.4",
     "@turf/area": "^6.4.0",
     "@turf/bbox": "^6.4.0",
     "@turf/centroid": "^6.0.2",

lib/locales/si.js

@@ -1561,7 +1561,11 @@ function getHoverLabelText(d, showCommonLabel, hovermode, fullLayout, t0, g) {
     if(d.zLabel !== undefined) {
         if(d.xLabel !== undefined) text += 'x: ' + d.xLabel + '<br>';
         if(d.yLabel !== undefined) text += 'y: ' + d.yLabel + '<br>';
-        if(d.trace.type !== 'choropleth' && d.trace.type !== 'choroplethmapnew') {
+        if(
+            d.trace.type !== 'choropleth' &&
+            d.trace.type !== 'choroplethmapbox' &&
+            d.trace.type !== 'choroplethmapnew'
+        ) {
             text += (text ? 'z: ' : '') + d.zLabel;
         }
     } else if(showCommonLabel && d[h0 + 'Label'] === t0) {

package-lock.json

@@ -19,16 +19,16 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
     var dragMode = coerce('dragmode');
     if(dragMode === 'select') coerce('selectdirection');
 
-    // if only mapnew or geo subplots is present on graph,
+    // if only mapbox, mapnew or geo subplots is present on graph,
     // reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
     // so that the correct modebar button is active
-    var hasMapnew = layoutOut._has('mapnew');
+    var hasMap = layoutOut._has('mapbox') || layoutOut._has('mapnew');
     var hasGeo = layoutOut._has('geo');
     var len = layoutOut._basePlotModules.length;
 
     if(layoutOut.dragmode === 'zoom' && (
-        ((hasMapnew || hasGeo) && len === 1) ||
-        (hasMapnew && hasGeo && len === 2)
+        ((hasMap || hasGeo) && len === 1) ||
+        (hasMap && hasGeo && len === 2)
     )) {
         layoutOut.dragmode = 'pan';
     }

package.json

@@ -541,12 +541,14 @@ module.exports = function style(s, gd, legend) {
                     useGradient = true;
                     break;
                 case 'choropleth' :
+                case 'choroplethmapbox' :
                 case 'choroplethmapnew' :
                     ptsData = [
                         ['M-6,-6V6H6V-6Z']
                     ];
                     useGradient = true;
                     break;
+                case 'densitymapbox' :
                 case 'densitymapnew' :
                     ptsData = [
                         ['M-6,0 a6,6 0 1,0 12,0 a 6,6 0 1,0 -12,0']