pygeodesy 24.5.6__py2.py3-none-any.whl → 24.5.15__py2.py3-none-any.whl

pygeodesy/datums.py

@@ -67,7 +67,7 @@ datum, q.v. U{"A Guide to Coordinate Systems in Great Britain", Section 6
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import islistuple, map2, neg, _passarg, _xinstanceof, _zip
+from pygeodesy.basics import islistuple, map2, neg, _xinstanceof, _zip
 from pygeodesy.constants import R_M, _float as _F, _0_0, _1_0, _2_0, _8_0, _3600_0
 # from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase as _CEB, \
 #                                          LatLonEllipsoidalBase as _LLEB  # MODS
@@ -76,12 +76,13 @@ from pygeodesy.ellipsoids import a_f2Tuple, Ellipsoid, Ellipsoid2, Ellipsoids, _
 from pygeodesy.errors import _IsnotError, _TypeError, _xattr, _xellipsoidall, _xkwds, \
                              _xkwds_pop2
 from pygeodesy.fmath import fdot, fmean,  Fmt, _operator
+from pygeodesy.internals import _passarg, _under
 from pygeodesy.interns import NN, _a_, _Airy1830_, _AiryModified_, _BAR_, _Bessel1841_, \
-                             _Clarke1866_, _Clarke1880IGN_, _COMMASPACE_, _DOT_, \
-                             _earth_, _ellipsoid_, _ellipsoidal_, _GRS80_, _Intl1924_, \
-                             _MINUS_, _Krassovski1940_, _Krassowsky1940_, _NAD27_, \
-                             _NAD83_, _PLUS_, _s_, _Sphere_, _spherical_, _transform_, \
-                             _UNDER_, _WGS72_, _WGS84_, _under
+                             _Clarke1866_, _Clarke1880IGN_, _COMMASPACE_, _DOT_, _earth_, \
+                             _ellipsoid_, _ellipsoidal_, _GRS80_, _Intl1924_, _MINUS_, \
+                             _Krassovski1940_, _Krassowsky1940_, _NAD27_, _NAD83_, _s_, \
+                             _PLUS_, _Sphere_, _spherical_, _transform_, _UNDER_, \
+                             _WGS72_, _WGS84_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _NamedEnum, _NamedEnumItem, _lazyNamedEnumItem as _lazy
 # from pygeodesy.namedTuples import Vector3Tuple  # from .ellipsoids
@@ -93,7 +94,7 @@ from pygeodesy.units import _isRadius, Radius_,  radians
 # import operator as _operator  # from .fmath
 
 __all__ = _ALL_LAZY.datums
-__version__ = '24.03.07'
+__version__ = '24.05.14'
 
 _a_ellipsoid_ = _UNDER_(_a_, _ellipsoid_)
 _BD72_        = 'BD72'
@@ -722,7 +723,7 @@ assert _WGS84.ellipsoid is _EWGS84
 if __name__ == '__main__':
 
     from pygeodesy.interns import _COMMA_, _NL_, _NLATvar_
-    from pygeodesy.lazily import printf
+    from pygeodesy import printf
 
     # __doc__ of this file, force all into registery
     for r in (Datums, Transforms):

pygeodesy/ecef.py

@@ -86,7 +86,7 @@ from pygeodesy.utily import atan1, atan1d, atan2d, degrees90, degrees180, \
 from math import atan2, cos, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.ecef
-__version__ = '24.05.04'
+__version__ = '24.05.10'
 
 _Ecef_    = 'Ecef'
 _prolate_ = 'prolate'
@@ -646,7 +646,7 @@ class EcefSudano(_EcefBase):
 
         _a  = fabs
         lat = atan1d(z, R * E.e21)
-        sa, ca = sincos2d(fabs(lat))
+        sa, ca = sincos2d(_a(lat))
         # Sudano's Eq (A-6) and (A-7) refactored/reduced,
         # replacing Rn from Eq (A-4) with n = E.a / ca:
         # N = ca**2 * ((z + E.e2 * n * sa) * ca - R * sa)
@@ -656,17 +656,18 @@ class EcefSudano(_EcefBase):
         #   = ca**2 * (E.e2 * E.a / E.e2s2(sa) - R / ca**2)
         # N / D = (z * ca + (E.e2 * E.a - R) * sa) /
         #         (E.e2 * E.a / E.e2s2(sa) - R / ca**2)
+        _E  = EPS_2
         tol = self.tolerance
         _S2 = Fsum(sa).fsum2f_
         _rt = sqrt
         for i in range(1, _TRIPS):
             ca2 = _1_0 - sa**2
-            if ca2 < EPS_2:  # PYCHOK no cover
+            if ca2 < _E:  # PYCHOK no cover
                 ca = _0_0
                 break
             ca = _rt(ca2)
             r = e / E.e2s2(sa) - R / ca2
-            if _a(r) < EPS_2:
+            if _a(r) < _E:
                 break
             lat = None
             sa, r = _S2(-z * ca / r, -d * sa / r)

pygeodesy/elevations.py

@@ -34,7 +34,7 @@ from pygeodesy.units import Lat, Lon, Meter, Scalar, Str
 # from math import fabs  # from .karney
 
 __all__ = _ALL_LAZY.elevations
-__version__ = '23.05.26'
+__version__ = '24.05.13'
 
 try:
     from urllib2 import urlopen  # quote, urlcleanup
@@ -245,7 +245,7 @@ def geoidHeight2(lat, lon, model=0, timeout=2.0):
 
 if __name__ == '__main__':
 
-    from pygeodesy.lazily import printf
+    from pygeodesy import printf
     # <https://WikiPedia.org/wiki/Mount_Diablo>
     for f in (elevation2,     # (1173.79, '3DEP 1/3 arc-second')
               geoidHeight2):  # (-31.699, u'GEOID12B')

pygeodesy/ellipsoidalBaseDI.py

@@ -17,10 +17,12 @@ from pygeodesy.errors import _AssertionError, IntersectionError, _IsnotError, \
 from pygeodesy.fmath import favg, fmean_
 from pygeodesy.fsums import Fmt, fsumf_
 from pygeodesy.formy import _isequalTo, opposing, _radical2
-from pygeodesy.interns import _antipodal_, _concentric_, _dunder_nameof, \
-                              _ellipsoidal_, _exceed_PI_radians_, _low_, \
-                              _near_, _SPACE_, _too_
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
+# from pygeodesy.internals import _dunder_nameof  # from .lazily
+from pygeodesy.interns import _antipodal_, _concentric_, _ellipsoidal_, \
+                              _exceed_PI_radians_, _low_, _near_, \
+                              _SPACE_, _too_
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
+                             _dunder_nameof
 from pygeodesy.namedTuples import Bearing2Tuple, Destination2Tuple, \
                                   Intersection3Tuple, NearestOn2Tuple, \
                                   NearestOn8Tuple, _LL4Tuple
@@ -34,7 +36,7 @@ from pygeodesy.utily import m2km, unroll180, _unrollon, _unrollon3, \
 from math import degrees, radians
 
 __all__ = _ALL_LAZY.ellipsoidalBaseDI
-__version__ = '24.02.14'
+__version__ = '24.05.13'
 
 _polar__  = 'polar?'
 _B2END    = _1_5  # _intersect3 bearing to pseudo-end point factor

pygeodesy/elliptic.py

@@ -82,11 +82,12 @@ from pygeodesy.constants import EPS, INF, NAN, PI, PI_2, PI_4, \
                                _360_0, _over
 # from pygeodesy.errors import _ValueError  # from .fmath
 from pygeodesy.fmath import fdot, hypot1, zqrt,  _ValueError
-from pygeodesy.fsums import Fsum, _sum,  _ALL_LAZY
-from pygeodesy.interns import NN, _delta_, _DOT_, _dunder_nameof, _f_, \
-                             _invalid_, _invokation_, _negative_, _SPACE_
+from pygeodesy.fsums import Fsum, _sum
+# from pygeodesy.internals import _dunder_nameof  # from .lazily
+from pygeodesy.interns import NN, _delta_, _DOT_, _f_, _invalid_, \
+                             _invokation_, _negative_, _SPACE_
 from pygeodesy.karney import _K_2_0, _norm180, _signBit, _sincos2
-# from pygeodesy.lazily import _ALL_LAZY  # from .fsums
+from pygeodesy.lazily import _ALL_LAZY,  _dunder_nameof
 from pygeodesy.named import _Named, _NamedTuple,  Fmt, unstr
 from pygeodesy.props import _allPropertiesOf_n, Property_RO, _update_all
 # from pygeodesy.streprs import Fmt, unstr  # from .named
@@ -97,7 +98,7 @@ from math import asinh, atan, atan2, ceil, cosh, fabs, floor, \
                  radians, sin, sqrt, tanh
 
 __all__ = _ALL_LAZY.elliptic
-__version__ = '24.04.14'
+__version__ = '24.05.13'
 
 _TolRD  =  zqrt(EPS * 0.002)
 _TolRF  =  zqrt(EPS * 0.030)
@@ -402,10 +403,12 @@ class Elliptic(_Named):
         Phi = Fsum(phi)
         # first order correction
         phi = Phi.fsum_(self.eps * sin(phi * _2_0) / _N_2_0)
+        self._iteration = 0
         # For kp2 close to zero use asin(r / cE) or J. P. Boyd,
         # Applied Math. and Computation 218, 7005-7013 (2012)
         # <https://DOI.org/10.1016/j.amc.2011.12.021>
-        _Phi2, self._iteration = Phi.fsum2f_, 0  # aggregate
+        _Phi2 = Phi.fsum2f_  # aggregate
+        _abs  = fabs
         for i in range(1, _TRIPS):  # GEOGRAPHICLIB_PANIC
             sn, cn, dn = self._sncndn3(phi)
             if dn:
@@ -413,7 +416,7 @@ class Elliptic(_Named):
                 phi, d = _Phi2((r - sn) / dn)
             else:  # PYCHOK no cover
                 d = _0_0  # XXX continue?
-            if fabs(d) < _TolJAC:  # 3-4 trips
+            if _abs(d) < _TolJAC:  # 3-4 trips
                 _iterations(self, i)
                 break
         else:  # PYCHOK no cover

pygeodesy/errors.py

@@ -14,18 +14,18 @@ C{PYGEODESY_EXCEPTION_CHAINING=std} or to any non-empty string.
 # from pygeodesy.basics import isint, isodd, issubclassof, itemsorted, _xinstanceof, _zip  # _MODS
 # from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase, LatLonEllipsoidalBase  # _MODS
 # from pygeodesy import errors  # _MODS, _MODS.getattr
-from pygeodesy.interns import MISSING, NN, _a_, _an_, _and_, _clip_, _COLON_, \
-                             _COLONSPACE_, _COMMASPACE_, _datum_, _ellipsoidal_, \
-                             _incompatible_, _invalid_, _len_, _not_, _or_, _SPACE_, \
-                             _specified_, _UNDER_, _vs_, _with_, _tailof
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv, _PYTHON_X_DEV
+# from pygeodesy.internals import _tailof  # from .lazily
+from pygeodesy.interns import MISSING, NN, _a_, _an_, _and_, _clip_, _COLON_, _COLONSPACE_, \
+                             _COMMASPACE_, _datum_, _ellipsoidal_, _incompatible_, _invalid_, \
+                             _len_, _not_, _or_, _SPACE_, _specified_, _UNDER_, _vs_, _with_
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv, _PYTHON_X_DEV,  _tailof
 # from pygeodesy.streprs import Fmt, unstr  # _MODS
 # from pygeodesy.vector3dBase import Vector3dBase  # _MODS
 
 from copy import copy as _copy
 
 __all__ = _ALL_LAZY.errors  # _ALL_DOCS('_InvalidError', '_IsnotError')  _under
-__version__ = '24.05.06'
+__version__ = '24.05.15'
 
 _box_        = 'box'
 _limiterrors =  True  # in .formy

pygeodesy/etm.py

@@ -74,7 +74,7 @@ from pygeodesy.elliptic import _ALL_LAZY, Elliptic
 from pygeodesy.fmath import cbrt, hypot, hypot1, hypot2
 from pygeodesy.fsums import Fsum, fsum1f_
 from pygeodesy.interns import NN, _COMMASPACE_, _DASH_, _near_, _SPACE_, \
-                             _spherical_, _usage
+                             _spherical_
 from pygeodesy.karney import _copyBit, _diff182, _fix90, _norm2, _norm180, \
                              _tand, _unsigned2
 # from pygeodesy.lazily import _ALL_LAZY  # from .elliptic
@@ -92,7 +92,7 @@ from pygeodesy.utm import _cmlon, _LLEB, _parseUTM5, _toBand, _toXtm8, \
 from math import asinh, atan2, degrees, radians, sinh, sqrt
 
 __all__ = _ALL_LAZY.etm
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 _OVERFLOW = _1_EPS**2  # about 2e+31
 _TAYTOL   =  pow(EPS, 0.6)
@@ -1109,6 +1109,7 @@ def toEtm8(latlon, lon=None, datum=None, Etm=Etm, falsed=True,
 
 if __name__ == '__main__':  # MCCABE 13
 
+    from pygeodesy.internals import _usage
     from pygeodesy import fstr, KTransverseMercator, printf
     from sys import argv, exit as _exit
 

pygeodesy/fmath.py

@@ -7,7 +7,7 @@ u'''Utilities using precision floating point summation.
 from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import _copysign, copysign0, isbool, isint, isscalar, \
-                              len2, map1
+                              len2, map1, _xiterable
 from pygeodesy.constants import EPS0, EPS02, EPS1, NAN, PI, PI_2, PI_4, \
                                _0_0, _0_125, _1_6th, _0_25, _1_3rd, _0_5, _1_0, \
                                _N_1_0, _1_5, _copysign_0_0, _isfinite, remainder
@@ -24,7 +24,7 @@ from math import fabs, sqrt  # pow
 import operator as _operator  # in .datums, .trf, .utm
 
 __all__ = _ALL_LAZY.fmath
-__version__ = '24.05.06'
+__version__ = '24.05.10'
 
 # sqrt(2) <https://WikiPedia.org/wiki/Square_root_of_2>
 _0_4142  =  0.41421356237309504880  # ... sqrt(2) - 1
@@ -521,17 +521,18 @@ def fidw(xs, ds, beta=2):
                 _F =  Fsum
                 W  = _F()
                 X  = _F()
-                for i, d in enumerate(ds):
+                for i, d in enumerate(_xiterable(ds)):
                     x = xs[i]
-                    if d < EPS0:
-                        if d < 0:
+                    D = _F(d)
+                    if D < EPS0:
+                        if D < 0:
                             raise ValueError(_negative_)
                         x = float(x)
                         i = n
                         break
-                    D = _F(d).fpow(b)
-                    W += D
-                    X += D.fmul(x)
+                    if D.fpow(b):
+                        W += D
+                        X += D.fmul(x)
                 else:
                     x  = X.fover(W, raiser=False)
                     i += 1  # len(xs) >= len(ds)
@@ -539,7 +540,7 @@ def fidw(xs, ds, beta=2):
                 i += 1  # len(xs) < i < len(ds)
             except Exception as X:
                 _I = Fmt.INDEX
-                raise _xError(X, _I(ds=i), d, _I(xs=i), x)
+                raise _xError(X, _I(xs=i), x, _I(ds=i), d)
         else:  # b == 0
             x = fsum(xs) / n  # fmean(xs)
             i = n
@@ -630,12 +631,12 @@ except ImportError:
     def fprod(xs, start=1):
         '''Iterable product, like C{math.prod} or C{numpy.prod}.
 
-           @arg xs: Terms to be multiplied, an iterable, list,
-                    tuple, etc. (C{scalar}s).
-           @kwarg start: Initial term, also the value returned
+           @arg xs: Iterable of values to be multiplied (each
+                    C{scalar} or an L{Fsum}).
+           @kwarg start: Initial value, also the value returned
                          for an empty B{C{xs}} (C{scalar}).
 
-           @return: The product (C{float}).
+           @return: The product (C{float} or an L{Fsum}).
 
            @see: U{NumPy.prod<https://docs.SciPy.org/doc/
                  numpy/reference/generated/numpy.prod.html>}.