Improve used sources listing

Author: svenseeberg

opendrift_leeway_webgui/simulation.py

@@ -86,6 +86,7 @@ def main():
         action="store_true",
         default=False,
     )
+
     args = parser.parse_args()
 
     simulation = Leeway(loglevel=50)
@@ -95,8 +96,9 @@ def main():
         for data_file in os.listdir(INPUTDIR)
         if data_file.endswith(".nc")
     ]
+    sources = []
     if local_sources:
-        sources = local_sources
+        sources += local_sources
     elif not args.no_web:
         if os.environ.get("COPERNICUSMARINE_SERVICE_USERNAME") not in (
             None,
@@ -109,7 +111,9 @@ def main():
                 "cmems_mod_glo_phy_anfc_merged-uv_PT1H-i",
                 "cmems_obs-wind_glo_phy_nrt_l4_0.125deg_PT1H",
             ]
-            print("Using sources:\n - {}".format("\n - ".join(cmems_dataset_ids)))
+            print(
+                "Using CMEMS datasets:\n - {}".format("\n - ".join(cmems_dataset_ids))
+            )
             readers = []
             for dataset_id in cmems_dataset_ids:
                 try:
@@ -123,18 +127,16 @@ def main():
                     raise
                 readers.append(Reader(ds, name=dataset_id))
             simulation.add_reader(readers)
-            sources = [
+            sources += [
                 "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd"
             ]
-            simulation.add_readers_from_list(sources, lazy=False)
-
-    else:
-        sources = [
-            "https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest",
-            "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd",
-        ]
-        print("Using sources:\n - {}".format("\n - ".join(sources)))
-        simulation.add_readers_from_list(sources, lazy=False)
+        else:
+            sources += [
+                "https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest",
+                "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd",
+            ]
+    print("Using sources:\n - {}".format("\n - ".join(sources)))
+    simulation.add_readers_from_list(sources, lazy=False)
 
     reader_landmask = reader_global_landmask.Reader()
     simulation.add_reader([reader_landmask])

tests/leeway/test_simulation.py

@@ -1,5 +1,5 @@
 import re
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import pytest
 from django.core import mail
@@ -24,7 +24,9 @@ def test_simulation(admin_client, settings, celery_worker, uuid_store):
             "latitude": "33°58'44.3\"",
             "longitude": "11°21'13.4\"",
             "object_type": 27,
-            "start_time": datetime.now().strftime("%Y-%m-%d %H:%M"),
+            "start_time": (datetime.now() - timedelta(hours=4)).strftime(
+                "%Y-%m-%d %H:%M"
+            ),
             "duration": 2,
             "radius": 1000,
         },