Merge branch 'master' into update-plotly-js-version-2-35-1

LiamConnors · web-flow · commit 31e1f8fa5e30 · 2024-09-09T16:04:50.000-04:00
diff --git a/doc/apidoc/plotly.graph_objects.rst b/doc/apidoc/plotly.graph_objects.rst
@@ -99,6 +99,9 @@ Map Traces
 
    Scattergeo
    Choropleth
+   Scattermap
+   Choroplethmap
+   Densitymap
    Scattermapbox
    Choroplethmapbox
    Densitymapbox
diff --git a/doc/python/density-heatmaps.md b/doc/python/density-heatmaps.md
@@ -72,7 +72,7 @@ fig.show()
 
 > Mapbox traces are deprecated and may be removed in a future version of Plotly.py.
 
-The earlier examples using `px.density_mapbox` and `go.Densitymap` use [Maplibre](https://maplibre.org/maplibre-gl-js/docs/) for rendering. These traces were introduced in Plotly.py 5.24. These trace types are now the recommended way to make tile-based density heatmaps. There are also traces that use [Mapbox](https://docs.mapbox.com): `density_mapbox` and `go.Densitymapbox`.
+The earlier examples using `px.density_map` and `go.Densitymap` use [Maplibre](https://maplibre.org/maplibre-gl-js/docs/) for rendering. These traces were introduced in Plotly.py 5.24. These trace types are now the recommended way to make tile-based density heatmaps. There are also traces that use [Mapbox](https://docs.mapbox.com): `density_mapbox` and `go.Densitymapbox`.
 
 To use these trace types, in some cases 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.
 
diff --git a/doc/python/filled-area-tile-maps.md b/doc/python/filled-area-tile-maps.md
@@ -26,7 +26,7 @@ jupyter:
     display_as: maps
     language: python
     layout: base
-    name: Filled Area on Maps
+    name: Filled Area on Tile Maps
     order: 4
     page_type: example_index
     permalink: python/filled-area-tile-maps/
diff --git a/doc/python/lines-on-tile-maps.md b/doc/python/lines-on-tile-maps.md
@@ -26,15 +26,15 @@ jupyter:
     display_as: maps
     language: python
     layout: base
-    name: Lines on Maps
+    name: Lines on Tile Maps
     order: 3
     page_type: example_index
     permalink: python/lines-on-tile-maps/
     redirect_from: python/lines-on-mapbox/
     thumbnail: thumbnail/line_mapbox.jpg
 ---
 
-### Lines on maps using Plotly Express
+### Lines on tile maps using Plotly Express
 
 To draw a line on a map, you either can use `px.line_map` in Plotly Express, or `go.Scattermap` in Plotly Graph Objects. Here's an example of drawing a line on a tile-based map using Plotly Express.
 
diff --git a/doc/python/map-configuration.md b/doc/python/map-configuration.md
@@ -39,7 +39,7 @@ Plotly supports two different kinds of maps:
 
 - **[Tile-based maps](https://en.wikipedia.org/wiki/Tiled_web_map)**
 
-If your figure is created with a `px.scatter_map`, `px.scatter_mapbox`, `px.line_map`, `px.line_mapbox`, `px.choropleth_map`, `px.choropleth_mapbox`, `px.density_map`, or `px.density_mapbox` function or otherwise contains one or more traces of type `go.Scattermap`, `go.Scattermapbox`,`go.Choroplethmap`, `go.Choroplethmapbox`, `go.Densitymap`, or `go.Densitymapbox` the `layout.map` object in your figure contains configuration information for the map itself.
+If your figure is created with a `px.scatter_map`, `px.scatter_mapbox`, `px.line_map`, `px.line_mapbox`, `px.choropleth_map`, `px.choropleth_mapbox`, `px.density_map`, or `px.density_mapbox` function or otherwise contains one or more traces of type `go.Scattermap`, `go.Scattermapbox`, `go.Choroplethmap`, `go.Choroplethmapbox`, `go.Densitymap`, or `go.Densitymapbox`, the `layout.map` object in your figure contains configuration information for the map itself.
 
 - **Outline-based maps**
 
diff --git a/doc/python/smoothing.md b/doc/python/smoothing.md
@@ -95,7 +95,7 @@ fig.add_trace(go.Scatter(
 
 fig.add_trace(go.Scatter(
     x=x,
-    y=signal.savgol_filter(y,
+    y=signal.savgol_filter(y_noise,
                            53, # window size used for filtering
                            3), # order of fitted polynomial
     mode='markers',
diff --git a/doc/python/tile-county-choropleth.md b/doc/python/tile-county-choropleth.md
diff --git a/doc/python/tile-map-layers.md b/doc/python/tile-map-layers.md
@@ -29,8 +29,8 @@ jupyter:
     name: Tile Map Layers
     order: 9
     page_type: u-guide
-    permalink: /python/tile-map-layers/
-    redirect_from: /python/mapbox-layers/
+    permalink: python/tile-map-layers/
+    redirect_from: python/mapbox-layers/
     thumbnail: thumbnail/mapbox-layers.png
 ---
 
@@ -42,7 +42,7 @@ Plotly supports two different kinds of maps:
 
 - **[Tile-based maps](https://en.wikipedia.org/wiki/Tiled_web_map)**
 
-If your figure is created with a `px.scatter_map`, `px_scatter_mapbox`, `px.line_map`, `px.line_mapbox`, `px.choropleth_map`, `px.choropleth_mapbox`, `px.density_map`, or `px.density_mapbox` function or otherwise contains one or more traces of type `go.Scattermap`, `go.Scattermapbox`,`go.Choroplethmap`, `go.Choroplethmapbox`, `go.Densitymap`, or `go.Densitymapbox` the `layout.map` or `layout.mapbox` object in your figure contains configuration information for the map itself.
+If your figure is created with a `px.scatter_map`, `px_scatter_mapbox`, `px.line_map`, `px.line_mapbox`, `px.choropleth_map`, `px.choropleth_mapbox`, `px.density_map`, or `px.density_mapbox` function or otherwise contains one or more traces of type `go.Scattermap`, `go.Scattermapbox`, `go.Choroplethmap`, `go.Choroplethmapbox`, `go.Densitymap`, or `go.Densitymapbox`, the `layout.map` or `layout.mapbox` object in your figure contains configuration information for the map itself.
 
 - **Outline-based maps**
 
diff --git a/doc/python/tile-scatter-maps.md b/doc/python/tile-scatter-maps.md
@@ -26,7 +26,7 @@ jupyter:
     display_as: maps
     language: python
     layout: base
-    name: Scatter Plots on Mapbox
+    name: Scatter Plots on Tile Maps
     order: 10
     page_type: u-guide
     permalink: python/tile-scatter-maps/
@@ -303,6 +303,7 @@ fig.show()
 ## Mapbox Maps
 
 > Mapbox traces are deprecated and may be removed in a future version of Plotly.py.
+
 The earlier examples using `px.scatter_map` and `go.Scattermap` use [Maplibre](https://maplibre.org/maplibre-gl-js/docs/) for rendering. These traces were introduced in Plotly.py 5.24 and are now the recommended way to create scatter plots on tile-based maps. There are also traces that use [Mapbox](https://docs.mapbox.com): `px.scatter_mapbox` and `go.Scattermapbox`
 
 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.
