Assorted minor fixes (#3302)

holoviz · Dec 16, 2018 · 706bf43 · 706bf43
1 parent 806f562
commit 706bf43
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/holoviews/core/ndmapping.py b/holoviews/core/ndmapping.py
@@ -885,7 +885,7 @@ def dframe(self, dimensions=None, multi_index=False):
         for key, element in self.data.items():
             df = element.dframe(inner_dimensions, multi_index)
             names = [d.name for d in outer_dimensions]
-            key_dims = [(d, key[i]) for d, i in inds]
+            key_dims = [(d.name, key[i]) for d, i in inds]
             if multi_index:
                 length = len(df)
                 indexes = [[v]*length for _, v in key_dims]

diff --git a/holoviews/operation/datashader.py b/holoviews/operation/datashader.py
@@ -324,7 +324,7 @@ def get_agg_data(cls, obj, category=None):
             df[category] = df[category].astype('category')
 
         is_dask = isinstance(df, dd.DataFrame)
-        if any((not is_dask and isinstance(df[d.name].values[0], cftime_types)) or
+        if any((not is_dask and len(df[d.name]) and isinstance(df[d.name].values[0], cftime_types)) or
                df[d.name].dtype.kind == 'M' for d in (x, y)):
             df = df.copy()
 

diff --git a/holoviews/plotting/plotly/element.py b/holoviews/plotting/plotly/element.py
@@ -448,7 +448,7 @@ def generate_plot(self, key, ranges, element=None):
         ranges = self.compute_ranges(self.hmap, key, ranges)
         figure = None
         for okey, subplot in self.subplots.items():
-            if element is not None:
+            if element is not None and subplot.drawn:
                 idx, spec, exact = dynamic_update(self, subplot, okey, element, items)
                 if idx is not None:
                     _, el = items.pop(idx)