From 1ce23a5d4ebc5a2fb321a3f4af29215fa2e0fd53 Mon Sep 17 00:00:00 2001 From: Stephan Finkensieper Date: Mon, 23 Nov 2020 15:22:33 +0000 Subject: [PATCH] Fix handling of modifiers in satpy-cf reader --- satpy/readers/satpy_cf_nc.py | 1 + satpy/tests/reader_tests/test_satpy_cf_nc.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/satpy/readers/satpy_cf_nc.py b/satpy/readers/satpy_cf_nc.py index ee6375ffd2..d9e93955af 100644 --- a/satpy/readers/satpy_cf_nc.py +++ b/satpy/readers/satpy_cf_nc.py @@ -263,6 +263,7 @@ def _coordinate_datasets(self, configured_datasets=None): ds_info = dict(val.attrs) ds_info['file_type'] = self.filetype_info['file_type'] ds_info['name'] = var_name + self.fix_modifier_attr(ds_info) yield True, ds_info def get_dataset(self, ds_id, ds_info): diff --git a/satpy/tests/reader_tests/test_satpy_cf_nc.py b/satpy/tests/reader_tests/test_satpy_cf_nc.py index 22a114fc6c..15f6434711 100644 --- a/satpy/tests/reader_tests/test_satpy_cf_nc.py +++ b/satpy/tests/reader_tests/test_satpy_cf_nc.py @@ -64,12 +64,14 @@ def setUp(self): dims=('y', 'x'), coords={'y': y_visir, 'x': x_visir}, attrs={'name': 'lat', - 'standard_name': 'latitude'}) + 'standard_name': 'latitude', + 'modifiers': np.array([])}) lon = xr.DataArray(lon, dims=('y', 'x'), coords={'y': y_visir, 'x': x_visir}, attrs={'name': 'lon', - 'standard_name': 'longitude'}) + 'standard_name': 'longitude', + 'modifiers': np.array([])}) self.scene = Scene() self.scene.attrs['sensor'] = ['avhrr-1', 'avhrr-2', 'avhrr-3'] scene_dict = {'image0': vis006,