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

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2011-08-18 08:35:29 -0700 (Thu, 18 Aug 2011)
New Revision: 47743

Modified:
   grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
   grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py
Log:
support snow product

Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-18 14:56:52 UTC (rev 47742)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-18 15:35:29 UTC (rev 47743)
@@ -60,9 +60,12 @@
         vi_color = ['ndvi','evi']
         vi_suff = {'.250m_16_days_NDVI.tif' : '250m_16_days_VI_Quality.tif',
         '.250m_16_days_EVI.tif' : '250m_16_days_VI_Quality.tif'}
+        snow1_spec = ('( 1 )')
+        snow1_specqa = ('( 1 1 )')
+        snow1suff = {'Snow_Cover_Daily_Tile':'Snow_Spatial_QA'}
         
-        snow_spec = ('( 1 1 )')
-        snow_color = ('evi') #TODO CREATE THE COLOR FOR MODIS_SNOW
+        snow8_spec = ('( 1 1 )')
+        snow8_color = ('evi') #TODO CREATE THE COLOR FOR MODIS_SNOW
         lstL2_spec = 'LST; QC; Error_LST; Emis_31; Emis_32; View_angle; View_time'
         
 	self.prod = value
@@ -114,16 +117,16 @@
                                     }
         }
         snow = {'snow_terra_daily_500' : {'url' : usrsnow, 'folder' : 
-				'SAN/MOST/MOD10A1.005', 'res' : 500, 'spec' : snow_spec
-				,'spec_qa': None}, 
+				'SAN/MOST/MOD10A1.005', 'res' : 500, 'spec' : snow1_spec
+				,'spec_qa': snow1_specqa, 'suff' : snow1suff}, 
 		'snow_aqua_daily_500' : {'url' : usrsnow, 'folder' : 
-                                'SAN/MOSA/MYD10A1.005', 'res' : 500, 'spec' : snow_spec
-                                ,'spec_qa': None},
+                                'SAN/MOSA/MYD10A1.005', 'res' : 500, 'spec' : snow1_spec
+                                ,'spec_qa': snow1_specqa, 'suff' : snow1suff},
                 'snow_terra_eight_500' : {'url' : usrsnow, 'folder' : 
-                                'SAN/MOST/MOD10A2.005', 'res' : 500, 'spec' : snow_spec
+                                'SAN/MOST/MOD10A2.005', 'res' : 500, 'spec' : snow8_spec
                                 ,'spec_qa': None}, 
                 'snow_aqua_eight_500' : {'url' : usrsnow, 'folder' : 
-                                'SAN/MOSA/MYD10A2.005', 'res' : 500, 'spec' : snow_spec
+                                'SAN/MOSA/MYD10A2.005', 'res' : 500, 'spec' : snow8_spec
                                 ,'spec_qa': None}
 				}
 	self.products = { }

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	2011-08-18 14:56:52 UTC (rev 47742)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2011-08-18 15:35:29 UTC (rev 47743)
@@ -146,7 +146,7 @@
         return 0
     # set username, password and folder if settings are insert by stdin
     if options['setting'] == '-':
-        if options['folder']:
+        if options['folder'] != '':
             if check(options['folder']):
                 fold = options['folder']
             user = raw_input(_('Insert username (usually anonymous): '))
@@ -166,7 +166,7 @@
         passwd = fileread[1].strip()
         filesett.close()
         # set the folder by option folder
-        if options['folder']:
+        if options['folder'] != '':
             if check(options['folder']):
                 fold = options['folder']
         # set the folder from path where setting file is stored