refactor

Author: Clarmy

README.md

@@ -16,7 +16,7 @@ When API key is reday, you can download DEM data like this:
 bbox = 108.444319, 20.161757, 111.318897, 18.05883
 
 terrain = Terrain("Dto0r88DQuaQizoxcQSxxx")
-xs, ys, elevation = terrain.fetch(bbox=bbox, progress_bar=True, coord="lonlat", zoom=10)
+xs, ys, elevation = terrain.fetch(bbox=bbox, quiet=False, coord="lonlat", zoom=12)
 ```
 
 If download is not complete because of connection, retry it.

pyterrain/core.py

@@ -79,13 +79,17 @@ def fetch(
         self,
         bbox: List,
         zoom: int = None,
-        progress_bar=False,
         timeout=10,
         cache_path="./cache",
         keep_cache=True,
         coord="xy",
         multiproc=4,
+        quiet=False,
     ) -> tuple:
+        if quiet:
+            progress_bar = False
+        else:
+            progress_bar = True
 
         left, upper, right, lower = bbox
         if zoom is None:
@@ -149,18 +153,20 @@ def fetch(
             if not os.path.exists(tmpfp):
                 task_args.append([url, tmpfp, timeout])
 
-        with Pool(multiproc) as p:
-            result = list(
-                tqdm(
-                    p.imap_unordered(single_download, task_args),
-                    total=len(task_args),
-                    desc="downloading",
-                ),
-            )
-        try:
-            assert all(result)
-        except AssertionError:
-            raise Exception("Not download completely, please retry")
+        if task_args:
+            with Pool(multiproc) as p:
+                result = list(
+                    tqdm(
+                        p.imap_unordered(single_download, task_args),
+                        total=len(task_args),
+                        desc="downloading",
+                    ),
+                )
+
+            try:
+                assert all(result)
+            except AssertionError:
+                raise Exception("Not download completely, please retry")
 
         for (nx, ny), (x, y), url in tqdm(
             urls, disable=not progress_bar, desc="mosaicing"
@@ -176,11 +182,12 @@ def fetch(
         blue = canvas[..., 2]
         elevation = ((red * 256 + green + blue / 256) - 32768).astype(int)[idx]
 
-        print(f"bbox: {bbox}")
-        print(f"zoom: {zoom}")
-        print(f"mean of elevation: {int(elevation.mean())}")
-        print(f"max of elevation: {elevation.max()}")
-        print(f"min of elevation: {elevation.min()}")
+        if not quiet:
+            print(f"bbox: {bbox}")
+            print(f"zoom: {zoom}")
+            print(f"mean of elevation: {int(elevation.mean())}")
+            print(f"max of elevation: {elevation.max()}")
+            print(f"min of elevation: {elevation.min()}")
 
         if not keep_cache:
             shutil.rmtree(cache_path)

sample/zelda.py

@@ -12,7 +12,7 @@
 
     terrain = Terrain("qBD4m7PNT5apV-Xl7PROxA")
 
-    xs, ys, elevation = terrain.fetch(bbox=bbox, progress_bar=True, coord="lonlat", zoom=12)
+    xs, ys, elevation = terrain.fetch(bbox=bbox, quiet=False, coord="lonlat", zoom=12)
 
     land = copy.deepcopy(elevation)
     land[land < 0] = -9999