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

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-22 08:05:47 -0700 (Mon, 22 Aug 2011)
New Revision: 47826

Modified:
   grass-addons/grass7/raster/r.modis/libmodis/modis.py
   grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
   grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
Log:
fix datum + LST color table

Modified: grass-addons/grass7/raster/r.modis/libmodis/modis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/modis.py	2011-08-22 14:52:52 UTC (rev 47825)
+++ grass-addons/grass7/raster/r.modis/libmodis/modis.py	2011-08-22 15:05:47 UTC (rev 47826)
@@ -435,7 +435,7 @@
     self.resam_list_swath = ('NN', 'BI', 'CC')
     
     # datum
-    self.datum_list = ('NONE', 'NAD27', 'NAD83', 'WGS66', 'WGS72', 'WGS84')
+    self.datum_list = ('NONE', 'NAD27', 'NAD83', 'WGS66', 'WGS72', 'WGS84', 'NoDatum')
     self.sphere_list = (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20)
 
   def __str__(self):

Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-22 14:52:52 UTC (rev 47825)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-22 15:05:47 UTC (rev 47826)
@@ -58,7 +58,7 @@
         lst1km_suff = {'.LST_Day_1km':'.QC_Day','.LST_Night_1km':'.QC_Night'}
         lst6km_suff = {'.LST_Day_6km':'.QC_Day','.LST_Night_6km':'.QC_Night'}
         # color for lst product
-        lst_color = ['modis_lst']
+        lst_color = ['celsius']
         # all the possible layers of lst and vi products, it is used when mosaic it's created
         lstvi_specall = '( 1 1 1 1 1 1 1 1 1 1 1 1)'
         ### values of vi product:
@@ -77,7 +77,7 @@
         snow1_patt = {3 : [2,3], 7 : [6, 7], 15 : [10, 11, 14, 15]}
         
         snow8_spec = ('( 1 1 )')
-        snow_color = ['evi'] #TODO CREATE THE COLOR FOR MODIS_SNOW
+        snow_color = ['gyr'] #TODO CREATE THE COLOR TABLE FOR MODIS_SNOW
         snow8_suff = {'.Maximum_Snow_Extent' : None, '.Eight_Day_Snow_Cover' : None}
         lstL2_spec = 'LST; QC; Error_LST; Emis_31; Emis_32; View_angle; View_time'
         

Modified: grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2011-08-22 14:52:52 UTC (rev 47825)
+++ grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.py	2011-08-22 15:05:47 UTC (rev 47826)
@@ -172,6 +172,8 @@
     resampl = resampling(opts['resampl']).returned()
     # projpar
     projpar = projObj.return_params()
+    if projpar != "( 0, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 )":
+        dat = "NoDatum"
     return pm.confResample(spectr, None, pref, dat, resampl, proj, zone, projpar)
 
 def prefix(options, name = False):