Skip to content

Commit c774561

Browse files
johntruckenbrodtjohntruckenbrodt
committed
[auxdata] disable TDX90m DEM option (FTP server no longer available, HTTPS authentication yet to be implemented if possible)
1 parent c6fa498 commit c774561

File tree

3 files changed

+45
-55
lines changed

3 files changed

+45
-55
lines changed

‎pyroSAR/auxdata.py‎

Lines changed: 41 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ def dem_autoload(geometries, demType, vrt=None, buffer=None, username=None,
103103
104104
* url: https://download.esa.int/step/auxdata/dem/SRTM90/tiff
105105
* height reference: EGM96
106-
107-
- 'TDX90m'
108-
109-
* registration: https://geoservice.dlr.de/web/dataguide/tdm90
110-
* url: ftpes://tandemx-90m.dlr.de
111-
* height reference: WGS84
112106
113107
vrt: str or None
114108
an optional GDAL VRT file created from the obtained DEM tiles
@@ -181,17 +175,6 @@ def dem_autoload(geometries, demType, vrt=None, buffer=None, username=None,
181175
- 'SRTM 3Sec'
182176
183177
* 'dem': the actual Digital Elevation Model
184-
185-
- 'TDX90m'
186-
187-
* 'dem': the actual Digital Elevation Model
188-
* 'am2': Amplitude Mosaic representing the minimum value
189-
* 'amp': Amplitude Mosaic representing the mean value
190-
* 'com': Consistency Mask
191-
* 'cov': Coverage Map
192-
* 'hem': Height Error Map
193-
* 'lsm': Layover and Shadow Mask, based on SRTM C-band and Globe DEM data
194-
* 'wam': Water Indication Mask
195178
196179
crop: bool
197180
crop to the provided geometries (or return the full extent of the DEM tiles)?
@@ -922,42 +905,42 @@ def config(self):
922905
'datatype': {'dem': 'Int16'},
923906
'authentication': False
924907
},
925-
'TDX90m': {'url': 'ftpes://tandemx-90m.dlr.de',
926-
'nodata': {'dem': -32767.0,
927-
'am2': 0,
928-
'amp': 0,
929-
'com': 0,
930-
'cov': 0,
931-
'hem': -32767.0,
932-
'lsm': 0,
933-
'wam': 0},
934-
'resolution': {'0-50': (1 / 1200, 1 / 1200),
935-
'50-60': (1.5 / 1200, 1 / 1200),
936-
'60-70': (2 / 1200, 1 / 1200),
937-
'70-80': (3 / 1200, 1 / 1200),
938-
'80-85': (5 / 1200, 1 / 1200),
939-
'85-90': (10 / 1200, 1 / 1200)},
940-
'tilesize': 1,
941-
'area_or_point': 'point',
942-
'vsi': '/vsizip/',
943-
'pattern': {'dem': '*_DEM.tif',
944-
'am2': '*_AM2.tif',
945-
'amp': '*_AMP.tif',
946-
'com': '*_COM.tif',
947-
'cov': '*_COV.tif',
948-
'hem': '*_HEM.tif',
949-
'lsm': '*_LSM.tif',
950-
'wam': '*_WAM.tif'},
951-
'datatype': {'dem': 'Float32',
952-
'am2': 'UInt16',
953-
'amp': 'UInt16',
954-
'com': 'Byte',
955-
'cov': 'Byte',
956-
'hem': 'Float32',
957-
'lsm': 'Byte',
958-
'wam': 'Byte'},
959-
'authentication': True
960-
}
908+
# 'TDX90m': {'url': 'ftpes://tandemx-90m.dlr.de',
909+
# 'nodata': {'dem': -32767.0,
910+
# 'am2': 0,
911+
# 'amp': 0,
912+
# 'com': 0,
913+
# 'cov': 0,
914+
# 'hem': -32767.0,
915+
# 'lsm': 0,
916+
# 'wam': 0},
917+
# 'resolution': {'0-50': (1 / 1200, 1 / 1200),
918+
# '50-60': (1.5 / 1200, 1 / 1200),
919+
# '60-70': (2 / 1200, 1 / 1200),
920+
# '70-80': (3 / 1200, 1 / 1200),
921+
# '80-85': (5 / 1200, 1 / 1200),
922+
# '85-90': (10 / 1200, 1 / 1200)},
923+
# 'tilesize': 1,
924+
# 'area_or_point': 'point',
925+
# 'vsi': '/vsizip/',
926+
# 'pattern': {'dem': '*_DEM.tif',
927+
# 'am2': '*_AM2.tif',
928+
# 'amp': '*_AMP.tif',
929+
# 'com': '*_COM.tif',
930+
# 'cov': '*_COV.tif',
931+
# 'hem': '*_HEM.tif',
932+
# 'lsm': '*_LSM.tif',
933+
# 'wam': '*_WAM.tif'},
934+
# 'datatype': {'dem': 'Float32',
935+
# 'am2': 'UInt16',
936+
# 'amp': 'UInt16',
937+
# 'com': 'Byte',
938+
# 'cov': 'Byte',
939+
# 'hem': 'Float32',
940+
# 'lsm': 'Byte',
941+
# 'wam': 'Byte'},
942+
# 'authentication': True
943+
# }
961944
}
962945

963946
def load(self, dem_type, vrt=None, buffer=None, username=None,
@@ -1180,6 +1163,11 @@ def remote_ids(self, extent, dem_type, product='dem', username=None, password=No
11801163
str
11811164
the sorted names of the remote files
11821165
"""
1166+
keys = self.config.keys()
1167+
if dem_type not in keys:
1168+
raise RuntimeError("demType '{}' is not supported\n "
1169+
"possible options: '{}'"
1170+
.format(dem_type, "', '".join(keys)))
11831171

11841172
def index(x=None, y=None, nx=3, ny=3, reverse=False):
11851173
if reverse:

‎tests/conftest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def auxdata_dem_cases():
5454
cases = [('AW3D30', ['N050E010/N051E011.tar.gz']),
5555
('SRTM 1Sec HGT', ['N51E011.SRTMGL1.hgt.zip']),
5656
('SRTM 3Sec', ['srtm_39_02.zip']),
57-
('TDX90m', ['DEM/N51/E010/TDM1_DEM__30_N51E011.zip'])]
57+
# ('TDX90m', ['DEM/N51/E010/TDM1_DEM__30_N51E011.zip'])
58+
]
5859
return cases
5960

6061

‎tests/test_auxdata.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ def test_handler(auxdata_dem_cases):
1717
cases = [('AW3D30', ['S055W015/S052W012.tar.gz']),
1818
('SRTM 1Sec HGT', ['S52W012.SRTMGL1.hgt.zip']),
1919
('SRTM 3Sec', ['srtm_34_23.zip']),
20-
('TDX90m', ['DEM/S52/W010/TDM1_DEM__30_S52W012.zip'])]
20+
# ('TDX90m', ['DEM/S52/W010/TDM1_DEM__30_S52W012.zip'])
21+
]
2122
for demType, reference in cases:
2223
result = handler.remote_ids(dem_type=demType, extent=box.extent)
2324
assert result == reference

0 commit comments

Comments
 (0)