pygeodesy 24.10.10__py2.py3-none-any.whl → 24.10.24__py2.py3-none-any.whl

pygeodesy/ellipsoidalBase.py

@@ -5,7 +5,7 @@ u'''(INTERNAL) Private ellipsoidal base classes C{CartesianEllipsoidalBase}
 and C{LatLonEllipsoidalBase}.
 
 A pure Python implementation of geodesy tools for ellipsoidal earth models,
-transcoded in part from JavaScript originals by I{(C) Chris Veness 2005-2016}
+transcoded in part from JavaScript originals by I{(C) Chris Veness 2005-2024}
 and published under the same MIT Licence**, see for example U{latlon-ellipsoidal
 <https://www.Movable-Type.co.UK/scripts/geodesy/docs/latlon-ellipsoidal.js.html>}.
 '''
@@ -35,7 +35,7 @@ from pygeodesy.units import Epoch, _isDegrees, Radius_, _1mm as _TOL_M
 # from math import fabs  # from .latlonBase
 
 __all__ = _ALL_LAZY.ellipsoidalBase
-__version__ = '24.08.14'
+__version__ = '24.10.12'
 
 
 class CartesianEllipsoidalBase(CartesianBase):

pygeodesy/ellipsoidalBaseDI.py

@@ -34,7 +34,7 @@ from pygeodesy.utily import m2km, unroll180, _unrollon, _unrollon3, \
 from math import degrees, radians
 
 __all__ = _ALL_LAZY.ellipsoidalBaseDI
-__version__ = '24.09.26'
+__version__ = '24.10.19'
 
 _polar__  = 'polar?'
 _B2END    = _1_5  # _intersect3 bearing to pseudo-end point factor
@@ -279,9 +279,9 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
            two points or as a point and bearing.
 
            @arg circle: Radius of the circle centered at this location (C{meter},
-                        conventionally) or a point on the circle (this C{LatLon}).
-           @arg point: A location on the geodesic (this C{LatLon}).
-           @arg other: An other point on the geodesic (this C{LatLon}) or the
+                        conventionally) or a point on the circle (same C{LatLon} class).
+           @arg point: A location on the geodesic (same C{LatLon} class).
+           @arg other: An other point on the geodesic (same C{LatLon} class) or the
                        (forward) bearing at the B{C{point}} (compass C{degrees}).
            @kwarg exact: Exact C{geodesic...} to use (C{bool} or C{Geodesic...}), see
                          method L{Ellipsoid.geodesic_}.
@@ -292,12 +292,12 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
            @kwarg tol: Convergence tolerance (C{scalar}).
 
            @return: 2-Tuple of the intersection points (representing a geodesic chord),
-                    each an instance of this C{LatLon}.  Both points are the same
+                    each an instance of same C{LatLon} class.  Both points are the same
                     instance if the geodesic (line) is tangential to the circle.
 
            @raise IntersectionError: The circle and geodesic do not intersect.
 
-           @raise TypeError: If B{C{point}} is not this C{LatLon} or B{C{circle}}
+           @raise TypeError: If B{C{point}} is not same C{LatLon} class or B{C{circle}}
                              or B{C{other}} invalid.
 
            @raise UnitError: Invalid B{C{circle}}, B{C{other}}, B{C{exact}} or
@@ -345,7 +345,7 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
            @return: A L{NearestOn8Tuple}C{(closest, distance, fi, j, start, end,
                     initial, final)} with C{distance} in C{meter}, conventionally
                     and with the C{closest}, the C{start} the C{end} point each
-                    an instance of this C{LatLon}.
+                    an instance of same C{LatLon} class.
 
            @raise PointsError: Insufficient number of B{C{points}}.
 
@@ -397,7 +397,7 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
 
         f, j = _fi_j2(f, len(Ps))  # like .vector3d.nearestOn6
 
-        n = self.nearestOn8.__name__  # _dunder_nameof
+        n = self.nearestOn8.__name__  # _DUNDER_nameof
         c.rename(n)
         if s is not c:
             s = s.copy(name=n)
