fix import

Author: Jeffrey Whitaker

lib/mpl_toolkits/basemap/geodesicline.py

@@ -32,7 +32,7 @@ class GeodesicLine(object):
   """Points on a geodesic path"""
 
   def __init__(self, geod, lat1, lon1, azi1, caps = GeodesicCapability.ALL):
-    from pyproj.geodesic import Geodesic
+    from mpl_toolkits.basemap.geodesic import Geodesic
     self._a = geod._a
     self._f = geod._f
     self._b = geod._b
@@ -137,7 +137,7 @@ def __init__(self, geod, lat1, lon1, azi1, caps = GeodesicCapability.ALL):
   # return a12, lat2, lon2, azi2, s12, m12, M12, M21, S12
   def GenPosition(self, arcmode, s12_a12, outmask):
 
-    from pyproj.geodesic import Geodesic
+    from mpl_toolkits.basemap.geodesic import Geodesic
     a12 = lat2 = lon2 = azi2 = s12 = m12 = M12 = M21 = S12 = Math.nan
     outmask &= self._caps & Geodesic.OUT_ALL
     if not (arcmode or (self._caps & Geodesic.DISTANCE_IN & Geodesic.OUT_ALL)):
@@ -312,7 +312,7 @@ def Position(self, s12,
       Geodesic.ALL
     """
 
-    from pyproj.geodesic import Geodesic
+    from mpl_toolkits.basemap.geodesic import Geodesic
     Geodesic.CheckDistance(s12)
     result = {'lat1': self._lat1, 'lon1': self._lon1, 'azi1': self._azi1,
               's12': s12}

lib/mpl_toolkits/basemap/polygonarea.py

@@ -23,7 +23,7 @@ class PolygonArea(object):
   def transit(lon1, lon2):
     # Return 1 or -1 if crossing prime meridian in east or west direction.
     # Otherwise return zero.
-    from pyproj.geodesic import Geodesic
+    from mpl_toolkits.basemap.geodesic import Geodesic
     lon1 = Geodesic.AngNormalize(lon1)
     lon2 = Geodesic.AngNormalize(lon2)
     # treat lon12 = -180 as an eastward geodesic, so convert to 180.
@@ -38,7 +38,7 @@ def transit(lon1, lon2):
   transit = staticmethod(transit)
 
   def __init__(self, earth, polyline = False):
-    from pyproj.geodesic import Geodesic
+    from mpl_toolkits.basemap.geodesic import Geodesic
     self._earth = earth
     self._area0 = 4 * math.pi * earth._c2
     self._polyline = polyline