final tweaks

Author: nicolaskruchten

python/filled-area-on-mapbox.md

@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.1'
-      jupytext_version: 1.2.1
+      jupytext_version: 1.1.1
   kernelspec:
     display_name: Python 3
     language: python
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.7.3
+    version: 3.6.8
   plotly:
     description: How to make an area on Map in Python with Plotly.
     display_as: maps
@@ -36,18 +36,20 @@ jupyter:
     title: Python Mapbox Choropleth Maps | plotly
 ---
 
+<!-- #region -->
 
 ### Mapbox Access Token
 
 To plot on Mapbox maps with Plotly you *may* need a Mapbox account and a public [Mapbox Access Token](https://www.mapbox.com/studio). See our [Mapbox Map Layers](/python/mapbox-layers/) documentation for more information.
 
 
-### How to Show an Area on a Map 
+There are three different ways to show a filled area in a Mapbox map: 
+1. Use a [Scattermapbox](https://plot.ly/python/reference/#scattermapbox) trace and set `fill` attribute to 'toself' 
+2. Use a Mapbox layout (i.e. by minimally using an empty [Scattermapbox](https://plot.ly/python/reference/#scattermapbox) trace) and add a GeoJSON layer
+3. Use the [Choroplethmapbox](https://plot.ly/python/mapbox-county-choropleth/) trace type
+<!-- #endregion -->
 
-There are three different ways to show an area in a mapbox: 
-- Use [Scattermapbox](https://plot.ly/python/reference/#scattermapbox) trace and set `fill` attribute to 'toself' 
-- Use [Scattermapbox](https://plot.ly/python/reference/#scattermapbox) trace and define the corresponding geojson
-- Use the new trace type: [Choroplethmapbox](https://plot.ly/python/mapbox-county-choropleth/) for mapbox cases, or [Choropleth](https://plot.ly/python/choropleth-maps/) trace for non-mapbox ones.
+### Filled `Scattermapbox` Trace
 
 The following example uses `Scattermapbox` and sets `fill = 'toself'` 
 
@@ -69,16 +71,17 @@ fig.update_layout(
 fig.show()
 ```
 
-### Provide Gaps on Map
+### Multiple Filled Areas with a `Scattermapbox` trace
 
-The following example shows how to use missing values in your data to provide gap in your graph. To ignore the gap on your plot, take benefit of [connectorgaps](https://plot.ly/python/reference/#scattermapbox-connectgaps) attribute.
+The following example shows how to use `None` in your data to draw multiple filled areas. Such gaps in trace data are unconnected by default, but this can be controlled via the [connectgaps](https://plot.ly/python/reference/#scattermapbox-connectgaps) attribute.
 
 ```python
 import plotly.graph_objects as go
 
 fig = go.Figure(go.Scattermapbox(
     mode = "lines", fill = "toself",
-    lon = [-10, -10, 8, 8, None, 30, 30, 50, 50, None, 100, 100, 80, 80], lat = [30, 6, 6, 30, None, 20, 30, 30, 20, None, 40, 50, 50, 40]))
+    lon = [-10, -10, 8, 8, -10, None, 30, 30, 50, 50, 30, None, 100, 100, 80, 80, 100], 
+    lat = [30, 6, 6, 30, 30,    None, 20, 30, 30, 20, 20, None, 40, 50, 50, 40, 40]))
 
 fig.update_layout(
     mapbox = {'style': "stamen-terrain", 'center': {'lon': 30, 'lat': 30}, 'zoom': 2},
@@ -88,9 +91,9 @@ fig.update_layout(
 fig.show()
 ```
 
-### Use the Corresponding Geojson
+### GeoJSON Layers
 
-The second way is using Scattermapbox trace with the corresponding geojson.
+In this map we add a GeoJSON layer.
 
 ```python
 import plotly.graph_objects as go

python/lines-on-mapbox.md

@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.1'
-      jupytext_version: 1.2.1
+      jupytext_version: 1.1.1
   kernelspec:
     display_name: Python 3
     language: python
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.7.3
+    version: 3.6.8
   plotly:
     description: How to draw a line on Map in Python with Plotly.
     display_as: maps
@@ -40,39 +40,30 @@ jupyter:
 
 To plot on Mapbox maps with Plotly you *may* need a Mapbox account and a public [Mapbox Access Token](https://www.mapbox.com/studio). See our [Mapbox Map Layers](/python/mapbox-layers/) documentation for more information.
 
-### How to draw a Line on a Map 
+To draw a line on your map, you either can use [`px.line_mapbox()`](https://www.plotly.express/plotly_express/#plotly_express.line_mapbox) in plotly express, or [`Scattermapbox`](https://plot.ly/python/reference/#scattermapbox) traces. Below we show you how to draw a line on Mapbox using plotly express.
 
-To draw a line on your map, you either can use [line_mapbox](https://www.plotly.express/plotly_express/#plotly_express.line_mapbox) in plotly express, or [Scattermapbox](https://plot.ly/python/reference/#scattermapbox) and [scattergeo](https://plot.ly/python/reference/#scattergeo) trace type in plotly. Below we show you how to draw a line on Mapbox using plotly express.
+### Lines on Mapbox maps using Plotly Express
 
 ```python
 import pandas as pd
 
-us_cities1 = pd.read_csv("https://raw.githubusercontent.com/plotly/datasets/master/us-cities-top-1k.csv")
-States = ['New York', 'Ohio']
-us_cities = us_cities1[us_cities1.State.isin(States)]
+us_cities = pd.read_csv("https://raw.githubusercontent.com/plotly/datasets/master/us-cities-top-1k.csv")
+us_cities = us_cities.query("State in ['New York', 'Ohio']")
 
 import plotly.express as px
 
-fig = px.line_mapbox(
-    us_cities, 
-    lat="lat", 
-    lon="lon", 
-    line_group='State', 
-    hover_name="City", 
-    hover_data=["State", "Population"],
-    color_discrete_sequence=["fuchsia"], 
-    zoom=3, 
-    height=300)
+fig = px.line_mapbox(us_cities, lat="lat", lon="lon", color="State", zoom=3, height=300)
 
-fig.update_layout(
-    mapbox_style="stamen-terrain", mapbox_zoom=4, mapbox_center_lat = 41,
+fig.update_layout(mapbox_style="stamen-terrain", mapbox_zoom=4, mapbox_center_lat = 41,
     margin={"r":0,"t":0,"l":0,"b":0})
 
 fig.show()
 ```
 
-This example uses scattermapbox and defines
-the drawing [mode](https://plot.ly/python/reference/#scattermapbox-mode) to the combination of markers and line.
+### Lines on Mapbox maps using `Scattermapbox` traces
+
+This example uses `go.Scattermapbox` and sets
+the [mode](https://plot.ly/python/reference/#scattermapbox-mode) attribute to a combination of markers and line.
 
 ```python
 import plotly.graph_objects as go
@@ -100,32 +91,5 @@ fig.update_layout(
 fig.show()
 ```
 
-This example uses scattermapbox trace and shows how to customize hoverinfo in Mapbox.
-
-```python
-import pandas as pd
-
-us_cities1 = pd.read_csv("https://raw.githubusercontent.com/plotly/datasets/master/us-cities-top-1k.csv")
-States = ['Washington']
-us_cities = us_cities1[us_cities1.State.isin(States)]
-
-import plotly.graph_objects as go
-
-fig = go.Figure(go.Scattermapbox(   
-    lat=us_cities.lat, 
-    lon=us_cities.lon, 
-    mode='markers+lines',
-    marker={'color':'fuchsia', 'size':10, 'opacity':0.8},
-    hovertext=us_cities['City'],
-    hoverinfo='lat+lon+text'))
-
-fig.update_layout(
-    mapbox={'style': 'stamen-terrain', 'center':{'lat':47, 'lon':-117}, 'zoom':5},
-    margin={"r":0,"t":0,"l":0,"b":0})
-
-fig.show()
-
-```
-
 #### Reference
 See https://plot.ly/python/reference/#scattermapbox for more information about mapbox and their attribute options.

python/scattermapbox.md

@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.6.7
+    version: 3.6.8
   plotly:
     description: How to make scatter plots on Mapbox maps in Python.
     display_as: maps
@@ -198,7 +198,7 @@ fig.show()
 
 ### Set Marker Symbols 
 
-You can define a symbol on your map by setting [symbol](https://plot.ly/python/reference/#scattermapbox-marker-symbol) attribute. This attribute only works on mapbox tiles (not work on raster tiles): 
+You can define a symbol on your map by setting [symbol](https://plot.ly/python/reference/#scattermapbox-marker-symbol) attribute. This attribute only works on Mapbox-provided `style`s: 
 - basic
 - streets
 - outdoors