Ensure vdims are initialized on PointDraw stream

holoviz · May 24, 2018 · 0ad43ed · 0ad43ed
1 parent 8711663
commit 0ad43ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/holoviews/plotting/bokeh/callbacks.py b/holoviews/plotting/bokeh/callbacks.py
@@ -4,6 +4,7 @@
 from bokeh.models import (CustomJS, FactorRange, DatetimeAxis, ColumnDataSource, Selection)
 
 from ...core import OrderedDict
+from ...core.util import dimension_sanitizer
 from ...streams import (Stream, PointerXY, RangeXY, Selection1D, RangeX,
                         RangeY, PointerX, PointerY, BoundsX, BoundsY,
                         Tap, SingleTap, DoubleTap, MouseEnter, MouseLeave,
@@ -906,6 +907,12 @@ def initialize(self):
                                    empty_value=self.streams[0].empty_value,
                                    renderers=renderers)
         self.plot.state.tools.append(point_tool)
+        source = self.plot.handles['source']
+        element = self.plot.current_frame
+        for d in element.dimensions():
+            dim = dimension_sanitizer(d.name)
+            if dim not in source.data:
+                source.data[dim] = element.dimension_values(d)
         super(PointDrawCallback, self).initialize()
 
 

diff --git a/tests/plotting/bokeh/testcallbacks.py b/tests/plotting/bokeh/testcallbacks.py
@@ -143,6 +143,12 @@ def test_point_draw_callback_initialized_js(self):
         self.assertEqual(plot.handles['source'].js_property_callbacks,
                          {'change:data': [plot.callbacks[0].callbacks[0]]})
 
+    def test_point_draw_callback_with_vdims_initialization(self):
+        points = Points([(0, 1, 'A')], vdims=['A'])
+        stream = PointDraw(source=points)
+        bokeh_server_renderer.get_plot(points)
+        self.assertEqual(stream.element.dimension_values('A'), np.array(['A']))
+
     def test_point_draw_callback_with_vdims(self):
         points = Points([(0, 1, 'A')], vdims=['A'])
         point_draw = PointDraw(source=points)