Menu
▾
▴
SF.net SVN: matplotlib: [5339] trunk/toolkits/basemap
|
From: <js...@us...> - 2008-05-30 22:24:11
|
Revision: 5339
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5339&view=rev
Author: jswhit
Date: 2008-05-30 15:24:06 -0700 (Fri, 30 May 2008)
Log Message:
-----------
updated pyproj to 1.8.6
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py
trunk/toolkits/basemap/src/_geod.c
trunk/toolkits/basemap/src/_geod.pyx
trunk/toolkits/basemap/src/_pyproj.pxi
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2008-05-30 20:55:24 UTC (rev 5338)
+++ trunk/toolkits/basemap/Changelog 2008-05-30 22:24:06 UTC (rev 5339)
@@ -1,5 +1,5 @@
-version 0.99 (svn revision 5338)
- * updated pyproj to 1.8.5.
+version 0.99 (svn revision 5339)
+ * updated pyproj to 1.8.6.
* fixed bug in NetCDFFile creating masked arrays when both
_FillValue and missing_value exist.
* drawparallels and drawmeridians return a dictionary containing
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py 2008-05-30 20:55:24 UTC (rev 5338)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py 2008-05-30 22:24:06 UTC (rev 5339)
@@ -53,7 +53,7 @@
from array import array
from types import TupleType, ListType, NoneType
import os
-import numpy as np
+#import numpy as np
pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
set_datapath(pyproj_datadir)
@@ -369,10 +369,11 @@
"""
initialize a Geod class instance.
- Geodetic parameters for specifying the ellipsoid or sphere to
- use must either be given in a dictionary 'initparams' or as
- keyword arguments. Following is a list of the ellipsoids that
- may be defined using the 'ellps' keyword:
+ Geodetic parameters for specifying the ellipsoid
+ can be given in a dictionary 'initparams', as keyword arguments,
+ or as as proj4 geod initialization string.
+ Following is a list of the ellipsoids that may be defined using the
+ 'ellps' keyword:
MERIT a=6378137.0 rf=298.257 MERIT 1983
SGS85 a=6378136.0 rf=298.257 Soviet Geodetic System 85
@@ -457,20 +458,35 @@
54.663 -123.448 288303.720
-65.463 79.342 4013037.318
51.254 -71.576 5579916.649
+ >>> g2 = Geod('+ellps=clrk66') # use proj4 style initialization string
+ >>> az12,az21,dist = g2.inv(boston_lon,boston_lat,portland_lon,portland_lat)
+ >>> print "%7.3f %6.3f %12.3f" % (az12,az21,dist)
+ -66.531 75.654 4164192.708
"""
- # if projparams is None, use kwargs.
+ # if initparams is None, use kwargs.
if initparams is None:
if len(kwargs) == 0:
raise RuntimeError('no ellipsoid control parameters specified')
else:
- initparams = kwargs
- # set units to meters.
- if not initparams.has_key('units'):
- initparams['units']='m'
- elif initparams['units'] != 'm':
- print 'resetting units to meters ...'
- initparams['units']='m'
- return _Geod.__new__(self, initparams)
+ initstring = _dict2string(kwargs)
+ elif type(initparams) == str:
+ # if projparams is a string, interpret as a proj4 init string.
+ initstring = initparams
+ else: # projparams a dict
+ initstring = _dict2string(initparams)
+ # make sure units are meters.
+ if not initstring.count('+units='):
+ initstring = '+units=m '+initstring
+ else:
+ kvpairs = []
+ for kvpair in initstring.split():
+ if kvpair.startswith('+units'):
+ k,v = kvpair.split('=')
+ kvpairs.append(k+'=m ')
+ else:
+ kvpairs.append(kvpair+' ')
+ initstring = ''.join(kvpairs)
+ return _Geod.__new__(self, initstring)
def fwd(self, lons, lats, az, dist, radians=False):
"""
Modified: trunk/toolkits/basemap/src/_geod.c
===================================================================
--- trunk/toolkits/basemap/src/_geod.c 2008-05-30 20:55:24 UTC (rev 5338)
+++ trunk/toolkits/basemap/src/_geod.c 2008-05-30 22:24:06 UTC (rev 5339)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.14 on Tue May 20 09:25:55 2008 */
+/* Generated by Cython 0.9.6.14 on Fri May 30 16:08:08 2008 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -103,20 +103,6 @@
static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
-static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/
-static int __Pyx_EndUnpack(PyObject *); /*proto*/
-
-static inline PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
- if (likely(PyList_CheckExact(L))) {
- if (PyList_Append(L, x) < 0) return NULL;
- Py_INCREF(Py_None);
- return Py_None; // this is just to have an accurate signature
- }
- else {
- return PyObject_CallMethod(L, "append", "(O)", x);
- }
-}
-
static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
@@ -127,18 +113,18 @@
/* Declarations */
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":5
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":5
* include "_pyproj.pxi"
*
* cdef class Geod: # <<<<<<<<<<<<<<
* cdef GEODESIC_T geodesic_t
- * cdef public object geodparams
+ * cdef public object geodstring
*/
struct __pyx_obj_5_geod_Geod {
PyObject_HEAD
GEODESIC_T geodesic_t;
- PyObject *geodparams;
+ PyObject *geodstring;
PyObject *proj_version;
char *geodinitstring;
};
@@ -148,7 +134,7 @@
/* Implementation of _geod */
-static char __pyx_k_2[] = "1.8.4";
+static char __pyx_k_2[] = "1.8.5";
static PyObject *__pyx_n___cinit__;
static PyObject *__pyx_n___reduce__;
@@ -165,179 +151,61 @@
static PyObject *__pyx_k_2p;
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":11
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":11
* cdef char *geodinitstring
*
- * def __new__(self, geodparams): # <<<<<<<<<<<<<<
+ * def __new__(self, geodstring): # <<<<<<<<<<<<<<
* cdef GEODESIC_T GEOD_T
- * self.geodparams = geodparams
+ * # setup geod initialization string.
*/
-static PyObject *__pyx_n_iteritems;
-static PyObject *__pyx_n_append;
-static PyObject *__pyx_n_join;
static PyObject *__pyx_n_RuntimeError;
-static PyObject *__pyx_k_3p;
-static PyObject *__pyx_k_4p;
-static PyObject *__pyx_k_5p;
-static PyObject *__pyx_k_6p;
-
static PyObject *__pyx_builtin_RuntimeError;
-static char __pyx_k_3[] = "+";
-static char __pyx_k_4[] = "=";
-static char __pyx_k_5[] = " ";
-static char __pyx_k_6[] = "";
-
static int __pyx_pf_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static int __pyx_pf_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
- PyObject *__pyx_v_geodparams = 0;
+ PyObject *__pyx_v_geodstring = 0;
GEODESIC_T __pyx_v_GEOD_T;
- PyObject *__pyx_v_geodargs;
- PyObject *__pyx_v_key;
- PyObject *__pyx_v_value;
int __pyx_r;
- PyObject *__pyx_1 = 0;
- Py_ssize_t __pyx_2 = 0;
+ int __pyx_1;
+ PyObject *__pyx_2 = 0;
PyObject *__pyx_3 = 0;
- PyObject *__pyx_4 = 0;
- PyObject *__pyx_5 = 0;
- int __pyx_6;
- static char *__pyx_argnames[] = {"geodparams",0};
+ static char *__pyx_argnames[] = {"geodstring",0};
if (likely(!__pyx_kwds) && likely(PyTuple_GET_SIZE(__pyx_args) == 1)) {
- __pyx_v_geodparams = PyTuple_GET_ITEM(__pyx_args, 0);
+ __pyx_v_geodstring = PyTuple_GET_ITEM(__pyx_args, 0);
}
else {
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_geodparams))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L2;}
+ if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_geodstring))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L2;}
}
goto __pyx_L3;
__pyx_L2:;
__Pyx_AddTraceback("_geod.Geod.__cinit__");
return -1;
__pyx_L3:;
- __pyx_v_geodargs = Py_None; Py_INCREF(Py_None);
- __pyx_v_key = Py_None; Py_INCREF(Py_None);
- __pyx_v_value = Py_None; Py_INCREF(Py_None);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":13
- * def __new__(self, geodparams):
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":14
* cdef GEODESIC_T GEOD_T
- * self.geodparams = geodparams # <<<<<<<<<<<<<<
- * # setup proj initialization string.
- * geodargs = []
- */
- Py_INCREF(__pyx_v_geodparams);
- Py_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams);
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams = __pyx_v_geodparams;
-
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":15
- * self.geodparams = geodparams
- * # setup proj initialization string.
- * geodargs = [] # <<<<<<<<<<<<<<
- * for key,value in geodparams.iteritems():
- * geodargs.append('+'+key+"="+str(value)+' ')
- */
- __pyx_1 = PyList_New(0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_v_geodargs);
- __pyx_v_geodargs = ((PyObject *)__pyx_1);
- __pyx_1 = 0;
-
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":16
- * # setup proj initialization string.
- * geodargs = []
- * for key,value in geodparams.iteritems(): # <<<<<<<<<<<<<<
- * geodargs.append('+'+key+"="+str(value)+' ')
- * self.geodinitstring = PyString_AsString(''.join(geodargs))
- */
- __pyx_1 = PyObject_GetAttr(__pyx_v_geodparams, __pyx_n_iteritems); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_1); __pyx_1 = 0;
- if (PyList_CheckExact(__pyx_3)) { __pyx_2 = 0; __pyx_1 = __pyx_3; Py_INCREF(__pyx_1); }
- else { __pyx_1 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;} }
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- for (;;) {
- if (PyList_CheckExact(__pyx_1)) { if (__pyx_2 >= PyList_GET_SIZE(__pyx_1)) break; __pyx_3 = PyList_GET_ITEM(__pyx_1, __pyx_2++); Py_INCREF(__pyx_3); }
- else {
- __pyx_3 = PyIter_Next(__pyx_1);
- if (!__pyx_3) {
- break;
- }
- }
- if (PyTuple_CheckExact(__pyx_3) && PyTuple_GET_SIZE(__pyx_3) == 2) {
- PyObject* tuple = __pyx_3;
- __pyx_5 = PyTuple_GET_ITEM(tuple, 0);
- Py_INCREF(__pyx_5);
- Py_DECREF(__pyx_v_key);
- __pyx_v_key = __pyx_5;
- __pyx_5 = 0;
- __pyx_5 = PyTuple_GET_ITEM(tuple, 1);
- Py_INCREF(__pyx_5);
- Py_DECREF(__pyx_v_value);
- __pyx_v_value = __pyx_5;
- __pyx_5 = 0;
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- }
- else {
- __pyx_4 = PyObject_GetIter(__pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_5 = __Pyx_UnpackItem(__pyx_4, 0); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_v_key);
- __pyx_v_key = __pyx_5;
- __pyx_5 = 0;
- __pyx_5 = __Pyx_UnpackItem(__pyx_4, 1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_v_value);
- __pyx_v_value = __pyx_5;
- __pyx_5 = 0;
- if (__Pyx_EndUnpack(__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_4); __pyx_4 = 0;
- }
-
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":17
- * geodargs = []
- * for key,value in geodparams.iteritems():
- * geodargs.append('+'+key+"="+str(value)+' ') # <<<<<<<<<<<<<<
- * self.geodinitstring = PyString_AsString(''.join(geodargs))
+ * # setup geod initialization string.
+ * self.geodstring = geodstring # <<<<<<<<<<<<<<
+ * self.geodinitstring = PyString_AsString(self.geodstring)
* # initialize projection
*/
- __pyx_5 = PyNumber_Add(__pyx_k_3p, __pyx_v_key); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyNumber_Add(__pyx_5, __pyx_k_4p); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_5); __pyx_5 = 0;
- __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_INCREF(__pyx_v_value);
- PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_value);
- __pyx_5 = PyObject_Call(((PyObject*)&PyString_Type), ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
- __pyx_4 = PyNumber_Add(__pyx_3, __pyx_5); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- Py_DECREF(__pyx_5); __pyx_5 = 0;
- __pyx_3 = PyNumber_Add(__pyx_4, __pyx_k_5p); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_4); __pyx_4 = 0;
- __pyx_5 = __Pyx_PyObject_Append(__pyx_v_geodargs, __pyx_3); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- Py_DECREF(__pyx_5); __pyx_5 = 0;
- }
- Py_DECREF(__pyx_1); __pyx_1 = 0;
+ Py_INCREF(__pyx_v_geodstring);
+ Py_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring = __pyx_v_geodstring;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":18
- * for key,value in geodparams.iteritems():
- * geodargs.append('+'+key+"="+str(value)+' ')
- * self.geodinitstring = PyString_AsString(''.join(geodargs)) # <<<<<<<<<<<<<<
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":15
+ * # setup geod initialization string.
+ * self.geodstring = geodstring
+ * self.geodinitstring = PyString_AsString(self.geodstring) # <<<<<<<<<<<<<<
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
*/
- __pyx_4 = PyObject_GetAttr(__pyx_k_6p, __pyx_n_join); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_INCREF(__pyx_v_geodargs);
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_geodargs);
- __pyx_5 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(__pyx_4); __pyx_4 = 0;
- Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring = PyString_AsString(__pyx_5);
- Py_DECREF(__pyx_5); __pyx_5 = 0;
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring = PyString_AsString(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":20
- * self.geodinitstring = PyString_AsString(''.join(geodargs))
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":17
+ * self.geodinitstring = PyString_AsString(self.geodstring)
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0] # <<<<<<<<<<<<<<
* if pj_errno != 0:
@@ -345,70 +213,65 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t = (GEOD_init_plus(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring, (&__pyx_v_GEOD_T))[0]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":21
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":18
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0: # <<<<<<<<<<<<<<
* raise RuntimeError(pj_strerrno(pj_errno))
* self.proj_version = PJ_VERSION/100.
*/
- __pyx_6 = (pj_errno != 0);
- if (__pyx_6) {
+ __pyx_1 = (pj_errno != 0);
+ if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":22
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":19
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
* self.proj_version = PJ_VERSION/100.
*
*/
- __pyx_1 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
- PyTuple_SET_ITEM(__pyx_4, 0, __pyx_1);
- __pyx_1 = 0;
- __pyx_3 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
- __Pyx_Raise(__pyx_3, 0, 0);
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
- goto __pyx_L6;
+ __pyx_2 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
+ __pyx_2 = 0;
+ __pyx_2 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+ __Pyx_Raise(__pyx_2, 0, 0);
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ goto __pyx_L4;
}
- __pyx_L6:;
+ __pyx_L4:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":23
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":20
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* self.proj_version = PJ_VERSION/100. # <<<<<<<<<<<<<<
*
* def __reduce__(self):
*/
- __pyx_5 = PyFloat_FromDouble((PJ_VERSION / 100.)); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyFloat_FromDouble((PJ_VERSION / 100.)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->proj_version);
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->proj_version = __pyx_5;
- __pyx_5 = 0;
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->proj_version = __pyx_3;
+ __pyx_3 = 0;
__pyx_r = 0;
goto __pyx_L0;
__pyx_L1:;
- Py_XDECREF(__pyx_1);
+ Py_XDECREF(__pyx_2);
Py_XDECREF(__pyx_3);
- Py_XDECREF(__pyx_4);
- Py_XDECREF(__pyx_5);
__Pyx_AddTraceback("_geod.Geod.__cinit__");
__pyx_r = -1;
__pyx_L0:;
- Py_DECREF(__pyx_v_geodargs);
- Py_DECREF(__pyx_v_key);
- Py_DECREF(__pyx_v_value);
return __pyx_r;
}
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":25
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":22
* self.proj_version = PJ_VERSION/100.
*
* def __reduce__(self): # <<<<<<<<<<<<<<
* """special method that allows pyproj.Geod instance to be pickled"""
- * return (self.__class__,(self.geodparams,))
+ * return (self.__class__,(self.geodstring,))
*/
static PyObject *__pyx_n___class__;
@@ -421,18 +284,18 @@
PyObject *__pyx_2 = 0;
PyObject *__pyx_3 = 0;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":27
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":24
* def __reduce__(self):
* """special method that allows pyproj.Geod instance to be pickled"""
- * return (self.__class__,(self.geodparams,)) # <<<<<<<<<<<<<<
+ * return (self.__class__,(self.geodstring,)) # <<<<<<<<<<<<<<
*
* def _fwd(self, object lons, object lats, object az, object dist, radians=False):
*/
- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n___class__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_INCREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams);
- PyTuple_SET_ITEM(__pyx_2, 0, ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams);
- __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n___class__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ Py_INCREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
+ PyTuple_SET_ITEM(__pyx_2, 0, ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
+ __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
PyTuple_SET_ITEM(__pyx_3, 1, ((PyObject *)__pyx_2));
__pyx_1 = 0;
@@ -453,8 +316,8 @@
return __pyx_r;
}
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":29
- * return (self.__class__,(self.geodparams,))
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":26
+ * return (self.__class__,(self.geodstring,))
*
* def _fwd(self, object lons, object lats, object az, object dist, radians=False): # <<<<<<<<<<<<<<
* """
@@ -463,13 +326,13 @@
static PyObject *__pyx_n_ValueError;
-static PyObject *__pyx_k_7p;
-static PyObject *__pyx_k_8p;
+static PyObject *__pyx_k_3p;
+static PyObject *__pyx_k_4p;
static PyObject *__pyx_builtin_ValueError;
-static char __pyx_k_7[] = "Buffer lengths not the same";
-static char __pyx_k_8[] = "undefined forward geodesic (may be an equatorial arc)";
+static char __pyx_k_3[] = "Buffer lengths not the same";
+static char __pyx_k_4[] = "undefined forward geodesic (may be an equatorial arc)";
static PyObject *__pyx_pf_5_geod_4Geod__fwd(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_5_geod_4Geod__fwd[] = "\n forward transformation - determine longitude, latitude and back azimuth \n of a terminus point given an initial point longitude and latitude, plus\n forward azimuth and distance.\n if radians=True, lons/lats are radians instead of degrees.\n ";
@@ -514,7 +377,7 @@
}
}
else {
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOOO|O", __pyx_argnames, &__pyx_v_lons, &__pyx_v_lats, &__pyx_v_az, &__pyx_v_dist, &__pyx_v_radians))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L2;}
+ if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOOO|O", __pyx_argnames, &__pyx_v_lons, &__pyx_v_lats, &__pyx_v_az, &__pyx_v_dist, &__pyx_v_radians))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L2;}
}
goto __pyx_L3;
__pyx_L2:;
@@ -522,7 +385,7 @@
return NULL;
__pyx_L3:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":40
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":37
* cdef void *londata, *latdata, *azdat, *distdat
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0: # <<<<<<<<<<<<<<
@@ -532,7 +395,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons, (&__pyx_v_londata), (&__pyx_v_buflenlons)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":41
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":38
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -540,12 +403,12 @@
* raise RuntimeError
*/
__Pyx_Raise(__pyx_builtin_RuntimeError, 0, 0);
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L4;
}
__pyx_L4:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":42
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":39
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0: # <<<<<<<<<<<<<<
@@ -555,7 +418,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats, (&__pyx_v_latdata), (&__pyx_v_buflenlats)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":43
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":40
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -563,12 +426,12 @@
* raise RuntimeError
*/
__Pyx_Raise(__pyx_builtin_RuntimeError, 0, 0);
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L5;
}
__pyx_L5:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":44
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":41
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0: # <<<<<<<<<<<<<<
@@ -578,7 +441,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_az, (&__pyx_v_azdat), (&__pyx_v_buflenaz)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":45
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":42
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -586,12 +449,12 @@
* raise RuntimeError
*/
__Pyx_Raise(__pyx_builtin_RuntimeError, 0, 0);
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L6;
}
__pyx_L6:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":46
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":43
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0: # <<<<<<<<<<<<<<
@@ -601,7 +464,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_dist, (&__pyx_v_distdat), (&__pyx_v_buflend)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":47
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":44
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -609,12 +472,12 @@
* if not buflenlons == buflenlats == buflenaz == buflend:
*/
__Pyx_Raise(__pyx_builtin_RuntimeError, 0, 0);
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L7;
}
__pyx_L7:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":49
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":46
* raise RuntimeError
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend: # <<<<<<<<<<<<<<
@@ -631,42 +494,42 @@
__pyx_2 = (!__pyx_1);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":50
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":47
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same") # <<<<<<<<<<<<<<
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata
*/
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_INCREF(__pyx_k_7p);
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k_7p);
- __pyx_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ Py_INCREF(__pyx_k_3p);
+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k_3p);
+ __pyx_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
__Pyx_Raise(__pyx_4, 0, 0);
Py_DECREF(__pyx_4); __pyx_4 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L8;
}
__pyx_L8:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":51
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":48
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize # <<<<<<<<<<<<<<
* lonsdata = <double *>londata
* latsdata = <double *>latdata
*/
- __pyx_3 = PyInt_FromSsize_t(__pyx_v_buflenlons); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__doublesize); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_5 = PyNumber_Divide(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyInt_FromSsize_t(__pyx_v_buflenlons); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__doublesize); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyNumber_Divide(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
- __pyx_6 = __pyx_PyIndex_AsSsize_t(__pyx_5); if (unlikely((__pyx_6 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_6 = __pyx_PyIndex_AsSsize_t(__pyx_5); if (unlikely((__pyx_6 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
__pyx_v_ndim = __pyx_6;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":52
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":49
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata # <<<<<<<<<<<<<<
@@ -675,7 +538,7 @@
*/
__pyx_v_lonsdata = ((double *)__pyx_v_londata);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":53
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":50
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata
* latsdata = <double *>latdata # <<<<<<<<<<<<<<
@@ -684,7 +547,7 @@
*/
__pyx_v_latsdata = ((double *)__pyx_v_latdata);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":54
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":51
* lonsdata = <double *>londata
* latsdata = <double *>latdata
* azdata = <double *>azdat # <<<<<<<<<<<<<<
@@ -693,7 +556,7 @@
*/
__pyx_v_azdata = ((double *)__pyx_v_azdat);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":55
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":52
* latsdata = <double *>latdata
* azdata = <double *>azdat
* distdata = <double *>distdat # <<<<<<<<<<<<<<
@@ -702,7 +565,7 @@
*/
__pyx_v_distdata = ((double *)__pyx_v_distdat);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":56
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":53
* azdata = <double *>azdat
* distdata = <double *>distdat
* for i from 0 <= i < ndim: # <<<<<<<<<<<<<<
@@ -711,17 +574,17 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_ndim; __pyx_v_i++) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":57
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":54
* distdata = <double *>distdat
* for i from 0 <= i < ndim:
* if radians: # <<<<<<<<<<<<<<
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
*/
- __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":58
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":55
* for i from 0 <= i < ndim:
* if radians:
* self.geodesic_t.p1.v = lonsdata[i] # <<<<<<<<<<<<<<
@@ -730,7 +593,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":59
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":56
* if radians:
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i] # <<<<<<<<<<<<<<
@@ -739,7 +602,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":60
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":57
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i] # <<<<<<<<<<<<<<
@@ -748,7 +611,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = (__pyx_v_azdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":61
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":58
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -760,55 +623,55 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":63
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":60
* self.geodesic_t.DIST = distdata[i]
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
*/
- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyFloat_FromDouble((__pyx_v_lonsdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyFloat_FromDouble((__pyx_v_lonsdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":64
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":61
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i]
*/
- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyFloat_FromDouble((__pyx_v_latsdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyFloat_FromDouble((__pyx_v_latsdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":65
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":62
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t)
*/
- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyFloat_FromDouble((__pyx_v_azdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__dg2rad); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyFloat_FromDouble((__pyx_v_azdata[__pyx_v_i])); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyNumber_Multiply(__pyx_3, __pyx_4); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_5); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = __pyx_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":66
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":63
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -819,7 +682,7 @@
}
__pyx_L11:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":67
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":64
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -828,7 +691,7 @@
*/
geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":68
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":65
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -838,27 +701,27 @@
__pyx_2 = (pj_errno != 0);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":69
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":66
* geod_pre(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
* geod_for(&self.geodesic_t)
* if pj_errno != 0:
*/
- __pyx_3 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3);
__pyx_3 = 0;
- __pyx_5 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
__Pyx_Raise(__pyx_5, 0, 0);
Py_DECREF(__pyx_5); __pyx_5 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L12;
}
__pyx_L12:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":70
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":67
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -867,7 +730,7 @@
*/
geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":71
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":68
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -877,27 +740,27 @@
__pyx_1 = (pj_errno != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":72
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":69
* geod_for(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
* if isnan(self.geodesic_t.ALPHA21):
* raise ValueError('undefined forward geodesic (may be an equatorial arc)')
*/
- __pyx_3 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyString_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3);
__pyx_3 = 0;
- __pyx_5 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
__Pyx_Raise(__pyx_5, 0, 0);
Py_DECREF(__pyx_5); __pyx_5 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L13;
}
__pyx_L13:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":73
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":70
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* if isnan(self.geodesic_t.ALPHA21): # <<<<<<<<<<<<<<
@@ -907,36 +770,36 @@
__pyx_8 = isnan(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21);
if (__pyx_8) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":74
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":71
* raise RuntimeError(pj_strerrno(pj_errno))
* if isnan(self.geodesic_t.ALPHA21):
* raise ValueError('undefined forward geodesic (may be an equatorial arc)') # <<<<<<<<<<<<<<
* if radians:
* lonsdata[i] = self.geodesic_t.p2.v
*/
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1;}
- Py_INCREF(__pyx_k_8p);
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k_8p);
- __pyx_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ Py_INCREF(__pyx_k_4p);
+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k_4p);
+ __pyx_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
__Pyx_Raise(__pyx_4, 0, 0);
Py_DECREF(__pyx_4); __pyx_4 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1;}
goto __pyx_L14;
}
__pyx_L14:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":75
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":72
* if isnan(self.geodesic_t.ALPHA21):
* raise ValueError('undefined forward geodesic (may be an equatorial arc)')
* if radians: # <<<<<<<<<<<<<<
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u
*/
- __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1;}
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":76
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":73
* raise ValueError('undefined forward geodesic (may be an equatorial arc)')
* if radians:
* lonsdata[i] = self.geodesic_t.p2.v # <<<<<<<<<<<<<<
@@ -945,7 +808,7 @@
*/
(__pyx_v_lonsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":77
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":74
* if radians:
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u # <<<<<<<<<<<<<<
@@ -954,7 +817,7 @@
*/
(__pyx_v_latsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.u;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":78
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":75
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u
* azdata[i] = self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
@@ -966,51 +829,51 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":80
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":77
* azdata[i] = self.geodesic_t.ALPHA21
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v # <<<<<<<<<<<<<<
* latsdata[i] = _rad2dg*self.geodesic_t.p2.u
* azdata[i] = _rad2dg*self.geodesic_t.ALPHA21
*/
- __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_lonsdata[__pyx_v_i]) = __pyx_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":81
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":78
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
* latsdata[i] = _rad2dg*self.geodesic_t.p2.u # <<<<<<<<<<<<<<
* azdata[i] = _rad2dg*self.geodesic_t.ALPHA21
*
*/
- __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.u); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.u); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_latsdata[__pyx_v_i]) = __pyx_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":82
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":79
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
* latsdata[i] = _rad2dg*self.geodesic_t.p2.u
* azdata[i] = _rad2dg*self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
*
* def _inv(self, object lons1, object lats1, object lons2, object lats2, radians=False):
*/
- __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1;}
- __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__rad2dg); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_3 = PyFloat_FromDouble(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_4 = PyNumber_Multiply(__pyx_5, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1;}
+ __pyx_7 = __pyx_PyFloat_AsDouble(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_azdata[__pyx_v_i]) = __pyx_7;
}
@@ -1029,7 +892,7 @@
return __pyx_r;
}
-/* "/Volumes/User/jwhitaker/matplotlib/...
[truncated message content] |
