Move call to _ensure_time_compatible

Move the call to xcube.core.tile._ensure_time_compatible from
_get_var_2d_array to parse_non_spatial_labels.

Author: pont-us

test/core/test_tile.py

@@ -105,6 +105,17 @@ def test_invalid(self):
         self.assertEqual("'jetzt' is not a valid value for dimension 'time'",
                          f'{cm.exception}')
 
+    def test_ensure_timezone_naive(self):
+        da_tznaive = xr.DataArray(
+            np.zeros((3,3,3)),
+            coords=self.coords,
+            dims=self.dims)
+        labels = parse_non_spatial_labels(dict(time='2000-01-02T00:00:00Z'),
+                                          dims=da_tznaive.dims,
+                                          coords=da_tznaive.coords,
+                                          var=da_tznaive)
+        self.assertIsNone(pd.Timestamp(labels['time']).tzinfo)
+
 
 class EnsureTimeCompatibleTest(unittest.TestCase):
     da_tznaive = xr.DataArray(
@@ -131,11 +142,11 @@ def test_both_tzaware(self):
 
     def test_tznaive_array_tzaware_indexer(self):
         self.assertTrue(
-            self._are_times_equal(
+            _are_times_equal(
                 self.labels_tznaive,
                 _ensure_time_compatible(self.da_tznaive,
                                         self.labels_tzaware)))
 
-    @staticmethod
-    def _are_times_equal(labels1, labels2):
-        return pd.Timestamp(labels1['time']) == pd.Timestamp(labels2['time'])
+
+def _are_times_equal(labels1, labels2):
+    return pd.Timestamp(labels1['time']) == pd.Timestamp(labels2['time'])

xcube/core/tile.py

@@ -242,8 +242,7 @@ def _get_var_2d_array(var: xr.DataArray,
         if labels_are_indices:
             array = var.isel(**labels)
         else:
-            labels_safe_time = _ensure_time_compatible(var, labels)
-            array = var.sel(method='nearest', **labels_safe_time)
+            array = var.sel(method='nearest', **labels)
     else:
         raise exception_type(f'Variable "{var.name}" of dataset "{ds_id}" '
                              'must be an N-D Dataset with N >= 2, '
@@ -328,7 +327,8 @@ def parse_non_spatial_labels(
         dims: Sequence[Hashable],
         coords: Mapping[Hashable, xr.DataArray],
         allow_slices: bool = False,
-        exception_type: type = ValueError
+        exception_type: type = ValueError,
+        var: xr.DataArray = None
 ) -> Mapping[str, Any]:
     xy_var_names = get_dataset_xy_var_names(coords, must_exist=False)
     if xy_var_names is None:
@@ -384,4 +384,7 @@ def to_datetime(datetime_str: str, dim_var: xr.DataArray):
             raise exception_type(f'{label_str!r} is not a valid'
                                  f' value for dimension {dim!r}') from e
 
-    return parsed_labels
+    if var is not None:
+        return _ensure_time_compatible(var, parsed_labels)
+    else:
+        return parsed_labels

xcube/webapi/controllers/tiles.py

@@ -79,7 +79,8 @@ def get_dataset_tile(ctx: ServiceContext,
                                       var.dims,
                                       var.coords,
                                       allow_slices=False,
-                                      exception_type=ServiceBadRequestError)
+                                      exception_type=ServiceBadRequestError,
+                                      var=var)
 
     return get_ml_dataset_tile(ml_dataset,
                                var_name,