rusterize>=0.7 (#85)

* `rusterize>=0.7` for `all_touched` support

* Pass all_touched through rusterize engine and test it

Remove rusterize-specific snapshots since rusterize>=0.7 now matches
rasterio output exactly. Add all_touched parametrization to tests.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* tweak

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: dcherian

docs/examples/line-zonal-stats.ipynb

@@ -140,7 +140,7 @@
     "        ds,\n",
     "        geoms,\n",
     "        all_touched=True,\n",
-    "        engine=\"rasterio\",\n",
+    "        engine=\"rusterize\",\n",
     "    )\n",
     "    .compute()\n",
     "    .rename(\"segment\")\n",
@@ -195,14 +195,6 @@
    "id": "13",
    "metadata": {},
    "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "14",
-   "metadata": {},
-   "outputs": [],
    "source": [
     "import xvec  # noqa: F401\n",
     "\n",
@@ -213,7 +205,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "15",
+   "id": "14",
    "metadata": {},
    "source": [
     "## Plot"
@@ -222,7 +214,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "16",
+   "id": "15",
    "metadata": {},
    "outputs": [],
    "source": [

pixi.lock

@@ -47,7 +47,7 @@ pytest-xdist = "*"
 rasterio = "*"
 
 [feature.with-rusterize.pypi-dependencies]
-rusterize = "<0.7"
+rusterize = ">=0.7.1"
 
 [feature.with-xarray-dev.pypi-dependencies]
 xarray = { git = "https://github.com/pydata/xarray.git", rev = "26ccc7f8f014f29c551fd566a04d6e9f878c0b0b" }

pixi.toml

@@ -38,14 +38,14 @@ dynamic=["version"]
 [project.optional-dependencies]
 dask = ["dask-geopandas"]
 rasterize = ["rasterio"]
-rusterize = ["rusterize"]
+rusterize = ["rusterize>=0.7.1"]
 exactextract = ["exactextract", "sparse"]
 docs = [
   "geodatasets",
   "pooch",
   "dask-geopandas",
   "rasterio",
-  "rusterize",
+  "rusterize>=0.7.1",
   "rioxarray",
   "exactextract",
   "sparse",

pyproject.toml

@@ -211,7 +211,6 @@ def rasterize(
       Requires GDAL.
 
     - **rusterize**: A Rust-based rasterization engine. Does not require GDAL.
-      Does not support ``all_touched=True``.
 
     - **exactextract**: Uses the exactextract library for precise sub-pixel
       coverage computation. Any pixel with non-zero coverage is burned, which

src/rasterix/rasterize/core.py

@@ -429,7 +429,7 @@ def rasterize_geometries(
     if all_touched:
         raise NotImplementedError(
             "all_touched=True is not supported by the exactextract engine. "
-            "Use engine='rasterio' if you need all_touched support."
+            "Use engine='rusterize' or engine='rasterio' if you need all_touched support."
         )
 
     if len(geometries) == 0:
@@ -540,7 +540,7 @@ def np_geometry_mask(
     if all_touched:
         raise NotImplementedError(
             "all_touched=True is not supported by the exactextract engine. "
-            "Use engine='rasterio' if you need all_touched support."
+            "Use engine='rasterio' or engine='rusterize' if you need all_touched support."
         )
 
     if len(geometries) == 0:

src/rasterix/rasterize/exact.py

@@ -65,7 +65,6 @@ def rasterize_geometries(
         Starting value for geometry indices.
     all_touched : bool
         If True, all pixels touched by geometries will be burned in.
-        Note: rusterize may not support this parameter directly.
     merge_alg : str
         Merge algorithm. Supported values: "last", "sum", "first", "min", "max", "count", "any".
     fill : Any
@@ -80,12 +79,6 @@ def rasterize_geometries(
     """
     from rusterize import rusterize
 
-    if all_touched:
-        raise NotImplementedError(
-            "all_touched=True is not supported by the rusterize engine. "
-            "Use engine='rasterio' if you need all_touched support."
-        )
-
     # Create GeoDataFrame with index values
     # Dummy CRS required by rusterize but not used by the algorithm
     # https://github.com/ttrotto/rusterize/issues/10
@@ -102,6 +95,7 @@ def rasterize_geometries(
         field="value",
         fun=merge_alg,
         background=fill,
+        all_touched=all_touched,
         encoding="numpy",
         dtype=str(dtype),
     )
@@ -167,7 +161,6 @@ def np_geometry_mask(
         Affine transform for the output grid.
     all_touched : bool
         If True, all pixels touched by geometries will be included.
-        Note: rusterize may not support this parameter directly.
     invert : bool
         If True, pixels inside geometries are True (unmasked).
         If False (default), pixels inside geometries are False (masked).
@@ -181,12 +174,6 @@ def np_geometry_mask(
     """
     from rusterize import rusterize
 
-    if all_touched:
-        raise NotImplementedError(
-            "all_touched=True is not supported by the rusterize engine. "
-            "Use engine='rasterio' if you need all_touched support."
-        )
-
     # Create GeoDataFrame with burn value
     # Dummy CRS required by rusterize but not used by the algorithm
     # https://github.com/ttrotto/rusterize/issues/10
@@ -202,6 +189,7 @@ def np_geometry_mask(
         burn=1,
         fun="any",
         background=0,
+        all_touched=all_touched,
         encoding="numpy",
         dtype="uint8",
     )

src/rasterix/rasterize/rusterize.py

@@ -21,16 +21,15 @@ def dataset():
         return ds
 
 
+@pytest.mark.parametrize("all_touched", [False, True])
 @pytest.mark.parametrize("clip", [False, True])
-def test_rasterize(clip, engine, dataset):
-    # Use engine-specific snapshots due to pixel boundary differences:
-    # - rasterio: default (center-point) rasterization
-    # - rusterize: has its own boundary handling
-    # - exactextract: equivalent to all_touched=True (any coverage counts)
-    if engine == "rusterize":
-        suffix = "_rusterize"
-    elif engine == "exactextract":
-        suffix = "_all_touched"  # exactextract matches rasterio all_touched=True
+def test_rasterize(clip, all_touched, engine, dataset):
+    if engine == "exactextract" and all_touched:
+        pytest.skip("exactextract always behaves as all_touched=True; does not accept the parameter")
+
+    # exactextract inherently matches the all_touched snapshot
+    if all_touched or engine == "exactextract":
+        suffix = "_all_touched"
     else:
         suffix = ""
     fname = f"rasterize_snapshot{suffix}.nc"
@@ -43,7 +42,7 @@ def test_rasterize(clip, engine, dataset):
         snapshot = snapshot.sel(latitude=slice(83.25, None))
 
     world = gpd.read_file(geodatasets.get_path("naturalearth land"))
-    kwargs = dict(xdim="longitude", ydim="latitude", clip=clip, engine=engine)
+    kwargs = dict(xdim="longitude", ydim="latitude", clip=clip, all_touched=all_touched, engine=engine)
     rasterized = rasterize(dataset, world[["geometry"]], **kwargs)
     xr.testing.assert_identical(rasterized, snapshot)
     assert rasterized.dtype == "uint8"
@@ -68,17 +67,16 @@ def test_rasterize(clip, engine, dataset):
         xr.testing.assert_identical(drasterized, snapshot)
 
 
+@pytest.mark.parametrize("all_touched", [False, True])
 @pytest.mark.parametrize("invert", [False, True])
 @pytest.mark.parametrize("clip", [False, True])
-def test_geometry_mask(clip, invert, engine, dataset):
-    # Use engine-specific snapshots due to pixel boundary differences:
-    # - rasterio: default (center-point) rasterization
-    # - rusterize: has its own boundary handling
-    # - exactextract: equivalent to all_touched=True (any coverage counts)
-    if engine == "rusterize":
-        suffix = "_rusterize"
-    elif engine == "exactextract":
-        suffix = "_all_touched"  # exactextract matches rasterio all_touched=True
+def test_geometry_mask(clip, invert, all_touched, engine, dataset):
+    if engine == "exactextract" and all_touched:
+        pytest.skip("exactextract always behaves as all_touched=True; does not accept the parameter")
+
+    # exactextract inherently matches the all_touched snapshot
+    if all_touched or engine == "exactextract":
+        suffix = "_all_touched"
     else:
         suffix = ""
     fname = f"geometry_mask_snapshot{suffix}.nc"
@@ -93,7 +91,9 @@ def test_geometry_mask(clip, invert, engine, dataset):
 
     world = gpd.read_file(geodatasets.get_path("naturalearth land"))
 
-    kwargs = dict(xdim="longitude", ydim="latitude", clip=clip, invert=invert, engine=engine)
+    kwargs = dict(
+        xdim="longitude", ydim="latitude", clip=clip, invert=invert, all_touched=all_touched, engine=engine
+    )
     rasterized = geometry_mask(dataset, world[["geometry"]], **kwargs)
     xr.testing.assert_identical(rasterized, snapshot)