Skip to content

Commit e8fdc77

Browse files
archmojarchmoj
authored
Merge pull request #7060 from plotly/add-maplibre-option
Add new traces: `scattermap`, `choroplethmap` and `densitymap` which use `maplibre` to render maps
2 parents 55d8f98 + d704f71 commit e8fdc77

File tree

142 files changed

+85158
-29508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+85158
-29508
lines changed

‎.circleci/config.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ jobs:
231231
command: .circleci/test.sh mathjax-firefox82+
232232

233233
make-baselines-virtual-webgl:
234-
parallelism: 4
234+
parallelism: 8
235235
docker:
236236
- image: circleci/python:3.8.9
237237
working_directory: ~/plotly.js
@@ -268,7 +268,7 @@ jobs:
268268
- plotly.js
269269

270270
make-baselines:
271-
parallelism: 4
271+
parallelism: 12
272272
docker:
273273
- image: circleci/python:3.8.9
274274
working_directory: ~/plotly.js
@@ -287,7 +287,7 @@ jobs:
287287
- plotly.js
288288

289289
make-baselines-b64:
290-
parallelism: 4
290+
parallelism: 12
291291
docker:
292292
- image: circleci/python:3.8.9
293293
working_directory: ~/plotly.js
@@ -486,12 +486,12 @@ jobs:
486486
- run:
487487
name: Test plotly.min.js import using requirejs
488488
command: npm run test-requirejs
489-
- run:
490-
name: Test plotly bundles against es6
491-
command: npm run no-es6-dist
492-
- run:
493-
name: Display function constructors in all bundles
494-
command: npm run no-new-func
489+
# - run:
490+
# name: Test plotly bundles against es6
491+
# command: npm run no-es6-dist
492+
# - run:
493+
# name: Display function constructors in all bundles
494+
# command: npm run no-new-func
495495

496496
test-stackgl-bundle:
497497
docker:

‎.circleci/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ case $1 in
9595
make-baselines-virtual-webgl)
9696
SUITE=$({\
9797
find $ROOT/test/image/mocks/gl* -type f -printf "%f\n"; \
98-
find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
98+
find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
9999
} | sed 's/\.json$//1' | circleci tests split)
100100
python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
101101
exit $EXIT_STATE

‎lib/choroplethmap.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = require('../src/traces/choroplethmap');

‎lib/densitymap.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = require('../src/traces/densitymap');

‎lib/index-map.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
'use strict';
2+
3+
var Plotly = require('./core');
4+
5+
Plotly.register([
6+
// traces
7+
require('./scattermap'),
8+
require('./choroplethmap'),
9+
require('./densitymap'),
10+
11+
// transforms
12+
require('./aggregate'),
13+
require('./filter'),
14+
require('./groupby'),
15+
require('./sort'),
16+
17+
// components
18+
require('./calendars'),
19+
]);
20+
21+
module.exports = Plotly;

‎lib/index-strict.js

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Plotly.register([
3939
require('./scattermapbox'),
4040
require('./choroplethmapbox'),
4141
require('./densitymapbox'),
42+
require('./scattermap'),
43+
require('./choroplethmap'),
44+
require('./densitymap'),
4245
require('./sankey'),
4346
require('./indicator'),
4447
require('./table'),

‎lib/index.js

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ Plotly.register([
3939
require('./scattermapbox'),
4040
require('./choroplethmapbox'),
4141
require('./densitymapbox'),
42+
require('./scattermap'),
43+
require('./choroplethmap'),
44+
require('./densitymap'),
4245
require('./sankey'),
4346
require('./indicator'),
4447
require('./table'),

‎lib/scattermap.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = require('../src/traces/scattermap');

0 commit comments

Comments
 (0)