Update erddap_data.py

- solve and close #201
euroargodev · Apr 5, 2022 · 13a180b · 13a180b
1 parent e5c55c0
commit 13a180b
Showing 1 changed file with 15 additions and 25 deletions.
diff --git a/argopy/data_fetchers/erddap_data.py b/argopy/data_fetchers/erddap_data.py
@@ -582,33 +582,23 @@ def uri(self):
         list(str)
         """
         if not self.parallel:
-            if len(self.WMO) <= 5:  # todo: This max WMO number should be parameterized somewhere else
-                # Retrieve all WMOs in a single request
-                return [self.get_url()]
-            else:
-                # Retrieve one WMO by URL sequentially (same behaviour as localftp and argovis)
-                urls = []
-                for wmo in self.WMO:
-                    urls.append(
-                        Fetch_wmo(
-                            WMO=wmo, CYC=self.CYC, ds=self.dataset_id, parallel=False
-                        ).get_url()
-                    )
-                return urls
+            chunks = "auto"
+            chunks_maxsize = {'wmo': 5}
         else:
-            self.Chunker = Chunker(
-                {"wmo": self.WMO}, chunks=self.chunks, chunksize=self.chunks_maxsize
+            chunks = self.chunks
+            chunks_maxsize = self.chunks_maxsize
+        self.Chunker = Chunker(
+            {"wmo": self.WMO}, chunks=chunks, chunksize=chunks_maxsize
+        )
+        wmo_grps = self.Chunker.fit_transform()
+        urls = []
+        for wmos in wmo_grps:
+            urls.append(
+                Fetch_wmo(
+                    WMO=wmos, CYC=self.CYC, ds=self.dataset_id, parallel=False
+                ).get_url()
             )
-            wmo_grps = self.Chunker.fit_transform()
-            # self.chunks = C.chunks
-            urls = []
-            for wmos in wmo_grps:
-                urls.append(
-                    Fetch_wmo(
-                        WMO=wmos, CYC=self.CYC, ds=self.dataset_id, parallel=False
-                    ).get_url()
-                )
-            return urls
+        return urls
 
     def dashboard(self, **kw):
         if len(self.WMO) == 1: