From d202202b91443711dd8bcf5ac1feebaebe68ba29 Mon Sep 17 00:00:00 2001
From: dmt0 <dmitry@plot.ly>
Date: Mon, 27 Aug 2018 18:57:10 -0400
Subject: [PATCH] mapbox layout + fixes

---
 src/components/fields/LocationSelector.js |  7 +++++--
 src/components/fields/derived.js          |  2 +-
 src/default_panels/GraphSubplotsPanel.js  | 23 +++++++++++++++++++++++
 src/default_panels/StyleTracesPanel.js    |  4 ++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/fields/LocationSelector.js b/src/components/fields/LocationSelector.js
index aad9a2caf..c4fcbb8dd 100644
--- a/src/components/fields/LocationSelector.js
+++ b/src/components/fields/LocationSelector.js
@@ -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
@@ -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>
     );
   }
 }
diff --git a/src/components/fields/derived.js b/src/components/fields/derived.js
index baeb5ae1e..9424f8ed3 100644
--- a/src/components/fields/derived.js
+++ b/src/components/fields/derived.js
@@ -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'},
diff --git a/src/default_panels/GraphSubplotsPanel.js b/src/default_panels/GraphSubplotsPanel.js
index 75263f951..6a6987a4c 100644
--- a/src/default_panels/GraphSubplotsPanel.js
+++ b/src/default_panels/GraphSubplotsPanel.js
@@ -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')}
diff --git a/src/default_panels/StyleTracesPanel.js b/src/default_panels/StyleTracesPanel.js
index 981351f65..5c1be56a7 100644
--- a/src/default_panels/StyleTracesPanel.js
+++ b/src/default_panels/StyleTracesPanel.js
@@ -272,6 +272,9 @@ const StyleTracesPanel = (props, {localize: _}) => (
         'scatter3d',
         'scattergl',
         'scattergeo',
+        'scattermapbox',
+        'box',
+        'violin',
       ]}
     >
       <Numeric label={_('Width')} attr="line.width" />
@@ -310,6 +313,7 @@ const StyleTracesPanel = (props, {localize: _}) => (
         'scatterternary',
         'bar',
         'scattergeo',
+        'scattermapbox',
       ]}
     >
       <DataSelector label={_('Text')} attr="text" />