Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 155 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
d59264f
Install maplibre
birkskyum Jun 5, 2024
54408b2
migrate to maplibre
birkskyum Jun 5, 2024
e30f3b0
remove index file
birkskyum Jun 5, 2024
a8a5416
use prod build
birkskyum Jun 5, 2024
7e15adf
remove the mapbox token
birkskyum Jun 5, 2024
720f1d8
remove mapbox token
birkskyum Jun 5, 2024
0dd739d
lint
birkskyum Jun 5, 2024
32deaba
update expected schema
birkskyum Jun 5, 2024
d509764
remove maplibre logo addition
birkskyum Jun 5, 2024
5ebf050
lint
birkskyum Jun 5, 2024
998e548
fix maplibre style var naming
birkskyum Jun 5, 2024
e6408a1
lint
birkskyum Jun 5, 2024
0f323f2
lint
birkskyum Jun 5, 2024
a136a89
fix the built in style glyphs
birkskyum Jun 5, 2024
cb59be1
maplibre doesn't need credentials
birkskyum Jun 5, 2024
5229cd5
Revert "fix the built in style glyphs"
birkskyum Jun 5, 2024
15ae076
fix extrabold fonts
birkskyum Jun 5, 2024
941952f
add missing closing braces
birkskyum Jun 6, 2024
03c64e3
lint
birkskyum Jun 6, 2024
688d210
changelog
birkskyum Jun 6, 2024
e07d60a
add maplibre-gl to webpack config
birkskyum Jun 6, 2024
a789a26
reduce the diff to a minimum - keep mapbox naming in traces
birkskyum Jun 6, 2024
e239623
ci
birkskyum Jun 6, 2024
54fc455
reduce diff
birkskyum Jun 6, 2024
87c89e5
reduce diff
birkskyum Jun 6, 2024
84758fa
reduce diff
birkskyum Jun 6, 2024
77ddb35
reduce diff
birkskyum Jun 6, 2024
8042130
typo
birkskyum Jun 6, 2024
153169b
use change file instead of changelog
birkskyum Jun 6, 2024
5bf848b
reduce diff
birkskyum Jun 6, 2024
23aba28
reduce diff
birkskyum Jun 6, 2024
d46c5c5
reduce diff
birkskyum Jun 6, 2024
24b95c1
trim lines
birkskyum Jun 6, 2024
2a04b4f
reduce diff
birkskyum Jun 6, 2024
2c4c949
revert mocks
birkskyum Jun 6, 2024
6d04f0b
remove open sans extrabold font fix from this pr
birkskyum Jun 6, 2024
01b54da
Merge branch 'master' into maplibre
birkskyum Jun 6, 2024
ad1cd31
remove maplibre fox webpack
birkskyum Jun 6, 2024
68dd920
fix open sans extrabold
birkskyum Jun 6, 2024
9982cf9
add to blacklist
birkskyum Jun 6, 2024
805270c
fix open sans font
birkskyum Jun 6, 2024
fe51207
Noto Sans Regular
birkskyum Jun 6, 2024
5c57f0d
remove console.log
birkskyum Jun 6, 2024
b645866
fix layout check race condition
birkskyum Jun 6, 2024
7cd4e85
remove blacklists
birkskyum Jun 6, 2024
9ecc9ad
add back blacklist
birkskyum Jun 6, 2024
3386006
adjust blacklist
birkskyum Jun 6, 2024
923375a
make lint-fix pass no-es6 check
birkskyum Jun 6, 2024
7cd3177
update baselines
birkskyum Jun 6, 2024
c2663ed
revert mocks
birkskyum Jun 6, 2024
95e4206
define mapbox style keywords
birkskyum Jun 6, 2024
099ee56
use vector styles
birkskyum Jun 6, 2024
962774e
add styles
birkskyum Jun 7, 2024
2f5aa98
add nolabels and voyager style
birkskyum Jun 7, 2024
014e063
sat
birkskyum Jun 7, 2024
2b5bf15
fixed the extrabold issue in mapbox_fonts-supported-open-sans-weight …
birkskyum Jun 7, 2024
9cd8406
add extra styles
birkskyum Jun 7, 2024
b2873b5
update plot-schema
birkskyum Jun 7, 2024
3a3ee24
lint
birkskyum Jun 7, 2024
bbcfe39
bais
birkskyum Jun 7, 2024
6ca6748
blacklist custom style
birkskyum Jun 7, 2024
f05189f
blacklist gl2d_heatmapgl
birkskyum Jun 7, 2024
36fe51d
add error desc to gl2d
birkskyum Jun 7, 2024
1ebdb38
remove api keys from stamen
birkskyum Jun 7, 2024
0e3ac61
cleanup style loading
birkskyum Jun 7, 2024
a3c5f40
cleanup getStyle
birkskyum Jun 7, 2024
408d362
blacklist gl2d_heatmapgl_discrete , memory issue
birkskyum Jun 7, 2024
af5745b
update baselines
birkskyum Jun 7, 2024
ad43fff
use voyager for streets
birkskyum Jun 7, 2024
d33c8ea
have labels by default
birkskyum Jun 7, 2024
1a12460
nolabels
birkskyum Jun 7, 2024
cd2ac06
adjust defualt
birkskyum Jun 7, 2024
1a79b82
update baseline
birkskyum Jun 7, 2024
a845821
remove mapbox from blacklist
birkskyum Jun 7, 2024
72cef73
use sat
birkskyum Jun 7, 2024
0bfbfcd
blacklist stamen
birkskyum Jun 7, 2024
7ce0a68
fix attribution tests
birkskyum Jun 7, 2024
986dd55
update custom style
birkskyum Jun 7, 2024
2eacc32
osm style
birkskyum Jun 7, 2024
d5411fa
add gl2d to blacklist
birkskyum Jun 7, 2024
7a2c98f
remove
birkskyum Jun 7, 2024
8839f4c
add
birkskyum Jun 7, 2024
48fb8d6
remove special cases found in compare_pixels_test.js
birkskyum Jun 7, 2024
8da4c5d
update baselines
birkskyum Jun 7, 2024
c6c2ef7
remove filter of mock
birkskyum Jun 7, 2024
ff3b9ee
remove skipping blacklist
birkskyum Jun 7, 2024
53478d9
lint
birkskyum Jun 7, 2024
f74cb08
increase parallelism for baseline creation
archmoj Jun 7, 2024
fd50eb5
small baselines updates related to change of order of rendering
archmoj Jun 7, 2024
6540ade
revisit blacklist in compare_pixels_test.js
archmoj Jun 7, 2024
97f8898
Use url in style
birkskyum Jun 10, 2024
84cf02e
nolabel
birkskyum Jun 10, 2024
4125395
Bump to maplibre-gl 4.4.0 and use unminified prod build
birkskyum Jun 14, 2024
1b62417
Merge remote-tracking branch 'origin/master' into maplibre
birkskyum Jun 18, 2024
fd53631
disable tests
birkskyum Jun 18, 2024
17f4324
fix choropleth jasmine test
birkskyum Jul 2, 2024
d35eb4c
fix densitymapbox jasmine test
birkskyum Jul 2, 2024
5733a95
fix some mapbox jasmine tests
birkskyum Jul 2, 2024
fcfb09b
fix mapbox scroolZoom test
birkskyum Jul 2, 2024
310fdef
maplibre is more strict, protecting against invalid sources and layers
birkskyum Jul 2, 2024
3cf4f9d
disable test due to incorrect mock
birkskyum Jul 2, 2024
258998a
update expectations due to Carto style
birkskyum Jul 2, 2024
2e5f8f9
rehover mapbox test
birkskyum Jul 2, 2024
510fa26
lint
birkskyum Jul 3, 2024
dd4cb63
show errors in ci
birkskyum Jul 3, 2024
8a7b84c
fix layer indexes
birkskyum Jul 3, 2024
d718685
remove fit
birkskyum Jul 3, 2024
a408f14
lint
birkskyum Jul 3, 2024
961c747
remove comment
birkskyum Jul 3, 2024
db36596
fix 'should be able to add, update and remove layers'
birkskyum Jul 3, 2024
871c2d3
don't fit
birkskyum Jul 3, 2024
9a36cf6
lint
birkskyum Jul 3, 2024
1308cbe
add clean function to mapbox plot
birkskyum Jul 3, 2024
0116b21
add addition to scrollZoom test
birkskyum Jul 3, 2024
070941e
remove fit()
birkskyum Jul 3, 2024
f5e471c
Drop test_image from noci task
birkskyum Jul 8, 2024
240a392
Drop test_image from noci task
birkskyum Jul 8, 2024
d09cdd4
Merge remote-tracking branch 'origin/master' into add-maplibre-option
archmoj Jul 18, 2024
ee406f7
update baselines
archmoj Jul 18, 2024
4710fba
find and replace mapbox with mapnew
archmoj Jul 18, 2024
f2c361d
rename file names
archmoj Jul 18, 2024
4c2196a
rename mocks and baselines
archmoj Jul 18, 2024
522fd13
rename jasmine tests
archmoj Jul 19, 2024
649122e
baselines without mapbox in their name & title
archmoj Jul 19, 2024
4770657
bring back mapbox files
archmoj Jul 19, 2024
e173ca8
bring back mapbox mocks and baselines
archmoj Jul 19, 2024
047ed33
bring back mapbox tests
archmoj Jul 19, 2024
0efeb15
bring back mapbox in various places
archmoj Jul 19, 2024
9a2db69
revise blacklist
archmoj Jul 19, 2024
779ee24
adjust parallelism for baselines
archmoj Jul 19, 2024
6d86a42
update baselines with new order on CI
archmoj Jul 19, 2024
827b9a6
adjust jasmine tests
archmoj Jul 19, 2024
5f0e9e7
bump maplibre-gl v4.5.0
archmoj Jul 22, 2024
a1ea0bc
find & replace mapnew > map
archmoj Jul 22, 2024
760ecd3
rename files mapnew > map
archmoj Jul 22, 2024
b261c19
map* tests also includes mapbox now
archmoj Jul 22, 2024
4101e40
adjust duplicate map variables in map_test
archmoj Jul 22, 2024
f3998ac
adjust map_test to run locally
archmoj Jul 22, 2024
e0dfa44
update schema
archmoj Jul 22, 2024
929be3f
add flaky for some map baselines
archmoj Jul 22, 2024
6b56217
load maki icon
birkskyum Jul 26, 2024
7e743c5
requestedIcons
birkskyum Jul 26, 2024
2fb79ac
lint
birkskyum Jul 26, 2024
d7f467e
update baselines maki icons
birkskyum Jul 26, 2024
fb0f1cc
add map_angles to isOtherFlaky
birkskyum Jul 26, 2024
096b347
Merge pull request #7068 from birkskyum/load-maki-icons
archmoj Jul 26, 2024
5fc241b
separate hasMapbox and hasMap
archmoj Jul 29, 2024
c8f5702
refactor compare_pixels_test
archmoj Jul 29, 2024
1dd8c0e
test map not mapbox in new modebar_test
archmoj Jul 30, 2024
5e3d3fe
use url for custom style for map
archmoj Jul 30, 2024
6a46b43
show labels for light and dark styles similar to mapbox
archmoj Jul 31, 2024
530064c
update map_angles.png
archmoj Aug 7, 2024
abe9389
map_angles is more flaky
archmoj Aug 7, 2024
6794fbd
update map_angles.png
archmoj Aug 7, 2024
d704f71
no need for requiredVersion in src/plots/map/constants.js
archmoj Aug 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
- plotly.js

make-baselines:
parallelism: 4
parallelism: 12
docker:
- image: circleci/python:3.8.9
working_directory: ~/plotly.js
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions lib/choroplethmap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';

module.exports = require('../src/traces/choroplethmap');
3 changes: 3 additions & 0 deletions lib/densitymap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';

module.exports = require('../src/traces/densitymap');
21 changes: 21 additions & 0 deletions lib/index-map.js
Original file line number Diff line number Diff line change
@@ -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;
3 changes: 3 additions & 0 deletions lib/index-strict.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Plotly.register([
require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox'),
require('./scattermap'),
require('./choroplethmap'),
require('./densitymap'),
require('./sankey'),
require('./indicator'),
require('./table'),
Expand Down
3 changes: 3 additions & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Plotly.register([
require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox'),
require('./scattermap'),
require('./choroplethmap'),
require('./densitymap'),
require('./sankey'),
require('./indicator'),
require('./table'),
Expand Down
3 changes: 3 additions & 0 deletions lib/scattermap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict';

module.exports = require('../src/traces/scattermap');
Loading