Merge pull request #63 from Deltares/fix/utils_60_61

Fix/utils 60 61 Former-commit-id: c16be68
Deltares · Oct 1, 2023 · 7477bab · 7477bab
2 parents 7132ebf + 4e09a24
commit 7477bab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -1,3 +1,7 @@
+## v2.2.6 (2023-10-01)
+
+- Fixed an issue where irregular station names like `MA_67.00Z` caused a sorting error in `utils.Compare1D2D`
+
 ## v2.2.5 (2023-07-28)
 
 - FM2PROF now validates the "SkipMaps" parameter and throws error if its value is larger than the available number of maps

diff --git a/fm2prof/utils.py b/fm2prof/utils.py
@@ -1729,8 +1729,8 @@ def get_route(
 
         # sort data
         sorted_indices = np.argsort(routekms)
-        sorted_stations = [stations[i] for i in sorted_indices]
-        sorted_rkms = [routekms[i] for i in sorted_indices]
+        sorted_stations = [stations[i] for i in sorted_indices if routekms[i] is not np.nan]
+        sorted_rkms = [routekms[i] for i in sorted_indices if routekms[i] is not np.nan]
 
         # sort lmw stations
         lmw_stations = [
@@ -2348,7 +2348,7 @@ def _catch_e(
         try:
             return func(*args, **kwargs)
         except exception as e:
-            return None
+            return np.nan
 
 
 class Network1D: