Merge pull request #8 from scottstanie/gdal-fixes

Gdal fixes
scottstanie · Aug 13, 2022 · f31d9b3 · f31d9b3
2 parents f75df52 + ec9dfd5
commit f31d9b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/sardem/cop_dem.py b/sardem/cop_dem.py
@@ -63,11 +63,17 @@ def download_and_stitch(
     # Used the __RETURN_OPTION_LIST__ to get the list of options for debugging
     logger.info("Creating {}".format(output_name))
     logger.info("Fetching remote tiles...")
-    cmd = _gdal_cmd_from_options(vrt_filename, output_name, option_dict)
-    logger.info("Running GDAL command:")
+    try:
+        cmd = _gdal_cmd_from_options(vrt_filename, output_name, option_dict)
+        logger.info("Running GDAL command:")
+        logger.info(cmd)
+    except Exception:
+        # Can't form the cli version due to `deepcopy` Pickle error, just skip
+        logger.info("Running gdal Warp with options:")
+        logger.info(option_dict)
+        pass
+    # Now convert to something GDAL can actually use
     option_dict["callback"] = gdal.TermProgress
-    logger.info(cmd)
-    # Now convert to something GDAL can actuall use
     gdal.Warp(output_name, vrt_filename, options=gdal.WarpOptions(**option_dict))
     return
 

diff --git a/sardem/dem.py b/sardem/dem.py
@@ -452,7 +452,9 @@ def main(
 
     if make_isce_xml:
         logger.info("Creating ISCE2 XML file")
-        utils.gdal2isce_xml(output_name, keep_egm=keep_egm, shift_rsc=using_gdal_bounds)
+        utils.gdal2isce_xml(
+            output_name, keep_egm=keep_egm, using_gdal_bounds=using_gdal_bounds
+        )
 
     if keep_egm or data_source == "NASA_WATER":
         logger.info("Keeping DEM as EGM96 geoid heights")

diff --git a/sardem/tests/test_dem.py b/sardem/tests/test_dem.py
@@ -37,7 +37,7 @@ class TestDownload(unittest.TestCase):
     def setUp(self):
         self.bounds = utils.bounding_box(-155.4, 19.75, 0.001, 0.001)
         self.test_tile = "N19W156"
-        self.hgt_url = "http://e4ftl01.cr.usgs.gov/MEASURES/\
+        self.hgt_url = "https://e4ftl01.cr.usgs.gov/MEASURES/\
 SRTMGL1.003/2000.02.11/N19W156.SRTMGL1.hgt.zip"
 
         sample_hgt_path = join(DATAPATH, self.test_tile + ".hgt.zip")
@@ -52,7 +52,7 @@ def tearDown(self):
     def test_init(self):
         d = download.Downloader([self.test_tile], netrc_file=NETRC_PATH)
         self.assertEqual(
-            d.data_url, "http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11"
+            d.data_url, "https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11"
         )
 
     @responses.activate

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="sardem",
-    version="0.10.5",
+    version="0.10.6",
     author="Scott Staniewicz",
     author_email="scott.stanie@gmail.com",
     description="Create upsampled DEMs for InSAR processing",