Fixes planar configuration being tied to photometric interpretation (#61)

Author: jakenotjay

pyproject.toml

@@ -55,6 +55,7 @@ dev = [
   "mkdocs>=1.6.1",
   "mkdocstrings>=0.29.1",
   "mkdocstrings-python>=1.16.10",
+  "rioxarray>=0.19.0",
 ]
 
 [tool.pixi.workspace]
@@ -192,4 +193,4 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.ruff.lint.isort]
-known-first-party = ["src/virtual_tiff"]
+known-first-party = ["src/virtual_tiff"]

src/virtual_tiff/parser.py

@@ -160,10 +160,9 @@ def _add_dim_for_samples_per_pixel(
 ) -> tuple[tuple[int, ...], tuple[int, ...]]:
     sample_dim_length = int(ifd.samples_per_pixel)
     shape = (sample_dim_length,) + shape
-    if ifd.photometric_interpretation == 2 and ifd.planar_configuration == 2:
-        # For PlanarConfiguration = 2, the StripOffsets for the component planes are stored
-        # in the indicated order: first the Red component plane StripOffsets, then the Green plane
-        # StripOffsets, then the Blue plane StripOffsets.
+    if ifd.planar_configuration == 2:
+        # For PlanarConfiguration = 2, the offsets for each component plane are stored
+        # separately. Each plane has its own set of offsets, ordered by component.
         chunks = (1,) + chunks
     else:
         chunks = (sample_dim_length,) + chunks

tests/test_multiband_s3.py

@@ -0,0 +1,32 @@
+import xarray as xr
+from obstore.store import S3Store
+from virtualizarr.registry import ObjectStoreRegistry
+
+from virtual_tiff import VirtualTIFF
+
+
+def test_multiband_planar_tiff_from_source_coop():
+    """Test multi-band TIFF with PlanarConfiguration=2 and non-RGB PhotometricInterpretation.
+
+    This tests the fix for the TIFF 6.0 spec compliance issue where PlanarConfiguration=2
+    was only handled for RGB images (PhotometricInterpretation=2).
+
+    The AEF embedding TIFFs have:
+    - PhotometricInterpretation = 1 (BlackIsZero)
+    - SamplesPerPixel = 64 (embedding dimensions)
+    - PlanarConfiguration = 2 (separate planes)
+    """
+    filepath = "s3://us-west-2.opendata.source.coop/tge-labs/aef/v1/annual/2023/10N/xjtqldak16clgy5os-0000000000-0000008192.tiff"
+    store = S3Store(
+        bucket="us-west-2.opendata.source.coop",
+        skip_signature=True,
+        region="us-west-2",
+    )
+    registry = ObjectStoreRegistry({"s3://us-west-2.opendata.source.coop/": store})
+    parser = VirtualTIFF(ifd=0)
+    ms = parser(filepath, registry=registry)
+    ds = xr.open_zarr(ms, zarr_format=3, consolidated=False)
+
+    assert isinstance(ds, xr.Dataset)
+    assert "band" in ds["0"].dims
+    assert ds["0"].sizes["band"] == 64