Merge pull request #51 from giswqs/develop

Updated to WBT v2.2.0

.gitignore

@@ -16,6 +16,7 @@ dev/
 .vscode/
 _build/
 temp/
+whitebox/__MACOSX/
 
 # C extensions
 *.so

whitebox/automation.py

@@ -89,18 +89,25 @@
 with open(os.path.join(WBT_dir, "whitebox_tools.py")) as f_wbt:
     lines = f_wbt.readlines()
     for index, line in enumerate(lines):
+        if line.strip() == "os.chdir(self.exe_path)":
+            f.write("            work_dir = os.getcwd()\n")
         f.write(line)
+
         if line.strip() == "from subprocess import STARTUPINFO, STARTF_USESHOWWINDOW":
             with open(os.path.join(work_dir, "download_wbt.py")) as f_dl:
                 dl_lines = f_dl.readlines()
                 f.write("\n")
                 f.writelines(dl_lines)
-        elif line.strip() == "self.__compress_rasters = False":
+        elif line.strip() == "self.__max_procs = -1":
             f.write("        download_wbt()\n")
 
+        if line.strip() in ["return 1", "return err"]:
+            f.write("        finally:\n")
+            f.write("            os.chdir(work_dir)\n")
+
+
 shutil.move(
-    os.path.join(WBT_dir, "whitebox_tools"), os.path.join(
-        work_dir, "whitebox_tools")
+    os.path.join(WBT_dir, "whitebox_tools"), os.path.join(work_dir, "whitebox_tools")
 )
 
 

whitebox/download_wbt.py

@@ -120,9 +120,9 @@ def download_wbt(verbose=True):
             except:
                 pass
 
-            # The official WhiteboxTools Linux binary from whiteboxgeo.com requires GLIBC 2.29,
-            # which is incompatible with Google Colab that uses GLIBC 2.27. The following code
-            # downloads the binary that is compatible with Google Colab.
+            # # The official WhiteboxTools Linux binary from whiteboxgeo.com requires GLIBC 2.29,
+            # # which is incompatible with Google Colab that uses GLIBC 2.27. The following code
+            # # downloads the binary that is compatible with Google Colab.
             if "google.colab" in sys.modules:
                 url = "https://github.com/giswqs/whitebox-bin/raw/master/WhiteboxTools_ubuntu_18.04.zip"
                 zip_name = os.path.join(pkg_dir, os.path.basename(url))
@@ -143,7 +143,7 @@ def download_wbt(verbose=True):
                 except Exception as e:
                     print(e)
 
-            webbrowser.open('https://www.whiteboxgeo.com/', new=2)
+            webbrowser.open("https://www.whiteboxgeo.com/", new=2)
 
         if not os.path.exists(work_dir):
             if verbose: