Skip to content

Commit

Permalink
Merge 400e517 into adbda77
Browse files Browse the repository at this point in the history
  • Loading branch information
ajduberstein committed Sep 18, 2019
2 parents adbda77 + 400e517 commit 37921e3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
14 changes: 11 additions & 3 deletions bindings/python/pydeck/docs/deck.md
Expand Up @@ -28,7 +28,7 @@ Requires a Mapbox API token to display a basemap, see notes below.
`map_style` : `str`, default `"mapbox://styles/mapbox/dark-v9"`
URI for Mapbox basemap style

`mapbox_key` : `str`, default None
`mapbox_key` : `str`, default `None`
Read on initialization from the MAPBOX_API_KEY environment variable. Defaults to None if not set.
If not using a basemap, you can set this value to `None`.
See https://docs.mapbox.com/help/how-mapbox-works/access-tokens/#mapbox-account-dashboard
Expand All @@ -37,6 +37,12 @@ Requires a Mapbox API token to display a basemap, see notes below.
Initial camera angle relative to the map, defaults to a fully zoomed out 0, 0-centered map with 0 pitch and bearing
To compute a viewport from data, see `pydeck.data\_utils.compute\_viewport`

`height` : int, default `500`
Height of visualization, in pixels

`width` : int, default `750`
Width of visualization, in pixels

## pydeck.Deck.show

```python
Expand Down Expand Up @@ -88,12 +94,14 @@ not render.
`notebook_display` : `bool`, default `True`
Attempts to display the HTML output in an iframe if True. Only works in a Jupyter notebook.

`iframe_width` : `int`, default `500`
`iframe_width` : `int`, default `None`
Height of Jupyter notebook iframe in pixels, if rendered in a Jupyter notebook.

`iframe_height` : `int`, default `500`
`iframe_height` : `int`, default `None`
Width of Jupyter notebook iframe in pixels, if rendered in a Jupyter notebook.



#### Returns
`str` : A string path to the HTML file

Expand Down
4 changes: 2 additions & 2 deletions bindings/python/pydeck/pydeck/bindings/deck.py
Expand Up @@ -18,7 +18,7 @@ def __init__(
map_style='mapbox://styles/mapbox/dark-v9',
mapbox_key=None,
initial_view_state=ViewState(),
width=500,
width=750,
height=500,
):
"""Constructor for a Deck object, similar to the `Deck`_ class from deck.gl
Expand All @@ -41,7 +41,7 @@ def __init__(
See https://docs.mapbox.com/help/how-mapbox-works/access-tokens/#mapbox-account-dashboard
height : int, default 500
Height of visualization, in pixels
width : int, default 500
width : int, default 750
Width of visualization, in pixels
Expand Down

0 comments on commit 37921e3

Please sign in to comment.