From 9d3d083d8f4210bbd489301e08b99d283c44f853 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Thu, 11 Apr 2024 12:15:26 -0400 Subject: [PATCH] remove FutureWarning from Xarray providers (#1623) --- pygeoapi/provider/xarray_.py | 12 ++++++------ pygeoapi/provider/xarray_edr.py | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pygeoapi/provider/xarray_.py b/pygeoapi/provider/xarray_.py index 2609e29..f177be7 100644 --- a/pygeoapi/provider/xarray_.py +++ b/pygeoapi/provider/xarray_.py @@ -211,9 +211,9 @@ class XarrayProvider(BaseProvider): _to_datetime_string(data.coords[self.time_field].values[-1]) ], "driver": "xarray", - "height": data.dims[self.y_field], - "width": data.dims[self.x_field], - "time_steps": data.dims[self.time_field], + "height": data.sizes[self.y_field], + "width": data.sizes[self.x_field], + "time_steps": data.sizes[self.time_field], "variables": {var_name: var.attrs for var_name, var in data.variables.items()} } @@ -385,9 +385,9 @@ class XarrayProvider(BaseProvider): 'x_axis_label': self.x_field, 'y_axis_label': self.y_field, 'time_axis_label': self.time_field, - 'width': self._data.dims[self.x_field], - 'height': self._data.dims[self.y_field], - 'time': self._data.dims[self.time_field], + 'width': self._data.sizes[self.x_field], + 'height': self._data.sizes[self.y_field], + 'time': self._data.sizes[self.time_field], 'time_duration': self.get_time_coverage_duration(), 'bbox_units': 'degrees', 'resx': np.abs(self._data.coords[self.x_field].values[1] diff --git a/pygeoapi/provider/xarray_edr.py b/pygeoapi/provider/xarray_edr.py index 7bfe178..e724f1d 100644 --- a/pygeoapi/provider/xarray_edr.py +++ b/pygeoapi/provider/xarray_edr.py @@ -138,11 +138,11 @@ class XarrayEDRProvider(BaseEDRProvider, XarrayProvider): raise ProviderNoDataError() try: - height = data.dims[self.y_field] + height = data.sizes[self.y_field] except KeyError: height = 1 try: - width = data.dims[self.x_field] + width = data.sizes[self.x_field] except KeyError: width = 1 time, time_steps = self._parse_time_metadata(data, kwargs) @@ -215,8 +215,8 @@ class XarrayEDRProvider(BaseEDRProvider, XarrayProvider): except KeyError: raise ProviderNoDataError() - height = data.dims[self.y_field] - width = data.dims[self.x_field] + height = data.sizes[self.y_field] + width = data.sizes[self.x_field] time, time_steps = self._parse_time_metadata(data, kwargs) out_meta = {