From c368e788ad4fd876cacfc67bc2e97635318aaf09 Mon Sep 17 00:00:00 2001 From: Philipp Rudiger Date: Sun, 21 Jun 2020 04:32:13 +0200 Subject: [PATCH] Support recent versions of DeckGL (#1443) --- panel/models/deckgl.py | 8 ++++---- panel/pane/deckgl.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panel/models/deckgl.py b/panel/models/deckgl.py index 4b2a4b8648..3ecdaade31 100644 --- a/panel/models/deckgl.py +++ b/panel/models/deckgl.py @@ -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", @@ -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"} } diff --git a/panel/pane/deckgl.py b/panel/pane/deckgl.py index 5d31c84bc9..70bd3c2748 100644 --- a/panel/pane/deckgl.py +++ b/panel/pane/deckgl.py @@ -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