Merge pull request #61 from earthdaily/dev

v0.1.0

Author: nkarasiak

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.0] - 2024-04-19
+
+### Fixed
+
+- Scaled/asset when duplicated datetimes.
+- Chunks asked in datacube are not the same as the output (due du smallest dims).
+- Autoconverting list/dict coords to string for zarr compatibility
+
+
 ## [0.0.17] - 2024-04-15
 
 ### Fixed

earthdaily/__init__.py

@@ -5,4 +5,4 @@
 # to hide warnings from rioxarray or nano seconds conversion
 warnings.filterwarnings("ignore")
 
-__version__ = "0.0.17"
+__version__ = "0.1.0"

earthdaily/earthdatastore/__init__.py

@@ -746,7 +746,6 @@ def datacube(
 
             if clear_cover:
                 xr_datacube = mask.filter_clear_cover(xr_datacube, clear_cover)
-
         return xr_datacube
 
     def _update_search_for_assets(self, assets):

earthdaily/earthdatastore/cube_utils/__init__.py

@@ -1,10 +1,8 @@
-import logging
-from datetime import datetime
 from collections import defaultdict
+import logging
 import pandas as pd
 import geopandas as gpd
 import numpy as np
-import pytz
 import xarray as xr
 from rasterio.enums import Resampling
 from shapely.geometry import box
@@ -14,6 +12,7 @@
 from .asset_mapper import AssetMapper
 import rioxarray
 from functools import wraps
+import json
 
 __all__ = ["GeometryManager", "rioxarray", "zonal_stats", "zonal_stats_numpy"]
 
@@ -118,6 +117,8 @@ def _cube_odc(
         metadata = {k: ("time", v.tolist()) for k, v in df.items()}
         # assign metadata as coords
         ds = ds.assign_coords(**metadata)
+    ds = ds.chunk(kwargs["chunks"])
+
     return ds
 
 
@@ -249,6 +250,16 @@ def datacube(
 
     if isinstance(assets, dict):
         ds = ds.rename(assets)
+
+    for coord in ds.coords:
+        if ds.coords[coord].values.shape == ():
+            continue
+        if isinstance(ds.coords[coord].values[0], (list, dict)):
+            ds.coords[coord].values = [
+                json.dumps(ds.coords[coord].values[idx])
+                for idx in range(ds.coords[coord].size)
+            ]
+
     return ds
 
 
@@ -358,14 +369,9 @@ def rescale_assets_with_items(
             ds_scaled[asset] = []
             for scale in scales[asset].keys():
                 for offset in scales[asset][scale].keys():
-                    times = list(set(scales[asset][scale][offset]))
-                    if len(times) != len(scales[asset][scale][offset]):
-                        for time in times:
-                            d = ds[[asset]].loc[dict(time=time)] * scale + offset
-                            ds_scaled[asset].append(d)
-                    else:
-                        d = ds[[asset]].loc[dict(time=times)] * scale + offset
-                        ds_scaled[asset].append(d)
+                    times = np.in1d(ds.time, list(set(scales[asset][scale][offset])))
+                    asset_scaled = ds[[asset]].isel(time=times) * scale + offset
+                    ds_scaled[asset].append(asset_scaled)
         ds_ = []
         for k, v in ds_scaled.items():
             ds_k = []

earthdaily/earthdatastore/mask/__init__.py

@@ -162,6 +162,7 @@ def compute_clear_coverage(
                 )
             }
         )
+        # self._obj = self._obj.reset_coords(names=['clear_pixels','clear_percent'])
 
         return self._obj