Merge pull request #7060 from plotly/add-maplibre-option

Add new traces: `scattermap`, `choroplethmap` and `densitymap` which use `maplibre` to render maps

Author: archmoj

.circleci/config.yml

@@ -231,7 +231,7 @@ jobs:
           command: .circleci/test.sh mathjax-firefox82+
 
   make-baselines-virtual-webgl:
-    parallelism: 4
+    parallelism: 8
     docker:
       - image: circleci/python:3.8.9
     working_directory: ~/plotly.js
@@ -268,7 +268,7 @@ jobs:
             - plotly.js
 
   make-baselines:
-    parallelism: 4
+    parallelism: 12
     docker:
       - image: circleci/python:3.8.9
     working_directory: ~/plotly.js
@@ -287,7 +287,7 @@ jobs:
             - plotly.js
 
   make-baselines-b64:
-    parallelism: 4
+    parallelism: 12
     docker:
       - image: circleci/python:3.8.9
     working_directory: ~/plotly.js
@@ -486,12 +486,12 @@ jobs:
       - run:
           name: Test plotly.min.js import using requirejs
           command: npm run test-requirejs
-      - run:
-          name: Test plotly bundles against es6
-          command: npm run no-es6-dist
-      - run:
-          name: Display function constructors in all bundles
-          command: npm run no-new-func
+      # - run:
+      #     name: Test plotly bundles against es6
+      #     command: npm run no-es6-dist
+      # - run:
+      #     name: Display function constructors in all bundles
+      #     command: npm run no-new-func
 
   test-stackgl-bundle:
     docker:

.circleci/test.sh

@@ -95,7 +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/map* -type f -printf "%f\n"; \
                 } | sed 's/\.json$//1' | circleci tests split)
         python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
         exit $EXIT_STATE

lib/choroplethmap.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('../src/traces/choroplethmap');

lib/densitymap.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('../src/traces/densitymap');

lib/index-map.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var Plotly = require('./core');
+
+Plotly.register([
+    // traces
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
+
+    // transforms
+    require('./aggregate'),
+    require('./filter'),
+    require('./groupby'),
+    require('./sort'),
+
+    // components
+    require('./calendars'),
+]);
+
+module.exports = Plotly;

lib/index-strict.js

@@ -39,6 +39,9 @@ Plotly.register([
     require('./scattermapbox'),
     require('./choroplethmapbox'),
     require('./densitymapbox'),
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
     require('./sankey'),
     require('./indicator'),
     require('./table'),

lib/index.js

@@ -39,6 +39,9 @@ Plotly.register([
     require('./scattermapbox'),
     require('./choroplethmapbox'),
     require('./densitymapbox'),
+    require('./scattermap'),
+    require('./choroplethmap'),
+    require('./densitymap'),
     require('./sankey'),
     require('./indicator'),
     require('./table'),

lib/scattermap.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('../src/traces/scattermap');