Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ jobs:
- name: Run noCI tests
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1
with:
run: ./tasks/noci_test.sh jasmine
run: npm run test-jasmine -- --tags=noCI,noCIdep --nowatch

# ============================================================
# Image baseline generation and comparison
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ Other methods used by some trace modules:
selections.
- `_module.convert`: Sometimes separated from `_module.plot` or `_module.calc` to convert the
plotly.js settings to another framework e.g. to `gl-plot3d` for `gl3d` traces, to
`mapbox-gl` for `mapbox` traces. This split can make the logic easier to test.
`maplibre-gl` for `map` traces. This split can make the logic easier to test.
If you make a `convert`, you should call it from either `calc` or `plot`.

## Coding style
Expand Down
4 changes: 0 additions & 4 deletions devtools/test_dashboard/devtools.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

var Fuse = require('fuse.js/dist/fuse.common.js');
var mocks = require('../../build/test_dashboard_mocks.json');
var credentials = require('../../build/credentials.json');
var Lib = require('../../src/lib');

require('./perf');
Expand All @@ -18,9 +17,6 @@ var Tabs = {

// use local topojson files
topojsonURL: "../../topojson/dist",
// register mapbox access token
// run `npm run preset` if you haven't yet
mapboxAccessToken: credentials.MAPBOX_ACCESS_TOKEN,

// show all logs in console
logging: 2
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7860_remove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Remove `scattermapbox`, `choroplethmapbox`, `densitymapbox` trace types, the `mapbox` subplot, and the `mapboxAccessToken` config option [[#7860](https://github.com/plotly/plotly.js/pull/7860)]
3 changes: 0 additions & 3 deletions lib/choroplethmapbox.js

This file was deleted.

3 changes: 0 additions & 3 deletions lib/densitymapbox.js

This file was deleted.

15 changes: 0 additions & 15 deletions lib/index-mapbox.js

This file was deleted.

3 changes: 0 additions & 3 deletions lib/index-strict.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ Plotly.register([
require('../src/traces/splom/strict'),
require('../src/traces/parcoords/strict'),
require('./parcats'),
require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox'),
require('./scattermap'),
require('./choroplethmap'),
require('./densitymap'),
Expand Down
1 change: 0 additions & 1 deletion lib/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export type {
AxisName,
ButtonClickEvent,
Icon,
Mapbox,
ModeBarButton,
ModeBarButtonAny,
ModeBarDefaultButtons,
Expand Down
3 changes: 0 additions & 3 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ Plotly.register([
require('./splom'),
require('./parcoords'),
require('./parcats'),
require('./scattermapbox'),
require('./choroplethmapbox'),
require('./densitymapbox'),
require('./scattermap'),
require('./choroplethmap'),
require('./densitymap'),
Expand Down
4 changes: 2 additions & 2 deletions lib/locales/si.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions lib/scattermapbox.js

This file was deleted.

128 changes: 0 additions & 128 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"strict": "node devtools/test_dashboard/server.mjs --strict",
"start": "node devtools/test_dashboard/server.mjs",
"baseline": "node test/image/make_baseline.mjs",
"noci-baseline": "npm run cibuild && ./tasks/noci_test.sh image && git checkout dist && echo 'Please do not commit unless the change was expected!'",
"preversion": "check-node-version --node 18 --npm 10 && npm-link-check && npm ls --prod --all",
"version": "npm run build && git add -A lib dist build src/version.js",
"postversion": "node -e \"console.log('Version bumped and committed. If ok, run: git push && git push --tags')\"",
Expand All @@ -74,7 +73,6 @@
"@plotly/d3": "3.8.2",
"@plotly/d3-sankey": "0.7.2",
"@plotly/d3-sankey-circular": "0.33.1",
"@plotly/mapbox-gl": "1.13.4",
"@plotly/regl": "^2.1.2",
"@turf/area": "^7.1.0",
"@turf/bbox": "^7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/fx/hover.js
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ function getHoverLabelText(d, showCommonLabel, hovermode, fullLayout, t0, g) {
if (d.zLabel !== undefined) {
if (d.xLabel !== undefined) text += 'x: ' + d.xLabel + '<br>';
if (d.yLabel !== undefined) text += 'y: ' + d.yLabel + '<br>';
if (d.trace.type !== 'choropleth' && d.trace.type !== 'choroplethmapbox' && d.trace.type !== 'choroplethmap') {
if (d.trace.type !== 'choropleth' && d.trace.type !== 'choroplethmap') {
text += (text ? 'z: ' : '') + d.zLabel;
}
} else if (showCommonLabel && d[h0 + 'Label'] === t0) {
Expand Down
7 changes: 3 additions & 4 deletions src/components/fx/layout_defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,16 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut) {
var dragMode = coerce('dragmode');
if(dragMode === 'select') coerce('selectdirection');

// if only mapbox, map or geo subplots is present on graph,
// if only map or geo subplots is present on graph,
// reset 'zoom' dragmode to 'pan' until 'zoom' is implemented,
// so that the correct modebar button is active
var hasMapbox = layoutOut._has('mapbox');
var hasMap = layoutOut._has('map');
var hasGeo = layoutOut._has('geo');
var len = layoutOut._basePlotModules.length;

if(layoutOut.dragmode === 'zoom' && (
((hasMapbox || hasMap || hasGeo) && len === 1) ||
((hasMapbox || hasMap) && hasGeo && len === 2)
((hasMap || hasGeo) && len === 1) ||
(hasMap && hasGeo && len === 2)
)) {
layoutOut.dragmode = 'pan';
}
Expand Down
4 changes: 1 addition & 3 deletions src/components/legend/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ module.exports = function style(s, gd, legend) {
// the map itself, which usually doesn't correspond to a valid
// Plotly symbol. Always draw a circle so the swatch is consistent
// across symbols rather than silently mismatched.
var isScattermapTrace = trace.type === 'scattermap' || trace.type === 'scattermapbox';
var isScattermapTrace = trace.type === 'scattermap';
dEdit.mx = isScattermapTrace ? 'circle' : boundVal('marker.symbol', pickFirst);
dEdit.mo = boundVal('marker.opacity', Lib.mean, [0.2, 1]);
dEdit.mlc = boundVal('marker.line.color', pickFirst);
Expand Down Expand Up @@ -574,12 +574,10 @@ module.exports = function style(s, gd, legend) {
useGradient = true;
break;
case 'choropleth':
case 'choroplethmapbox':
case 'choroplethmap':
ptsData = [['M-6,-6V6H6V-6Z']];
useGradient = true;
break;
case 'densitymapbox':
case 'densitymap':
ptsData = [['M-6,0 a6,6 0 1,0 12,0 a 6,6 0 1,0 -12,0']];
useGradient = 'radial';
Expand Down
Loading
Loading