@@ -422,9 +422,9 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
                         and/or B{C{other}} (C{bool}).
            @kwarg tol: Convergence tolerance (C{meter}).
 
-           @return: The intersection point, an instance of this C{LatLon}.
+           @return: The intersection point, an instance of same C{LatLon} class.
 
-           @raise TypeError: If B{C{point}} or B{C{other}} not this C{LatLon}.
+           @raise TypeError: If B{C{point}} or B{C{other}} not same C{LatLon} class.
 
            @raise UnitError: Invalid B{C{other}}, B{C{exact}} or B{C{height}}.
         '''

pygeodesy/ellipsoidalNvector.py

@@ -8,7 +8,7 @@ and C{Nvector} and DEPRECATED L{Ned} and functions L{meanOf}, L{sumOf}
 and DEPRECATED L{toNed}.
 
 Pure Python implementation of n-vector-based geodetic (lat-/longitude)
-methods by I{(C) Chris Veness 2011-2016} published under the same MIT
+methods by I{(C) Chris Veness 2011-2024} published under the same MIT
 Licence**, see U{Vector-based geodesy
 <https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>}.
 
@@ -48,7 +48,7 @@ from pygeodesy.units import Bearing, Distance, Height, Scalar
 # from math import fabs  # from .nvectorBase
 
 __all__ = _ALL_LAZY.ellipsoidalNvector
-__version__ = '24.08.13'
+__version__ = '24.10.19'
 
 
 class Ned(_Ned):
@@ -417,7 +417,7 @@ class LatLon(LatLonNvectorBase, LatLonEllipsoidalBase):
         return LatLonNvectorBase.toNvector(self, **kwds)
 
 
-_Nvll = LatLon(0, 0, name=_Nv00_)  # reference instance (L{LatLon})
+_Nv00 = LatLon(0, 0, name=_Nv00_)  # reference instance (L{LatLon})
 
 
 class Nvector(NvectorBase):
@@ -541,7 +541,7 @@ def meanOf(points, datum=_WGS84, height=None, wrap=False,
 
        @raise ValueError: Insufficient number of B{C{points}}.
     '''
-    Ps = _Nvll.PointsIter(points, wrap=wrap)
+    Ps = _Nv00.PointsIter(points, wrap=wrap)
     n  =  sumOf(p._N_vector for p in Ps.iterate(closed=False))
     return n.toLatLon(**_xkwds(LatLon_and_kwds, height=height, datum=datum,
                                                 LatLon=LatLon, name__=meanOf))

pygeodesy/ellipsoidalVincenty.py

@@ -8,7 +8,7 @@ I{Thaddeus Vincenty}'s geodetic (lat-/longitude) L{LatLon}, geocentric
 L{intersections2}, L{nearestOn} and L{perimeterOf}.
 
 Pure Python implementation of geodesy tools for ellipsoidal earth models,
-transcoded from JavaScript originals by I{(C) Chris Veness 2005-2016}
+transcoded from JavaScript originals by I{(C) Chris Veness 2005-2024}
 and published under the same MIT Licence**, see U{Vincenty geodesics
 <https://www.Movable-Type.co.UK/scripts/LatLongVincenty.html>}.  More
 at U{geographiclib<https://PyPI.org/project/geographiclib>} and
@@ -72,7 +72,7 @@ from pygeodesy.utily import atan2b, atan2d, sincos2, sincos2d, unroll180, wrap18
 from math import atan2, cos, degrees, fabs, radians, tan
 
 __all__ = _ALL_LAZY.ellipsoidalVincenty
-__version__ = '24.08.13'
+__version__ = '24.10.12'
 
 _antipodal_to_ = _SPACE_(_antipodal_, _to_)
 

pygeodesy/ellipsoids.py

@@ -66,7 +66,7 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import copysign0, isbool, isint
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS1, INF, NINF, PI4, PI_2, PI_3, R_M, R_MA, R_FM, \
-                               _EPSqrt, _EPStol as _TOL, _floatuple as _T, _isfinite, _SQRT2_2, \
+                               _EPSqrt, _EPStol as _TOL, _floatuple as _T, _isfinite, \
                                _0_0s, _0_0, _0_5, _1_0, _1_EPS, _2_0, _4_0, _90_0, \
                                _0_25, _3_0  # PYCHOK used!
 from pygeodesy.errors import _AssertionError, IntersectionError, _ValueError, _xattr, _xkwds_not
@@ -93,7 +93,7 @@ from pygeodesy.utily import atan1, atan1d, atan2b, degrees90, m2radians, radians
 from math import asinh, atan, atanh, cos, degrees, exp, fabs, radians, sin, sinh, sqrt, tan
 
 __all__ = _ALL_LAZY.ellipsoids
-__version__ = '24.07.25'
+__version__ = '24.10.15'
 
 _f_0_0    = Float(f =_0_0)  # zero flattening
 _f__0_0   = Float(f_=_0_0)  # zero inverse flattening
@@ -281,7 +281,7 @@ class Ellipsoid(_NamedEnumItem):
 
         self._register(Ellipsoids, n)
 
-        if f and f_:  # see .test/testEllipsoidal.py
+        if f and f_:  # see test/testEllipsoidal
             d = dict(eps=_TOL)
             if None in ff_:  # both f_ and f given
                 d.update(Error=_ValueError, txt=_incompatible_)
@@ -1160,7 +1160,7 @@ class Ellipsoid(_NamedEnumItem):
                 v = v.times_(t, t, 0)  # force z=0.0
                 h = x - a  # equatorial
             else:  # normal in 1st quadrant
-                x, y, i = _plumbTo3(x, y, self)
+                x, y, i = _MODS.triaxials._plumbTo3(x, y, self)
                 t, v = v, v.times_(x, x, y)
                 h = t.minus(v).length
 
@@ -1522,9 +1522,9 @@ class Ellipsoid(_NamedEnumItem):
     def _Rhumbs(self):
         '''(INTERNAL) Get all C{Rhumb...} classes, I{once}.
         '''
-        p = _MODS.rhumb
-        return (p.aux_.RhumbAux,  # overwrite property_ROver
-                p.ekx.Rhumb, p.solve.RhumbSolve)
+        r = _MODS.rhumb
+        return (r.aux_.RhumbAux,  # overwrite property_ROver
+                r.ekx.Rhumb, r.solve.RhumbSolve)
 
     @property
     def rhumbsolve(self):
@@ -2276,47 +2276,6 @@ def n2f_(n):
     return f2f_(n2f(n))
 
 
-def _plumbTo3(px, py, E, eps=EPS):  # in .height4 above
-    '''(INTERNAL) Nearest point on a 2-D ellipse in 1st quadrant.
-
-       @see: Functions C{pygeodesy.triaxial._plumbTo4} and C{-._plumbTo5}.
-    '''
-    a, b, e0 = E.a, E.b, EPS0
-    if min(px, py, a, b) < e0:
-        raise _AssertionError(px=px, py=py, a=a, b=b, E=E)
-
-    a2 = a - b * E.b_a
-    b2 = b - a * E.a_b
-    tx = ty = _SQRT2_2
-    _a,  _h =  fabs, hypot
-    for i in range(16):  # max 5
-        ex = a2 * tx**3
-        ey = b2 * ty**3
-
-        qx =  px - ex
-        qy =  py - ey
-        q  = _h(qx, qy)
-        if q < e0:  # PYCHOK no cover
-            break
-        r = _h(ex - tx * a,
-               ey - ty * b) / q
-
-        sx, tx = tx, min(_1_0, max(0, (ex + qx * r) / a))
-        sy, ty = ty, min(_1_0, max(0, (ey + qy * r) / b))
-        t = _h(ty, tx)
-        if t < e0:  # PYCHOK no cover
-            break
-        tx = tx / t  # /= chokes PyChecker
-        ty = ty / t
-        if _a(sx - tx) < eps and \
-           _a(sy - ty) < eps:
-            break
-
-    tx *= a / px
-    ty *= b / py
-    return tx, ty, i  # x and y as fractions
-
-
 class Ellipsoids(_NamedEnum):
     '''(INTERNAL) L{Ellipsoid} registry, I{must} be a sub-class
        to accommodate the L{_LazyNamedEnumItem} properties.

pygeodesy/elliptic.py

@@ -84,12 +84,12 @@ from pygeodesy.constants import EPS, INF, NAN, PI, PI_2, PI_4, _0_0, \
 # from pygeodesy.errors import _ValueError  # from .fmath
 from pygeodesy.fmath import favg, hypot1, zqrt,  _ValueError
 from pygeodesy.fsums import Fsum, _sum
-# from pygeodesy.internals import _dunder_nameof  # from .lazily
+from pygeodesy.internals import _DUNDER_nameof
 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,  _dunder_nameof
-from pygeodesy.named import _Named, _NamedTuple,  Fmt, unstr
+# from pygeodesy.lazily import _ALL_LAZY  # from .named
+from pygeodesy.named import _Named, _NamedTuple,  _ALL_LAZY, Fmt, unstr
 from pygeodesy.props import _allPropertiesOf_n, Property_RO, _update_all
 # from pygeodesy.streprs import Fmt, unstr  # from .named
 from pygeodesy.units import Scalar, Scalar_
@@ -99,7 +99,7 @@ from math import asin, asinh, atan, atan2, ceil, cosh, fabs, floor, \
                  radians, sin, sinh, sqrt, tan, tanh
 
 __all__ = _ALL_LAZY.elliptic
-__version__ = '24.09.06'
+__version__ = '24.10.14'
 
 _TolRD  =  zqrt(EPS * 0.002)
 _TolRF  =  zqrt(EPS * 0.030)
@@ -408,9 +408,9 @@ class Elliptic(_Named):
     def _Einv(self, x):
         '''(INTERNAL) Helper for C{.deltaEinv} and C{.fEinv}.
         '''
-        E2 = self.cE * _2_0
-        n  = floor(x / E2 + _0_5)
-        r  = x - E2 * n  # r in [-cE, cE)
+        E2  = self.cE * _2_0
+        n   = floor(x / E2 + _0_5)
+        r   = x - E2 * n  # r in [-cE, cE)
         # linear approximation
         phi = PI * r / E2  # phi in [-PI_2, PI_2)
         Phi = Fsum(phi)
@@ -427,7 +427,7 @@ class Elliptic(_Named):
                 sn = self.fE(sn, cn, dn)
                 phi, d = _Phi2((r - sn) / dn)
             else:  # PYCHOK no cover
-                d = _0_0  # XXX continue?
+                d = _0_0  # XXX or continue?
             if fabs(d) < _TolJAC:  # 3-4 trips
                 _iterations(self, i)
                 break
@@ -497,20 +497,20 @@ class Elliptic(_Named):
             '''(INTERNAL) Core of C{.fE}.
             '''
             if sn:
-                sn2, cn2, dn2 = sn**2, cn**2, dn**2
-                kp2, k2 = self.kp2, self.k2
+                cn2, dn2 = cn**2, dn**2
+                kp2, k2  = self.kp2, self.k2
                 if k2 <= 0:  # Carlson, eq. 4.6, <https://DLMF.NIST.gov/19.25.E9>
                     Ei = _RF3(self, cn2, dn2, _1_0)
                     if k2:
-                        Ei -= _RD(self, cn2, dn2, _1_0, _3over(k2, sn2))
+                        Ei -= _RD(self, cn2, dn2, _1_0, _3over(k2, sn**2))
                 elif kp2 >= 0:  # k2 > 0, <https://DLMF.NIST.gov/19.25.E10>
                     Ei = _over(k2 * fabs(cn), dn)  # float
                     if kp2:
-                        Ei += (_RD( self, cn2, _1_0,  dn2, _3over(k2, sn2)) +
+                        Ei += (_RD( self, cn2, _1_0,  dn2, _3over(k2, sn**2)) +
                                _RF3(self, cn2,  dn2, _1_0)) * kp2
                 else:  # kp2 < 0, <https://DLMF.NIST.gov/19.25.E11>
                     Ei  = _over(dn, fabs(cn))
-                    Ei -= _RD(self, dn2, _1_0, cn2, _3over(kp2, sn2))
+                    Ei -= _RD(self, dn2, _1_0, cn2, _3over(kp2, sn**2))
                 Ei *= fabs(sn)
                 ei  = float(Ei)
             else:  # PYCHOK no cover
@@ -1075,7 +1075,7 @@ def _ellipticError(where, *args, **kwds_cause_txt):
 
     x, t, kwds = _x_t_kwds(**kwds_cause_txt)
 
-    n = _dunder_nameof(where, where)
+    n = _DUNDER_nameof(where, where)
     n = _DOT_(Elliptic.__name__, n)
     n = _SPACE_(_invokation_, n)
     u =  unstr(n, *args, **kwds)

pygeodesy/errors.py

@@ -14,12 +14,12 @@ 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.internals import _dunder_nameof_, _plural, _tailof
+from pygeodesy.internals import _DUNDER_nameof_, _getPYGEODESY, _plural, _tailof
 from pygeodesy.interns import MISSING, NN, _a_, _an_, _and_, _clip_, _COLON_, _COLONSPACE_, \
                              _COMMASPACE_, _datum_, _ELLIPSIS_, _ellipsoidal_, _incompatible_, \
                              _invalid_, _keyword_, _LatLon_, _len_, _not_, _or_, _SPACE_, \
                              _specified_, _UNDER_, _vs_, _with_
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv, _PYTHON_X_DEV
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _PYTHON_X_DEV
 # from pygeodesy import streprs as _streprs  # _MODS
 # from pygeodesy.unitsBase import Str  # _MODS
 # from pygeodesy.vector3dBase import Vector3dBase  # _MODS
@@ -27,7 +27,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv, _PYTHON_X_D
 from copy import copy as _copy
 
 __all__ = _ALL_LAZY.errors  # _ALL_DOCS('_InvalidError', '_IsnotError')  _under
-__version__ = '24.10.01'
+__version__ = '24.10.14'
 
 _argument_   = 'argument'
 _box_        = 'box'
@@ -43,7 +43,7 @@ try:
     _exception_chaining = None  # not available
     _ = Exception().__cause__   # Python 3.9+ exception chaining
 
-    if _PYTHON_X_DEV or _getenv('PYGEODESY_EXCEPTION_CHAINING', NN):  # == _std_
+    if _PYTHON_X_DEV or _getPYGEODESY('EXCEPTION_CHAINING'):  # == _std_
         _exception_chaining = True  # turned on, std
         raise AttributeError()  # allow exception chaining
 
@@ -527,7 +527,7 @@ def _IsnotError(*types__, **name_value_Error_cause):  # name=value [, Error=Type
     n, v    = _xkwds_item2(kwds)
 
     n = _streprs.Fmt.PARENSPACED(n, repr(v))
-    t = _not_(_an(_or(*_dunder_nameof_(*types__))) if types__ else _specified_)
+    t = _not_(_an(_or(*_DUNDER_nameof_(*types__))) if types__ else _specified_)
     return _XError(E, n, txt=t, cause=x)
 
 

pygeodesy/etm.py

@@ -91,7 +91,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.09.06'
+__version__ = '24.10.21'
 
 _OVERFLOW = _1_EPS**2  # about 2e+31
 _TAYTOL   =  pow(EPS, 0.6)
@@ -1160,14 +1160,30 @@ if __name__ == '__main__':  # MCCABE 16
 
     _main()
 
+# % python3.13 -m pygeodesy.etm -p 12 33.33 44.44
+# ExactTransverseMercator: 4276926.114803905599 4727193.767015309073 28.375536563148 1.233325101778
+# ExactTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
+
+# % python3.13 -m pygeodesy.etm -s -p 12 33.33 44.44
+# KTransverseMercator: 4276926.114803904667 4727193.767015310004 28.375536563148 1.233325101778
+# KTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
+
 # % python3.12 -m pygeodesy.etm -p 12 33.33 44.44
 # ExactTransverseMercator: 4276926.11480390653 4727193.767015309073 28.375536563148 1.233325101778
 # ExactTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
 
-# % python3.12 -s -m pygeodesy.etm -p 12 33.33 44.44
+# % python3.12 -m pygeodesy.etm -s -p 12 33.33 44.44
+# KTransverseMercator: 4276926.114803904667 4727193.767015310004 28.375536563148 1.233325101778
+# KTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
+
+# % python2 -m pygeodesy.etm -p 12 33.33 44.44
 # ExactTransverseMercator: 4276926.11480390653 4727193.767015309073 28.375536563148 1.233325101778
 # ExactTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
 
+# % python2 -m pygeodesy.etm -s -p 12 33.33 44.44
+# KTransverseMercator: 4276926.114803904667 4727193.767015310004 28.375536563148 1.233325101778
+# KTransverseMercator: 33.33 44.44 28.375536563148 1.233325101778
+
 # % echo 33.33 44.44 | .../bin/TransverseMercatorProj
 # 4276926.114804 4727193.767015 28.375536563148 1.233325101778
 

pygeodesy/fmath.py

@@ -16,7 +16,7 @@ from pygeodesy.errors import _IsnotError, LenError, _TypeError, _ValueError, \
 from pygeodesy.fsums import _2float, Fsum, fsum, _isFsum_2Tuple, _1primed, \
                              Fmt, unstr
 from pygeodesy.interns import MISSING, _negative_, _not_scalar_
-from pygeodesy.lazily import _ALL_LAZY, _sys_version_info2
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
 from pygeodesy.units import Int_, _isHeight, _isRadius,  Float_  # PYCHOK for .heights
 
@@ -24,7 +24,7 @@ from math import fabs, sqrt  # pow
 import operator as _operator  # in .datums, .trf, .utm
 
 __all__ = _ALL_LAZY.fmath
-__version__ = '24.10.04'
+__version__ = '24.10.11'
 
 # sqrt(2) - 1 <https://WikiPedia.org/wiki/Square_root_of_2>
 _0_4142  =  0.41421356237309504880  # ... ~ 3730904090310553 / 9007199254740992
@@ -804,7 +804,7 @@ def fremainder(x, y):
     return r
 
 
-if _sys_version_info2 < (3, 8):  # PYCHOK no cover
+if _MODS.sys_version_info2 < (3, 8):  # PYCHOK no cover
     from math import hypot  # OK in Python 3.7-
 
     def hypot_(*xs):
@@ -831,7 +831,7 @@ if _sys_version_info2 < (3, 8):  # PYCHOK no cover
         '''
         return float(_Hypot(*xs))
 
-elif _sys_version_info2 < (3, 10):
+elif _MODS.sys_version_info2 < (3, 10):
     # In Python 3.8 and 3.9 C{math.hypot} is inaccurate, see
     # U{agdhruv<https://GitHub.com/geopy/geopy/issues/466>},
     # U{cffk<https://Bugs.Python.org/issue43088>} and module

pygeodesy/formy.py

@@ -20,11 +20,11 @@ from pygeodesy.errors import IntersectionError, LimitError, limiterrors, \
                             _xcallable,_xkwds, _xkwds_pop2
 from pygeodesy.fmath import euclid, hypot, hypot2, sqrt0
 from pygeodesy.fsums import fsumf_,  Fmt, unstr
-# from pygeodesy.internals import _dunder_nameof  # from .named
+# from pygeodesy.internals import _DUNDER_nameof  # from .named
 from pygeodesy.interns import _delta_, _distant_, _inside_, _SPACE_, _too_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name__, _name2__, _NamedTuple, _xnamed, \
-                            _dunder_nameof
+                            _DUNDER_nameof
 from pygeodesy.namedTuples import Bearing2Tuple, Distance4Tuple, LatLon2Tuple, \
                                   Intersection3Tuple, PhiLam2Tuple, Vector3Tuple
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
@@ -43,7 +43,7 @@ from contextlib import contextmanager
 from math import asin, atan, atan2, cos, degrees, fabs, radians, sin, sqrt  # pow
 
 __all__ = _ALL_LAZY.formy
-__version__ = '24.09.27'
+__version__ = '24.10.14'
 
 _RADIANS2 = (PI / _180_0)**2  # degrees- to radians-squared
 _ratio_   = 'ratio'
@@ -1136,7 +1136,7 @@ class _idllmn6(object):  # see also .geodesicw._wargs, .latlonBase._toCartesian3
                 _, lat2, lon2 = _Wrap.latlon3(lon1, lat2, lon2, wrap)
                 kwds = _xkwds(kwds, wrap=wrap)  # for _xError
             m =  small if small is _100km else Meter_(small=small)
-            n = _dunder_nameof(intersections2 if s else intersection2)
+            n = _DUNDER_nameof(intersections2 if s else intersection2)
             if datum is None or euclidean(lat1, lon1, lat2, lon2) < m:
                 d, m = None, _MODS.vector3d
                 _i   = m._intersects2 if s else m._intersect3d3

pygeodesy/fsums.py

@@ -48,12 +48,12 @@ from pygeodesy.errors import _AssertionError, _OverflowError, _TypeError, \
                              _ValueError, _xError, _xError2, _xkwds, \
                              _xkwds_get, _xkwds_get1, _xkwds_not, \
                              _xkwds_pop, _xsError
-from pygeodesy.internals import _enquote, _passarg
+from pygeodesy.internals import _enquote, _getPYGEODESY, _MODS, _passarg
 from pygeodesy.interns import NN, _arg_, _COMMASPACE_, _DOT_, _from_, \
                              _not_finite_, _SPACE_, _std_, _UNDER_
-from pygeodesy.lazily import _ALL_LAZY, _getenv, _sys_version_info2
+# from pygeodesy.lazily import _ALL_LAZY  # from .named
 from pygeodesy.named import _name__, _name2__, _Named, _NamedTuple, \
-                            _NotImplemented
+                            _NotImplemented,  _ALL_LAZY
 from pygeodesy.props import _allPropertiesOf_n, deprecated_method, \
                              deprecated_property_RO, Property, \
                              Property_RO, property_RO
@@ -64,7 +64,7 @@ from math import fabs, isinf, isnan, \
                  ceil as _ceil, floor as _floor  # PYCHOK used! .ltp
 
 __all__ = _ALL_LAZY.fsums
-__version__ = '24.10.09'
+__version__ = '24.10.22'
 
 from pygeodesy.interns import (
   _PLUS_     as _add_op_,  # in .auxilats.auxAngle
@@ -79,15 +79,15 @@ from pygeodesy.interns import (
 )
 _floordiv_op_ = _truediv_op_ * 2  # _DSLASH_
 _divmod_op_   = _floordiv_op_ + _mod_op_
-_F2PRODUCT    = _getenv('PYGEODESY_FSUM_F2PRODUCT', NN)
+_F2PRODUCT    = _getPYGEODESY('FSUM_F2PRODUCT')
 _iadd_op_     = _add_op_ + _fset_op_  # in .auxilats.auxAngle, .fstats
 _integer_     = 'integer'
 _isub_op_     = _sub_op_ + _fset_op_  # in .auxilats.auxAngle
 _NONFINITEr   = _0_0  # NOT INT0!
-_NONFINITES   = _getenv('PYGEODESY_FSUM_NONFINITES', NN)
+_NONFINITES   = _getPYGEODESY('FSUM_NONFINITES')
 _non_zero_    = 'non-zero'
 _pow_op_      = _mul_op_ * 2  # _DSTAR_
-_RESIDUAL_0_0 = _getenv('PYGEODESY_FSUM_RESIDUAL', _0_0)
+_RESIDUAL_0_0 = _getPYGEODESY('FSUM_RESIDUAL', _0_0)
 _significant_ = 'significant'
 _threshold_   = 'threshold'
 
@@ -516,7 +516,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
        @see: Module L{fsums<pygeodesy.fsums>} for env variables C{PYGEODESY_FSUM_F2PRODUCT},
              C{PYGEODESY_FSUM_NONFINITES} and C{PYGEODESY_FSUM_RESIDUAL}.
     '''
-    _f2product = _sys_version_info2 > (3, 12) or bool(_F2PRODUCT)
+    _f2product = _MODS.sys_version_info2 > (3, 12) or bool(_F2PRODUCT)
     _isfine    = {}  # == _isfinite, see nonfiniterrors()
     _n         =  0
 #   _ps        = []  # partial sums
@@ -913,6 +913,14 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
         f = self._copy_2r(other, self.__rdivmod__)
         return f._fdivmod2(self, _divmod_op_)
 
+#       turned off, called by _deepcopy and _copy
+#   def __reduce__(self):  # Python 3.8+
+#       ''' Pickle, like std C{fractions.Fraction}, see U{__reduce__
+#           <https://docs.Python.org/3/library/pickle.html#object.__reduce__>}
+#       '''
+#       dict_ = self._Fsum_as().__dict__  # no __setstate__
+#       return (self.__class__, self.partials, dict_)
+
 #   def __repr__(self):
 #       '''Return the default C{repr(this)}.
 #       '''
@@ -926,7 +934,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
         f = self._copy_2r(other, self.__rfloordiv__)
         return f._floordiv(self, _floordiv_op_)
 
-    def __rmatmul__(self, other):  # PYCHOK no cover
+    def __rmatmul__(self, other):  # PYCHOK no coveS
         '''Not implemented.'''
         return _NotImplemented(self, other)
 
@@ -1015,7 +1023,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
 
     __trunc__ = __int__
 
-    if _sys_version_info2 < (3, 0):  # PYCHOK no cover
+    if _MODS.sys_version_info2 < (3, 0):  # PYCHOK no cover
         # <https://docs.Python.org/2/library/operator.html#mapping-operators-to-functions>
         __div__     = __truediv__
         __idiv__    = __itruediv__
@@ -1101,7 +1109,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
     def _copy_2(self, which, name=NN):
         '''(INTERNAL) Copy for I{dyadic} operators.
         '''
-        n =  name or which.__name__  # _dunder_nameof
+        n =  name or which.__name__  # _DUNDER_nameof
         # NOT .classof due to .Fdot(a, *b) args, etc.
         f = _Named.copy(self, deep=False, name=n)
         f._ps = list(self._ps)  # separate list
@@ -1152,6 +1160,8 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase, .fstats
             fs    = _xs(xs, **kwds)  # PYCHOK yield
             ps    =  self._ps
             ps[:] =  self._ps_acc(list(ps), fs, up=up)
+#           if len(ps) > 16:
+#               _ = _psum(ps, **self._isfine)
         return self
 
     def _facc_args(self, xs, **up):
@@ -2803,7 +2813,7 @@ def _xsum(which, xs, nonfinites=None, primed=0, **floats):  # origin=0
 # delete all decorators, etc.
 del _allPropertiesOf_n, deprecated_method, deprecated_property_RO, \
      Property, Property_RO, property_RO, _ALL_LAZY, _F2PRODUCT, \
-     MANT_DIG, _NONFINITES, _RESIDUAL_0_0, _getenv, _std_
+     MANT_DIG, _NONFINITES, _RESIDUAL_0_0, _getPYGEODESY, _std_
 
 if __name__ == '__main__':