diff --git a/Hillup/data/SRTM1.py b/Hillup/data/SRTM1.py index 3781bb0..5f8b440 100644 --- a/Hillup/data/SRTM1.py +++ b/Hillup/data/SRTM1.py @@ -4,7 +4,7 @@ from math import floor, log from os import unlink, close, write, chmod, makedirs from os.path import basename, exists, isdir, join -from httplib import HTTPConnection +from httplib import HTTPConnection, HTTPSConnection from urlparse import urlparse from tempfile import mkstemp from zipfile import ZipFile @@ -80,7 +80,7 @@ def datasource(lat, lon, source_dir): return None # FIXME for western / southern hemispheres - fmt = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM1/Region_%02d/N%02dW%03d.hgt.zip' + fmt = 'https://dds.cr.usgs.gov/srtm/version2_1/SRTM1/Region_%02d/N%02dW%03d.hgt.zip' url = fmt % (reg, abs(lat), abs(lon)) # @@ -114,7 +114,7 @@ def datasource(lat, lon, source_dir): # print >> stderr, 'Retrieving', url, 'in DEM.SRTM1.datasource().' - conn = HTTPConnection(host, 80) + conn = HTTPSConnection(host) conn.request('GET', path) resp = conn.getresponse() diff --git a/Hillup/data/SRTM3.py b/Hillup/data/SRTM3.py index e502f2d..395eb75 100644 --- a/Hillup/data/SRTM3.py +++ b/Hillup/data/SRTM3.py @@ -55,7 +55,7 @@ from math import floor, log from os import unlink, close, write, chmod, makedirs from os.path import basename, exists, isdir, join -from httplib import HTTPConnection +from httplib import HTTPConnection, HTTPSConnection from urlparse import urlparse from tempfile import mkstemp from zipfile import ZipFile @@ -174,7 +174,7 @@ def datasource(lat, lon, source_dir): # we're probably outside a known region return None - fmt = 'http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/%s/%s.hgt.zip' + fmt = 'https://dds.cr.usgs.gov/srtm/version2_1/SRTM3/%s/%s.hgt.zip' url = fmt % (reg, filename(lat, lon)) # @@ -208,7 +208,7 @@ def datasource(lat, lon, source_dir): # print >> stderr, 'Retrieving', url, 'in DEM.SRTM3.datasource().' - conn = HTTPConnection(host, 80) + conn = HTTPSConnection(host) conn.request('GET', path) resp = conn.getresponse() @@ -256,4 +256,4 @@ def datasources(minlon, minlat, maxlon, maxlat, source_dir): if __name__ == '__main__': import doctest - doctest.testmod() \ No newline at end of file + doctest.testmod()