Merge branch 'master' into projecting_issue209

Author: guziy

doc/users/figures/geos_partial.py

@@ -11,7 +11,7 @@
 # plot just upper right quadrant (corners determined from global map).
 # keywords llcrnrx,llcrnry,urcrnrx,urcrnry used to define the lower
 # left and upper right corners in map projection coordinates.
-# llcrnrlat,llcrnrlon,ucrnrlon,urcrnrlat could be used to define
+# llcrnrlat,llcrnrlon,urcrnrlon,urcrnrlat could be used to define
 # lat/lon values of corners - but this won't work in cases such as this
 # where one of the corners does not lie on the earth.
 m = Basemap(projection='geos',lon_0=lon_0,resolution='l',\

doc/users/figures/nsper_partial.py

@@ -14,7 +14,7 @@
 # plot just upper right quadrant (corners determined from global map).
 # keywords llcrnrx,llcrnry,urcrnrx,urcrnry used to define the lower
 # left and upper right corners in map projection coordinates.
-# llcrnrlat,llcrnrlon,ucrnrlon,urcrnrlat could be used to define
+# llcrnrlat,llcrnrlon,urcrnrlon,urcrnrlat could be used to define
 # lat/lon values of corners - but this won't work in cases such as this
 # where one of the corners does not lie on the earth.
 m = Basemap(projection='nsper',satellite_height=h*1000.,\

doc/users/figures/ortho_partial.py

@@ -11,7 +11,7 @@
 # plot just upper right quadrant (corners determined from global map).
 # keywords llcrnrx,llcrnry,urcrnrx,urcrnry used to define the lower
 # left and upper right corners in map projection coordinates.
-# llcrnrlat,llcrnrlon,ucrnrlon,urcrnrlat could be used to define
+# llcrnrlat,llcrnrlon,urcrnrlon,urcrnrlat could be used to define
 # lat/lon values of corners - but this won't work in cases such as this
 # where one of the corners does not lie on the earth.
 m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution='l',\

lib/mpl_toolkits/basemap/__init__.py

@@ -27,7 +27,7 @@
 from matplotlib.patches import Ellipse, Circle, Polygon, FancyArrowPatch
 from matplotlib.lines import Line2D
 from matplotlib.transforms import Bbox
-from mpl_toolkits.basemap import pyproj
+from . import pyproj
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 from matplotlib.image import imread
 import sys, os, math
@@ -712,7 +712,7 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
                     self.urcrnrlon = urcrnrlon; self.urcrnrlat = urcrnrlat
                 else:
                     if width is None or height is None:
-                        raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters')
+                        raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat) in degrees or width and height in meters')
                     if lon_0 is None or lat_0 is None:
                         raise ValueError('must specify lon_0 and lat_0 when using width, height to specify projection region')
                     llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
@@ -725,7 +725,7 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
                 raise ValueError('must specify lat_0 and lon_0 for Stereographic basemap (lat_ts is optional)')
             if not using_corners:
                 if width is None or height is None:
-                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters')
+                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat) in degrees or width and height in meters')
                 if lon_0 is None or lat_0 is None:
                     raise ValueError('must specify lon_0 and lat_0 when using width, height to specify projection region')
                 llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
@@ -762,7 +762,7 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
                 raise ValueError('must specify lat_0 and lon_0 for Lambert Azimuthal basemap')
             if not using_corners:
                 if width is None or height is None:
-                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters')
+                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat) in degrees or width and height in meters')
                 if lon_0 is None or lat_0 is None:
                     raise ValueError('must specify lon_0 and lat_0 when using width, height to specify projection region')
                 llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
@@ -777,7 +777,7 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
                 raise ValueError('must specify lat_0 and lon_0 for Transverse Mercator, Gnomonic, Cassini-Soldnerr and Polyconic basemap')
             if not using_corners:
                 if width is None or height is None:
-                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters')
+                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat) in degrees or width and height in meters')
                 if lon_0 is None or lat_0 is None:
                     raise ValueError('must specify lon_0 and lat_0 when using width, height to specify projection region')
                 llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
@@ -871,7 +871,7 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
             #    raise ValueError, 'cannot specify map region with width and height keywords for this projection, please specify lat/lon values of corners'
             if not using_corners:
                 if width is None or height is None:
-                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters')
+                    raise ValueError('must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat) in degrees or width and height in meters')
                 if lon_0 is None or lat_0 is None:
                     raise ValueError('must specify lon_0 and lat_0 when using width, height to specify projection region')
                 llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
@@ -4190,7 +4190,7 @@ def warpimage(self,image="bluemarble",scale=None,**kwargs):
                 # to map projection coords.
                 # if masked=True, values outside of
                 # projection limb will be masked.
-                for k in range(3):
+                for k in range(self._bm_rgba.shape[2]):
                     self._bm_rgba_warped[:,:,k],x,y = \
                     self.transform_scalar(self._bm_rgba[:,:,k],\
                     self._bm_lons,self._bm_lats,nx,ny,returnxy=True)

lib/mpl_toolkits/basemap/proj.py

@@ -1,5 +1,5 @@
 import numpy as np
-from mpl_toolkits.basemap import pyproj
+from . import pyproj
 import math
 from matplotlib.cbook import dedent
 

lib/mpl_toolkits/basemap/pyproj.py

@@ -47,7 +47,7 @@
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """
 
-from mpl_toolkits.basemap import _proj
+from . import _proj
 __version__ =  _proj.__version__
 set_datapath =  _proj.set_datapath
 from array import array