Skip to content

Commit c289e5c

Browse files
committed
fix SRTM download
1 parent 5c6896b commit c289e5c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ost/Project.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
# ------ bug of rasterio --------
55
import os
6+
67
if "GDAL_DATA" in list(os.environ.keys()):
78
del os.environ["GDAL_DATA"]
89
if "PROJ_LIB" in list(os.environ.keys()):
@@ -69,7 +70,7 @@ def __init__(
6970
logger.info('Project directory already exists. '
7071
'No data has been deleted at this point but '
7172
'make sure you really want to use this folder.')
72-
73+
7374
# define project sub-directories if not set, and create folders
7475
self.download_dir = self.project_dir.joinpath('download')
7576
self.download_dir.mkdir(parents=True, exist_ok=True)
@@ -617,7 +618,6 @@ def pre_download_srtm(self):
617618
logger.info('Pre-downloading SRTM tiles')
618619
srtm.download_srtm(self.aoi)
619620

620-
621621
def bursts_to_ards(
622622
self,
623623
timeseries=False,
@@ -712,13 +712,13 @@ def bursts_to_ards(
712712
if overwrite:
713713
logger.info('Deleting processing folder to start from scratch')
714714
h.remove_folder_content(self.config_dict['processing_dir'])
715-
715+
716716
# --------------------------------------------
717717
# 5 set resolution to degree
718718
# self.ard_parameters['resolution'] = h.resolution_in_degree(
719719
# self.center_lat, self.ard_parameters['resolution'])
720720

721-
if self.config_dict['max_workers'] > 1:
721+
if self.config_dict['max_workers'] > 1 and self.ard_parameters['single_ARD']['dem']['dem_name'] == 'SRTM 1Sec HGT':
722722
self.pre_download_srtm()
723723

724724
# --------------------------------------------

ost/helpers/srtm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ def download_srtm(aoi):
9595
warnings.filterwarnings(
9696
'ignore', 'Geometry is in a geographic CRS', UserWarning
9797
)
98-
srtm = gpd.read_file(
99-
OST_ROOT.joinpath('aux/srtm1sectiles.gpkg')
100-
)
98+
99+
srtm = gpd.read_file(OST_ROOT.joinpath('aux/srtm1sectiles.gpkg'))
101100

102101
aoi_gdf = vec.wkt_to_gdf(aoi)
103102
aoi_gdf['geometry'] = aoi_gdf.geometry.buffer(1)
104103
overlap_df = gpd.overlay(srtm, aoi_gdf, how='intersection')
104+
105105
iter_list = []
106106
for file in overlap_df.url.values:
107107
iter_list.append(file)

0 commit comments

Comments
 (0)