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

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2015-11-04 00:58:13 -0800 (Wed, 04 Nov 2015)
New Revision: 66732

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: fixed water product, added new products into r.modis.download

Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2015-11-04 02:25:57 UTC (rev 66731)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2015-11-04 08:58:13 UTC (rev 66732)
@@ -216,9 +216,12 @@
                                         'color': snow_color,
                                         'suff': snow8_suff, 'res': 500}
                 }
-        water = {'url': urlbase, 'folder': 'MOLT/', 'prod': 'MOD44W.005',
-                 'spec': water_spec, 'spec_qa': water_specqa, 'res': 250,
-                 'suff': water_suff, 'days': one, 'color': snow_color}
+        water = {'water_terra_250': {'url': urlbase, 'folder': 'MOLT/',
+                                     'prod': 'MOD44W.005', 'spec': water_spec,
+                                     'spec_qa': water_specqa, 'res': 250,
+                                     'suff': water_suff, 'days': daily,
+                                     'color': snow_color}
+                }
         self.products = {}
         self.products.update(lst)
         self.products.update(vi)

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-11-04 02:25:57 UTC (rev 66731)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.py	2015-11-04 08:58:13 UTC (rev 66732)
@@ -45,7 +45,7 @@
 #% label: Name of MODIS product(s)
 #% multiple: yes
 #% required: no
-#% options: lst_terra_daily_1000, lst_aqua_daily_1000, lst_terra_eight_1000, lst_aqua_eight_1000, lst_terra_daily_6000, lst_aqua_daily_6000, ndvi_terra_sixteen_250, ndvi_aqua_sixteen_250, ndvi_terra_sixteen_500, ndvi_aqua_sixteen_500, ndvi_terra_sixteen_1000, ndvi_aqua_sixteen_1000, snow_terra_daily_500, snow_aqua_daily_500, snow_terra_eight_500, snow_aqua_eight_500
+#% options: lst_terra_daily_1000, lst_aqua_daily_1000, lst_terra_eight_1000, lst_aqua_eight_1000, lst_terra_daily_6000, lst_aqua_daily_6000, ndvi_terra_sixteen_250, ndvi_aqua_sixteen_250, ndvi_terra_sixteen_500, ndvi_aqua_sixteen_500, ndvi_terra_sixteen_1000, ndvi_aqua_sixteen_1000, snow_terra_daily_500, snow_aqua_daily_500, snow_terra_eight_500, snow_aqua_eight_500, surfreflec_terra_eight_500, surfreflec_aqua_eight_500, water_terra_250
 #% answer: lst_terra_daily_1000
 #%end
 #%option