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

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

Revision: 4116
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4116&view=rev
Author:   jswhit
Date:     2007-11-05 12:53:49 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
some optimizations for orthographic projection

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-05 20:42:23 UTC (rev 4115)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-05 20:53:49 UTC (rev 4116)
@@ -504,6 +504,9 @@
                 self._fulldisk = False
             self.llcrnrlon = llcrnrlon; self.llcrnrlat = llcrnrlat
             self.urcrnrlon = urcrnrlon; self.urcrnrlat = urcrnrlat
+            # FIXME: won't work for points exactly on equator??
+            if npy.abs(lat_0) < 1.e-2: lat_0 = 1.e-2
+            projparams['lat_0'] = lat_0
         elif projection == 'geos':
             if lon_0 is None and satellite_height is None:
                 raise ValueError, 'must specify lon_0 and satellite_height for Geostationary basemap'
@@ -758,12 +761,10 @@
         # make sure orthographic projection has containsPole=True
         # we will compute the intersections in stereographic
         # coordinates, then transform to orthographic.
-        if self.projection == 'ortho':  
+        if self.projection == 'ortho' and name == 'gshhs':  
             containsPole = True
             lon_0=self.projparams['lon_0']
             lat_0=self.projparams['lat_0']
-            # FIXME: won't work for points exactly on equator??
-            if npy.abs(lat_0) < 1.e-4: lat_0 = 1.e04
             maptran = pyproj.Proj(proj='stere',lon_0=lon_0,lat_0=lat_0)
             # boundary polygon for orthographic projection
             # in stereographic coorindates.
@@ -845,7 +846,7 @@
                     blons = b[:,0]; blats = b[:,1]
                     # special case for ortho, compute polygon
                     # coordinates in stereographic coords.
-                    if self.projection == 'ortho':
+                    if name == 'gshhs' and self.projection == 'ortho':
                         bx, by = maptran(blons, blats)
                     else:
                         bx, by = self(blons, blats)
@@ -860,6 +861,13 @@
                         # in this map projection.
                         bx = npy.compress(mask, bx)
                         by = npy.compress(mask, by)
+                        # for orthographic projection, all points
+                        # outside map projection region are eliminated
+                        # with the above step, so we're done.
+                        if self.projection == 'ortho':
+                            polygons.append(zip(bx,by))
+                            polygon_types.append(type)
+                            continue
                         poly = LineShape(zip(bx,by))
                     if boundarypolyxy.intersects(poly):
                         try:


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