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

pygeodesy/utm.py

@@ -39,7 +39,7 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84,  _under
 from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.errors import MGRSError, RangeError, _ValueError, \
                             _xkwds_get, _xkwds_pop2
-from pygeodesy.fmath import fdot3, hypot, hypot1,  _operator
+from pygeodesy.fmath import fdot_, fdot3, hypot, hypot1,  _operator
 # from pygeodesy.internals import _under  # from .datums
 from pygeodesy.interns import MISSING, NN, _by_, _COMMASPACE_, _N_, \
                              _NS_, _outside_, _range_, _S_, _scale0_, \
@@ -51,19 +51,19 @@ from pygeodesy.props import deprecated_method, property_doc_, \
                             Property_RO
 from pygeodesy.streprs import Fmt, unstr
 from pygeodesy.units import Band, Int, Lat, Lon, Meter, Zone
-from pygeodesy.utily import atan1, degrees90, degrees180, sincos2
+from pygeodesy.utily import atan1, atan2, degrees90, degrees180, sincos2
 from pygeodesy.utmupsBase import _hemi, _LLEB, _parseUTMUPS5, _to4lldn, \
                                  _to3zBhp, _to3zll, _UPS_LATS, _UPS_ZONE, \
                                  _UTM_LAT_MAX, _UTM_ZONE_MAX, \
                                  _UTM_LAT_MIN, _UTM_ZONE_MIN, \
                                  _UTM_ZONE_OFF_MAX, UtmUpsBase
 
-from math import asinh, atanh, atan2, cos, cosh, degrees, fabs, \
-                 radians, sin, sinh, tan, tanh
+from math import asinh, atanh, cos, cosh, degrees, fabs, radians, \
+                 sin, sinh, tan, tanh  # tan as _tan
 # import operator as _operator  # from .fmath
 
 __all__ = _ALL_LAZY.utm
-__version__ = '24.10.12'
+__version__ = '24.11.26'
 
 _Bands = 'CDEFGHJKLMNPQRSTUVWXX'  # UTM latitude bands C..X (no
 # I|O) 8° each, covering 80°S to 84°N and X repeated for 80-84°N
