Merge pull request #109 from jswhit/master

fix issue #108

Author: Jeff Whitaker

Changelog

@@ -2,6 +2,8 @@ since version 1.0.6
 -------------------
 * support for rotated pole transormation (projection = 'rotpole').
 * fix warpimage with projection = 'hammer' (issue 100).
+* fix tolerances for detecting jumps in meridians and parallels for
+  cyl and rotpole projections (issue 108).
 
 version 1.0.6 (git tag v1.0.6rel)
 --------------------------------

lib/mpl_toolkits/basemap/__init__.py

@@ -2318,9 +2318,10 @@ def drawparallels(self,circles,color='k',linewidth=1.,zorder=None, \
                 xd = (x[1:]-x[0:-1])**2
                 yd = (y[1:]-y[0:-1])**2
                 dist = np.sqrt(xd+yd)
-                #split = dist > 500000.
-                # normalize by radius of sphere
-                split = dist > 5000000./6370997.0*self.rmajor
+                if self.projection not in ['cyl','rotpole']: 
+                    split = dist > self.rmajor/10.
+                else:
+                    split = dist > 1.
                 if np.sum(split) and self.projection not in _cylproj:
                     ind = (np.compress(split,np.squeeze(split*np.indices(xd.shape)))+1).tolist()
                     xl = []
@@ -2601,9 +2602,10 @@ def addlon(meridians,madd):
                 xd = (x[1:]-x[0:-1])**2
                 yd = (y[1:]-y[0:-1])**2
                 dist = np.sqrt(xd+yd)
-                #split = dist > 500000.
-                # normalize by radius of sphere
-                split = dist > 5000000./6370997.0*self.rmajor
+                if self.projection not in ['cyl','rotpole']: 
+                    split = dist > self.rmajor/10.
+                else:
+                    split = dist > 1.
                 if np.sum(split) and self.projection not in _cylproj:
                     ind = (np.compress(split,np.squeeze(split*np.indices(xd.shape)))+1).tolist()
                     xl = []