Skip to content

Add bounds to mapbox subplot #6339

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

Merged
merged 5 commits into from
Oct 13, 2022
Merged
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
1 change: 1 addition & 0 deletions draftlogs/6339_add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Add bounds to mapbox suplots [[6339](https://github.com/plotly/plotly.js/pull/6339)]
31 changes: 31 additions & 0 deletions src/plots/mapbox/layout_attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,37 @@ var attrs = module.exports = overrideAll({
].join(' ')
},

bounds: {
west: {
valType: 'number',
description: [
'Sets the minimum longitude of the map (in degrees East)',
'if `east`, `south` and `north` are declared.'
].join(' ')
},
east: {
valType: 'number',
description: [
'Sets the maximum longitude of the map (in degrees East)',
'if `west`, `south` and `north` are declared.'
].join(' ')
},
south: {
valType: 'number',
description: [
'Sets the minimum latitude of the map (in degrees North)',
'if `east`, `west` and `north` are declared.'
].join(' ')
},
north: {
valType: 'number',
description: [
'Sets the maximum latitude of the map (in degrees North)',
'if `east`, `west` and `south` are declared.'
].join(' ')
}
},

layers: templatedArray('layer', {
visible: {
valType: 'boolean',
Expand Down
13 changes: 13 additions & 0 deletions src/plots/mapbox/layout_defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ function handleDefaults(containerIn, containerOut, coerce, opts) {
coerce('bearing');
coerce('pitch');

var west = coerce('bounds.west');
var east = coerce('bounds.east');
var south = coerce('bounds.south');
var north = coerce('bounds.north');
if(
west === undefined ||
east === undefined ||
south === undefined ||
north === undefined
) {
delete containerOut.bounds;
}

handleArrayContainerDefaults(containerIn, containerOut, {
name: 'layers',
handleItemDefaults: handleLayerDefaults
Expand Down
4 changes: 4 additions & 0 deletions src/plots/mapbox/mapbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
// store access token associated with this map
self.accessToken = opts.accesstoken;

var bounds = opts.bounds;
var maxBounds = bounds ? [[bounds.west, bounds.south], [bounds.east, bounds.north]] : null;

// create the map!
var map = self.map = new mapboxgl.Map({
container: self.div,
Expand All @@ -100,6 +103,7 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
zoom: opts.zoom,
bearing: opts.bearing,
pitch: opts.pitch,
maxBounds: maxBounds,

interactive: !self.isStatic,
preserveDrawingBuffer: self.isStatic,
Expand Down
Binary file modified test/image/baselines/mapbox_bubbles-text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions test/image/mocks/mapbox_bubbles-text.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
],
"layout": {
"mapbox": {
"bounds": {
"west": -60,
"east": 60,
"south": -30,
"north": 30
},
"style": "light",
"zoom": 2.5,
"center": {
Expand Down
3 changes: 3 additions & 0 deletions test/jasmine/tests/select_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1862,6 +1862,9 @@ describe('Test select box and lasso per trace:', function() {
fig.data[0].lat.push(null);

fig.layout.dragmode = 'select';

delete fig.layout.mapbox.bounds;

fig.config = {
mapboxAccessToken: require('@build/credentials.json').MAPBOX_ACCESS_TOKEN
};
Expand Down
24 changes: 24 additions & 0 deletions test/plot-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3006,6 +3006,30 @@
"editType": "plot",
"valType": "number"
},
"bounds": {
"east": {
"description": "Sets the maximum longitude of the map (in degrees East) if `west`, `south` and `north` are declared.",
"editType": "plot",
"valType": "number"
},
"editType": "plot",
"north": {
"description": "Sets the maximum latitude of the map (in degrees North) if `east`, `west` and `south` are declared.",
"editType": "plot",
"valType": "number"
},
"role": "object",
"south": {
"description": "Sets the minimum latitude of the map (in degrees North) if `east`, `west` and `north` are declared.",
"editType": "plot",
"valType": "number"
},
"west": {
"description": "Sets the minimum longitude of the map (in degrees East) if `east`, `south` and `north` are declared.",
"editType": "plot",
"valType": "number"
}
},
"center": {
"editType": "plot",
"lat": {
Expand Down