@@ -566,12 +566,12 @@ def toUtm8(latlon, lon=None, datum=None, Utm=Utm, falsed=True,
     # easting, northing: Karney 2011 Eq 7-14, 29, 35
     sb, cb = sincos2(b)
 
-    T = tan(a)
+    T   = tan(a)
     T12 = hypot1(T)
-    S = sinh(E.e * atanh(E.e * T / T12))
+    S   = sinh(E.e * atanh(E.e * T / T12))
 
-    T_ = T * hypot1(S) - S * T12
-    H = hypot(T_, cb)
+    T_ = fdot_(T, hypot1(S), -S, T12)
+    H  = hypot(T_, cb)
 
     y = atan2(T_, cb)  # ξ' ksi
     x = asinh(sb / H)  # η' eta
@@ -733,7 +733,7 @@ def utmZoneBand5(lat, lon, cmoff=False, **name):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/utmups.py

@@ -294,7 +294,7 @@ def utmupsZoneBand5(lat, lon, cmoff=False, **name):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/utmupsBase.py

@@ -494,7 +494,7 @@ __all__ += _ALL_DOCS(UtmUpsBase)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/vector2d.py

@@ -12,7 +12,7 @@ from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INF, INT0, \
                                _1_0, _1_0_1T, _N_1_0, _2_0, _N_2_0, _4_0
 from pygeodesy.errors import _and, _AssertionError, IntersectionError, NumPyError, \
                               PointsError, TriangleError, _xError, _xkwds
-from pygeodesy.fmath import fabs, fdot, hypot, hypot2_, sqrt
+from pygeodesy.fmath import fabs, fdot, fdot_, hypot, hypot2_, sqrt
 from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
 from pygeodesy.interns import NN, _a_, _and_, _b_, _c_, _center_, _coincident_, \
                              _colinear_, _COMMASPACE_, _concentric_, _few_, \
@@ -31,7 +31,7 @@ from contextlib import contextmanager
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector2d
-__version__ = '24.08.19'
+__version__ = '24.11.21'
 
 _cA_        = 'cA'
 _cB_        = 'cB'
@@ -175,7 +175,7 @@ def _circin6(point1, point2, point3, eps=EPS4, useZ=True, dLL3=False, **Vector_k
         C = V(c.x, c.y, c.z, **V_kwds)
         return c, C
 
-    t, p1, p2, p3 = _radii11ABC(point1, point2, point3, useZ=useZ)
+    t, p1, p2, p3 = _radii11ABC4(point1, point2, point3, useZ=useZ)
     V, r1, r2, r3 =  point1.classof, t.rA, t.rB, t.rC
 
     c1, cA = _contact2(t.a, p2, r2, p3, r3, V, _xkwds(Vector_kwds, name=_cA_))
@@ -251,8 +251,8 @@ def circum4(points, useZ=True, **Vector_and_kwds):
        @kwarg useZ: If C{True}, use the points' Z component, otherwise force C{z=INT0}
                     (C{bool}).
        @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the center point
-                     and optional, additional B{C{Vector}} keyword arguments, otherwise
-                     the first B{C{points}}' (sub-)class is used.
+                     and optionally, additional B{C{Vector}} keyword arguments, otherwise
+                     the B{C{points}}' (sub-)class.
 
        @return: L{Circum4Tuple}C{(radius, center, rank, residuals)} with C{center} an
                 instance of C{B{points}[0]}' (sub-)class or B{C{Vector}} if specified.
@@ -509,12 +509,12 @@ def radii11(point1, point2, point3, useZ=True):
              U{Tangent Circles<https://MathWorld.Wolfram.com/TangentCircles.html>}.
     '''
     try:
-        return _radii11ABC(point1, point2, point3, useZ=useZ)[0]
+        return _radii11ABC4(point1, point2, point3, useZ=useZ)[0]
     except (TypeError, ValueError) as x:
         raise _xError(x, point1=point1, point2=point2, point3=point3)
 
 
-def _radii11ABC(point1, point2, point3, useZ=True):
+def _radii11ABC4(point1, point2, point3, useZ=True):
     # (INTERNAL) Tangent, Circum, Incircle, Soddy radii, sides and semi-perimeter
     A = _otherV3d(useZ=useZ, point1=point1, NN_OK=False)
     B = _otherV3d(useZ=useZ, point2=point2, NN_OK=False)
@@ -589,7 +589,7 @@ def soddy4(point1, point2, point3, eps=EPS4, useZ=True):
        @see: Functions L{radii11} and L{circum3} and U{Soddy Circles
              <https://MathWorld.Wolfram.com/SoddyCircles.html>}.
     '''
-    t, p1, p2, p3 = _radii11ABC(point1, point2, point3, useZ=useZ)
+    t, p1, p2, p3 = _radii11ABC4(point1, point2, point3, useZ=useZ)
 
     r    =  t.riS
     c, d = _tricenter3d2(p1, t.rA + r,
@@ -635,10 +635,10 @@ def triaxum5(points, useZ=True):
         b = _1_0_1T * n
         T, R, rk = _np.least_squares3(A, b)
 
-    def _sqrt(x):
-        return sqrt(_1_0 / x) if x else _0_0
+    def _1_sqrt(x):
+        return sqrt(_1_0 / x) if x else _0_0  # INF
 
-    a, b, c = map(_sqrt, T)
+    a, b, c = map(_1_sqrt, T)
     return Triaxum5Tuple(a, b, c, rk, R)
 
 
@@ -685,8 +685,8 @@ def trilaterate2d2(x1, y1, radius1, x2, y2, radius2, x3, y3, radius3,
        @kwarg eps: Tolerance to check the trilaterated point I{delta} on
                    all 3 circles (C{scalar}) or C{None} for no checking.
        @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return
-                               the trilateration and optional, additional
-                               B{C{Vector}} keyword arguments).
+                     the trilateration and optionally, additional B{C{Vector}}
+                     keyword arguments).
 
        @return: Trilaterated point as C{B{Vector}(x, y, **B{Vector_kwds})}
                 or L{Vector2Tuple}C{(x, y)} if C{B{Vector} is None}.
@@ -742,14 +742,14 @@ def _trilaterate2d2(x1, y1, radius1, x2, y2, radius2, x3, y3, radius3,
         raise IntersectionError(_and(_astr(x3=x3, y3=y3, radius3=r3),
                                      _astr(x1=x1, y1=y1, radius1=r1)), txt=t)
 
-    q = (a * e - b * d) * _2_0
+    q = fdot_(a, e, -b, d) * _2_0
     if isnear0(q):
         t = _no_(_intersection_)
         raise IntersectionError(_and(_astr(x1=x1, y1=y1, radius1=r1),
                                      _astr(x2=x2, y2=y2, radius2=r2),
                                      _astr(x3=x3, y3=y3, radius3=r3)), txt=t)
-    t = Vector2Tuple((c * e - b * f) / q,
-                     (a * f - c * d) / q, name=trilaterate2d2.__name__)
+    t = Vector2Tuple(fdot_(c, e, -b, f) / q,
+                     fdot_(a, f, -c, d) / q, name=trilaterate2d2.__name__)
 
     if eps and eps > 0:  # check distances to center vs radius
         for x, y, r in ((x1, y1, r1), (x2, y2, r2), (x3, y3, r3)):
@@ -871,7 +871,7 @@ def _tri5perturbs(eps, r):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/vector3d.py

@@ -20,7 +20,7 @@ from pygeodesy.iters import PointsIter,  Fmt
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name__, _name2__, _xnamed, _xotherError
 from pygeodesy.namedTuples import Intersection3Tuple, NearestOn2Tuple, \
-                                  NearestOn6Tuple, Vector3Tuple  # Vector4Tuple
+                                  NearestOn6Tuple, _v2Cls, Vector3Tuple  # Vector4Tuple
 # from pygeodesy.nvectorBase import _nsumOf  # _MODS
 # from pygeodesy.streprs import Fmt  # from .iters
 from pygeodesy.units import _fi_j2, _isDegrees, Radius, Radius_
@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector3d
-__version__ = '24.10.01'
+__version__ = '24.11.22'
 
 _vector2d = _MODS.into(vector2d=__name__)
 
@@ -272,7 +272,7 @@ class Vector3d(Vector3dBase):
                  Circles<https://MathWorld.Wolfram.com/TangentCircles.html>}.
         '''
         try:
-            return _vector2d._radii11ABC(self, point2, point3, useZ=True)[0]
+            return _vector2d._radii11ABC4(self, point2, point3, useZ=True)[0]
         except (TypeError, ValueError) as x:
             raise _xError(x, point=self, point2=point2, point3=point3)
 
@@ -303,6 +303,17 @@ class Vector3d(Vector3dBase):
         '''
         return _vector2d.soddy4(self, point2, point3, eps=eps, useZ=True)
 
+    def toCartesian(self, Cartesian, **Cartesian_kwds):
+        '''Return this C{Vector3d} as a C{Cartesian}.
+
+           @arg Cartesian: The C{Cartesian} class to use.
+           @kwarg Cartesian_kwds: Optional, additional C{Cartesian}
+                                  keyword arguments.
+
+           @return: The C{B{Cartesian}} instance.
+        '''
+        return _v2Cls(self, Cartesian, Cartesian_kwds)
+
     def trilaterate2d2(self, radius, center2, radius2, center3, radius3, eps=EPS4, z=INT0):
         '''Trilaterate this and two other circles, each given as a (2-D) center
            and a radius.
@@ -497,17 +508,16 @@ def intersection3d3(start1, end1, start2, end2, eps=EPS, useZ=True,
                   B{C{start2}} (Ccompass C{degrees}).
        @kwarg eps: Tolerance for skew line distance and length (C{EPS}).
        @kwarg useZ: If C{True}, use the Z components, otherwise force C{z=INT0} (C{bool}).
-       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the
-                               intersection points and optional, additional B{C{Vector}}
-                               keyword arguments, otherwise B{C{start1}}'s (sub-)class.
+       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the intersection
+                     points and optional, additional B{C{Vector}} keyword arguments,
+                     otherwise B{C{start1}}'s (sub-)class.
 
-       @return: An L{Intersection3Tuple}C{(point, outside1, outside2)} with
-                C{point} an instance of B{C{Vector}} or B{C{start1}}'s (sub-)class.
+       @return: An L{Intersection3Tuple}C{(point, outside1, outside2)} with C{point}
+                an instance of B{C{Vector}} or B{C{start1}}'s (sub-)class.
 
        @note: The C{outside} values is C{0} for lines specified by point and bearing.
 
-       @raise IntersectionError: Invalid, skew, non-co-planar or otherwise
-                                 non-intersecting lines.
+       @raise IntersectionError: Invalid, skew, non-co-planar or otherwise non-intersecting lines.
 
        @see: U{Line-line intersection<https://MathWorld.Wolfram.com/Line-LineIntersection.html>}
              and U{line-line distance<https://MathWorld.Wolfram.com/Line-LineDistance.html>},
@@ -538,9 +548,9 @@ def intersections2(center1, radius1, center2, radius2, sphere=True, **Vector_and
        @kwarg sphere: If C{True}, compute the center and radius of the intersection of
                       two spheres.  If C{False}, ignore the C{z}-component and compute
                       the intersection of two circles (C{bool}).
-       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the
-                               intersection points and optional, additional B{C{Vector}}
-                               keyword arguments, otherwise B{C{center1}}'s (sub-)class.
+       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the intersection
+                     points and optionally, additional B{C{Vector}} keyword arguments,
+                     otherwise B{C{center1}}'s (sub-)class.
 
        @return: If C{B{sphere} is True}, a 2-tuple of the C{center} and C{radius} of the
                 intersection of the I{spheres}.  For abutting circles, C{radius} is C{0.0}
@@ -725,12 +735,12 @@ def nearestOn6(point, points, closed=False, useZ=True, **Vector_and_kwds):  # ep
        @kwarg closed: Optionally, close the path or polygon (C{bool}).
        @kwarg useZ: If C{True}, use the Z components, otherwise force C{z=INT0} (C{bool}).
        @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the closest
-                               point and optional, additional B{C{Vector}} keyword
-                               arguments, otherwise B{C{point}}'s (sub-)class.
+                     point and optionally, additional B{C{Vector}} keyword arguments,
+                     otherwise B{C{point}}'s (sub-)class.
 
        @return: A L{NearestOn6Tuple}C{(closest, distance, fi, j, start, end)} with the
                 C{closest}, the C{start} and the C{end} point each an instance of the
-                B{C{Vector}} keyword argument of if {B{Vector}=None} or not specified,
+                B{C{Vector}} keyword argument or if {B{Vector}=None} or not specified,
                 an instance of the reference B{C{point}}'s (sub-)class.
 
        @raise PointsError: Insufficient number of B{C{points}}
@@ -854,17 +864,16 @@ def trilaterate3d2(center1, radius1, center2, radius2, center3, radius3,
                      and C{z}).
        @kwarg eps: Pertubation tolerance (C{scalar}), same units as C{x},
                    C{y} and C{z} or C{None} for no pertubations.
-       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return
-                               the trilateration and optional, additional
-                               B{C{Vector}} keyword arguments, otherwise
-                               the B{C{center1}}'s (sub-)class.
+       @kwarg Vector_and_kwds: Optional class C{B{Vector}=None} to return the
+                     trilateration and optionally, additional B{C{Vector}}
+                     keyword arguments, otherwise B{C{center1}}'s (sub-)class.
 
        @return: 2-Tuple with two trilaterated points, each a B{C{Vector}}
                 instance.  Both points are the same instance if all three
                 spheres abut/intersect in a single point.
 
-       @raise ImportError: Package C{numpy} not found, not installed or
-                           older than version 1.10.
+       @raise ImportError: Package C{numpy} not found, not installed or older
+                           than version 1.10.
 
        @raise IntersectionError: Near-concentric, -colinear, too distant or
                                  non-intersecting spheres.
@@ -904,7 +913,7 @@ __all__ += _ALL_DOCS(intersections2, sumOf, Vector3dBase)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/vector3dBase.py

@@ -14,7 +14,7 @@ from pygeodesy.constants import EPS, EPS0, INT0, PI, PI2, _copysignINF, \
                                _float0, isnear0, isnear1, isneg0, \
                                _pos_self, _1_0
 from pygeodesy.errors import CrossError, VectorError, _xcallable, _xError
-from pygeodesy.fmath import euclid_, fdot, hypot_, hypot2_
+from pygeodesy.fmath import euclid_, fdot, fdot_, hypot_, hypot2_  # _MODS.fmath.fma
 from pygeodesy.interns import _coincident_, _colinear_, _COMMASPACE_, _xyz_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_DOCS, _ALL_MODS as _MODS
 from pygeodesy.named import _NamedBase, _NotImplemented, _xother3
@@ -23,12 +23,12 @@ from pygeodesy.props import deprecated_method, Property, Property_RO, \
                             property_doc_, property_RO, _update_all
 from pygeodesy.streprs import Fmt, strs, unstr
 from pygeodesy.units import Float, Scalar
-from pygeodesy.utily import sincos2,  atan2, fabs
+from pygeodesy.utily import atan2, sincos2,  fabs
 
 from math import ceil as _ceil, floor as _floor, trunc as _trunc
 
 __all__ = _ALL_LAZY.vector3dBase
-__version__ = '24.10.12'
+__version__ = '24.11.24'
 
 
 class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
@@ -141,10 +141,6 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
         '''Not implemented.'''
         return _NotImplemented(self, other)
 
-    def __format__(self, *other):  # PYCHOK no cover
-        '''Not implemented.'''
-        return _NotImplemented(self, *other)
-
     def __ge__(self, other):
         '''Is this vector longer than or equal to an other vector?
 
@@ -504,9 +500,9 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
         '''
         X, Y, Z = self.others(other).xyz3
         x, y, z = self.xyz3
-        xyz = ((y * Z - z * Y),
-               (z * X - x * Z),
-               (x * Y - y * X))
+        xyz = (fdot_(y, Z, -z, Y),
+               fdot_(z, X, -x, Z),
+               fdot_(x, Y, -y, X))
 
         if raiser and self.crosserrors and eps0 > 0 \
                   and max(map(fabs, xyz)) < eps0:
@@ -823,11 +819,12 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
         '''
         return self._plus(*_xyz3(self.plus_, other_x, *y_z))
 
-    def rotate(self, axis, theta):
+    def rotate(self, axis, theta, fma=False):
         '''Rotate this vector around an axis by a specified angle.
 
            @arg axis: The axis being rotated around (L{Vector3d}).
            @arg theta: The angle of rotation (C{radians}).
+           @kwarg fma: If C{True}, use fused-multiply-add (C{bool}).
 
            @return: New, rotated vector (L{Vector3d}).
 
@@ -846,17 +843,23 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
             bx, by, bz = r.times(d).xyz3
             sx, sy, sz = r.times(s).xyz3
 
-            x = fdot(p, ax * bx + c,  ax * by - sz, ax * bz + sy)
-            y = fdot(p, ay * bx + sz, ay * by + c,  ay * bz - sx)
-            z = fdot(p, az * bx - sy, az * by + sx, az * bz + c)
+            if fma:
+                _fma = _MODS.fmath.fma
+            else:
+                def _fma(a, b, c):
+                    return a * b + c
+
+            x = fdot(p, _fma(ax, bx,   c), _fma(ax, by, -sz), _fma(ax, bz,  sy))
+            y = fdot(p, _fma(ay, bx,  sz), _fma(ay, by,   c), _fma(ay, bz, -sx))
+            z = fdot(p, _fma(az, bx, -sy), _fma(az, by,  sx), _fma(az, bz,   c))
         else:  # unrotated
             x, y, z = self.xyz3
         return self.classof(x, y, z)
 
     @deprecated_method
-    def rotateAround(self, axis, theta):  # PYCHOK no cover
+    def rotateAround(self, axis, theta):
         '''DEPRECATED, use method C{rotate}.'''
-        return self.rotate(axis, theta)
+        return self.rotate(axis, theta)  # PYCHOK no cover
 
     def times(self, factor):
         '''Multiply this vector by a scalar.
@@ -897,7 +900,7 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
 #
 #          @return: A L{PhiLam2Tuple}C{(phi, lam)}.
 #       '''
-#       return _MODS.formy.n_xyz2philam(self.x, self.y, self.z)
+#       return _MODS.nvectorBase.n_xyz2philam(self.x, self.y, self.z)
 
 #   @deprecated_method
 #   def to2ll(self):  # PYCHOK no cover
@@ -905,7 +908,7 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
 #
 #          @return: A L{LatLon2Tuple}C{(lat, lon)}.
 #       '''
-#       return _MODS.formy.n_xyz2latlon(self.x, self.y, self.z)
+#       return _MODS.nvectorBase.n_xyz2latlon(self.x, self.y, self.z)
 
     @deprecated_method
     def to3xyz(self):  # PYCHOK no cover
@@ -1047,7 +1050,7 @@ __all__ += _ALL_DOCS(Vector3dBase)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/webmercator.py

@@ -36,7 +36,7 @@ from pygeodesy.utily import degrees90, degrees180
 from math import atan, atanh, exp, radians, sin, tanh
 
 __all__ = _ALL_LAZY.webmercator
-__version__ = '24.08.13'
+__version__ = '24.11.06'
 
 # _FalseEasting  = 0   # false Easting (C{meter})
 # _FalseNorthing = 0   # false Northing (C{meter})
@@ -314,10 +314,10 @@ def toWm(latlon, lon=None, earth=R_MA, Wm=Wm, **name_Wm_kwds_radius):
                      L{a_f2Tuple}, L{Ellipsoid} or L{Ellipsoid2}), overridden
                      by B{C{latlon}}'s datum if present.
        @kwarg Wm: Optional class to return the WM coordinate (L{Wm}) or C{None}.
-       @kwarg name_Wm_kwds_radius: Optional C{B{name}=NN} (C{str}), optional,
+       @kwarg name_Wm_kwds_radius: Optional C{B{name}=NN} (C{str}), optionally,
                    additional B{C{Wm}} keyword arguments, ignored if C{B{Wm} is
-                   None} and DEPRECATED keyword argument C{B{radius}=earth},
-                   use B{C{earth}}.
+                   None} and DEPRECATED keyword argument C{B{radius}=earth}, use
+                   B{C{earth}}.
 
        @return: The WM coordinate (B{C{Wm}}) or if C{B{Wm} is None}, an
                 L{EasNorRadius3Tuple}C{(easting, northing, radius)}.
@@ -352,7 +352,7 @@ def toWm(latlon, lon=None, earth=R_MA, Wm=Wm, **name_Wm_kwds_radius):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/wgrs.py

@@ -32,7 +32,7 @@ from pygeodesy.utily import ft2m, m2ft, m2NM
 from math import floor
 
 __all__ = _ALL_LAZY.wgrs
-__version__ = '24.08.15'
+__version__ = '24.11.06'
 
 _Base    =  10
 _BaseLen =  4
@@ -212,9 +212,9 @@ class Georef(Str):
 
            @kwarg LatLon: Class to use (C{LatLon}) or C{None}.
            @kwarg height: Optional height (C{meter}), overriding this height.
-           @kwarg name_LatLon_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{LatLon}} keyword arguments, ignored if
-                       C{B{LatLon} is None}.
+           @kwarg name_LatLon_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{LatLon}} keyword arguments, ignored if C{B{LatLon}
+                       is None}.
 
            @return: This georef location (B{C{LatLon}}) or if C{B{LatLon} is None},
                     a L{LatLon3Tuple}C{(lat, lon, height)}.
