fix wrong dimension _compute_chunks(); cover with test

Author: LucaMarconato

src/spatialdata_io/readers/_utils/_image.py

@@ -39,15 +39,14 @@ def _compute_chunks(
         Array of shape (n_tiles_x, n_tiles_y, 4). Each entry defines a tile
         as (x, y, width, height).
     """
-    # TODO: check x -> 1 and y -> 0?
-    x_positions, widths = _compute_chunk_sizes_positions(shape[1], chunk_size[1])
-    y_positions, heights = _compute_chunk_sizes_positions(shape[0], chunk_size[0])
+    x_positions, widths = _compute_chunk_sizes_positions(shape[0], chunk_size[0])
+    y_positions, heights = _compute_chunk_sizes_positions(shape[1], chunk_size[1])
 
     # Generate the tiles
     tiles = np.array(
         [
-            [[x, y, w, h] for x, w in zip(x_positions, widths, strict=True)]
-            for y, h in zip(y_positions, heights, strict=True)
+            [[x, y, w, h] for y, h in zip(y_positions, heights, strict=True)]
+            for x, w in zip(x_positions, widths, strict=True)
         ],
         dtype=int,
     )

tests/readers/test_utils_image.py

@@ -9,7 +9,7 @@
 
 
 @pytest.mark.parametrize(
-    ("size", "chunk", "positions", "lengths"),
+    ("size", "chunk", "expected_positions", "expected_lengths"),
     [
         (300, 100, np.array([0, 100, 200]), np.array([100, 100, 100])),
         (300, 200, np.array([0, 200]), np.array([200, 100])),
@@ -18,12 +18,12 @@
 def test_compute_chunk_sizes_positions(
     size: int,
     chunk: int,
-    positions: NDArray[np.number],
-    lengths: NDArray[np.number],
+    expected_positions: NDArray[np.number],
+    expected_lengths: NDArray[np.number],
 ) -> None:
     computed_positions, computed_lengths = _compute_chunk_sizes_positions(size, chunk)
-    assert (positions == computed_positions).all()
-    assert (lengths == computed_lengths).all()
+    assert (expected_positions == computed_positions).all()
+    assert (expected_lengths == computed_lengths).all()
 
 
 @pytest.mark.parametrize(
@@ -33,13 +33,24 @@ def test_compute_chunk_sizes_positions(
         (
             (2, 2),
             (1, 1),
-            np.array([[[0, 0, 1, 1], [1, 0, 1, 1]], [[0, 1, 1, 1], [1, 1, 1, 1]]]),
+            np.array(
+                [
+                    [[0, 0, 1, 1], [0, 1, 1, 1]],
+                    [[1, 0, 1, 1], [1, 1, 1, 1]],
+                ]
+            ),
         ),
         # Different tile sizes
         (
-            (3, 3),
-            (2, 2),
-            np.array([[[0, 0, 2, 2], [2, 0, 1, 2]], [[0, 2, 2, 1], [2, 2, 1, 1]]]),
+            (300, 300),
+            (100, 200),
+            np.array(
+                [
+                    [[0, 0, 100, 200], [0, 200, 100, 100]],
+                    [[100, 0, 100, 200], [100, 200, 100, 100]],
+                    [[200, 0, 100, 200], [200, 200, 100, 100]],
+                ]
+            ),
         ),
     ],
 )