Merge pull request #562 from EJFielding/https-fixes

More https changes in isceobj iscesys alos2proc

components/isceobj/Alos2Proc/runDownloadDem.py

@@ -132,9 +132,9 @@ def downloadDem(bbox, demType='version3', resolution=1, fillingValue=-32768, out
 
     if demType == 'version3':
         if resolution == 1:
-            ds._url1 = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11'
+            ds._url1 = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11'
         else:
-            ds._url3 = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11'
+            ds._url3 = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11'
     elif demType == 'nasadem':
         resolution = 1
         #this url is included in the module

components/iscesys/DataManager/Dem1Manager.py

@@ -47,7 +47,7 @@ DATA_EXT = Component.Parameter('_dataExt',
     mandatory = False,
     doc = 'Extension of the data such as .hgt')
 URL = Component.Parameter('_url',
-    public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11',
+    public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11',
     type = str,
     mandatory = False,
     doc = "Url for the high resolution DEM.")
@@ -141,4 +141,3 @@ class Dem1Manager(SRTMManager):
     def updateParameters(self):
         self.extendParameterList(SRTMManager,Dem1Manager)
         super(Dem1Manager,self).updateParameters()
-   

components/iscesys/DataManager/Dem3Manager.py

@@ -43,7 +43,7 @@ EXTRA = Component.Parameter('_extra',
           +' otherwise if no value is provided is then interpreted as None by the xml reader.')
 
 URL = Component.Parameter('_url',
-    public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11',
+    public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11',
     type = str,
     mandatory = False,
     doc = "Url for the high resolution DEM.")
@@ -74,4 +74,3 @@ class Dem3Manager(Dem1Manager):
     def updateParameters(self):
         self.extendParameterList(Dem1Manager,Dem3Manager)
         super(Dem3Manager,self).updateParameters()
-   

components/iscesys/DataManager/SWBDManager.py

@@ -45,7 +45,7 @@ DATA_EXT = Component.Parameter('_dataExt',
     mandatory = False,
     doc = 'Extension of the data such as .raw')
 URL = Component.Parameter('_url',
-    public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMSWBD.003/2000.02.11',
+    public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMSWBD.003/2000.02.11',
     type = str,
     mandatory = False,
     doc = "Url for the high resolution water body mask")
@@ -120,4 +120,3 @@ class SWBDManager(SRTMManager):
     def updateParameters(self):
         self.extendParameterList(SRTMManager,SWBDManager)
         super(SWBDManager,self).updateParameters()
-   

contrib/stack/alosStack/alosStack.xml

@@ -86,7 +86,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #3 arcsec for geocoding
     mkdir dem_3_arcsec
     cd dem_3_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
@@ -94,7 +94,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #1 arcsec for creating differential interferogram
     mkdir dem_1_arcsec
     cd dem_1_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../

examples/input_files/alos2/alos2App.xml

@@ -98,7 +98,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #3 arcsec for geocoding
     mkdir dem_3_arcsec
     cd dem_3_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
@@ -106,7 +106,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #1 arcsec for creating differential interferogram
     mkdir dem_1_arcsec
     cd dem_1_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../

examples/input_files/alos2/alos2burstApp.xml

@@ -93,7 +93,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #3 arcsec for geocoding
     mkdir dem_3_arcsec
     cd dem_3_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 3 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
@@ -101,7 +101,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     #1 arcsec for creating differential interferogram
     mkdir dem_1_arcsec
     cd dem_1_arcsec
-    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
+    dem.py -a stitch -b 29 37 125 133 -k -s 1 -c -f -u https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11
     fixImageXml.py -i demLat_*_*_Lon_*_*.dem.wgs84 -f
     rm *.hgt *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../