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

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-22 09:20:32 -0700 (Mon, 22 Aug 2011)
New Revision: 47828

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.html
Log:
fix resampling naming

Modified: grass-addons/grass7/raster/r.modis/libmodis/modis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/modis.py	2011-08-22 15:34:56 UTC (rev 47827)
+++ grass-addons/grass7/raster/r.modis/libmodis/modis.py	2011-08-22 16:20:32 UTC (rev 47828)
@@ -431,7 +431,7 @@
     self.proj_list = ('GEO', 'HAM', 'IGH', 'ISIN', 'LA', 'LCC', 'MOL', 'PS', 
                       'SIN','TM', 'UTM', 'MERCAT')
     # resampling
-    self.resam_list = ('NEAREST_NEIGHBOR', 'BICUBIC', 'CUBIC_CONVOLUTION', 'NONE')
+    self.resam_list = ('NEAREST_NEIGHBOR', 'BILINEAR', 'CUBIC_CONVOLUTION')
     self.resam_list_swath = ('NN', 'BI', 'CC')
     
     # datum

Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-22 15:34:56 UTC (rev 47827)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py	2011-08-22 16:20:32 UTC (rev 47828)
@@ -220,8 +220,8 @@
     """
     def __init__(self,value):
         self.code = value
-        self.resampling = {'NN': 'NEAREST_NEIGHBOR','BI' : 'BICUBIC',
-        'CC' : 'CUBIC CONVOLUTION','NONE' : 'NONE'}
+        self.resampling = {'nearest': 'NEAREST_NEIGHBOR', 'bilinear': 'BILINEAR',
+        'cubic': 'CUBIC CONVOLUTION'}
 
     def returned(self):
         return self.resampling[self.code]

Modified: grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.html
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.html	2011-08-22 15:34:56 UTC (rev 47827)
+++ grass-addons/grass7/raster/r.modis/r.modis.import/r.modis.import.html	2011-08-22 16:20:32 UTC (rev 47828)
@@ -19,8 +19,9 @@
 <b>Warning</b>: 
 <ul>
   <li>The module has currently only been tested with Lat/Long locations, but also
-   the follow projection systems are supported:  Lambert Conformal Conic,
-   Mercator, Polar Stereographic, Transverse Mercator, Universal Transverse Mercator</li>
+   the following projection systems are supported: Lambert Azimuthal Equal Area,
+   Lambert Conformal Conic, Mercator, Polar Stereographic, Transverse Mercator,
+   Universal Transverse Mercator</li>
 </ul>
 
 <h2>EXAMPLES</h2>
@@ -41,14 +42,14 @@
 </pre></div>
 
 Import a single file with the default subset without QA layer analysis and without
-rescaling the pixel:
+rescaling the pixel values:
 <div class="code"><pre>
 r.modis.import -r dsn=/path/to/file mrtpath=/path/to/mrt
 </pre></div>
 
 Import a single file with your own subset of layers (for power user):
 <div class="code"><pre>
-r.modis.import dsn=/path/to/file mrtpath=/path/to/mrt spectral="( 1 0 1 0)"
+r.modis.import dsn=/path/to/file mrtpath=/path/to/mrt spectral="( 1 0 1 0 )"
 </pre></div>
 
 Import more files with your own subset of layers and without QA layer analysis (for power users):