Skip to content

Commit 4e7b3f7

Browse files
committed
Move irregular to xarray interface
1 parent 5f59140 commit 4e7b3f7

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

holoviews/core/data/grid.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ def concat_dim(cls, datasets, dim, vdims):
172172
def irregular(cls, dataset, dim):
173173
return dataset.data[dimension_name(dim)].ndim > 1
174174

175+
175176
@classmethod
176177
def isscalar(cls, dataset, dim):
177178
values = cls.values(dataset, dim, expanded=False)

holoviews/core/data/xarray.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,13 @@ def validate(cls, dataset, vdims=True):
276276
"non-matching array dimensions:\n\n%s"
277277
% ('\n'.join(nonmatching)), cls)
278278

279+
@classmethod
280+
def irregular(cls, dataset, dim):
281+
if dataset.data[dimension_name(dim)].ndim > 1:
282+
return True
283+
dim_name = dimension_name(dim)
284+
return dim_name not in dataset.data.dims and dim_name in dataset.data.coords
285+
279286
@classmethod
280287
def compute(cls, dataset):
281288
return dataset.clone(dataset.data.compute())
@@ -410,8 +417,7 @@ def values(cls, dataset, dim, expanded=True, flat=True, compute=True, keep_index
410417
data = data.data
411418
irregular = cls.irregular(dataset, dim) if dim in dataset.kdims else False
412419
irregular_kdims = [d for d in dataset.kdims if cls.irregular(dataset, d)]
413-
non_dimensinal_dim = hasattr(dataset.data, 'dims') and dimension_name(dim) not in dataset.data.dims
414-
if irregular_kdims or non_dimensinal_dim:
420+
if irregular_kdims:
415421
virtual_coords = list(dataset.data[irregular_kdims[0].name].coords.dims)
416422
else:
417423
virtual_coords = []

0 commit comments

Comments
 (0)