[GRASS-SVN] r47824 - in grass-addons/grass7/raster/r.modis:
libmodis r.modis.download
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Aug 22 10:47:40 EDT 2011
Author: neteler
Date: 2011-08-22 07:47:40 -0700 (Mon, 22 Aug 2011)
New Revision: 47824
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.download/r.modis.download.html
Log:
catch absence of +b; fix laea selection
Modified: grass-addons/grass7/raster/r.modis/libmodis/modis.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/modis.py 2011-08-22 14:23:31 UTC (rev 47823)
+++ grass-addons/grass7/raster/r.modis/libmodis/modis.py 2011-08-22 14:47:40 UTC (rev 47824)
@@ -537,7 +537,7 @@
return rangeTime
def retBoundary(self):
- """Return the maximum extend of the MODIS file inside a dictionary"""
+ """Return the maximum extent of the MODIS file inside a dictionary"""
self._getGranule()
self.boundary = []
lat = []
@@ -590,7 +590,7 @@
return value
def retPSA(self):
- """Return the PSA values inside a dictionary, the PSAName is he key and
+ """Return the PSA values inside a dictionary, the PSAName is the key and
and PSAValue is the value
"""
value = {}
@@ -654,7 +654,7 @@
projtype = the output projection system, the valid values are: AEA
(Albers Equal Area), ER (Equirectangular), GEO (Geographic
Latitude/Longitude), HAM (Hammer), ISIN (Integerized Sinusoidal),
- IGH (Interrupted Goode Homolosine), LA (Lambert Azimuthal),
+ IGH (Interrupted Goode Homolosine), LA (Lambert Azimuthal Equal Area),
LCC (LambertConformal Conic), MERCAT (Mercator), MOL (Mollweide),
PS (Polar Stereographic), SIN ()Sinusoidal), UTM (Universal
TransverseMercator)
@@ -692,7 +692,7 @@
if resampl in self.resam_list:
conFile.write("RESAMPLING_TYPE = %s\n" % resampl)
else:
- raise IOError('The resampling type %s is not supportet.\n' \
+ raise IOError('The resampling type %s is not supported.\n' \
'The resampling type supported are %s' % (resampl,resam_list))
# if projtype is in proj_list set the parameter otherwise return an error
if projtype in self.proj_list:
@@ -742,7 +742,7 @@
AEA (Albers Equal Area), ER (Equirectangular),
GEO (Geographic Latitude/Longitude), HAM (Hammer),
ISIN (Integerized Sinusoidal),IGH (Interrupted Goode Homolosine),
- LA (Lambert Azimuthal), LCC (LambertConformal Conic),
+ LA (Lambert Azimuthal Equal Area), LCC (LambertConformal Conic),
MERCAT (Mercator), MOL (Mollweide), PS (Polar Stereographic),
SIN ()Sinusoidal), UTM (Universal TransverseMercator)
utm = the UTM zone if projection system is UTM
Modified: grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py
===================================================================
--- grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py 2011-08-22 14:23:31 UTC (rev 47823)
+++ grass-addons/grass7/raster/r.modis/libmodis/rmodislib.py 2011-08-22 14:47:40 UTC (rev 47824)
@@ -233,14 +233,12 @@
self.proj = get_proj()
self.val = self.proj['proj']
self.dat = self.proj['datum']
- self.projections = {'laea' : 'LAMBERT AZIMUTHAL EQUAL AREA','ll':'GEO',
- 'lcc':'LAMBERT CONFORMAL CONIC', 'merc':'MERCATOR',
- 'polar':'POLAR STEREOGRAPHIC', 'utm':'UTM',
- 'tmerc':'TRANSVERSE MERCATOR'}
+ self.projections = {'laea' : 'LA','ll':'GEO', 'lcc':'LCC',
+ 'merc':'MERCAT', 'polar':'PS', 'utm':'UTM', 'tmerc':'TM'}
self.datumlist = {'none':'NONE', 'nad27':'NAD27', 'nad83':'NAD83',
'wgs66':'WGS66', 'wgs72':'WGS72', 'wgs84':'WGS84', 'etrs89':'WGS84'}
- self.datumlist_swath = {'Clarke 1866' : 0, 'Clarke 1880' : 1, 'bessel' : 2
- , 'International 1967' : 3, 'International 1909': 4, 'wgs72' : 5,
+ self.datumlist_swath = {'Clarke 1866' : 0, 'Clarke 1880' : 1, 'bessel' : 2,
+ 'International 1967' : 3, 'International 1909': 4, 'wgs72' : 5,
'Everest' : 6, 'wgs66' : 7, 'wgs84' : 8, 'Airy' : 9,
'Modified Everest' : 10, 'Modified Airy' : 11, 'Walbeck' : 12,
'Southeast Asia' : 13, 'Australian National' : 14, 'Krassovsky' : 15,
@@ -257,9 +255,10 @@
def _par(self,key):
"""Function use in return_params"""
if self.proj[key]:
- SMinor = self.proj[key]
+ Val = self.proj[key]
else:
- SMinor = 0.0
+ Val = 0.0
+ return float(Val)
def _outpar(self, SMajor, SMinor, Val, Factor, CentMer, TrueScale, FE, FN,swath):
if swath:
@@ -270,14 +269,14 @@
SMajor, SMinor, Val, Factor, CentMer, TrueScale, FE, FN )
def return_params(self, swath = False):
- """ Return the 13 paramaters for parameter file """
+ """ Return the 13 parameters for MRT parameter file """
if self.val == 'll' or self.val == 'utm':
return self._outpar(0, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, swath)
elif self.val == 'laea':
SMajor = self._par('+a')
- if self._par('+b'):
+ try:
SMinor = self._par('+b')
- elif self._par('+rf'):
+ except:
SMinor = self._par('+rf')
CentMer = self._par('+lon_0')
CentLat = self._par('+lat_0')
@@ -285,11 +284,11 @@
FN = self._par('+y_0')
return self._outpar(SMajor, SMinor, 0.0, 0.0, CentMer,
CentLat, FE, FN, swath)
- elif self.val == 'lcc' or self.val == 'laea':
+ elif self.val == 'lcc':
SMajor = self._par('+a')
- if self._par('+b'):
+ try:
SMinor = self._par('+b')
- elif self._par('+rf'):
+ except:
SMinor = self._par('+rf')
STDPR1 = self._par('+lat_1')
STDPR2 = self._par('+lat_2')
@@ -301,9 +300,9 @@
CentLat, FE, FN, swath)
elif self.val == 'merc' or self.val == 'polar' or self.val == 'tmerc':
SMajor = self._par('+a')
- if self._par('+b'):
+ try:
SMinor = self._par('+b')
- elif self._par('+rf'):
+ except:
SMinor = self._par('+rf')
CentMer = self._par('+lon_0')
if self.val == 'tmerc':
Modified: grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.html
===================================================================
--- grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.html 2011-08-22 14:23:31 UTC (rev 47823)
+++ grass-addons/grass7/raster/r.modis/r.modis.download/r.modis.download.html 2011-08-22 14:47:40 UTC (rev 47824)
@@ -50,7 +50,7 @@
r.modis.download setting=/home/user/.grass7/r.modis/SETTING startday=2011-05-01 endday=2011-05-31
</pre></div>
-To downlad another product (for example <em>Snow eight days 500 m</em>),
+To download another product (for example <em>Snow eight days 500 m</em>),
with other default options:
<div class="code"><pre>
r.modis.download setting=/home/user/.grass7/r.modis/SETTING product=snow_terra_eight_500
More information about the grass-commit
mailing list