Skip to content

mapbox layout + fixes #714

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.

Sign up for GitHub

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 1 commit into from
Aug 28, 2018
Merged

mapbox layout + fixes #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/components/fields/LocationSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class UnconnectedLocationSelector extends Component {
container: {type: type},
} = this.context;

return type === 'scattergeo' || type === 'scattermapbox' ? (
return type === 'scattergeo' ? (
<Fragment>
<Field {...this.props} attr={this.props.attr}>
<Radio
Expand All @@ -116,7 +116,10 @@ class UnconnectedLocationSelector extends Component {
) : type === 'choropleth' ? (
<Location attr="type" />
) : (
''
<Fragment>
<DataSelector label={_('Latitude')} attr="lat" />
<DataSelector label={_('Longitude')} attr="lon" />
</Fragment>
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/derived.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ export const HoverInfo = connectToContainer(UnconnectedFlaglist, {
options = [{label: _('Longitude'), value: 'lon'}, {label: _('Latitude'), value: 'lat'}];
}
} else if (container.type === 'scattermapbox') {
options = [{label: _('Longitude'), value: 'loc'}, {label: _('Latitude'), value: 'lat'}];
options = [{label: _('Longitude'), value: 'lon'}, {label: _('Latitude'), value: 'lat'}];
} else if (container.type === 'scatterternary') {
options = [
{label: _('A'), value: 'a'},
Expand Down
23 changes: 23 additions & 0 deletions src/default_panels/GraphSubplotsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,29 @@ const GraphSubplotsPanel = (props, {localize: _}) => (
<ColorPicker label={_('Plot Background')} attr="bgcolor" />
</PlotlySection>

<PlotlySection name={_('Map Style')}>
<Dropdown
label={_('Mapbox Style')}
attr="style"
options={[
{label: _('Basic'), value: 'basic'},
{label: _('Outdoors'), value: 'outdoors'},
{label: _('Light'), value: 'light'},
{label: _('Dark'), value: 'dark'},
{label: _('Satellite'), value: 'satellite'},
{label: _('Satellite with Streets'), value: 'satellite-streets'},
]}
clearable={false}
/>
</PlotlySection>
<PlotlySection name={_('Map Positioning')}>
<Numeric label={_('Center Latitude')} attr="center.lat" />
<Numeric label={_('Center Longitude')} attr="center.lon" />
<Numeric label={_('Zoom Level')} attr="zoom" min={0} />
<Numeric label={_('Bearing')} attr="bearing" />
<Numeric label={_('Pitch')} attr="pitch" min={0} />
</PlotlySection>

<PlotlySection name={_('Map Projection')}>
<Dropdown
label={_('Region')}
Expand Down
4 changes: 4 additions & 0 deletions src/default_panels/StyleTracesPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,9 @@ const StyleTracesPanel = (props, {localize: _}) => (
'scatter3d',
'scattergl',
'scattergeo',
'scattermapbox',
'box',
'violin',
]}
>
<Numeric label={_('Width')} attr="line.width" />
Expand Down Expand Up @@ -310,6 +313,7 @@ const StyleTracesPanel = (props, {localize: _}) => (
'scatterternary',
'bar',
'scattergeo',
'scattermapbox',
]}
>
<DataSelector label={_('Text')} attr="text" />
Expand Down