pygeodesy 25.4.25__py2.py3-none-any.whl → 25.5.25__py2.py3-none-any.whl

pygeodesy/resections.py

@@ -10,7 +10,7 @@ L{triAngle}, L{triAngle5}, L{triSide}, L{triSide2} and L{triSide4}.
        U{Pierlot<http://www.Telecom.ULg.ac.BE/publi/publications/pierlot/Pierlot2014ANewThree>}.
 '''
 # make sure int/int division yields float quotient
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import map1, map2, _zip,  _ALL_LAZY, typename
 from pygeodesy.constants import EPS, EPS0, EPS02, INT0, PI, PI2, PI_2, PI_4, \
@@ -18,12 +18,11 @@ from pygeodesy.constants import EPS, EPS0, EPS02, INT0, PI, PI2, PI_2, PI_4, \
                                _16_0, _180_0, _360_0, isnear0, _over, _umod_360
 from pygeodesy.errors import _and, _or, TriangleError, _ValueError, _xcallable, \
                              _xkwds, _xkwds_pop2
-from pygeodesy.fmath import favg, Fdot, fidw, fmean, hypot, hypot2_
+from pygeodesy.fmath import favg, Fdot, Fdot_, fidw, _fma, fmean, hypot, hypot2_
 from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1, fsum1f_
 # from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import _a_, _A_, _area_, _b_, _B_, _c_, _C_, _coincident_, \
-                              _colinear_, _d_, _invalid_, _negative_, _not_, \
-                              _rIn_, _SPACE_
+                              _colinear_, _d_, _invalid_, _negative_, _rIn_, _SPACE_
 # from pygeodesy.lazily import _ALL_LAZY  # from .basics
 from pygeodesy.named import _NamedTuple, _Pass,  Fmt
 # from pygeodesy.streprs import Fmt  # from .named
@@ -35,7 +34,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d
 from math import cos, degrees, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.resections
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _concyclic_ = 'concyclic'
 _PA_        = 'PA'
@@ -43,7 +42,6 @@ _PB_        = 'PB'
 _PC_        = 'PC'
 _pointH_    = 'pointH'
 _pointP_    = 'pointP'
-_positive_  = 'positive'
 _radA_      = 'radA'
 _radB_      = 'radB'
 _radC_      = 'radC'
@@ -170,11 +168,9 @@ def cassini(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
 
     A, B, C = _ABC3(useZ, pointA, pointB, pointC)
     try:
-        sa, sb = map1(float, alpha, beta)
-        if min(sa, sb) < 0:
-            raise ValueError(_negative_)
+        sa, sb = _noneg(alpha, beta)
         if fsumf_(_360_0, -sa, -sb) < EPS0:
-            raise ValueError()
+            raise ValueError(_colinear_)
 
         x1, y1 = _H(A, C,  sa)
         x2, y2 = _H(B, C, -sb)
@@ -253,15 +249,15 @@ def collins5(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
 
     def _xyz(d, r, A, B, C, useZ):
         s, c = sincos2(r)
-        x =  d * s + A.x  # fma(d, s, A.x)
-        y =  d * c + A.y  # fma(d, c, A.y)
+        x = _fma(d, s, A.x)
+        y = _fma(d, c, A.y)
         z = _zidw(x, y, useZ, A, B, C)
         return x, y, z
 
     A, B, C = _ABC3(useZ, pointA, pointB, pointC)
     try:
-        ra, rb = radians(alpha), radians(beta)
-        if min(ra, rb) < 0:
+        ra, rb = t = radians(alpha), radians(beta)
+        if min(t) < 0:
             raise ValueError(_negative_)
 
         sra, srH = sin(ra), sin(ra + rb - PI)  # rH = PI - ((PI - ra) + (PI - rb))
@@ -294,6 +290,15 @@ def collins5(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
                              alpha=alpha, beta=beta, cause=x)
 
 
+def _noneg(*xs):
+    '''(INTERNAL) Return non-negative C{float}s.
+    '''
+    xs = tuple(map(float, xs))
+    if min(xs) < 0:
+        raise ValueError(_negative_)
+    return xs
+
+
 def pierlot(point1, point2, point3, alpha12, alpha23, useZ=False, eps=EPS,
                                                     **Clas_and_kwds):
     '''3-Point resection using U{Pierlot<http://www.Telecom.ULg.ac.BE/publi/publications/
@@ -342,7 +347,7 @@ def pierlot(point1, point2, point3, alpha12, alpha23, useZ=False, eps=EPS,
         if eps > 0:
             return c / (min(s, -eps) if s < 0 else max(s, eps))
         t = Fmt.PARENSPACED(eps=eps)
-        raise ValueError(_SPACE_(t, _not_, _positive_))
+        raise ValueError(_SPACE_(t, _invalid_))
 
     B1, B2, B3 = _B3(useZ, point1, point2, point3)
     try:
@@ -400,8 +405,8 @@ def _pierlot3(B1, B2, B3, a12, a23, useZ, _cot):
         #   = (x31 - x23) * (y12 - y23) - (x12 - x23) * (y31 - y23)
         # x = (d * B2.x + K * Y12_23).fover(d)
         # y = (d * B2.y - K * X12_23).fover(d)
-        x, y = _pierlotxy2(B2, -K, Y12_23, X12_23, (X31_23 * Y12_23 -
-                                                    X12_23 * Y31_23))
+        x, y = _pierlotxy2(B2, -K, Y12_23, X12_23, Fdot_(X31_23, Y12_23,
+                                                        -X12_23, Y31_23))
     else:
         x, y, _ = B2.xyz3
     return x, y, _zidw(x, y, useZ, B1, B2, B3)
@@ -492,11 +497,11 @@ def _pierlotx3(a_z_Bs, useZ, _cot, Cs):
     if K:
         cot23 = _cot(*sincos2d(a23))
 
-        # x23 = x2_ + cot23 * y2_
-        # y23 = y2_ - cot23 * x2_
+        # x23 = x2_ + cot23 * y2_  # _fma( cot23, y2_, x2_)
+        # y23 = y2_ - cot23 * x2_  # _fma(-cot23, x2_, y2_)
 
-        # x31 = x1_ + cot23 * y1_
-        # y31 = y1_ - cot23 * x1_
+        # x31 = x1_ + cot23 * y1_  # _fma( cot23, y1_, x1_)
+        # y31 = y1_ - cot23 * x1_  # _fma(-cot23, x1_, y1_)
 
         # x31 - x23 = x1_ + cot23 * y1_ - x2_ - cot23 * y2_
         X31_23 = _Fsumf_(x1_,  cot23 * y1_, -x2_, -cot23 * y2_)
@@ -504,10 +509,10 @@ def _pierlotx3(a_z_Bs, useZ, _cot, Cs):
         Y31_23 = _Fsumf_(y1_, -cot23 * x1_, -y2_,  cot23 * x2_)
 
         # d = (x31 - x23) * (x2_ - x1_) + (y31 - y23) * (y2_ - y1_)
-        # x = (D * B3.x - K * Y31_23).fover(d)
-        # y = (D * B3.y + K * X31_23).fover(d)
-        x, y = _pierlotxy2(B3, K, Y31_23, X31_23, (X31_23 * _Fsumf_(x2_, -x1_) +
-                                                   Y31_23 * _Fsumf_(y2_, -y1_)))
+        # x = (d * B3.x - K * Y31_23).fover(d)
+        # y = (d * B3.y + K * X31_23).fover(d)
+        x, y = _pierlotxy2(B3, K, Y31_23, X31_23, Fdot_(X31_23, _Fsumf_(x2_, -x1_),
+                                                        Y31_23, _Fsumf_(y2_, -y1_)))
     else:
         x, y, _ = B3.xyz3
     return x, y, _zidw(x, y, useZ, B1, B2, B3)
@@ -519,8 +524,8 @@ def _pierlotxy2(B, K, X, Y, D):
     d = float(D)
     if isnear0(d):
         raise ValueError(_or(_coincident_, _colinear_, _concyclic_))
-    x = (D * B.x - K * X).fover(d)
-    y = (D * B.y + K * Y).fover(d)
+    x = Fdot_(D, B.x, -K, X).fover(d)
+    y = Fdot_(D, B.y,  K, Y).fover(d)
     return x, y
 
 
@@ -551,9 +556,7 @@ def snellius3(a, b, degC, alpha, beta):
        @see: Function L{wildberger3}.
     '''
     try:
-        a, b, degC, alpha, beta = t = map1(float, a, b, degC, alpha, beta)
-        if min(t) < 0:
-            raise ValueError(_negative_)
+        a, b, degC, alpha, beta = _noneg(a, b, degC, alpha, beta)
         ra, rb, rC = map1(radians, alpha, beta, degC)
 
         r = fsum1f_(ra, rb, rC) * _0_5
@@ -705,17 +708,15 @@ def triAngle(a, b, c):
 
 def _triAngle(a, b, c):
     # (INTERNAL) To allow callers to embellish errors
-    a, b, c = map1(float, a, b, c)
-    if a < b:
+    a, b, c = _noneg(a, b, c)
+    if b > a:
         a, b = b, a
-    if b < 0 or c < 0:
-        raise ValueError(_negative_)
     if a < EPS0:
         raise ValueError(_coincident_)
     b_a = b / a
     if b_a < EPS0:
         raise ValueError(_coincident_)
-    t = fsumf_(_1_0, b_a**2, -(c / a)**2) / (b_a * _2_0)
+    t = _Fsumf_(_1_0, b_a**2, -(c / a)**2).fover(b_a * _2_0)
     return acos1(t)
 
 
@@ -733,7 +734,7 @@ def triAngle5(a, b, c):
                 C{radA}, C{radB} and C{radC} at triangle corners C{A}, C{B}
                 and C{C}, all in C{radians}, the C{InCircle} radius C{rIn}
                 aka C{inradius}, same units as triangle sides B{C{a}},
-                B{C{b}} and B{C{c}} and the triangle C{area} in those same
+                B{C{b}} and B{C{c}} and the triangle C{area} in the same
                 units I{squared}.
 
        @raise TriangleError: Invalid or negative B{C{a}}, B{C{b}} or B{C{c}}.
@@ -797,15 +798,15 @@ def triArea(a, b, c):
     try:
         r, y, x = sorted(map1(float, a, b, c))
         if r > 0:  # r = min(a, b, c)
-            ab = x - y
-            bc = y - r
-            y += r
-            r = (x + y) * (r - ab) * (r + ab) * (x + bc)
+            s =  r
+            d =  x - y
+            r = (s + d) * (s - d)
             if r:
-                r = sqrt(r / _16_0)
-        elif r < 0:
+                y +=  x
+                r *= (y + s) * (y - s)
+        if r < 0:
             raise ValueError(_negative_)
-        return r
+        return sqrt(r / _16_0) if r else _0_0
 
     except (TypeError, ValueError) as x:
         raise TriangleError(a=a, b=b, c=c, cause=x)
@@ -837,11 +838,8 @@ def triSide(a, b, radC):
 
 def _triSide(a, b, radC):
     # (INTERNAL) To allow callers to embellish errors
-    a, b, r = t = map1(float, a, b, radC)
-    if min(t) < 0:
-        raise ValueError(_negative_)
-
-    if a < b:
+    a, b, r = _noneg(a, b, radC)
+    if b < a:
         a, b = b, a
     if a > EPS0:
         ba = b / a
@@ -880,18 +878,21 @@ def triSide2(b, c, radB):
 
 def _triSide2(b, c, radB):
     # (INTERNAL) To allow callers to embellish errors
-    b, c, rB = map1(float, b, c, radB)
-    if min(b, c, rB) < 0:
-        raise ValueError(_negative_)
+    b, c, rB = _noneg(b, c, radB)
     sB, cB = sincos2(rB)
-    if isnear0(sB):
-        if not isnear0(b):
+    if isnear0(b) or isnear0(sB):
+        if isnear0(b) and isnear0(sB):
+            if cB < 0:
+                rA = PI
+                a  = b + c
+            else:
+                rA = _0_0
+                a  = fabs(b - c)
+        else:
             raise ValueError(_invalid_)
-        a, rA = ((b + c), PI) if cB < 0 else (fabs(b - c), _0_0)
-    elif isnear0(b):
-        raise ValueError(_invalid_)
     else:
-        rA = fsumf_(PI, -rB, -asin1(c * sB / b))
+        rC = asin1(c * sB / b)
+        rA = max(fsumf_(PI, -rB, -rC), _0_0)
         a  = sin(rA) * b / sB
     return TriSide2Tuple(a, rA, name=typename(triSide2))
 
@@ -918,17 +919,19 @@ def triSide4(radA, radB, c):
              and functions L{sqrt_a}, L{triSide} and L{triSide2}.
     '''
     try:
-        rA, rB, c = map1(float, radA, radB, c)
+        rA, rB, c = _noneg(radA, radB, c)
         rC = fsumf_(PI, -rA, -rB)
-        if min(rC, rA, rB, c) < 0:
+        if rC < 0:
             raise ValueError(_negative_)
         sa, ca, sb, cb = sincos2_(rA, rB)
         sc = fsum1f_(sa * cb, sb * ca)
         if sc < EPS0 or min(sa, sb) < 0:
             raise ValueError(_invalid_)
-        sc = c / sc
-        return TriSide4Tuple((sa * sc), (sb * sc), rC, (sa * sb * sc),
-                             name=typename(triSide4))
+        sc  = c / sc
+        sa *= sc
+        sd  = sa * sb
+        sb *= sc
+        return TriSide4Tuple(sa, sb, rC, sd, name=typename(triSide4))
 
     except (TypeError, ValueError) as x:
         raise TriangleError(radA=radA, radB=radB, c=c, cause=x)
@@ -947,7 +950,8 @@ def wildberger3(a, b, c, alpha, beta, R3=min):
        @arg alpha: Angle subtended by triangle side B{C{b}} (C{degrees}, non-negative).
        @arg beta: Angle subtended by triangle side B{C{a}} (C{degrees}, non-negative).
        @kwarg R3: Callable to determine C{R3} from C{(R3 - C)**2 = D}, typically standard
-                  Python function C{min} or C{max}, invoked with 2 arguments.
+                  Python function C{min} or C{max}, invoked with 2 arguments, each
+                  C{float} or an L{Fsum<pygeodesy.fsums.Fsum>}.
 
        @return: L{Survey3Tuple}C{(PA, PB, PC)} with distance from survey point C{P} to
                 each of the triangle corners C{A}, C{B} and C{C}, same units as B{C{a}},
@@ -961,43 +965,47 @@ def wildberger3(a, b, c, alpha, beta, R3=min):
              U{Devine Proportions, page 252<http://www.MS.LT/derlius/WildbergerDivineProportions.pdf>}
              and function L{snellius3}.
     '''
-    def _s(x):
+    def _sin2(x):
         return sin(x)**2
 
     def _vpa(r3, q2, q3, s2, s3):
-        r1 = s2 * q3 / s3
-        r  = r1 * r3 * _4_0
-        n  = (r - _Fsumf_(r1, r3, -q2)**2).fover(s3)
-        if n < 0 or r < EPS0:
+        r4 = r3 * _4_0
+        s4 = r4 * s2
+        if isnear0(s4):
+            raise ValueError(_coincident_)
+        r1 =  s2 * q3 / s3
+        N2 = _Fsumf_(r1, r3, -q2)**2
+        n  = (r4 * r1 - N2).fover(s4)
+        if n < 0:
             raise ValueError(_coincident_)
-        return sqrt((n / r) * q3) if n else _0_0
+        return sqrt(n) if n else _0_0
 
     try:
-        a, b, c, da, db = q = map1(float, a, b, c, alpha, beta)
-        if min(q) < 0:
-            raise ValueError(_negative_)
-
+        a, b, c, da, db = _noneg(a, b, c, alpha, beta)
         q1, q2, q3 = q = a**2, b**2, c**2
         if min(q) < EPS02:
             raise ValueError(_coincident_)
 
         ra, rb = map1(radians, da, db)
-        s1, s2, s3 = s = map1(_s, rb, ra, ra + rb)  # rb, ra!
+        s1, s2, s3 = s = map1(_sin2, rb, ra, ra + rb)  # rb, ra!
         if min(s) < EPS02:
             raise ValueError(_or(_coincident_, _colinear_))
-
-        q4 =  hypot2_(*q) * _2_0  # a**4 + ...
-        Qs = _Fsumf_(*q)   # == hypot2_(a, b, c)
-        d0 = (Qs**2 - q4).fmul(s1 * s2).fover(s3)
-        if d0 < 0:
-            raise ValueError(_negative_)
         s += _Fsumf_(*s),  # == fsum1(s),
-        C0 =  Fdot(s, q1, q2, q3, -Qs * _0_5)
+
+        Q  = _Fsumf_(*q)   # == a**2 + b**2 + ...
+        C0 =  Fdot(s, q1, q2, q3, -Q * _0_5)
         r3 =  C0.fover(-s3)  # C0 /= -s3
+
+        Q *=  Q  # Q**2 - 2 * (a**4 + b**4 ...
+        Q -=  hypot2_(*q) * _2_0  # ... + c**4)
+        Q *=  s1 * s2  # Q * s1 * s2 / s3
+        d0 =  Q.fover(s3)
         if d0 > EPS02:  # > c0
             _xcallable(R3=R3)
             d0 = sqrt(d0)
-            r3 = R3(float(C0 + d0), float(C0 - d0))  # XXX min or max
+            r3 = R3(C0 + d0, C0 - d0).as_iscalar  # XXX min or max
+        elif d0 < (-EPS02):
+            raise ValueError(_negative_)
 
         pa = _vpa(r3, q2, q3, s2, s3)
         pb = _vpa(r3, q1, q3, s1, s3)

pygeodesy/rhumb/aux_.py

@@ -26,7 +26,7 @@ License.  For more information, see the U{GeographicLib<https://GeographicLib.So
        windows/win32/fileio/naming-a-file#naming-conventions>} with and without extension.
 '''
 # make sure int/int division yields float quotient
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.auxilats.auxAngle import AuxMu, AuxPhi,  hypot
 from pygeodesy.auxilats.auxDLat import AuxDLat, _DClenshaw
@@ -48,7 +48,7 @@ from pygeodesy.rhumb.bases import RhumbBase, RhumbLineBase, \
 from math import ceil as _ceil, fabs, radians
 
 __all__ = _ALL_LAZY.rhumb_aux_
-__version__ = '25.04.12'
+__version__ = '25.05.12'
 
 # DIGITS = (sizeof(real) * 8) bits
 #        = (ctypes.sizeof(ctypes.c_double(1.0)) * 8) bits

pygeodesy/rhumb/bases.py

@@ -21,7 +21,7 @@ Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2014-2024) and lice
 License.  For more information, see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 '''
 # make sure int/int division yields float quotient
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import _copysign, itemsorted, unsigned0, _xinstanceof
 from pygeodesy.constants import EPS, EPS0, EPS1, INT0, NAN, _over, \
@@ -44,7 +44,7 @@ from pygeodesy.namedTuples import Distance2Tuple, LatLon2Tuple
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
                             property_RO, _update_all
 from pygeodesy.streprs import Fmt, pairs
-from pygeodesy.units import Float_, Lat, Lon, Meter, Radius_,  Int  # PYCHOK shared
+from pygeodesy.units import Float_, Lat, Lon, Meter, Radius_
 from pygeodesy.utily import acos1, _azireversed, _loneg, sincos2d, sincos2d_, \
                            _unrollon, _Wrap
 from pygeodesy.vector3d import _intersect3d3, Vector3d  # in .Intersection below
@@ -52,7 +52,7 @@ from pygeodesy.vector3d import _intersect3d3, Vector3d  # in .Intersection below
 from math import cos, fabs
 
 __all__ = ()
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _anti_ = _Dash('anti')
 _rls   = []  # instances of C{RbumbLine...} to be updated

pygeodesy/rhumb/ekx.py

@@ -20,7 +20,7 @@ Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2014-2024) and lice
 License.  For more information, see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 '''
 # make sure int/int division yields float quotient
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import copysign0, neg
 from pygeodesy.constants import PI_2, _0_0s, _0_0, _0_5, _1_0, \
@@ -31,8 +31,7 @@ from pygeodesy.errors import RhumbError, _xkwds_pop2, _Xorder
 from pygeodesy.fmath import hypot, hypot1
 # from pygeodesy.fsums import fsum1f_  # _MODS
 # from pygeodesy.karney import Caps  # from .rhumb.bases
-from pygeodesy.ktm import KTransverseMercator, _Xs, \
-                         _AlpCoeffs, _BetCoeffs  # PYCHOK used!
+from pygeodesy.ktm import _Xs, _AlpCoeffs, _BetCoeffs  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
                             property_RO
@@ -43,7 +42,7 @@ from pygeodesy.utily import atan1, sincos2_
 from math import asinh, atan, cos, cosh, radians, sin, sinh, sqrt, tan  # as _tan
 
 __all__ = _ALL_LAZY.rhumb_ekx
-__version__ = '25.04.12'
+__version__ = '25.05.12'
 
 
 class Rhumb(RhumbBase):

pygeodesy/rhumb/solve.py

@@ -9,7 +9,7 @@ as an (exact) rhumb or rhumb line from I{either GeographicLib 2.0 or 2.2+}.
        path of the C{RhumbSolve} executable.
 '''
 from pygeodesy.basics import _xinstanceof
-from pygeodesy.constants import _0_0, _180_0, _N_180_0, _over,  _90_0  # PYCHOK used!
+from pygeodesy.constants import _180_0, _N_180_0, _over,  _0_0  # PYCHOK used!
 from pygeodesy.errors import RhumbError   # PYCHOK used!
 from pygeodesy.interns import NN, _a12_, _azi12_, _DMAIN_, _lat2_, _lon2_, _s12_, \
                              _S12_, _UNDER_
@@ -21,7 +21,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.rhumb_solve
-__version__ = '25.04.12'
+__version__ = '25.05.07'
 
 
 class _RhumbSolveBase(_SolveGDictBase):

pygeodesy/simplify.py

@@ -65,7 +65,7 @@ See:
  - U{https://PyPI.org/project/simplification}
 '''
 # make sure int/int division yields float quotient, see .basics
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 # from pygeodesy.basics import len2  # from .fmath
 from pygeodesy.constants import EPS, R_M, _1_0
@@ -80,7 +80,7 @@ from pygeodesy.units import _ALL_LAZY, _1mm, Radius_
 from math import degrees, fabs, radians
 
 __all__ = _ALL_LAZY.simplify
-__version__ = '24.12.02'
+__version__ = '25.05.12'
 
 
 # try:

pygeodesy/solveBase.py

@@ -20,10 +20,10 @@ from pygeodesy.named import callername, _name2__, notOverloaded
 from pygeodesy.props import Property, Property_RO, property_RO, _update_all
 from pygeodesy.streprs import Fmt, fstr, fstrzs, pairs, strs
 from pygeodesy.units import Precision_
-from pygeodesy.utily import unroll180,  wrap360  # PYCHOK shared
+from pygeodesy.utily import unroll180
 
 __all__ = _ALL_LAZY.solveBase
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _ERROR_ = 'ERROR'
 

pygeodesy/sphericalBase.py

@@ -10,10 +10,10 @@ and published under the same MIT Licence**, see
 U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>}.
 '''
 # make sure int/int division yields float quotient, see .basics
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import _copysign, isbool, _isin, isinstanceof, map1
-from pygeodesy.cartesianBase import CartesianBase,  Bearing2Tuple
+from pygeodesy.cartesianBase import CartesianBase
 from pygeodesy.constants import EPS, EPS0, PI, PI2, PI_2, R_M, \
                                _0_0, _0_5, _1_0, _180_0, _360_0, \
                                _over, isnear0, isnon0
@@ -24,9 +24,9 @@ from pygeodesy.fmath import favg, fdot, hypot, sqrt_a
 from pygeodesy.interns import _COMMA_, _concentric_, _datum_, _distant_, \
                               _exceed_PI_radians_, _name_, _near_, \
                               _radius_, _too_
-from pygeodesy.latlonBase import LatLonBase,  _trilaterate5  # PYCHOK passed
+from pygeodesy.latlonBase import LatLonBase
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-# from pygeodesy.namedTuples import Bearing2Tuple  # from .cartesianBase
+# from pygeodesy.namedTuples import Bearing2Tuple  # _MODS
 from pygeodesy.nvectorBase import NvectorBase,  Fmt
 from pygeodesy.props import deprecated_method, property_doc_, property_RO, \
                            _update_all
@@ -40,7 +40,7 @@ from pygeodesy.utily import acos1, asin1, atan2b, atan2d, degrees90, \
 from math import cos, fabs, log, sin, sqrt
 
 __all__ = _ALL_LAZY.sphericalBase
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 
 class CartesianSphericalBase(CartesianBase):
@@ -157,7 +157,7 @@ class LatLonSphericalBase(LatLonBase):
         # .initialBearingTo is inside .-Nvector and .-Trigonometry
         i = self.initialBearingTo(other, wrap=wrap, raiser=raiser)  # PYCHOK .initialBearingTo
         f = self.finalBearingTo(  other, wrap=wrap, raiser=raiser)
-        return Bearing2Tuple(i, f, name=self.name)
+        return _MODS.namedTuples.Bearing2Tuple(i, f, name=self.name)
 
     @property_doc_(''' this point's datum (L{Datum}).''')
     def datum(self):

pygeodesy/sphericalNvector.py

@@ -31,7 +31,7 @@ Also note that on a spherical earth model, an n-vector is equivalent
 to a normalised version of an (ECEF) cartesian coordinate.
 '''
 # make sure int/int division yields float quosient, see .basics
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import _isin, _xinstanceof,  typename
 from pygeodesy.constants import EPS, EPS0, PI, PI2, PI_2, R_M, \
@@ -62,7 +62,7 @@ from pygeodesy.utily import atan2, degrees360, sincos2, sincos2_, sincos2d, \
 # from math import fabs  # from utily
 
 __all__ = _ALL_LAZY.sphericalNvector
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _lines_ = 'lines'
 

pygeodesy/sphericalTrigonometry.py

@@ -14,7 +14,7 @@ I{(C) Chris Veness 2011-2024} published under the same MIT Licence**, see
 U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>}.
 '''
 # make sure int/int division yields float quotient, see .basics
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import copysign0, _isin, map1, signOf,  typename
 from pygeodesy.constants import EPS, EPS1, EPS4, PI, PI2, PI_2, PI_4, R_M, \
@@ -34,8 +34,9 @@ from pygeodesy.interns import _1_, _2_, _coincident_, _composite_, _colinear_, \
                               _concentric_, _convex_, _end_, _infinite_, \
                               _invalid_, _line_, _near_, _null_, _parallel_, \
                               _point_, _SPACE_, _too_
+from pygeodesy.latlonBase import _trilaterate5
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
-# from pygeodesy.nvectorBase import NvectorBase, sumOf  # _MODE
+# from pygeodesy.nvectorBase import NvectorBase, sumOf  # _MODS
 from pygeodesy.namedTuples import LatLon2Tuple, LatLon3Tuple, NearestOn3Tuple, \
                                   Triangle7Tuple, Triangle8Tuple
 from pygeodesy.points import ispolar, nearestOn5 as _nearestOn5, \
@@ -43,10 +44,10 @@ from pygeodesy.points import ispolar, nearestOn5 as _nearestOn5, \
 from pygeodesy.props import deprecated_function, deprecated_method
 from pygeodesy.sphericalBase import _m2radians, CartesianSphericalBase, \
                                     _intersecant2, LatLonSphericalBase, \
-                                    _rads3, _radians2m, _trilaterate5
+                                    _rads3, _radians2m
 # from pygeodesy.streprs import Fmt as _Fmt  # from .points XXX shadowed
 from pygeodesy.units import Bearing_, Height, _isDegrees, _isRadius, Lamd, \
-                              Phid, Radius_, Scalar
+                            Phid, Radius_, Scalar
 from pygeodesy.utily import acos1, asin1, atan1d, atan2, atan2d, degrees90, \
                             degrees180, degrees2m, m2radians, radiansPI2, \
                             sincos2_, tan_2, unrollPI, _unrollon, _unrollon3, \
@@ -56,7 +57,7 @@ from pygeodesy.vector3d import sumOf, Vector3d
 from math import asin, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:

pygeodesy/trf.py

@@ -93,7 +93,7 @@ from math import ceil as _ceil, fabs
 # import operator as _operator  # from .datums
 
 __all__ = _ALL_LAZY.trf
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _EP0CH    =  Epoch(0, low=0)
 _Es       = {_EP0CH: _EP0CH}  # L{Epoch}s, deleted below
@@ -148,7 +148,7 @@ def _E(epoch):  # deleted below
     '''(INTERNAL) De-dup L{Epochs}s.
     '''
     e = Epoch(_F(epoch))
-    return _Es.setdefault(e, e)  # PYCHOK del
+    return _Es.setdefault(e, e)  # noqa: F821 del
 
 
 def _P(ps, name, _Ps):  # deleted below
@@ -1299,11 +1299,11 @@ def _trfX(n1, n2, raiser=True, **epoch_xform_rates):
 
 
 def _X(*ps):  # deleted below
-    return _P(ps, _xform_, _Xs)  # PYCHOK del
+    return _P(ps, _xform_, _Xs)  # noqa: F821 del
 
 
 def _R(*ps):  # deleted below
-    return _P(ps, _rates_, _Rs)  # PYCHOK del
+    return _P(ps, _rates_, _Rs)  # noqa: F821 del
 
 
 _P_0_0s = TRFXform7Tuple(_0_0s(len(_Names7)), name='unity')

pygeodesy/triaxials.py

@@ -28,7 +28,7 @@ see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 @var Triaxials.WGS84_35: Triaxial(name='WGS84_35', a=6378172, b=6378102, c=6356752.314245179, e2ab=0.00002195, e2bc=0.006683478, e2ac=0.006705281, volume=1083207319768789942272, area=510065621722018.125, area_p=510065626587483.3125)
 '''
 # make sure int/int division yields float quotient, see .basics
-from __future__ import division as _; del _  # PYCHOK semicolon
+from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import _isin, isLatLon, isscalar
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INT0, PI2, PI_3, PI4, \
@@ -59,7 +59,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '25.04.14'
+__version__ = '25.05.12'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'