Merge branch 'master' of https://github.com/OpenDroneMap/ODM into rolling

configure.py

@@ -60,7 +60,6 @@ def vcpkg_requirements():
     with open("vcpkg-requirements.txt") as f:
         pckgs = list(filter(lambda l: len(l) > 0, map(str.strip, f.read().split("\n"))))
     return pckgs
-        
 
 def build():
     # Create python virtual env
@@ -94,6 +93,7 @@ def build():
                         os.rename(top_dir, "vcpkg")
                     else:
                         print("Warning! Something looks wrong in the VCPKG archive... check the vcpkg/ directory.")
+                safe_remove("vcpkg-env.zip")
 
     if not os.path.exists(os.path.join("SuperBuild", "build")) or not os.path.exists(os.path.join("SuperBuild", "install")):
         print("Compiling SuperBuild")

opendm/config.py

@@ -536,7 +536,7 @@ def config(argv=None, parser=None):
                         action=StoreValue,
                         type=float,
                         default=5,
-                        help='DSM/DTM resolution in cm / pixel. Note that this value is capped by a ground sampling distance (GSD) estimate. To remove the cap, check --ignore-gsd also.'
+                        help='DSM/DTM resolution in cm / pixel. Note: This value is locked to at least 2x the ground sampling distance (GSD) estimate. To remove the cap, check --ignore-gsd also.'
                              ' Default: %(default)s')
 
     parser.add_argument('--dem-decimation',