Skip to content

Commit 33c25df

Browse files
committed
remove all references to mapbox subplots and trace types in manually-edited files
1 parent 9419595 commit 33c25df

10 files changed

Lines changed: 13 additions & 312 deletions

File tree

plotly/_subplots.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# little differently.
99
import collections
1010

11-
_single_subplot_types = {"scene", "geo", "polar", "ternary", "map", "mapbox"}
11+
_single_subplot_types = {"scene", "geo", "polar", "ternary", "map"}
1212
_subplot_types = set.union(_single_subplot_types, {"xy", "domain"})
1313

1414
# For most subplot types, a trace is associated with a particular subplot
@@ -20,7 +20,7 @@
2020
# the trace property is just named `subplot`. For example setting
2121
# the `scatterpolar.subplot` property to `polar3` associates the scatterpolar
2222
# trace with the third polar subplot in the figure
23-
_subplot_prop_named_subplot = {"polar", "ternary", "map", "mapbox"}
23+
_subplot_prop_named_subplot = {"polar", "ternary", "map"}
2424

2525

2626
# Named tuple to hold an xaxis/yaxis pair that represent a single subplot
@@ -152,7 +152,6 @@ def make_subplots(
152152
- 'polar': Polar subplot for scatterpolar, barpolar, etc.
153153
- 'ternary': Ternary subplot for scatterternary
154154
- 'map': Map subplot for scattermap, choroplethmap and densitymap
155-
- 'mapbox': Mapbox subplot for scattermapbox, choroplethmapbox and densitymapbox
156155
- 'domain': Subplot type for traces that are individually
157156
positioned. pie, parcoords, parcats, etc.
158157
- trace type: A trace type which will be used to determine

plotly/basedatatypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2427,7 +2427,7 @@ def get_subplot(self, row, col, secondary_y=False):
24272427
* plotly.graph_objs.layout.Scene: if subplot type is 'scene'
24282428
* plotly.graph_objs.layout.Polar: if subplot type is 'polar'
24292429
* plotly.graph_objs.layout.Ternary: if subplot type is 'ternary'
2430-
* plotly.graph_objs.layout.Mapbox: if subplot type is 'ternary'
2430+
* plotly.graph_objs.layout.Map: if subplot type is 'map'
24312431
* SubplotDomain namedtuple with `x` and `y` fields:
24322432
if subplot type is 'domain'.
24332433
- x: length 2 list of the subplot start and stop width

plotly/express/__init__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@
3131
scatter_polar,
3232
scatter_ternary,
3333
scatter_map,
34-
scatter_mapbox,
3534
scatter_geo,
3635
line,
3736
line_3d,
3837
line_polar,
3938
line_ternary,
4039
line_map,
41-
line_mapbox,
4240
line_geo,
4341
area,
4442
bar,
@@ -62,14 +60,11 @@
6260
funnel,
6361
funnel_area,
6462
choropleth_map,
65-
choropleth_mapbox,
6663
density_map,
67-
density_mapbox,
6864
)
6965

7066

7167
from ._core import ( # noqa: F401
72-
set_mapbox_access_token,
7368
defaults,
7469
get_trendline_results,
7570
NO_COLOR,
@@ -85,19 +80,16 @@
8580
"scatter_polar",
8681
"scatter_ternary",
8782
"scatter_map",
88-
"scatter_mapbox",
8983
"scatter_geo",
9084
"scatter_matrix",
9185
"density_contour",
9286
"density_heatmap",
9387
"density_map",
94-
"density_mapbox",
9588
"line",
9689
"line_3d",
9790
"line_polar",
9891
"line_ternary",
9992
"line_map",
100-
"line_mapbox",
10193
"line_geo",
10294
"parallel_coordinates",
10395
"parallel_categories",
@@ -112,7 +104,6 @@
112104
"ecdf",
113105
"choropleth",
114106
"choropleth_map",
115-
"choropleth_mapbox",
116107
"pie",
117108
"sunburst",
118109
"treemap",
@@ -123,7 +114,6 @@
123114
"data",
124115
"colors",
125116
"trendline_functions",
126-
"set_mapbox_access_token",
127117
"get_trendline_results",
128118
"IdentityMap",
129119
"Constant",

plotly/express/_chart_types.py

Lines changed: 0 additions & 187 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,193 +1406,6 @@ def line_map(
14061406
line_map.__doc__ = make_docstring(line_map)
14071407

14081408

1409-
def scatter_mapbox(
1410-
data_frame=None,
1411-
lat=None,
1412-
lon=None,
1413-
color=None,
1414-
text=None,
1415-
hover_name=None,
1416-
hover_data=None,
1417-
custom_data=None,
1418-
size=None,
1419-
animation_frame=None,
1420-
animation_group=None,
1421-
category_orders=None,
1422-
labels=None,
1423-
color_discrete_sequence=None,
1424-
color_discrete_map=None,
1425-
color_continuous_scale=None,
1426-
range_color=None,
1427-
color_continuous_midpoint=None,
1428-
opacity=None,
1429-
size_max=None,
1430-
zoom=8,
1431-
center=None,
1432-
mapbox_style=None,
1433-
title=None,
1434-
subtitle=None,
1435-
template=None,
1436-
width=None,
1437-
height=None,
1438-
) -> go.Figure:
1439-
"""
1440-
*scatter_mapbox* is deprecated! Use *scatter_map* instead.
1441-
Learn more at: https://plotly.com/python/mapbox-to-maplibre/
1442-
In a Mapbox scatter plot, each row of `data_frame` is represented by a
1443-
symbol mark on a Mapbox map.
1444-
"""
1445-
warn(
1446-
"*scatter_mapbox* is deprecated!"
1447-
+ " Use *scatter_map* instead."
1448-
+ " Learn more at: https://plotly.com/python/mapbox-to-maplibre/",
1449-
stacklevel=2,
1450-
category=DeprecationWarning,
1451-
)
1452-
return make_figure(args=locals(), constructor=go.Scattermapbox)
1453-
1454-
1455-
scatter_mapbox.__doc__ = make_docstring(scatter_mapbox)
1456-
1457-
1458-
def choropleth_mapbox(
1459-
data_frame=None,
1460-
geojson=None,
1461-
featureidkey=None,
1462-
locations=None,
1463-
color=None,
1464-
hover_name=None,
1465-
hover_data=None,
1466-
custom_data=None,
1467-
animation_frame=None,
1468-
animation_group=None,
1469-
category_orders=None,
1470-
labels=None,
1471-
color_discrete_sequence=None,
1472-
color_discrete_map=None,
1473-
color_continuous_scale=None,
1474-
range_color=None,
1475-
color_continuous_midpoint=None,
1476-
opacity=None,
1477-
zoom=8,
1478-
center=None,
1479-
mapbox_style=None,
1480-
title=None,
1481-
subtitle=None,
1482-
template=None,
1483-
width=None,
1484-
height=None,
1485-
) -> go.Figure:
1486-
"""
1487-
*choropleth_mapbox* is deprecated! Use *choropleth_map* instead.
1488-
Learn more at: https://plotly.com/python/mapbox-to-maplibre/
1489-
In a Mapbox choropleth map, each row of `data_frame` is represented by a
1490-
colored region on a Mapbox map.
1491-
"""
1492-
warn(
1493-
"*choropleth_mapbox* is deprecated!"
1494-
+ " Use *choropleth_map* instead."
1495-
+ " Learn more at: https://plotly.com/python/mapbox-to-maplibre/",
1496-
stacklevel=2,
1497-
category=DeprecationWarning,
1498-
)
1499-
return make_figure(args=locals(), constructor=go.Choroplethmapbox)
1500-
1501-
1502-
choropleth_mapbox.__doc__ = make_docstring(choropleth_mapbox)
1503-
1504-
1505-
def density_mapbox(
1506-
data_frame=None,
1507-
lat=None,
1508-
lon=None,
1509-
z=None,
1510-
hover_name=None,
1511-
hover_data=None,
1512-
custom_data=None,
1513-
animation_frame=None,
1514-
animation_group=None,
1515-
category_orders=None,
1516-
labels=None,
1517-
color_continuous_scale=None,
1518-
range_color=None,
1519-
color_continuous_midpoint=None,
1520-
opacity=None,
1521-
zoom=8,
1522-
center=None,
1523-
mapbox_style=None,
1524-
radius=None,
1525-
title=None,
1526-
subtitle=None,
1527-
template=None,
1528-
width=None,
1529-
height=None,
1530-
) -> go.Figure:
1531-
"""
1532-
*density_mapbox* is deprecated! Use *density_map* instead.
1533-
Learn more at: https://plotly.com/python/mapbox-to-maplibre/
1534-
In a Mapbox density map, each row of `data_frame` contributes to the intensity of
1535-
the color of the region around the corresponding point on the map
1536-
"""
1537-
warn(
1538-
"*density_mapbox* is deprecated!"
1539-
+ " Use *density_map* instead."
1540-
+ " Learn more at: https://plotly.com/python/mapbox-to-maplibre/",
1541-
stacklevel=2,
1542-
category=DeprecationWarning,
1543-
)
1544-
return make_figure(
1545-
args=locals(), constructor=go.Densitymapbox, trace_patch=dict(radius=radius)
1546-
)
1547-
1548-
1549-
density_mapbox.__doc__ = make_docstring(density_mapbox)
1550-
1551-
1552-
def line_mapbox(
1553-
data_frame=None,
1554-
lat=None,
1555-
lon=None,
1556-
color=None,
1557-
text=None,
1558-
hover_name=None,
1559-
hover_data=None,
1560-
custom_data=None,
1561-
line_group=None,
1562-
animation_frame=None,
1563-
animation_group=None,
1564-
category_orders=None,
1565-
labels=None,
1566-
color_discrete_sequence=None,
1567-
color_discrete_map=None,
1568-
zoom=8,
1569-
center=None,
1570-
mapbox_style=None,
1571-
title=None,
1572-
subtitle=None,
1573-
template=None,
1574-
width=None,
1575-
height=None,
1576-
) -> go.Figure:
1577-
"""
1578-
*line_mapbox* is deprecated! Use *line_map* instead.
1579-
Learn more at: https://plotly.com/python/mapbox-to-maplibre/
1580-
In a Mapbox line plot, each row of `data_frame` is represented as
1581-
a vertex of a polyline mark on a Mapbox map.
1582-
"""
1583-
warn(
1584-
"*line_mapbox* is deprecated!"
1585-
+ " Use *line_map* instead."
1586-
+ " Learn more at: https://plotly.com/python/mapbox-to-maplibre/",
1587-
stacklevel=2,
1588-
category=DeprecationWarning,
1589-
)
1590-
return make_figure(args=locals(), constructor=go.Scattermapbox)
1591-
1592-
1593-
line_mapbox.__doc__ = make_docstring(line_mapbox)
1594-
1595-
15961409
def scatter_matrix(
15971410
data_frame=None,
15981411
dimensions=None,

0 commit comments

Comments
 (0)