Merge branch 'master' into indicator-fixes

Author: etpinard

.circleci/test.sh

@@ -45,7 +45,7 @@ case $1 in
         set_tz
 
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
-        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky --showSkipped || EXIT_STATE=$?
+        npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
 
         exit $EXIT_STATE
         ;;
@@ -55,7 +55,7 @@ case $1 in
 
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
-            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --showSkipped
+            retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
         done
 
         exit $EXIT_STATE
@@ -67,7 +67,7 @@ case $1 in
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
         for s in ${SHARDS[@]}; do
-            retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI --showSkipped
+            retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI
         done
 
         exit $EXIT_STATE

dist/topojson/africa_110m.json

@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/traces/choroplethmapbox');

dist/topojson/africa_50m.json

@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/traces/densitymapbox');

dist/topojson/asia_110m.json

@@ -11,7 +11,9 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./scattermapbox')
+    require('./scattermapbox'),
+    require('./choroplethmapbox'),
+    require('./densitymapbox')
 ]);
 
 module.exports = Plotly;

dist/topojson/asia_50m.json

@@ -44,9 +44,14 @@ Plotly.register([
 
     require('./pointcloud'),
     require('./heatmapgl'),
+
     require('./parcoords'),
+
     require('./parcats'),
+
     require('./scattermapbox'),
+    require('./choroplethmapbox'),
+    require('./densitymapbox'),
 
     require('./sankey'),
     require('./indicator'),