Merge branch...

Merge branch 'lukas_issue235_bug_missing-indexing-in-datahandlermixedsamplingwithfilter' into 'develop'

Resolve "BUG: missing indexing in DataHandlerMixedSamplingWithFilter"

See merge request toar/mlair!213

mlair/data_handler/data_handler_mixed_sampling.py

@@ -147,7 +147,7 @@ class DataHandlerMixedSamplingWithFilterSingleStation(DataHandlerMixedSamplingSi
         data, self.meta = self.load_data(self.path[ind], self.station, stats_per_var, self.sampling[ind],
                                          self.station_type, self.network, self.store_data_locally, self.data_origin,
                                          start, end)
-        data = self.interpolate(data, dim=self.time_dim, method=self.interpolation_method,
+        data = self.interpolate(data, dim=self.time_dim, method=self.interpolation_method[ind],
                                 limit=self.interpolation_limit[ind])
         return data
 

mlair/data_handler/data_handler_single_station.py

@@ -39,17 +39,19 @@ DEFAULT_TIME_DIM = "datetime"
 DEFAULT_TARGET_VAR = "o3"
 DEFAULT_TARGET_DIM = "variables"
 DEFAULT_SAMPLING = "daily"
+DEFAULT_INTERPOLATION_LIMIT = 0
 DEFAULT_INTERPOLATION_METHOD = "linear"
 
 
 class DataHandlerSingleStation(AbstractDataHandler):
 
     def __init__(self, station, data_path, statistics_per_var, station_type=DEFAULT_STATION_TYPE,
-                 network=DEFAULT_NETWORK, sampling=DEFAULT_SAMPLING, target_dim=DEFAULT_TARGET_DIM,
-                 target_var=DEFAULT_TARGET_VAR, time_dim=DEFAULT_TIME_DIM,
+                 network=DEFAULT_NETWORK, sampling: Union[str, Tuple[str]] = DEFAULT_SAMPLING,
+                 target_dim=DEFAULT_TARGET_DIM, target_var=DEFAULT_TARGET_VAR, time_dim=DEFAULT_TIME_DIM,
                  window_history_size=DEFAULT_WINDOW_HISTORY_SIZE, window_history_offset=DEFAULT_WINDOW_HISTORY_OFFSET,
                  window_lead_time=DEFAULT_WINDOW_LEAD_TIME,
-                 interpolation_limit: int = 0, interpolation_method: str = DEFAULT_INTERPOLATION_METHOD,
+                 interpolation_limit: Union[int, Tuple[int]] = DEFAULT_INTERPOLATION_LIMIT,
+                 interpolation_method: Union[str, Tuple[str]] = DEFAULT_INTERPOLATION_METHOD,
                  overwrite_local_data: bool = False, transformation=None, store_data_locally: bool = True,
                  min_length: int = 0, start=None, end=None, variables=None, data_origin: Dict = None, **kwargs):
         super().__init__()  # path, station, statistics_per_var, transformation, **kwargs)