- FIX: Fixing condensed name to avoid duplicates:

  - adding the `job_id` for `VHR` products
  - adding the polarization channels for `SAR` products

Author: remi-braun

CHANGES.md

@@ -11,6 +11,9 @@
 
 ### Bug Fixes
 
+- FIX: Fixing condensed name to avoid duplicates:
+  - adding the `job_id` for `VHR` products
+  - adding the polarization channels for `SAR` products
 - FIX: Remove import of pystac in `stac_utils`
 - FIX: Fix bug for `Vision-1` data looking for non-existing RPC files in case of `ORTP` product type
 - FIX: Fix quicklook regex for `Vision-1` data

CI/SCRIPTS/test_satellites.py

@@ -191,7 +191,9 @@ def _test_core(
                 )
                 # Write to path if needed
                 if not extent_path.exists():
-                    raise FileNotFoundError(f"Extent not found for {prod}!")
+                    raise FileNotFoundError(
+                        f"Extent not found for {prod.condensed_name}!"
+                    )
                     # extent_path = os.path.join(
                     #     tmp_dir, f"{prod.condensed_name}_extent.geojson"
                     # )
@@ -218,7 +220,9 @@ def _test_core(
                 )
                 # Write to path if needed
                 if not footprint_path.exists():
-                    raise FileNotFoundError(f"Footprint not found for {prod}!")
+                    raise FileNotFoundError(
+                        f"Footprint not found for {prod.condensed_name}!"
+                    )
                     # footprint_path = os.path.join(
                     #     tmp_dir, f"{prod.condensed_name}_footprint.geojson"
                     # )

eoreader/products/__init__.py

@@ -129,7 +129,6 @@
     "SnapDems",
     "CosmoProduct",
     "CosmoProductType",
-    "CosmoPolarization",
     "CsgProduct",
     "CsgSensorMode",
     "CskProduct",
@@ -138,12 +137,10 @@
     "IceyeProductType",
     "IceyeSensorMode",
     "RcmProduct",
-    "RcmPolarization",
     "RcmProductType",
     "RcmSensorMode",
     "Rs2Product",
     "Rs2ProductType",
-    "Rs2Polarization",
     "Rs2SensorMode",
     "S1Product",
     "S1SensorMode",
@@ -158,12 +155,12 @@
     "TsxSensorMode",
 ]
 from .sar.sar_product import SarProduct, SarProductType, SnapDems
-from .sar.cosmo_product import CosmoProduct, CosmoProductType, CosmoPolarization
+from .sar.cosmo_product import CosmoProduct, CosmoProductType
 from .sar.csg_product import CsgProduct, CsgSensorMode
 from .sar.csk_product import CskProduct, CskSensorMode
 from .sar.iceye_product import IceyeProduct, IceyeProductType, IceyeSensorMode
