Merge main to v1 (#819)

Co-authored-by: roeldegoede <83765910+roeldegoede@users.noreply.github.com>
Co-authored-by: Dirk Eilander <dirk.eilander@gmail.com>
Co-authored-by: DirkEilander <15379728+DirkEilander@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Sam Vente <savente93@proton.me>

.github/workflows/tests.yml

@@ -11,6 +11,7 @@ on:
       - hydromt/*
       - data/*
       - pyproject.toml
+      - pixi.lock
   pull_request:
     branches:
       - main
@@ -20,6 +21,7 @@ on:
       - hydromt/*
       - data/*
       - pyproject.toml
+      - pixi.lock
 
 
 jobs:

.gitignore

@@ -107,9 +107,6 @@ venv.bak/
 .spyderproject
 .spyproject
 
-# VScode
-.vscode
-
 # PyCharm
 .idea
 

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+    "recommendations": [
+        "ms-python.python",
+        "ms-python.debugpy",
+        "ms-python.vscode-pylance",
+        "charliermarsh.ruff",
+        "njpwerner.autodocstring"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "purpose": ["debug-test"]
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+    "[python]": {
+        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit"
+        }
+    },
+    "editor.formatOnSave": true
+}

docs/changelog.rst

@@ -38,6 +38,9 @@ Changed
 -------
 - Development environment is now set up via pixi instead of mamba / conda. See the documentation for more information on how to install.
 
+Fixed
+-----
+- Bug in `raster.transform` with lazy coordinates. (#801)
 
 
 v0.9.4 (2024-02-26)

hydromt/gis/raster.py

@@ -591,6 +591,8 @@ def res(self) -> tuple[float, float]:
                 )
             ):
                 dy = -1 * dy
+        if isinstance(dx, dask.array.Array):
+            dx, dy = dx.compute(), dy.compute()
         self._res = dx, dy
         return dx, dy
 
@@ -649,6 +651,8 @@ def origin(self) -> tuple[float, float]:
                 b = c * math.cos(beta - alpha)
                 x0 = xs[0, 0] - np.sign(dy) * a
                 y0 = ys[0, 0] - np.sign(dy) * b
+        if isinstance(x0, dask.array.Array):  # compute if lazy
+            x0, y0 = x0.compute(), y0.compute()
         self._origin = x0, y0
         return x0, y0
 
@@ -1244,10 +1248,10 @@ def clip_bbox(self, bbox, align=None, buffer=0, crs=None):
                 xs, ys = zip(*gdf_bbox.dissolve().boundary[0].coords[:])
         cs, rs = ~self.transform * (np.array(xs), np.array(ys))
         # use round to get integer slices
-        c0 = max(int(round(cs.min() - buffer)), 0)
-        r0 = max(int(round(rs.min() - buffer)), 0)
-        c1 = int(round(cs.max() + buffer))
-        r1 = int(round(rs.max() + buffer))
+        c0 = max(int(np.round(cs.min() - buffer)), 0)
+        r0 = max(int(np.round(rs.min() - buffer)), 0)
+        c1 = int(np.round(cs.max() + buffer))
+        r1 = int(np.round(rs.max() + buffer))
         return self.clip(slice(c0, c1), slice(r0, r1))
 
     def clip_mask(self, da_mask: xr.DataArray, mask: bool = False):