From a92dfd13b3b33996519207706b6f906a6660cf9a Mon Sep 17 00:00:00 2001 From: nkarasiak Date: Fri, 2 Aug 2024 10:41:41 +0000 Subject: [PATCH] style(ruff) : automatic lint/format --- earthdaily/earthdatastore/__init__.py | 13 ++++++++---- .../earthdatastore/cube_utils/_zonal.py | 21 ++++++++++--------- earthdaily/earthdatastore/mask/__init__.py | 7 ++++--- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/earthdaily/earthdatastore/__init__.py b/earthdaily/earthdatastore/__init__.py index 7b0d4762..56fd2436 100644 --- a/earthdaily/earthdatastore/__init__.py +++ b/earthdaily/earthdatastore/__init__.py @@ -1062,14 +1062,19 @@ def datacube( { "clear_percent": ( "time", - np.multiply(np.divide(xr_datacube["clear_pixels"].data,xr_datacube.attrs["usable_pixels"]), 100 + np.multiply( + np.divide( + xr_datacube["clear_pixels"].data, + xr_datacube.attrs["usable_pixels"], + ), + 100, ).astype(np.int8), ) } ) - - xr_datacube['clear_pixels'] = xr_datacube['clear_pixels'].load() - xr_datacube['clear_percent'] = xr_datacube['clear_percent'].load() + + xr_datacube["clear_pixels"] = xr_datacube["clear_pixels"].load() + xr_datacube["clear_percent"] = xr_datacube["clear_percent"].load() if mask_with: xr_datacube = xr_datacube.drop(mask_with) if clear_cover: diff --git a/earthdaily/earthdatastore/cube_utils/_zonal.py b/earthdaily/earthdatastore/cube_utils/_zonal.py index 1096347a..42d3bfcf 100644 --- a/earthdaily/earthdatastore/cube_utils/_zonal.py +++ b/earthdaily/earthdatastore/cube_utils/_zonal.py @@ -48,32 +48,32 @@ def _rasterize(gdf, dataset, all_touched=False): return feats, yx_pos - def zonal_stats_numpy( dataset, gdf, operations=dict(mean=np.nanmean), all_touched=False, preload_time=False, - batch_time=1 + batch_time=1, ): tqdm_bar = tqdm.tqdm(total=len(dataset.data_vars) * dataset.time.size) - dataset = dataset.rio.clip_box(*gdf.to_crs(dataset.rio.crs).total_bounds)#.load() + dataset = dataset.rio.clip_box(*gdf.to_crs(dataset.rio.crs).total_bounds) # .load() feats, yx_pos = _rasterize(gdf, dataset, all_touched=all_touched) vals = [] - - + positions = [np.asarray(yx_pos[i + 1]) for i in np.arange(gdf.shape[0])] - for t_ in range(0,dataset.time.size,batch_time): - ts = np.arange(t_,np.min((t_+batch_time,dataset.time.size))) + for t_ in range(0, dataset.time.size, batch_time): + ts = np.arange(t_, np.min((t_ + batch_time, dataset.time.size))) vals.append({}) dataset_time = dataset.isel(time=ts) - if batch_time>1: + if batch_time > 1: dataset_time = dataset_time.load() for t in ts: - tqdm_bar.set_description(dataset.isel(time=t).time.dt.strftime('%Y-%m-%d').values) + tqdm_bar.set_description( + dataset.isel(time=t).time.dt.strftime("%Y-%m-%d").values + ) for data_var in dataset.data_vars: vals[t][data_var] = [] tqdm_bar.update(1) @@ -109,6 +109,7 @@ def zonal_stats_numpy( tqdm_bar.close() return da.transpose("feature", "time", "stats") + def zonal_stats( dataset, gdf, @@ -151,7 +152,7 @@ def zonal_stats( DESCRIPTION. """ - + if method == "geocube": from geocube.api.core import make_geocube from geocube.rasterize import rasterize_image diff --git a/earthdaily/earthdatastore/mask/__init__.py b/earthdaily/earthdatastore/mask/__init__.py index c94242d9..9d67f234 100644 --- a/earthdaily/earthdatastore/mask/__init__.py +++ b/earthdaily/earthdatastore/mask/__init__.py @@ -143,14 +143,15 @@ def compute_clear_coverage( "clear_percent": ( "time", np.multiply( - self._obj['n_pixels_as_labels'] / self._obj.attrs["usable_pixels"], + self._obj["n_pixels_as_labels"] + / self._obj.attrs["usable_pixels"], 100, ).astype(np.int8), ) } ) - self._obj['clear_pixels'] = self._obj['clear_pixels'].load() - self._obj['clear_percent'] = self._obj['clear_percent'].load() + self._obj["clear_pixels"] = self._obj["clear_pixels"].load() + self._obj["clear_percent"] = self._obj["clear_percent"].load() return self._obj