[GRASS-SVN] r66611 - in grass-addons/grass7/raster/r.modis: libmodis r.modis.download

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2015-10-27 02:57:01 -0700 (Tue, 27 Oct 2015)
New Revision: 66611

Modified:
   grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
   grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
Log:
r.modis: update url for snow; cleanup download tool

Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2015-10-27 01:26:58 UTC (rev 66610)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2015-10-27 09:57:01 UTC (rev 66611)
@@ -54,7 +54,7 @@
     def __init__(self, value=None):
         # url to download products
         urlbase = 'http://e4ftl01.cr.usgs.gov'
-        usrsnow = 'ftp://n4ftl01u.ecs.nasa.gov'
+        usrsnow = 'ftp://n5eil01u.ecs.nsidc.org'
         # values of lst product:
         lst_spec = '( 1 0 0 0 1 0 0 0 0 0 0 0 )'
         lst_specqa = '( 1 1 0 0 1 1 0 0 0 0 0 0 )'

Modified: grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2015-10-27 01:26:58 UTC (rev 66610)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2015-10-27 09:57:01 UTC (rev 66611)
@@ -141,7 +141,8 @@
         valueDay = lastday.strftime("%Y-%m-%d")
     # set only start day
     elif options['startday'] == '' and options['endday'] != '':
-        grass.fatal(_("It is not possible use <endday> option without <startday> option"))
+        grass.fatal(_("It is not possible use <endday> option without "
+                      "<startday> option"))
     # set start and end day
     elif options['startday'] != '' and options['endday'] != '':
         valueDay, valueEnd, valueDelta = check2day(options['startday'],
@@ -164,8 +165,8 @@
             user = 'anonymous'
             passwd = raw_input(_('Insert password (your e-mail): '))
         else:
-            grass.fatal(_("Set folder parameter when using stdin for passing the username " \
-            + "and password"))
+            grass.fatal(_("Set folder parameter when using stdin for passing "
+                          "the username and password"))
             return 0
     # set username, password and folder by file
     else:
@@ -236,9 +237,9 @@
             elif not flags['g'] and filesize == 0:
                 grass.message(_("All data have been previously downloaded"))
             elif filesize != 0:
-                grass.message(_("All data have been downloaded, continue with "\
-                + "r.modis.import with the option 'files=%s'" % modisOgg.filelist.name \
-                + " and 'mrtpath=/path/to/mrt/'"))
+                grass.message(_("All data have been downloaded, continue "
+                                "with r.modis.import with the option "
+                                "'files=%s'" % modisOgg.filelist.name))
         else:
             grass.fatal(_("Error during connection"))