Merge pull request #114 from jswhit/master

fix for issue #113 (meridians cut off in very small tmerc map)

Author: Jeff Whitaker

Changelog

@@ -1,5 +1,7 @@
-since version 1.0.6
--------------------
+version 1.0.7 (not yet released)
+-------------------------------
+* fix drawmeridians so meridians reach edge of plot when map projection region
+  is *very* small (issue 113).
 * update pyproj (with fixes to geodesic calculations).
 * support for rotated pole transormation (projection = 'rotpole').
 * fix warpimage with projection = 'hammer' (issue 100).

lib/mpl_toolkits/basemap/__init__.py

@@ -47,7 +47,7 @@
 else:
     basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '1.0.6'
+__version__ = '1.0.7'
 
 # module variable that sets the default value for the 'latlon' kwarg.
 # can be set to True by user so plotting functions can take lons,lats
@@ -1047,6 +1047,8 @@ def __init__(self, llcrnrlon=None, llcrnrlat=None,
             self.lonmax = self.urcrnrlon
         else:
             lons, lats = self.makegrid(1001,1001)
+            lats = ma.masked_where(lats > 1.e20,lats)
+            lons = ma.masked_where(lons > 1.e20,lons)
             self.latmin = lats.min()
             self.latmax = lats.max()
             self.lonmin = lons.min()
@@ -2575,10 +2577,11 @@ def addlon(meridians,madd):
         if xoffset is None:
             xoffset = (self.urcrnrx-self.llcrnrx)/100.
 
+        lats = np.linspace(self.latmin,self.latmax,10001)
         if self.projection not in _cylproj + _pseudocyl:
-            lats = np.linspace(-latmax,latmax,10001)
-        else:
-            lats = np.linspace(-90,90,100001)
+            testlat = np.logical_and(lats>-latmax,lats<latmax)
+            lats = np.compress(testlat,lats)
+
         xdelta = 0.01*(self.xmax-self.xmin)
         ydelta = 0.01*(self.ymax-self.ymin)
         linecolls = {}

setup.py

@@ -111,7 +111,7 @@ def checkversion(GEOS_dir):
 
 setup(
   name              = "basemap",
-  version           = "1.0.6",
+  version           = "1.0.7",
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data