Skip to content

Commit

Permalink
Support recent versions of DeckGL (#1443)
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Jun 21, 2020
1 parent 9000b6b commit c368e78
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions panel/models/deckgl.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class DeckGLPlot(HTMLBox):
__css__ = ["https://api.mapbox.com/mapbox-gl-js/v1.7.0/mapbox-gl.css"]

__javascript__ = [
"https://cdn.jsdelivr.net/npm/deck.gl@8.1.0-alpha.1/dist.min.js",
"https://cdn.jsdelivr.net/npm/@deck.gl/json@8.1.0-alpha.1/dist/dist.dev.js",
"https://cdn.jsdelivr.net/npm/deck.gl@8.1.12/dist.min.js",
"https://cdn.jsdelivr.net/npm/@deck.gl/json@8.1.12/dist.min.js",
"https://cdn.jsdelivr.net/npm/@loaders.gl/csv@2.0.2/dist/dist.min.js",
"https://cdn.jsdelivr.net/npm/@loaders.gl/json@2.0.2/dist/dist.min.js",
"https://cdn.jsdelivr.net/npm/@loaders.gl/3d-tiles@2.0.2/dist/dist.min.js",
Expand All @@ -35,8 +35,8 @@ class DeckGLPlot(HTMLBox):

__js_require__ = {
'paths': OrderedDict([
("deck.gl", "https://cdn.jsdelivr.net/npm/@deck.gl/jupyter-widget@^8.0.0/dist/index"),
("mapbox-gl", 'https://cdn.jsdelivr.net/npm/mapbox-gl@1.6.1/dist/mapbox-gl.min'),
("deck.gl", "https://cdn.jsdelivr.net/npm/@deck.gl/jupyter-widget@^8.1.2/dist/index"),
("mapbox-gl", 'https://cdn.jsdelivr.net/npm/mapbox-gl@1.7.0/dist/mapbox-gl.min'),
]),
'exports': {"deck.gl": "deck", "mapbox-gl": "mapboxgl"}
}
Expand Down
2 changes: 1 addition & 1 deletion panel/pane/deckgl.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def _get_properties(self, layout=True):
mapbox_api_key = data.pop('mapbox_key', self.mapbox_api_key)
deck_widget = data.pop('deck_widget', None)
tooltip = deck_widget.tooltip
data = recurse_data(data)
data = {k: v for k, v in recurse_data(data).items() if v is not None}

if layout:
properties = {p: getattr(self, p) for p in Layoutable.param
Expand Down

0 comments on commit c368e78

Please sign in to comment.