Merge pull request #66 from forrestfwilliams/dem-url

Fix DEM URLs

Author: forrestfwilliams

.gitignore

@@ -243,3 +243,7 @@ tags
 
 # Data
 src/multirtc/multimetric/*/
+
+# pixi environments
+.pixi/*
+!.pixi/config.toml

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.4]
+
+### Fixed
+* Copernicus DEM for NISAR URLs to fix 404 errors.
+
 ## [0.5.3]
 
 ### Changed

src/multirtc/dem.py

@@ -134,7 +134,7 @@ def get_dem_granule_url(lat: int, lon: int) -> str:
     lon_cardinal = 'W' if lon_tens < 0 else 'E'
 
     prefix = f'{lat_cardinal}{np.abs(lat_tens):02d}/{lat_cardinal}{np.abs(lat_tens):02d}_{lon_cardinal}{np.abs(lon_tens):03d}'
-    filename = f'DEM{lat_cardinal}{np.abs(lat):02d}_00_{lon_cardinal}{np.abs(lon):03d}_00_C01.tif'
+    filename = f'DEM_{lat_cardinal}{np.abs(lat):02d}_00_{lon_cardinal}{np.abs(lon):03d}_00_C01.tif'
     file_url = f'{URL}/{prefix}/{filename}'
     return file_url
 

tests/test_dem.py

@@ -5,7 +5,7 @@
 
 def test_get_granule_url():
     test_url = (
-        'https://nisar.asf.earthdatacloud.nasa.gov/NISAR/DEM/v1.2/EPSG4326/S10/S10_W020/DEMS01_00_W001_00_C01.tif'
+        'https://nisar.asf.earthdatacloud.nasa.gov/NISAR/DEM/v1.2/EPSG4326/S10/S10_W020/DEM_S01_00_W001_00_C01.tif'
     )
     url = dem.get_dem_granule_url(-1, -1)
     assert url == test_url