KJ135
/
ISCE_INSAR
mirror of http://172.16.0.12:5000/WBJY/ISCE_INSAR.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Download of nasadem now supported in dem.py

LT1AB
sssangha 2020-04-17 19:57:52 -07:00 committed by piyushrpt
parent b7423d7aa4
commit be959c3b27
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applications/dem.py
View File

@ -82,7 +82,7 @@ def main():
parser.add_argument('-n', '--uname', type = str, dest = 'uname', default = None, help = 'User name if using a server that requires authentication') parser.add_argument('-n', '--uname', type = str, dest = 'uname', default = None, help = 'User name if using a server that requires authentication')
parser.add_argument('-w', '--password', type = str, dest = 'password', default = None, help = 'Password if using a server that requires authentication') parser.add_argument('-w', '--password', type = str, dest = 'password', default = None, help = 'Password if using a server that requires authentication')
parser.add_argument('-t', '--type', type = str, dest = 'type', default = 'version3', help = \ parser.add_argument('-t', '--type', type = str, dest = 'type', default = 'version3', help = \
'Use version 3 or version 2 SRTM') 'Use version 3 or version 2 SRTM, or nasadem')
parser.add_argument('-x', '--noextras', action = 'store_true', dest = 'noextras', help = 'Use this flag if the filenames do not have extra part') parser.add_argument('-x', '--noextras', action = 'store_true', dest = 'noextras', help = 'Use this flag if the filenames do not have extra part')
parser.add_argument('-u', '--url', type = str, dest = 'url', default = None, help = \ parser.add_argument('-u', '--url', type = str, dest = 'url', default = None, help = \
'If --type=version2 then this is part of the url where the DEM files are located. The actual location must be' + \ 'If --type=version2 then this is part of the url where the DEM files are located. The actual location must be' + \
@ -91,10 +91,13 @@ def main():
args = parser.parse_args() args = parser.parse_args()
#first get the url,uname and password since are needed in the constructor #first get the url,uname and password since are needed in the constructor
ds = createDemStitcher(args.type) ds = createDemStitcher(args.type)
ds.configure() ds.configure()
#NASADEM only available in 1-arc sec resolution
if(args.type == 'nasadem'):
args.source == 1
if(args.url): if(args.url):
if(args.type == 'version3'): if(args.type == 'version3'):
if(args.source == 1): if(args.source == 1):

4
contrib/demUtils/__init__.py
View File

@ -32,6 +32,8 @@ def createDemStitcher(type='version3',name = ''):
from contrib.demUtils.DemStitcherV3 import DemStitcher from contrib.demUtils.DemStitcherV3 import DemStitcher
if(type == 'version2'): if(type == 'version2'):
from contrib.demUtils.DemStitcher import DemStitcher from contrib.demUtils.DemStitcher import DemStitcher
if(type == 'nasadem'):
from contrib.demUtils.DemStitcherV3 import DemStitcher
return DemStitcher(name=name) return DemStitcher(name=name)
def createSWBDStitcher(name = ''): def createSWBDStitcher(name = ''):
from contrib.demUtils.SWBDStitcher import SWBDStitcher from contrib.demUtils.SWBDStitcher import SWBDStitcher
@ -56,4 +58,4 @@ def getFactoriesInfo():
{ {
'factory':'createCorrect_geoid_i2_srtm' 'factory':'createCorrect_geoid_i2_srtm'
} }
} }

4
contrib/demUtils/demstitcher/DemStitcher.py
View File

@ -763,6 +763,7 @@ class DemStitcher(Component):
def getUnzippedName(self,name,source = None): def getUnzippedName(self,name,source = None):
return name.replace(self._zip,'') return name.replace(self._zip,'')
def stitchDems(self,lat,lon,source, outname, downloadDir = None,region = None, keep = None, swap = None): def stitchDems(self,lat,lon,source, outname, downloadDir = None,region = None, keep = None, swap = None):
import glob
if downloadDir is None: if downloadDir is None:
downloadDir = self._downloadDir downloadDir = self._downloadDir
else: else:
@ -839,7 +840,8 @@ class DemStitcher(Component):
if not self._keepDems: if not self._keepDems:
for dem in decompressedList: for dem in decompressedList:
os.remove(dem) for d in glob.glob('*'+os.path.basename(dem.decode('UTF-8'))[:7]+'*'):
os.remove(d)
if self._createXmlMetadata: if self._createXmlMetadata:
self.createXmlMetadata(lat,lon,source,outname) self.createXmlMetadata(lat,lon,source,outname)
if self._createRscMetadata: if self._createRscMetadata: