Zarr support

- Distinct slices of time is now default
- No longer assuming+shaping as multivar tiles unless needed

analysis/webservice/algorithms_spark/HofMoellerSpark.py

@@ -44,12 +44,12 @@ class HofMoellerCalculator(object):
     def hofmoeller_stats(tile_service_factory, metrics_callback, tile_in_spark):
 
         (latlon, tile_id, index,
-         min_lat, max_lat, min_lon, max_lon) = tile_in_spark
+         min_lat, max_lat, min_lon, max_lon, dataset) = tile_in_spark
 
         tile_service = tile_service_factory()
         try:
             # Load the dataset tile
-            tile = tile_service.find_tile_by_id(tile_id, metrics_callback=metrics_callback)[0]
+            tile = tile_service.find_tile_by_id(tile_id, metrics_callback=metrics_callback, ds=dataset)[0]
             calculation_start = datetime.now()
             # Mask it to the search domain
             tile = tile_service.mask_tiles_to_bbox(min_lat, max_lat,
@@ -352,7 +352,7 @@ def calc(self, compute_options, **args):
 
         min_lon, min_lat, max_lon, max_lat = bbox.bounds
 
-        nexus_tiles_spark = [(self._latlon, tile.tile_id, x, min_lat, max_lat, min_lon, max_lon) for x, tile in
+        nexus_tiles_spark = [(self._latlon, tile.tile_id, x, min_lat, max_lat, min_lon, max_lon, tile.dataset) for x, tile in
                              enumerate(self._get_tile_service().find_tiles_in_box(min_lat, max_lat, min_lon, max_lon,
                                                                                   ds, start_time, end_time,
                                                                                   metrics_callback=metrics_record.record_metrics,
@@ -408,7 +408,7 @@ def calc(self, compute_options, **args):
 
         min_lon, min_lat, max_lon, max_lat = bbox.bounds
 
-        nexus_tiles_spark = [(self._latlon, tile.tile_id, x, min_lat, max_lat, min_lon, max_lon) for x, tile in
+        nexus_tiles_spark = [(self._latlon, tile.tile_id, x, min_lat, max_lat, min_lon, max_lon, tile.dataset) for x, tile in
                              enumerate(self._get_tile_service().find_tiles_in_box(min_lat, max_lat, min_lon, max_lon,
                                                                                   ds, start_time, end_time,
                                                                                   metrics_callback=metrics_record.record_metrics,

data-access/nexustiles/backends/zarr/backend.py

@@ -198,7 +198,7 @@ def find_tiles_in_box(self, min_lat, max_lat, min_lon, max_lon, ds=None, start_t
         times = None
 
         if 0 <= start_time <= end_time:
-            if kwargs.get('distinct', False):
+            if kwargs.get('distinct', True):
                 times_asc = self.find_days_in_range_asc(min_lat, max_lat, min_lon, max_lon, ds, start_time, end_time)
                 times = [(t, t) for t in times_asc]
             else:
@@ -416,11 +416,15 @@ def __fetch_data_for_tile(self, tile: Tile):
 
         tile.times = ma.masked_invalid(times)
 
-        tile.data = ma.masked_invalid(
-            [matched[var].to_numpy() for var in self.__variables]
-        )
+        var_data = [matched[var].to_numpy() for var in self.__variables]
+
+        if len(self.__variables) > 1:
+            tile.data = ma.masked_invalid(var_data)
+            tile.is_multi = True
+        else:
+            tile.data = ma.masked_invalid(var_data[0])
+            tile.is_multi = False
 
-        tile.is_multi = True
 
     def _metadata_store_docs_to_tiles(self, *store_docs):
         return [ZarrBackend.__nts_url_to_tile(d) for d in store_docs]