From 1241c7605cfb6ef9f755949236ddbcab8f88bcbf Mon Sep 17 00:00:00 2001 From: Jelmer Bot Date: Sun, 24 Dec 2023 16:53:33 +0100 Subject: [PATCH 1/2] Align hvplot by and datashade by Shows categorical legend when hvplot's `by='column'` keyword is used with datashader enabled. Now results in the same output as `aggregator=ds.count_cat('columns')`. --- hvplot/converter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hvplot/converter.py b/hvplot/converter.py index e564610b3..1227f91f5 100644 --- a/hvplot/converter.py +++ b/hvplot/converter.py @@ -2335,7 +2335,7 @@ def _geom_plot(self, x=None, y=None, data=None, kind='polygons'): if 'tools' in opts_ and kind in ["polygons", "paths"] and not vdims: opts_["tools"] = [t for t in opts_["tools"] if t != "hover"] if self.geo: params['crs'] = self.crs - if self.by: + if self.by and not self.datashade: obj = Dataset(data, self.by+kdims, vdims).to(element, kdims, vdims, self.by, **params) if self.subplots: obj = obj.layout(sort=False) From b098ea3e96e5fb75e2d22711c318f427c46ccaea Mon Sep 17 00:00:00 2001 From: Jelmer Bot Date: Sun, 24 Dec 2023 17:11:22 +0100 Subject: [PATCH 2/2] Also update simple charts --- hvplot/converter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hvplot/converter.py b/hvplot/converter.py index 1227f91f5..6875009f2 100644 --- a/hvplot/converter.py +++ b/hvplot/converter.py @@ -1595,7 +1595,7 @@ def single_chart(self, element, x, y, data=None): ys += [self.kwds['yerr1']] kdims, vdims = self._get_dimensions([x], ys) - if self.by: + if self.by and not self.datashade: if element is Bars and not self.subplots: if any(y in self.indexes for y in ys): data = data.reset_index()