@@ -424,7 +424,7 @@ __all__ += _ALL_DOCS(decode3, decode5,  # functions
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

PyGeodesy-24.10.24.dist-info/RECORD

@@ -1,118 +0,0 @@
-pygeodesy/LICENSE,sha256=YfgAiyxOwY6P9Kkb1_5XN81nueTLrpb3Ffkv3EuPgFU,1144
-pygeodesy/__init__.py,sha256=r0yjEW8YI02U-NFs0qZF3tqSGbEqYLors4l-upxXJEg,42631
-pygeodesy/__main__.py,sha256=1lE1jMp57iXpvu3TEh2unyT2qvtSa5nJPQn_K7Wmj3E,5442
-pygeodesy/albers.py,sha256=BTeUqKPgygExYBLhRJh8b8FYdwuCIpCuo8ggCw6-Auw,30955
-pygeodesy/azimuthal.py,sha256=erI5DTM0-Nr5YC2LnBTVNbUKlrnnXJUwKe0SCQ7-Soc,50223
-pygeodesy/basics.py,sha256=I1za68bt64DDU7uDobR6EO8DZoNHtfTZHnKdGdH9O8w,30020
-pygeodesy/booleans.py,sha256=0sNGKydX2ALi-VaIdaGhoPoRxmfBvA-Ny66lAH_LVis,73463
-pygeodesy/cartesianBase.py,sha256=82h4wO5OxRRuvwMhGpjdZzeJjYVDWObP_3bhPB1T7TY,46935
-pygeodesy/clipy.py,sha256=hzI6IutTRkbssjPPgAjXv9OcgCIIZchjnMWaHin4YAU,27728
-pygeodesy/constants.py,sha256=X2qvwiHSbCKv-PalJ6u22EJpwCcvSksvFrJdLaxgnZk,19842
-pygeodesy/css.py,sha256=rPr5EcGm_blVt72h-851ytpVxdPhx1MEqqGs3Ppx3eI,25651
-pygeodesy/datums.py,sha256=trFx6KgEjlYY_VC6WViZhH1D-U3tDDDdbZXG6MD2H_U,34057
-pygeodesy/dms.py,sha256=FiI-h3nXngSp624i0KlzHkBqYp5X5ucmvN6fLGi_Xgk,42174
-pygeodesy/ecef.py,sha256=_yy_TIUGsXmEZ7aRcmchbJwTp7x__edx6EPiS3Xznes,59587
-pygeodesy/elevations.py,sha256=4FuVcVNb_D09gmcvUlck344N4f7Jms76SIRrdutvKjk,10801
-pygeodesy/ellipsoidalBase.py,sha256=D5OlvepTLoguqDdMmR50OqiMX44e1kaMM-z7k1NtFvI,55385
-pygeodesy/ellipsoidalBaseDI.py,sha256=-y6JhV_8ZA0uNaIV05MkhCASVmUaXJthM4azJrM5Lbk,38445
-pygeodesy/ellipsoidalExact.py,sha256=wmIGgZyd0cvjswP4KOeDuEcuagjwQQRRq1cmseRoD-Q,16946
-pygeodesy/ellipsoidalGeodSolve.py,sha256=fAT4b3HXkM6i1W_C0rb4vbSxZqr4c6rS7PIvGF2ad7s,16666
-pygeodesy/ellipsoidalKarney.py,sha256=qvJa8kZ4SgaRR2UbjtkcRxw_CRbwhXoUT4Dn_6DJ6Ag,18721
-pygeodesy/ellipsoidalNvector.py,sha256=Ye6O6SIRiiwY6PJG4KD9kZ6GBpKkWWxZWsZC4k3eH-s,30039
-pygeodesy/ellipsoidalVincenty.py,sha256=Eeh-lFB9y65kyYCZ5bc7uRIF9o6UT4lqdkk4EVRi0Pg,25946
-pygeodesy/ellipsoids.py,sha256=PQ4fZtEHN-24ROvEbKzARWquisy__WKvKkaT4SOXVB0,106894
-pygeodesy/elliptic.py,sha256=g_IuxDoVf0npEicUCT3x39GJqo1cfpkalC7aV1Z1hFY,45004
-pygeodesy/epsg.py,sha256=Vq_M1g7Z0x5Noqsmt6OCQkPdYJj4jpWObtixL5pAjDA,8220
-pygeodesy/errors.py,sha256=KtLGXxBeNMagCio5qeNX86NmR4g1GHmoYsSQ093RgfA,32040
-pygeodesy/etm.py,sha256=QMQstkJGAvGS5zrLz_TJ75IRzDOljNXuuwGs8peJkMg,46188
-pygeodesy/fmath.py,sha256=3y_qlxzq4vlOwqJ0vhDaGscAi3XbOyPbU6IISovvOzE,36494
-pygeodesy/formy.py,sha256=8xrs_fSGng-TVKSgDzjR41SBwtbEO4_kS3Lq4kLtX-4,75082
-pygeodesy/frechet.py,sha256=F6TYbOEYSOFcll6nvp4GhqafUWXh1umAKb1QaMYQtuM,34372
-pygeodesy/fstats.py,sha256=8Vn1cwlgCQD444WX8FfAEC-AXQcJDeI9_i14Mizp59U,28288
-pygeodesy/fsums.py,sha256=QEPeyM7wkgqeeWEynUNhJhiqynapRTCh8WzpU1fCREw,103404
-pygeodesy/gars.py,sha256=KRlyZUv1euEl7ZkDYSZG913GAfFMRG2m2hp37ObYY_Y,11829
-pygeodesy/geodesici.py,sha256=4Elhe9Z8tcVFD46K0HKd_TSS24CQmgQGGlDk6DnBnmo,74775
-pygeodesy/geodesicw.py,sha256=y6XVpgSG_s-sqF0Dh2HZwJWjBfKiUTCJoCP9Hc8LIww,28710
-pygeodesy/geodsolve.py,sha256=iimnxLJBwygqy7Lxxl-ZjkJ7HVPD6sUrPW8hUZBxaKo,29356
-pygeodesy/geohash.py,sha256=gDmDI91GOJAdNiAcf9bHq8I581UfPnMmwjWyJlPHRlM,40201
-pygeodesy/geoids.py,sha256=uOvDFPYigoEOPnl7yrzbEN1_pEjo4YP-Nan4zsHI_Vs,82479
-pygeodesy/hausdorff.py,sha256=-aKtRbMefDSoIk4V3wCvNrXPZ7Bqk1P6-XuGuI7o8Zc,34770
-pygeodesy/heights.py,sha256=Gv3b1xC7I0tBvTO-DdmWVW8A3ZV3RKxY3jveUUZso38,42909
-pygeodesy/internals.py,sha256=QPLqHnyTMQirTyjyRqlenCxP3vOq-PPxKnxFlKie0WM,24594
-pygeodesy/interns.py,sha256=t8hQ3Y1QHzVkoQxq8Z9f0YjkpRC0oB0G7hpV894aYjw,23403
-pygeodesy/iters.py,sha256=xPH0ytomvJeKHu717Fjzi3QbRrEikO6n7vqkY_IDz1k,20311
-pygeodesy/karney.py,sha256=UUZqUWlRn7S2YdF2A9bxuBNa-Qkpib9QkpRyGZXQOt8,40466
-pygeodesy/ktm.py,sha256=eUWYKhoPou1AiWiNz-xI8eDr-q-RvKDY6newAmYP26Q,27239
-pygeodesy/latlonBase.py,sha256=9R9O9SeIRXTmHfpR9WOL8-1m0yyG8Ymfth2eGq0mDEo,79070
-pygeodesy/lazily.py,sha256=MSQhTpG8jPYBGsi75yNx9yXEvefQFwzDFnYpW_-Kkc0,46648
-pygeodesy/lcc.py,sha256=oDooTzFHnqsMtSKmmmfEbypHpdlPltfo7Mt0pAO4-_A,25669
-pygeodesy/ltp.py,sha256=ZMdfJHLKeDHSoymmjWfoAZTtrdoADf0O6WccRf53L2w,50745
-pygeodesy/ltpTuples.py,sha256=oNTxtjxmHveMDQvPdQCHl-JzSJJGb1jFRrF8SEG_Ojw,58480
-pygeodesy/mgrs.py,sha256=3grmlAIeJFMDTLwCqlt86n4_kmIGocQ-3I6bIXd9nPo,29833
-pygeodesy/named.py,sha256=D71yA_a3mwELI-rUYSKKKiXGuJQNuUnVXPTDhW5zZyc,52386
-pygeodesy/namedTuples.py,sha256=e0rV1Zb2tbx8fztXcSkUFsRTmZtye8B5i_Hi4vBUndU,28758
-pygeodesy/nvectorBase.py,sha256=Xy1TDcH5UuUelVZ7aSKX85hx3fLlpDkYDhuoZijQ1vI,28644
-pygeodesy/osgr.py,sha256=3Qon_oWuVrIb1vYnd3ae3L5MDkjp_tngyVdiYHuL4to,30821
-pygeodesy/points.py,sha256=Vs9vShhBxebgo7UdHlt7Ov4D4Chfa723BZxV0_kpgGk,64389
-pygeodesy/props.py,sha256=IFykUIfSybnymwxQbMjCJax7uAZl6SVJ-uMjatQPsLc,24564
-pygeodesy/resections.py,sha256=IrPHAHbF9JdBgAVd9LMgXoPgPFRkY8j1G7p0P8y8pdc,43543
-pygeodesy/simplify.py,sha256=vkOtO478sOjZHZBuSFvCaRh72qSDQuzXLQpMK1LKyYI,25232
-pygeodesy/solveBase.py,sha256=DpgFNHmWs1GUwCViAU-9iBsmKLVFNc8kW1zrDNi31FY,18485
-pygeodesy/sphericalBase.py,sha256=lsjzDWm3VUxKTpKASqZJDYw7M_CJ4eCgzp3LiCJvMt8,32110
-pygeodesy/sphericalNvector.py,sha256=lUXLX0fSZ0TcResvJ59N25GKR-qQBZEuXlhK-T6ijY4,56984
-pygeodesy/sphericalTrigonometry.py,sha256=uOSNMlsdp5jEK36bL6750IlMuLdy-cKqOsd4tMhFr1M,64135
-pygeodesy/streprs.py,sha256=ItNnTqkE_TMZtqgsRhDonrRDpi5gXtD44sQ_D3Qfsd0,23418
-pygeodesy/trf.py,sha256=hxh6WA7IibL09dHoGMBKQeSXrRFPsYQV0F-LPAD40v4,119073
-pygeodesy/triaxials.py,sha256=priBlyuraA1VhNbN0gv_UAXuulAwV14XjOBvu_oJA4U,63559
-pygeodesy/units.py,sha256=XUbABlp93Pt9VL_Z_chhYRd-dMvwAMWNNWe54V6gmmM,35314
-pygeodesy/unitsBase.py,sha256=ZZ-VDntCOTjSerQJf9aaLE_J0lozrpmUhynRBaCtg24,14060
-pygeodesy/ups.py,sha256=qRyk3tnQNRD7KgWGPANWOrg6Hxqd9eS7vN8or_tKk4E,23338
-pygeodesy/utily.py,sha256=qLxVVE57PHEu1stJaULIYHZ6G-uNe7Fy_uoQfmNbXUg,36189
-pygeodesy/utm.py,sha256=Ubd6-kZtBEoOzCj-pbHb3gRzuGrWBX6nY9_h1YweV2Q,31091
-pygeodesy/utmups.py,sha256=g2Z_aEOt6fhV9f4fASlW4_K_O_P4zBsBbWfQV11mIKo,13196
-pygeodesy/utmupsBase.py,sha256=S4s1Sehj9jSMy-XRxwtwVstG3QhyVt924V0FHu0cPIk,18730
-pygeodesy/vector2d.py,sha256=O9a3uRIREL2k7G-pnpuacjBcAlKg75MnokjtfJB-nBs,39659
-pygeodesy/vector3d.py,sha256=PaiuJgHCf0bO8nhOai42ut2zk0_DskSNCrOtCuHxw6U,42673
-pygeodesy/vector3dBase.py,sha256=IJdJ-fLApA88HbPZb41vAJzbLlGywpfKn5yT7ia26A0,36108
-pygeodesy/webmercator.py,sha256=fFQtTxIsjOE35_nX_mAgFv1Eov7AdcsCBjT2ONm3qmI,14934
-pygeodesy/wgrs.py,sha256=6dO31uMKF-t-uQz58hdutilE2A5msOs5Bybq5Uq3qgk,15453
-pygeodesy/auxilats/_CX_4.py,sha256=WsxGrwqEhdWBx-K5ocwwDuatIkDTZB-FwrqQITbcNU0,6829
-pygeodesy/auxilats/_CX_6.py,sha256=PsaVhzOdCDyRuZ-SH6ZwbWrf_rAkidtwLuAQTlvv5XQ,11277
-pygeodesy/auxilats/_CX_8.py,sha256=mxk12xvzOMNimyHM74fn9sFB0aUSBLojYqtenYhAekQ,18899
-pygeodesy/auxilats/_CX_Rs.py,sha256=z7UXI7KUyURE44wGuLJE2on6SlgAZzfbay4jkbpON1U,7967
-pygeodesy/auxilats/__init__.py,sha256=ywIs1e5wes3qq3dvCvX0VdxoGtFNQwBmY8Ar-07f9Kg,2881
-pygeodesy/auxilats/__main__.py,sha256=pb0GWDrrg440xNvHvPAz-UTGrLu2uXp4g-RlbkW7P6c,3171
-pygeodesy/auxilats/auxAngle.py,sha256=nr-su1loEbv1uVxg7_cEjH0M1DLyodsulPfq4NVT5kY,16745
-pygeodesy/auxilats/auxDLat.py,sha256=3sq7Wc-ykpVbldNh10IZ3tIlJ7DcQFDlmZ4nOhJEgo0,10969
-pygeodesy/auxilats/auxDST.py,sha256=BSHR0M3hQBR1KjF_BUJHrNzGXr2PblYXUQsMD5L1Kcc,10468
-pygeodesy/auxilats/auxLat.py,sha256=7uxe7mtkY-9uSI3z2wmUNBqzCKyFujIpJU1v-8yDgds,31934
-pygeodesy/auxilats/auxily.py,sha256=X1y4_qC40Th7CgmZILqoQCLAUQoyORcR5W-bN4X0W4I,7882
-pygeodesy/deprecated/__init__.py,sha256=jSwmipBzyIOYIQhiZxZwsIQlqMXPfNaPfVpppBu7zkw,2815
-pygeodesy/deprecated/bases.py,sha256=nxUtxscAg5cb7HEzTSmPJFafLc9Ad2SL5ovwkYaU5z8,1655
-pygeodesy/deprecated/classes.py,sha256=gktUr5qYXCm8ztH6lfzFgaHKqMiw1tHc1Vw6i6DEvNA,12377
-pygeodesy/deprecated/consterns.py,sha256=W-rQiw443_zCFEUzjCGykGND-i5P_ghEIyJUSGg7-Nc,1908
-pygeodesy/deprecated/datum.py,sha256=s8Hke053RucP5ACvg3gdX8weQfGM0x59pQyHpY11eOs,1875
-pygeodesy/deprecated/functions.py,sha256=-spa_5k7yRWGd7s4UBObzf9QpAM0o-tgP4S0wX876JY,14122
-pygeodesy/deprecated/nvector.py,sha256=_dZf84RdmPr7e7i8Yi683R-8Mqn0ipTqIsDhNl29hGo,2117
-pygeodesy/deprecated/rhumbBase.py,sha256=d7YKW--dnRpobB2CSvhFsntWF0B5-HYJqID2pv5lD5k,1375
-pygeodesy/deprecated/rhumbaux.py,sha256=n29xazYMbVG4MJkLjAGu8B88bbcFF5xnvuj9xSxjfIk,1428
-pygeodesy/deprecated/rhumbsolve.py,sha256=QprjRfo5T1_C4ovaa1cffAcmNczzkhGIfmybAup9a9w,1431
-pygeodesy/deprecated/rhumbx.py,sha256=OS0p_meaoVrpZe5UhK6qZljjlrGpL0pCHWw8gofw7ks,1425
-pygeodesy/geodesicx/_C4_24.py,sha256=r5-So2i4z-OFY6NFYERUvhtxYHaYphPRgUUC3PWC5K4,90707
-pygeodesy/geodesicx/_C4_27.py,sha256=Pkpns4kBAHxBcvi0f9l_3GQeE6qcrl123DccEQ593To,134215
-pygeodesy/geodesicx/_C4_30.py,sha256=cseNhROi7DHi77kgdrXXDXO6yiiq00DNcX0HOVf2Rpg,201921
-pygeodesy/geodesicx/__init__.py,sha256=Z-Pq7wWevRZeMdG2qqL7OE1b8hRUubyZE2w1GqF1OzI,2478
-pygeodesy/geodesicx/__main__.py,sha256=wsJPK6lW_PsgVCR1ZJksgGhwxwrsMGSXhYkhpjbknTc,4188
-pygeodesy/geodesicx/gx.py,sha256=yeNpMQbw_uWfs4KOQX8RMAQt6WNsG3zsGgmZRVgbQIk,60612
-pygeodesy/geodesicx/gxarea.py,sha256=cJaXwMMxjQ21RiCGU7c2YLXNmrqkRawHxQxsg7o5gas,19454
-pygeodesy/geodesicx/gxbases.py,sha256=AyvsjiSENqikJK6qpm55rDkUlBSmTDk_-FoqzzMFX1M,6130
-pygeodesy/geodesicx/gxline.py,sha256=zNQF8lz9caHZlsUcL8NfjG02KIza39Q6Qd6XizDp_UI,27537
-pygeodesy/rhumb/__init__.py,sha256=G8qo1yrLhKfd0yWiVUdJbIPj3udcmsgqKZqFD0PYfeA,2207
-pygeodesy/rhumb/aux_.py,sha256=XN0zlNwhU525NdcHko-G_Igvc7-mzXbT7ypcVIt5ADw,16048
-pygeodesy/rhumb/bases.py,sha256=e_ASUIK9ABtORVZaTMiFMGRc3w2wKGNDPdJEfVCp5CU,54162
-pygeodesy/rhumb/ekx.py,sha256=JsmdCatWKqsffF8jCh4HDu5IKt_kHq1qUdmP1LMuofY,24044
-pygeodesy/rhumb/solve.py,sha256=Ko1uHcicoqw7x467IzncjMtppjRs1JC1yqVh_DtTV6k,23905
-PyGeodesy-24.10.24.dist-info/METADATA,sha256=tKtj7Pcqe2Kbx6YfgDvEdUNdDHw0-L4X0xpMStYFGlg,19919
-PyGeodesy-24.10.24.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-PyGeodesy-24.10.24.dist-info/top_level.txt,sha256=cEQPatCXzKZqrivpULC5V5fuy9_V_bAwaP_gUGid7pQ,10
-PyGeodesy-24.10.24.dist-info/RECORD,,