SF.net SVN: matplotlib: [4202] trunk/toolkits/basemap-testing/lib/ matplotlib/toolkits/basemap/basemap.py

[<js...@us...>]

Revision: 4202
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4202&view=rev
Author:   jswhit
Date:     2007-11-09 14:29:49 -0800 (Fri, 09 Nov 2007)

Log Message:
-----------
back off last commit, doesn't do the right thing in all cases.

Modified Paths:
--------------
    trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py

Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-09 22:11:14 UTC (rev 4201)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-09 22:29:49 UTC (rev 4202)
@@ -775,15 +775,6 @@
             b = npy.asarray(self._boundarypolyll.boundary)
             blons = b[:,0]; blats = b[:,1]
             boundarypolyxy = PolygonShape(zip(*maptran(blons,blats)))
-        # for map regions that don't contain Pole, see if Greenwich
-        # meridian is contained.
-        if not containsPole:
-            lon_0,lat_0 = self(self.xmin+0.5*(self.xmax-self.xmin),\
-                               self.ymin+0.5*(self.ymax-self.ymin),inverse=True)
-            GM0 = PointShape((0,lat_0))
-            GM360 = PointShape((360,lat_0))
-            hasGM0 = GM0.within(boundarypolyll)
-            hasGM360 = GM360.within(boundarypolyll)
         for line in bdatmetafile:
             linesplit = line.split()
             area = float(linesplit[1])
@@ -839,16 +830,11 @@
                     # (so as to properly treat polygons that cross 
                     # Greenwich meridian).
                     if not antart:
-                        if hasGM0:
-                            blons = b[:,0]-360
-                            poly1 = Shape(zip(blons,blats))
-                            polys = [poly1,poly]
-                        elif hasGM360:
-                            blons = b[:,0]+360
-                            poly2 = Shape(zip(blons,blats))
-                            polys = [poly,poly2]
-                        else:
-                            polys = [poly]
+                        blons = b[:,0]-360
+                        poly1 = Shape(zip(blons,blats))
+                        blons = b[:,0]+360
+                        poly2 = Shape(zip(blons,blats))
+                        polys = [poly1,poly,poly2]
                     else: # Antartica already extends from -360 to +720.
                         polys = [poly]
                     for poly in polys:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.