[GRASS-SVN] r58773 - grass/trunk/scripts/r.in.srtm

[svn_grass at osgeo.org]

Author: mmetz
Date: 2014-01-25 05:50:45 -0800 (Sat, 25 Jan 2014)
New Revision: 58773

Modified:
   grass/trunk/scripts/r.in.srtm/r.in.srtm.html
   grass/trunk/scripts/r.in.srtm/r.in.srtm.py
Log:
r.in.srtm: support V3

Modified: grass/trunk/scripts/r.in.srtm/r.in.srtm.html
===================================================================
--- grass/trunk/scripts/r.in.srtm/r.in.srtm.html	2014-01-24 14:32:30 UTC (rev 58772)
+++ grass/trunk/scripts/r.in.srtm/r.in.srtm.html	2014-01-25 13:50:45 UTC (rev 58773)
@@ -2,10 +2,14 @@
 
 <em>r.in.srtm</em> imports SRTM hgt files into GRASS.
 
-SRTM data sets can be downloaded from NASA at this FTP site (Version 1 and the
-improved Version 2):<br>
+SRTM Version 1 and improved Version 2 data sets can be downloaded from 
+NASA at this site:<br>
 <a href="http://dds.cr.usgs.gov/srtm/">http://dds.cr.usgs.gov/srtm/</a>
 
+<p>
+Gap-filled SRTM Version 3 data can be downloaded from USGS at this site:<br>
+<a href="http://e4ftl01.cr.usgs.gov/SRTM/SRTMGL3.003/2000.02.11/">http://e4ftl01.cr.usgs.gov/SRTM/SRTMGL3.003/2000.02.11/</a>
+
 <h2>NOTES</h2>
 
 SRTM tiles are of 1 degree by 1 degree size. The SRTM filename contains the
@@ -37,6 +41,7 @@
 <h2>AUTHORS</h2>
 
 Markus Neteler<br>
-Improved by W. Kyngesburye and H. Bowman
+Improved by W. Kyngesburye and H. Bowman<br>
+Update for SRTM V3 by Markus Metz
 
 <p><i>Last changed: $Date$</i>

Modified: grass/trunk/scripts/r.in.srtm/r.in.srtm.py
===================================================================
--- grass/trunk/scripts/r.in.srtm/r.in.srtm.py	2014-01-24 14:32:30 UTC (rev 58772)
+++ grass/trunk/scripts/r.in.srtm/r.in.srtm.py	2014-01-25 13:50:45 UTC (rev 58773)
@@ -143,7 +143,7 @@
 	tileout = output
 
     zipfile = infile + ".hgt.zip"
-    hgtfile = infile + ".hgt"
+    hgtfile = os.path.join(fdir, tile[:7] + ".hgt")
     if os.path.isfile(zipfile):
         #### check if we have unzip
 	if not grass.find_program('unzip'):
@@ -178,7 +178,7 @@
     in_temp = True
 
     zipfile = tile + ".hgt.zip"
-    hgtfile = tile + ".hgt"
+    hgtfile = tile[:7] + ".hgt"
     bilfile = tile + ".bil"
 
     if is_zip: