Fix regulation logic to account for listified input

Author: Simon-van-Diepen

sarxarray/_io.py

@@ -467,13 +467,20 @@ def _regulate_metadata(metadata, driver):
             )
 
         if key in META_ARRAY_KEYS.keys():  # need to regulate this one separately
-            regulated_array = np.zeros((len(metadata[key]), len(metadata[key][0])))
-            for row in range(len(metadata[key])):
-                for col in range(len(metadata[key][row])):
-                    regulated_array[row, col] = META_ARRAY_KEYS[key](
-                        metadata[key][row][col]
-                    )
-            metadata[key] = np.copy(regulated_array)
+            regulated_arrays = []
+            for arr in metadata[key]:
+                regulated_array = np.zeros((len(arr), len(arr[0])))
+                for row in range(len(arr)):
+                    for col in range(len(arr[row])):
+                        regulated_array[row, col] = META_ARRAY_KEYS[key](arr[row][col])
+                regulated_arrays.append(np.copy(regulated_array))
+
+            metadata[key] = [
+                np.copy(regulated_array) for regulated_array in regulated_arrays
+            ]
+            if len(metadata[key]) == 1:
+                metadata[key] = metadata[key][0]
+
 
         else:
             # Only keep the unique values

tests/test_io.py

@@ -190,6 +190,7 @@ def test_read_metadata_doris4(self, res_files_doris4):
 
     def test_read_metadata_doris5(self, res_files_doris5, caplog):
         with caplog.at_level(logging.WARNING):  # Last file has a wrong number of pixels
+            # also catches the multiple orbit warning
             metadata = sarxarray.read_metadata(res_files_doris5, driver="doris5")
         for key in RE_PATTERNS_DORIS5.keys():
             assert key in metadata
@@ -198,9 +199,10 @@ def test_read_metadata_doris5(self, res_files_doris5, caplog):
             elif key in META_INT_KEYS:
                 assert isinstance(metadata[key], int)
             elif key in META_ARRAY_KEYS.keys():
-                assert isinstance(metadata[key], np.ndarray)
-                assert len(metadata[key].shape) == 2
-                assert isinstance(metadata[key][0][0], META_ARRAY_KEYS[key])
+                assert isinstance(metadata[key][0], np.ndarray)
+                assert len(metadata[key]) == len(res_files_doris5)
+                assert len(metadata[key][0].shape) == 2
+                assert isinstance(metadata[key][0][0][0], META_ARRAY_KEYS[key])
         for key in RE_PATTERNS_DORIS5_IFG.keys():
             assert key in metadata
             if key in META_FLOAT_KEYS:
@@ -234,6 +236,10 @@ def test_read_metadata_doris5_onefile(self, res_files_doris5, caplog):
                 assert isinstance(metadata[key], float)
             elif key in META_INT_KEYS:
                 assert isinstance(metadata[key], int)
+            elif key in META_ARRAY_KEYS.keys():
+                assert isinstance(metadata[key], np.ndarray)
+                assert len(metadata[key].shape) == 2
+                assert isinstance(metadata[key][0][0], META_ARRAY_KEYS[key])
         for key in RE_PATTERNS_DORIS5_IFG.keys():
             assert key in metadata
             if key in META_FLOAT_KEYS: