diff --git a/mlair/helpers/data_sources/toar_data_v2.py b/mlair/helpers/data_sources/toar_data_v2.py index 5f8e831f3f77d9f3b4e933eae6ff011a58c97711..a592d2d16e6873ae8dfcef9b27698aaeca35ccb4 100644 --- a/mlair/helpers/data_sources/toar_data_v2.py +++ b/mlair/helpers/data_sources/toar_data_v2.py @@ -14,6 +14,7 @@ from timezonefinder import TimezoneFinder from mlair.configuration.toar_data_v2_settings import toar_data_v2_settings from mlair.helpers import to_list from mlair.helpers.data_sources.toar_data import EmptyQueryResult, get_data +from mlair.helpers.data_sources import join str_or_none = Union[str, None] @@ -173,7 +174,7 @@ def load_timeseries_data(timeseries_meta, url_base, opts, headers, sampling): res = get_data(opts, headers, as_json=False) data = pd.read_csv(StringIO(res), comment="#", index_col="datetime", parse_dates=True, infer_datetime_format=True) - data = data[opts.get("names", "value")].rename(meta["variable"]["name"]) + data = data[join._correct_stat_name(opts.get("names", "value"))].rename(meta["variable"]["name"]) coll.append(data) return coll diff --git a/test/test_configuration/test_defaults.py b/test/test_configuration/test_defaults.py index 07a5aa2f543b1992baf10421de4b28133feb0eac..b46590290eff09ac98d549c7d38010eb5506d09c 100644 --- a/test/test_configuration/test_defaults.py +++ b/test/test_configuration/test_defaults.py @@ -31,7 +31,6 @@ class TestAllDefaults: 'v': 'average_values', 'no': 'dma8eu', 'no2': 'dma8eu', 'cloudcover': 'average_values', 'pblheight': 'maximum'} - assert DEFAULT_NETWORK == "AIRBASE" assert DEFAULT_STATION_TYPE == "background" assert DEFAULT_VARIABLES == DEFAULT_VAR_ALL_DICT.keys() assert DEFAULT_START == "1997-01-01"