Merge branch 'hide_xarray' of https://git.cersat.fr/cerbere/cerbere into hide_xarray

cerbere/dataset/dataset.py

@@ -774,10 +774,11 @@ class Dataset(ABC):
                 storage type.
         """
         if isinstance(self.dataset, Dataset):
-           return self.dataset.get_values(
-               fieldname, index=index, as_masked_array=as_masked_array,
-               expand=expand, expand_dims=expand_dims, **kwargs
-           )
+            kwargs['expand'] = expand
+            kwargs['expand_dims'] = expand_dims
+            return self.dataset.get_values(
+               fieldname, index=index, as_masked_array=as_masked_array, **kwargs
+            )
 
         # ignore indices not applicable to the field
         reduced_index = None
@@ -798,9 +799,6 @@ class Dataset(ABC):
         # expand over requested dimensions
         if expand and expand_dims is not None:
 
-            # retrieve the dimensions to expand over
-            expand_dims = self._feature_geodimnames
-
             fdims = self.get_field_dimnames(fieldname)
             for dim in expand_dims[::-1]:
                 if dim in fdims:

cerbere/feature/feature.py

@@ -427,6 +427,25 @@ class Feature(Dataset):
         for fieldname, field in child_fields.items():
             self.add_field(field)
 
+    def get_values(self, fieldname, **kwargs):
+        """
+        Args:
+            expand (bool): expand the geocoordinate values to the full data
+                grid. This is only for lat, lon and times in the cases for
+                instance of cylindrical grids (where lat, lon are provided as
+                vectors) or average/climatological products (where time is
+                given as a single value for the whole grid). This returns a lat,
+                lon or times value for each grid pixel.
+
+        For more details on the other arguments, refer to:
+         :func:`cerbere.dataset.Dataset.get_values`
+        """
+        if 'expand_dims' not in kwargs:
+            kwargs['expand_dims'] = self._feature_geodimnames
+        return super(Feature, self).get_values(
+            fieldname, **kwargs
+        )
+
     def get_times(self, **kwargs):
         """Return the times of a feature.
 

cerbere/feature/grid.py

@@ -117,24 +117,6 @@ class Grid(Feature):
         else:
             return ('y', 'x',)
 
-    def get_values(self, fieldname, **kwargs):
-        """
-        Args:
-            expand (bool): expand the geocoordinate values to the full data
-                grid. This is only for lat, lon and times in the cases for
-                instance of cylindrical grids (where lat, lon are provided as
-                vectors) or average/climatological products (where time is
-                given as a single value for the whole grid). This returns a lat,
-                lon or times value for each grid pixel.
-
-        For more details on the other arguments, refer to:
-         :func:`cerbere.dataset.Dataset.get_values`
-        """
-        if 'expand_dims' not in kwargs:
-            kwargs['expand_dims'] = self._feature_geodimnames
-        return super(Grid, self).get_values(
-            fieldname, **kwargs
-        )
 
 
 #     def save(self, output, attrs=None, infer_cf_attrs=False, **kwargs):