Select newest init-time and carry over multilayering (#1047)

Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de>
Open-MSS · Jun 28, 2021 · 844f5ad · 844f5ad
1 parent 3b4fdf1
commit 844f5ad
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/mslib/msui/multilayers.py b/mslib/msui/multilayers.py
@@ -181,14 +181,24 @@ def reload_sync(self):
         self.synced_reference.vtimes = vtimes
         self.synced_reference.allowed_crs = crs
 
+        if self.current_layer:
+            if not self.synced_reference.level:
+                self.synced_reference.level = self.current_layer.level
+            if not self.synced_reference.itime:
+                self.synced_reference.itime = self.current_layer.itime
+            if not self.synced_reference.vtime:
+                self.synced_reference.vtime = self.current_layer.vtime
+
         if self.synced_reference.level not in self.synced_reference.levels:
-            self.synced_reference.level = self.synced_reference.levels[0] if self.synced_reference.levels else None
+            self.synced_reference.level = levels[0] if levels else None
 
         if self.synced_reference.itime not in self.synced_reference.itimes:
-            self.synced_reference.itime = self.synced_reference.itimes[0] if self.synced_reference.itimes else None
+            self.synced_reference.itime = itimes[-1] if itimes else None
 
-        if self.synced_reference.vtime not in self.synced_reference.vtimes:
-            self.synced_reference.vtime = self.synced_reference.vtimes[0] if self.synced_reference.vtimes else None
+        if self.synced_reference.vtime not in self.synced_reference.vtimes or \
+                self.synced_reference.vtime < self.synced_reference.itime:
+            self.synced_reference.vtime = next((vtime for vtime in vtimes if
+                                                vtime >= self.synced_reference.itime), None) if vtimes else None
 
     def filter_multilayers(self, filter_string=None):
         """