FIX: Fix multi-polarisation SAR data with swaths orthorectified independently (i.e. SAOCOM)

Author: remi-braun

CHANGES.md

@@ -26,6 +26,7 @@
 - FIX: Use only the number of range looks to derive the resolution and pixel_size of CSG data [#256](https://github.com/sertit/eoreader/issues/256)
 - FIX: Return an empty `lxml.Element` as metadata for S1 RTC ASF products instead of `None` to ensure consistency
 - FIX: Set `EPSG:4326` for rasters with empty CRS to be orthorectified with RPCs 
+- FIX: Fix multi-polarisation SAR data with swaths orthorectified independently (i.e. SAOCOM)
 - OPTIM: Use raw band path over default band path to speed up the computation of image information (extent, footprint, CRS, transform) of SAR ortho products
 - OPTIM: Allow predictor = 3 with LZW compression when saving SAR intermediate data as SNAP handles it properly now. [#173](https://github.com/sertit/eoreader/issues/173)
 - CI: Filter some warnings in pytest

ci/weekly/test_all_sat_end_to_end_on_disk.py

@@ -9,6 +9,7 @@
 import xarray as xr
 from lxml import etree
 from sertit import AnyPath, path, types
+from sertit.types import AnyPathStrType
 
 from ci.scripts_utils import (
     CI_EOREADER_S3,
@@ -123,10 +124,10 @@ def _test_core_optical(
     _test_core(
         pattern,
         [opt_path(), get_ci_db_dir().joinpath("more_optical")],
-        possible_bands,
-        tmpdir,
-        dem_path,
-        debug,
+        possible_bands=possible_bands,
+        tmpdir=tmpdir,
+        dem_path=dem_path,
+        debug=debug,
         **kwargs,
     )
 
@@ -144,16 +145,17 @@ def _test_core_sar(
     _test_core(
         pattern,
         get_ci_db_dir().joinpath("all_sar"),
-        possible_bands,
-        dem_path,
-        debug,
+        possible_bands=possible_bands,
+        tmpdir=tmpdir,
+        dem_path=dem_path,
+        debug=debug,
         **kwargs,
     )
 
 
 def _test_core(
     pattern: str,
-    prod_dirs: str | list,
+    prod_dirs: AnyPathStrType | list,
     possible_bands: list,
     tmpdir: Path,
     dem_path=None,

eoreader/products/sar/sar_product.py

@@ -1192,13 +1192,16 @@ def interp_na(array, dim):
         # Get the .img path(s)
         try:
             imgs = utils.get_dim_img_path(dim_path, f"*{pol}*")
+            LOGGER.debug(f"Found {imgs} sub-images (for {pol}).")
         except FileNotFoundError:
+            LOGGER.debug(f"No {pol} image found in {dim_path}")
             imgs = utils.get_dim_img_path(dim_path)  # Maybe not a good name
+            LOGGER.debug(f"Using {imgs} instead")
 
         # Manage cases where multiple swaths are ortho independently
         if len(imgs) > 1:
             mos_path, exists = self._get_out_path(
-                path.get_filename(dim_path) + "_mos.vrt"
+                path.get_filename(dim_path) + f"_mos_{pol}.vrt"
             )
             if not exists:
                 # Get .img file path (readable by rasterio)
@@ -1226,8 +1229,6 @@ def interp_na(array, dim):
                     arr = rasters.crop(arr, crop_window)
 
             # WARNING: Set nodata to 0 here as it is the value wanted by SNAP!
-            # SNAP < 10.0.0 fails with classic predictor !!! Set the predictor to the default value (1) !!!
-            # Caused by: javax.imageio.IIOException: Illegal value for Predictor in TIFF file
             arr = utils.write_path_in_attrs(arr, out_path)
             utils.write(
                 arr,