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

mapbox-gl@1.0.0 + improvements #3987

Merged
merged 49 commits into from
Jul 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2d4fe9b
bump mapbox-gl to 1.0.0 :tada:
etpinard May 17, 2019
95240e2
:hocho: clean navigation block
etpinard May 17, 2019
e0c684f
add missing .catch(failTest)
etpinard May 17, 2019
889abb6
adapt tests for mapbox-gl@v1
etpinard May 17, 2019
41d167f
adapt find-mapbox-access-token for maps that don't use Mapbox styles
etpinard May 17, 2019
1ee02da
mv DOM-related Lib function to src/lib/dom.js
etpinard May 29, 2019
5b43b8c
add mapbox-gl CSS when registering mapbox basePlotModule
etpinard May 17, 2019
a2d2522
modernize createMapbox API
etpinard May 30, 2019
1987b22
update mapbox baseline (using mapbox-gl@v1)
etpinard Jun 26, 2019
23ffe4f
add mapbox using OSM map raster style mock
etpinard Jun 26, 2019
43c568f
improve Choropleth.calc
etpinard Jun 18, 2019
91e0319
add dflt to choropleth marker.line.color
etpinard Jun 7, 2019
8fc1dbe
add choroplethmapbox attributes
etpinard Jun 4, 2019
70878b7
add `PlotlyGeoAssets` to window during Plotly.register
etpinard Jun 6, 2019
012a749
fetch GeoJSON URLs found in calcdata before updateData()
etpinard Jun 18, 2019
5d27983
introducing choroplethmapbox trace module
etpinard Jun 18, 2019
f7f3190
sort all choroplethmapbox traces below scattermapbox traces
etpinard Jun 18, 2019
4e88075
add GeoJSON feature 'properties' to eventData
etpinard Jun 18, 2019
a166761
improve mapbox hover after drag
etpinard Jun 18, 2019
9a602ba
first cut choroplethmapbox tests
etpinard Jun 18, 2019
a457722
allow numbers as *locations* items when using custom *geojson*
etpinard Jun 18, 2019
1359307
fixup choroplethmapbox hover content post-#3968
etpinard Jun 18, 2019
4d7e0aa
implement *below* in choroplethmapbox traces
etpinard Jun 26, 2019
cb202a8
add :three: choroplethmapbox mocks
etpinard Jun 26, 2019
e509047
mojtaba-proof a few things
etpinard Jun 27, 2019
7dd04e7
fixup choroplethmapbox "below" test
etpinard Jun 27, 2019
654c08e
do not coerce choropleth* marker.line.color
etpinard Jun 27, 2019
22c2a1e
add missing @gl tag to mapbox tests
etpinard Jun 27, 2019
fe6782d
add doNotFailOnEmptyTestSuite CLI option
etpinard Jun 27, 2019
7e15d81
add densitymapbox attributes
etpinard Jun 28, 2019
91a9bc4
implement densitymapbox
etpinard Jun 28, 2019
4f42d1b
add densitymapbox jasmine tests
etpinard Jun 28, 2019
4299857
add :three: densitymapbox mocks
etpinard Jun 28, 2019
1add90e
remove layers from last to first
etpinard Jun 28, 2019
36e3f06
add *open-street-map* `mapbox.style` value
etpinard Jun 28, 2019
ca48461
Merge pull request #3993 from plotly/densitymapbox-pr
etpinard Jun 28, 2019
a765249
raster support
Jun 2, 2019
7dcc506
fix syntax test
Jun 2, 2019
0c99017
do not decode raster source URL
etpinard Jul 2, 2019
153c6b4
add support for `sourcetype: 'image'` layers
etpinard Jul 2, 2019
54efdad
add some layer sourcetype -> type logic
etpinard Jul 2, 2019
0b17b62
add raster/raster and image/raster layers
etpinard Jul 2, 2019
f5bc2e4
bump mapbox-gl to 1.1.0
etpinard Jul 2, 2019
b69cf4b
Merge pull request #4006 from plotly/mapbox-raster-layer
etpinard Jul 2, 2019
6d7929c
Merge branch 'mapbox-v1' into choroplethmapbox-pr
etpinard Jul 3, 2019
eb04b4c
Merge pull request #3988 from plotly/choroplethmapbox-pr
etpinard Jul 3, 2019
a646575
Merge branch 'master' into mapbox-v1
etpinard Jul 3, 2019
8c48aa2
fixup package-lock
etpinard Jul 3, 2019
dfa4ec7
rm unnecessary --showSkipped CLI arg
etpinard Jul 3, 2019
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
6 changes: 3 additions & 3 deletions .circleci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand All @@ -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
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions lib/choroplethmapbox.js
Original file line number Diff line number Diff line change
@@ -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');
11 changes: 11 additions & 0 deletions lib/densitymapbox.js
Original file line number Diff line number Diff line change
@@ -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');
4 changes: 3 additions & 1 deletion lib/index-mapbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
var Plotly = require('./core');

Plotly.register([
require('./scattermapbox')
require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox')
]);

module.exports = Plotly;
5 changes: 5 additions & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,14 @@ Plotly.register([

require('./pointcloud'),
require('./heatmapgl'),

require('./parcoords'),

require('./parcats'),

require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox'),

require('./sankey'),
require('./indicator'),
Expand Down
Loading