switch default strategy, preserve attrs

Author: martinfleis

xvec/accessor.py

@@ -3,7 +3,7 @@
 import json
 import warnings
 from collections.abc import Callable, Hashable, Iterable, Mapping, Sequence
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 
 import numpy as np
 import pandas as pd
@@ -987,6 +987,9 @@ def zonal_stats(
         all_touched: bool = False,
         n_jobs: int = -1,
         nodata: Any = None,
+        strategy: Literal[
+            "feature-sequential", "raster-sequential"
+        ] = "raster-sequential",
         **kwargs: dict[str, Any],
     ) -> xr.DataArray | xr.Dataset:
         """Extract the values from a dataset indexed by a set of geometries
@@ -1067,6 +1070,10 @@ def zonal_stats(
         nodata : Any
             Value representing missing data. If not specified, the value is included in
             the aggregation.
+        strategy : str, optional
+            The strategy for ``exactextract`` method to use for the extraction, by
+            default "raster-sequential". Use either "feature-sequential" and
+            "raster-sequential". See :func:`exactextract.exact_extract` for details.
         **kwargs : optional
             Keyword arguments to be passed to the aggregation function
             (e.g., ``Dataset.quantile(**kwargs)``).
@@ -1194,6 +1201,7 @@ def zonal_stats(
                 stats=stats,
                 name=name,
                 nodata=nodata,
+                strategy=strategy,
                 **kwargs,
             )
         else:

xvec/zonal.py

@@ -2,7 +2,7 @@
 
 import gc
 from collections.abc import Callable, Hashable, Iterable, Sequence
-from typing import Any
+from typing import Any, Literal
 
 import numpy as np
 import pandas as pd
@@ -454,6 +454,10 @@ def _zonal_stats_exactextract(
 
     vec_cube.attrs = acc._obj.attrs
 
+    if isinstance(acc._obj, xr.Dataset):
+        for var in vec_cube.variables:
+            vec_cube[var].attrs = acc._obj[var].attrs
+
     if original_is_ds:
         acc._obj = original_ds
 
@@ -469,7 +473,7 @@ def _agg_exactextract(
     stats: str | Callable | Iterable[str | Callable | tuple] = "mean",
     name: str = "geometry",
     original_is_ds: bool = False,
-    strategy: str = "feature-sequential",
+    strategy: Literal["feature-sequential", "raster-sequential"] = "raster-sequential",
     nodata: Any = None,
 ):
     """Extract the values from a dataset indexed by a set of geometries
@@ -504,7 +508,7 @@ def _agg_exactextract(
         Value representing missing data. If not specified, the value is included in
         the aggregation.
     strategy : str, optional
-        The strategy to use for the extraction, by default "feature-sequential"
+        The strategy to use for the extraction, by default "raster-sequential"
         Use either "feature-sequential" and "raster-sequential".
 
     Returns
@@ -654,4 +658,6 @@ def _variable_zonal(
 
     combined = xr.combine_by_coords(r)
 
+    combined.attrs = acc._obj.attrs
+
     return combined