-from .sar.rcm_product import RcmProduct, RcmPolarization, RcmProductType, RcmSensorMode
-from .sar.rs2_product import Rs2Product, Rs2ProductType, Rs2Polarization, Rs2SensorMode
+from .sar.rcm_product import RcmProduct, RcmProductType, RcmSensorMode
+from .sar.rs2_product import Rs2Product, Rs2ProductType, Rs2SensorMode
 from .sar.s1_product import S1Product, S1SensorMode, S1ProductType
 from .sar.saocom_product import (
     SaocomProduct,

eoreader/products/optical/dimap_product.py

@@ -1217,3 +1217,12 @@ def get_quicklook_path(self) -> str:
             LOGGER.warning(f"No quicklook found in {self.condensed_name}")
 
         return quicklook_path
+
+    def _get_job_id(self) -> str:
+        """
+        Get VHR job ID
+
+        Returns:
+            str: VHR product ID
+        """
+        return self.split_name[-1]

eoreader/products/optical/maxar_product.py

@@ -1261,3 +1261,12 @@ def get_quicklook_path(self) -> str:
             LOGGER.warning(f"No quicklook found in {self.condensed_name}")
 
         return quicklook_path
+
+    def _get_job_id(self) -> str:
+        """
+        Get VHR job ID
+
+        Returns:
+            str: VHR product ID
+        """
+        return self.split_name[0].split("-")[-1]

eoreader/products/optical/pneo_product.py

@@ -121,3 +121,12 @@ def _set_instrument(self) -> None:
         Pleiades: https://earth.esa.int/eogateway/missions/pleiades-neo
         """
         self.instrument = "Pleiades-Neo Imager"
+
+    def _get_job_id(self) -> str:
+        """
+        Get VHR job ID
+
+        Returns:
+            str: VHR product ID
+        """
+        return self.split_name[-5]

eoreader/products/optical/vhr_product.py

@@ -83,9 +83,22 @@ def __init__(
         self._pan_res = None
         self._ms_res = None
 
+        self._job_id = None
+
         # Initialization from the super class
         super().__init__(product_path, archive_path, output_path, remove_tmp, **kwargs)
 
+    def _post_init(self, **kwargs) -> None:
+        """
+        Function used to post_init the products
+        (setting sensor type, band names and so on)
+        """
+        # Job ID
+        self._job_id = self._get_job_id()
+
+        # Post init done by the super class
+        super()._post_init(**kwargs)
+
     def get_default_band_path(self, **kwargs) -> Union[CloudPath, Path]:
         """
         Get default band (:code:`GREEN` for optical data) path.
@@ -467,7 +480,7 @@ def _get_condensed_name(self) -> str:
         Returns:
             str: Condensed name
         """
-        return f"{self.get_datetime()}_{self.constellation.name}_{self.product_type.name}_{self.band_combi.name}"
+        return f"{self.get_datetime()}_{self.constellation.name}_{self.product_type.name}_{self.band_combi.name}_{self._job_id}"
 
     def _get_path(
         self, filename: str = "", extension: str = ""
@@ -683,10 +696,20 @@ def default_transform(self, **kwargs) -> (affine.Affine, int, int, CRS):
     @abstractmethod
     def _get_tile_path(self) -> Union[CloudPath, Path]:
         """
-        Get the DIMAP filepath
+        Get the VHR tile path
+
+        Returns:
+            Union[CloudPath, Path]: VHR filepath
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    def _get_job_id(self) -> Union[CloudPath, Path]:
+        """
+        Get VHR job ID
 
         Returns:
-            Union[CloudPath, Path]: DIMAP filepath
+            Union[CloudPath, Path]: VHR product ID
         """
         raise NotImplementedError
 

eoreader/products/optical/vis1_product.py

@@ -658,3 +658,12 @@ def get_quicklook_path(self) -> str:
             LOGGER.warning(f"No quicklook found in {self.condensed_name}")
 
         return quicklook_path
+
+    def _get_job_id(self) -> str:
+        """
+        Get VHR job ID
+
+        Returns:
+            str: VHR product ID
+        """
+        return self.split_name[-2]

eoreader/products/sar/cosmo_product.py

@@ -73,27 +73,6 @@ class CosmoProductType(ListEnum):
     """Level 1D, Geocoded Terrain Corrected"""
 
 
-@unique
-class CosmoPolarization(ListEnum):
-    """
-    COSMO-SkyMed (both generations) polarizations used during the acquisition.
-    More info
-    `here <https://egeos.my.salesforce.com/sfc/p/#1r000000qoOc/a/69000000JXxZ/WEEbowzi5cmY8vLqyfAAMKZ064iN1eWw_qZAgUkTtXI>`_.
-    """
-
-    HH = "HH"
-    """Horizontal Tx/Horizontal Rx for Himage, ScanSAR and Spotlight modes"""
-
-    VV = "VV"
-    """Vertical Tx/Vertical Rx for Himage, ScanSAR and Spotlight modes"""
-
-    HV = "HV"
-    """Horizontal Tx/Vertical Rx for Himage, ScanSAR"""
-
-    VH = "VH"
-    """Vertical Tx/Horizontal Rx for Himage, ScanSAR"""
-
-
 class CosmoProduct(SarProduct):
     """
     Class for COSMO-SkyMed (both generations) Products

eoreader/products/sar/rcm_product.py

@@ -113,21 +113,6 @@ class RcmSensorMode(ListEnum):
     """ Spotlight Mode [FSL] """
 
 
-@unique
-class RcmPolarization(ListEnum):
-    """
-    RADARSAT-Constellation polarization mode.
-    Take a look `here <https://catalyst.earth/catalyst-system-files/help/references/gdb_r/RADARSAT_Constellation.html>`_.
-    """
-
-    RH = "RH"
-    RV = "RV"
-    HH = "HH"
-    VV = "VV"
-    VH = "VH"
-    HV = "HV"
-
-
 class RcmProduct(SarProduct):
     """
     Class for RADARSAT-Constellation Products
@@ -375,7 +360,7 @@ def _read_mtd(self) -> (etree._Element, dict):
 
     def _get_condensed_name(self) -> str:
         """
-        Get products condensed name ({acq_datetime}_RCM_{sensor_mode}_{product_type}).
+        Get products condensed name ({acq_datetime}_{constellation}_{polarization}_{sensor_mode}_{product_type}).
 
         Returns:
             str: Condensed RCM name
@@ -396,7 +381,8 @@ def _get_condensed_name(self) -> str:
         else:
             mode_name = self.sensor_mode.name
 
-        return f"{self.get_datetime()}_{self.constellation.name}_{mode_name}_{self.product_type.value}"
+        pol_chan = [pol.value for pol in self.pol_channels]
+        return f"{self.get_datetime()}_{self.constellation.name}_{'_'.join(pol_chan)}_{mode_name}_{self.product_type.value}"
 
     def get_quicklook_path(self) -> str:
         """