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

pygeodesy/ltpTuples.py

@@ -16,7 +16,7 @@ from pygeodesy.constants import _0_0, _1_0, _90_0, _N_90_0
 # from pygeodesy.dms import F_D, toDMS  # _MODS
 from pygeodesy.errors import _TypeError, _TypesError, _xattr, _xkwds, \
                              _xkwds_item2
-from pygeodesy.fmath import hypot, hypot_
+from pygeodesy.fmath import fdot_, hypot, hypot_
 from pygeodesy.interns import NN, _4_, _azimuth_, _center_, _COMMASPACE_, \
                              _ecef_, _elevation_, _height_, _lat_, _lon_, \
                              _ltp_, _M_, _name_, _up_, _X_, _x_, _xyz_, \
@@ -36,7 +36,7 @@ from pygeodesy.vector3d import Vector3d
 # from math import cos, radians  # from .utily
 
 __all__ = _ALL_LAZY.ltpTuples
-__version__ = '24.08.18'
+__version__ = '24.11.07'
 
 _aer_        = 'aer'
 _alt_        = 'alt'
@@ -126,9 +126,9 @@ class _AbcBase(_NamedBase):
         '''Get the I{local} I{Azimuth, Elevation, slant Range} (AER) components.
 
            @kwarg Aer: Class to return AER (L{Aer}) or C{None}.
-           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Aer}} keyword arguments, ignored if
-                       C{B{Aer} is None}.
+           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Aer}} keyword arguments, ignored if C{B{Aer}
+                       is None}.
 
            @return: AER as an L{Aer} instance or if C{B{Aer} is None}, an
                     L{Aer4Tuple}C{(azimuth, elevation, slantrange, ltp)}.
@@ -141,9 +141,9 @@ class _AbcBase(_NamedBase):
         '''Get the I{local} I{East, North, Up} (ENU) components.
 
            @kwarg Enu: Class to return ENU (L{Enu}) or C{None}.
-           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Enu}} keyword arguments, ignored if
-                       C{B{Enu} is None}.
+           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Enu}} keyword arguments, ignored if C{B{Enu}
+                       is None}.
 
            @return: ENU as an L{Enu} instance or if C{B{Enu} is None}, an
                     L{Enu4Tuple}C{(east, north, up, ltp)}.
@@ -156,9 +156,9 @@ class _AbcBase(_NamedBase):
         '''Get the I{local} I{North, East, Down} (NED) components.
 
            @kwarg Ned: Class to return NED (L{Ned}) or C{None}.
-           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Ned}} keyword arguments, ignored if
-                       C{B{Ned} is None}.
+           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Ned}} keyword arguments, ignored if C{B{Ned}
+                       is None}.
 
            @return: NED as an L{Ned} instance or if C{B{Ned} is None}, an
                     L{Ned4Tuple}C{(north, east, down, ltp)}.
@@ -172,9 +172,9 @@ class _AbcBase(_NamedBase):
 
            @kwarg Xyz: Class to return XYZ (L{XyzLocal}, L{Enu}, L{Ned}, L{Aer})
                        or C{None}.
-           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Xyz}} keyword arguments, ignored if
-                       C{B{Xyz} is None}.
+           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Xyz}} keyword arguments, ignored if C{B{Xyz}
+                       is None}.
 
            @return: XYZ as an B{C{Xyz}} instance or if C{B{Xyz} is None}, an
                     L{Xyz4Tuple}C{(x, y, z, ltp)}.
@@ -814,9 +814,9 @@ class XyzLocal(_Vector3d):
         '''Get the local I{Azimuth, Elevation, slant Range} components.
 
            @kwarg Aer: Class to return AER (L{Aer}) or C{None}.
-           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and
-                       optional, additional B{C{Aer}} keyword arguments,
-                       ignored if C{B{Aer} is None}.
+           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Aer}} keyword arguments, ignored if C{B{Aer}
+                       is None}.
 
            @return: AER as an L{Aer} instance or if C{B{Aer} is None}, an
                     L{Aer4Tuple}C{(azimuth, elevation, slantrange, ltp)}.
@@ -832,11 +832,11 @@ class XyzLocal(_Vector3d):
                              or C{None}.
            @kwarg ltp: Optional I{local tangent plane} (LTP) (L{Ltp}), overriding
                        this C{ltp}.
-           @kwarg name_Cartesian_kwds: Optional C{B{name}=NN} (C{str}) and optional,
+           @kwarg name_Cartesian_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
                        additional B{C{Cartesian}} keyword arguments, ignored if
                        C{B{Cartesian} is None}.
 
-           @return: A B{C{Cartesian}} instance of if C{B{Cartesian} is None}, an
+           @return: A B{C{Cartesian}} instance or if C{B{Cartesian} is None}, an
                     L{Ecef9Tuple}C{(x, y, z, lat, lon, height, C, M, datum)} with
                     C{M=None}, always.
 
@@ -856,9 +856,9 @@ class XyzLocal(_Vector3d):
         '''Get the local I{East, North, Up} (ENU) components.
 
            @kwarg Enu: Class to return ENU (L{Enu}) or C{None}.
-           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Enu}} keyword arguments, ignored if
-                       C{B{Enu} is None}.
+           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Enu}} keyword arguments, ignored if C{B{Enu}
+                       is None}.
 
            @return: ENU as an L{Enu} instance or if C{B{Enu} is None}, an
                     L{Enu4Tuple}C{(east, north, up, ltp)}.
@@ -874,11 +874,11 @@ class XyzLocal(_Vector3d):
                           C{None}.
            @kwarg ltp: Optional I{local tangent plane} (LTP) (L{Ltp}), overriding
                        this ENU/NED/AER/XYZ's LTP.
-           @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: An B{C{LatLon}} instance of if C{B{LatLon} is None}, an
+           @return: An B{C{LatLon}} instance or if C{B{LatLon} is None}, an
                     L{Ecef9Tuple}C{(x, y, z, lat, lon, height, C, M, datum)} with
                     C{M=None}, always.
 
@@ -913,9 +913,9 @@ class XyzLocal(_Vector3d):
         '''Get the local I{North, East, Down} (Ned) components.
 
            @kwarg Ned: Class to return NED (L{Ned}) or C{None}.
-           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Ned}} keyword arguments, ignored if
-                       C{B{Ned} is None}.
+           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Ned}} keyword arguments, ignored if C{B{Ned}
+                       is None}.
 
            @return: NED as an L{Ned} instance or if C{B{Ned} is None}, an
                     L{Ned4Tuple}C{(north, east, down, ltp)}.
@@ -929,9 +929,9 @@ class XyzLocal(_Vector3d):
 
            @kwarg Xyz: Class to return XYZ (L{XyzLocal}, L{Enu}, L{Ned}, L{Aer})
                        or C{None}.
-           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Xyz}} keyword arguments, ignored if
-                       C{B{Xyz} is None}.
+           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Xyz}} keyword arguments, ignored if C{B{Xyz}
+                       is None}.
 
            @return: XYZ as an B{C{Xyz}} instance or if C{B{Xyz} is None}, an
                     L{Xyz4Tuple}C{(x, y, z, ltp)}.
@@ -1042,9 +1042,9 @@ class Enu(XyzLocal):
            @arg location: The geodetic (C{LatLon}) or geocentric (C{Cartesian},
                           L{Vector3d}) location, like a Point-Of-View.
            @kwarg Uvw: Class to return UWV (L{Uvw}) or C{None}.
-           @kwarg name_Uvw_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Uvw}} keyword arguments, ignored if
-                       C{B{Uvw} is None}.
+           @kwarg name_Uvw_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Uvw}} keyword arguments, ignored if C{B{Uvw}
+                       is None}.
 
            @return: UVW as a L{Uvw} instance or if C{B{Uvw} is None}, a
                     L{Uvw3Tuple}C{(u, v, w)}.
@@ -1059,10 +1059,10 @@ class Enu(XyzLocal):
             raise _TypeError(location=location, cause=x)
         e, n, u, _ = self.enu4
 
-        t = ca * u - sa * n
-        U = cb * t - sb * e
-        V = cb * e + sb * t
-        W = ca * n + sa * u
+        t = fdot_(ca, u, -sa, n)
+        U = fdot_(cb, t, -sb, e)
+        V = fdot_(cb, e,  sb, t)
+        W = fdot_(ca, n,  sa, u)
 
         n, kwds = _name2__(name_Uvw_kwds, _or_nameof=self)
         return Uvw3Tuple(U, V, W, name=n) if Uvw is None else \
@@ -1185,9 +1185,9 @@ class Local9Tuple(_NamedTuple):
         '''Get the I{local} I{Azimuth, Elevation, slant Range} (AER) components.
 
            @kwarg Aer: Class to return AER (L{Aer}) or C{None}.
-           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Aer}} keyword arguments, ignored if
-                       C{B{Aer} is None}.
+           @kwarg name_Aer_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Aer}} keyword arguments, ignored if C{B{Aer}
+                       is None}.
 
            @return: AER as an L{Aer} instance or if C{B{Aer} is None}, an
                     L{Aer4Tuple}C{(azimuth, elevation, slantrange, ltp)}.
@@ -1201,7 +1201,7 @@ class Local9Tuple(_NamedTuple):
 
            @kwarg Cartesian: Optional class to return C{(x, y, z)} (C{Cartesian})
                              or C{None}.
-           @kwarg name_Cartesian_kwds: Optional C{B{name}=NN} (C{str}) and optional,
+           @kwarg name_Cartesian_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
                        additional B{C{Cartesian}} keyword arguments, ignored if
                        C{B{Cartesian} is None}.
 
@@ -1216,9 +1216,9 @@ class Local9Tuple(_NamedTuple):
         '''Get the I{local} I{East, North, Up} (ENU) components.
 
            @kwarg Enu: Class to return ENU (L{Enu}) or C{None}.
-           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Enu}} keyword arguments, ignored if
-                       C{B{Enu} is None}.
+           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Enu}} keyword arguments, ignored if C{B{Enu}
+                       is None}.
 
            @return: ENU as an L{Enu} instance or if C{B{Enu} is None}, an
                     L{Enu4Tuple}C{(east, north, up, ltp)}.
@@ -1232,14 +1232,14 @@ class Local9Tuple(_NamedTuple):
 
            @kwarg LatLon: Optional class to return C{(lat, lon, height)}
                           (C{LatLon}) or C{None}.
-           @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: An instance of C{B{LatLon}(lat, lon, **B{LatLon_kwds})}
-                    or if C{B{LatLon} is None}, a L{LatLon3Tuple}C{(lat, lon,
-                    height)} respectively L{LatLon4Tuple}C{(lat, lon, height,
-                    datum)} depending on whether C{datum} is un-/specified.
+           @return: An instance of C{B{LatLon}(lat, lon, **B{LatLon_kwds})} or if
+                    C{B{LatLon} is None}, a L{LatLon3Tuple}C{(lat, lon, height)}
+                    respectively L{LatLon4Tuple}C{(lat, lon, height, datum)}
+                    depending on whether C{datum} is un-/specified.
 
            @raise TypeError: Invalid B{C{LatLon}} or B{C{name_LatLon_kwds}}.
         '''
@@ -1249,9 +1249,9 @@ class Local9Tuple(_NamedTuple):
         '''Get the I{local} I{North, East, Down} (NED) components.
 
            @kwarg Ned: Class to return NED (L{Ned}) or C{None}.
-           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Ned}} keyword arguments, ignored if
-                       C{B{Ned} is None}.
+           @kwarg name_Ned_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Ned}} keyword arguments, ignored if C{B{Ned}
+                       is None}.
 
            @return: NED as an L{Ned} instance or if C{B{Ned} is None}, an
                     L{Ned4Tuple}C{(north, east, down, ltp)}.
@@ -1264,9 +1264,9 @@ class Local9Tuple(_NamedTuple):
         '''Get the I{local} I{X, Y, Z} (XYZ) components.
 
            @kwarg Xyz: Class to return XYZ (L{XyzLocal}) or C{None}.
-           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Xyz}} keyword arguments, ignored if
-                       C{B{Xyz} is None}.
+           @kwarg name_Xyz_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Xyz}} keyword arguments, ignored if C{B{Xyz}
+                       is None}.
 
            @return: XYZ as an B{C{Xyz}} instance or if C{B{Xyz} is None},
                     an L{Xyz4Tuple}C{(x, y, z, ltp)}.
@@ -1324,9 +1324,9 @@ class Uvw(_Vector3d):
            @arg location: The geodetic (C{LatLon}) or geocentric (C{Cartesian},
                           L{Vector3d}) location from where to cast the L{Los}.
            @kwarg Enu: Class to return ENU (L{Enu}) or C{None}.
-           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{L{Enu}} keyword arguments, ignored if
-                       C{B{Enu} is None}.
+           @kwarg name_Enu_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{L{Enu}} keyword arguments, ignored if C{B{Enu}
+                       is None}.
 
            @return: ENU as an L{Enu} instance or if C{B{Enu} is None}, an
                     L{Enu4Tuple}C{(east, north, up, ltp)} with C{ltp=None}.
@@ -1341,10 +1341,10 @@ class Uvw(_Vector3d):
             raise _TypeError(location=location, cause=x)
         u, v, w = self.uvw
 
-        t = cb * u + sb * v
-        E = cb * v - sb * u
-        N = ca * w - sa * t
-        U = ca * t + sa * w
+        t = fdot_(cb, u,  sb, v)
+        E = fdot_(cb, v, -sb, u)
+        N = fdot_(ca, w, -sa, t)
+        U = fdot_(ca, t,  sa, w)
 
         n, kwds = _name2__(name_Enu_kwds, _or_nameof=self)
         return Enu4Tuple(E, N, U, name=n) if Enu is None else \
@@ -1570,15 +1570,14 @@ class Footprint5Tuple(_NamedTuple):
            @kwarg ltp: The I{local tangent plane} (L{Ltp}), overriding this
                        footprint's C{center} or C{frustrum} C{ltp}.
            @kwarg LatLon: Optional I{geodetic} class (C{LatLon}) or C{None}.
-           @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}.
-
-           @return: A L{Footprint5Tuple} of 5 C{B{LatLon}(lat, lon,
-                    **B{name_LatLon_kwds})} instances or if C{B{LatLon} is None},
-                    5 L{LatLon3Tuple}C{(lat, lon, height)}s respectively
-                    5 L{LatLon4Tuple}C{(lat, lon, height, datum)}s depending
-                    on whether keyword argument C{datum} is un-/specified.
+           @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: A L{Footprint5Tuple} of 5 C{B{LatLon}(lat, lon, **B{name_LatLon_kwds})}
+                    instances or if C{B{LatLon} is None}, 5 L{LatLon3Tuple}C{(lat, lon,
+                    height)}s respectively 5 L{LatLon4Tuple}C{(lat, lon, height, datum)}s
+                    depending on whether keyword argument C{datum} is un-/specified.
 
            @raise TypeError: Invalid B{C{ltp}}, B{C{LatLon}} or B{C{name_LatLon_kwds}}.
 

pygeodesy/mgrs.py

@@ -55,7 +55,7 @@ from pygeodesy.utm import toUtm8, _to3zBlat, Utm, _UTM_ZONE_MAX, _UTM_ZONE_MIN
 # from pygeodesy.utmupsBase import _UTM_ZONE_MAX, _UTM_ZONE_MIN  # from .utm
 
 __all__ = _ALL_LAZY.mgrs
-__version__ = '24.10.13'
+__version__ = '24.11.06'
 
 _AN_    = 'AN'  # default south pole grid tile and band B
 _AtoPx_ = _AtoZnoIO_.tillP
@@ -594,15 +594,14 @@ def toMgrs(utmups, Mgrs=Mgrs, **name_Mgrs_kwds):
     '''Convert a UTM or UPS coordinate to an MGRS grid reference.
 
        @arg utmups: A UTM or UPS coordinate (L{Utm}, L{Etm} or L{Ups}).
-       @kwarg Mgrs: Optional class to return the MGRS grid reference
-                    (L{Mgrs}) or C{None}.
-       @kwarg name_Mgrs_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                   additional B{C{Mgrs}} keyword arguments, ignored if
-                   C{B{Mgrs} is None}.
-
-       @return: The MGRS grid reference as B{C{Mgrs}} or if C{B{Mgrs} is
-                None} as an L{Mgrs6Tuple}C{(zone, EN, easting, northing,
-                band, datum)}.
+       @kwarg Mgrs: Optional class to return the MGRS grid reference (L{Mgrs})
+                    or C{None}.
+       @kwarg name_Mgrs_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                   additional B{C{Mgrs}} keyword arguments, ignored if C{B{Mgrs}
+                   is None}.
+
+       @return: The MGRS grid reference as B{C{Mgrs}} or if C{B{Mgrs} is None} as
+                an L{Mgrs6Tuple}C{(zone, EN, easting, northing, band, datum)}.
 
        @raise MGRSError: Invalid B{C{utmups}}.
 

pygeodesy/named.py

@@ -141,6 +141,10 @@ class _Named(object):
     _classnaming = False  # prefixed (C{bool})
 #   _updates     = 0      # OBSOLETE Property/property updates
 
+    def __format__(self, fmt):  # PYCHOK no cover
+        '''Not implemented.'''
+        return _NotImplemented(self, fmt)
+
     def __imatmul__(self, other):  # PYCHOK no cover
         '''Not implemented.'''
         return _NotImplemented(self, other)  # PYCHOK Python 3.5+

pygeodesy/osgr.py

@@ -53,7 +53,7 @@ from pygeodesy.utily import degrees90, degrees180, sincostan3, truncate
 from math import cos, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.osgr
-__version__ = '24.08.13'
+__version__ = '24.11.06'
 
 _equivalent_ = 'equivalent'
 _OSGR_       = 'OSGR'
@@ -505,20 +505,17 @@ def _ll2LatLon3(ll, LatLon, datum, LatLon_kwds):
 
 
 def parseOSGR(strOSGR, Osgr=Osgr, **name_Osgr_kwds):
-    '''Parse a string representing an OS Grid Reference, consisting
-       of C{"[GD] easting northing"}.
+    '''Parse a string representing an OS Grid Reference, consisting of C{"[GD]
+       easting northing"}.
 
-       Accepts standard OS Grid References like "SU 387 148", with
-       or without whitespace separators, from 2- up to 22-digit
-       references, or all-numeric, comma-separated references in
-       meters, for example "438700,114800".
+       Accepts standard OS Grid References like "SU 387 148", with or without
+       whitespace separators, from 2- up to 22-digit references, or all-numeric,
+       comma-separated references in meters, for example "438700,114800".
 
        @arg strOSGR: An OSGR coordinate (C{str}).
-       @kwarg Osgr: Optional class to return the OSGR coordinate
-                    (L{Osgr}) or C{None}.
-       @kwarg name_Osgr_kwds: Optional C{B{name}=NN} (C{str}) and
-                   optional, additional B{C{Osgr}} keyword arguments,
-                   ignored if C{B{Osgr} is None}.
+       @kwarg Osgr: Optional class to return the OSGR coordinate (L{Osgr}) or C{None}.
+       @kwarg name_Osgr_kwds: Optional C{B{name}=NN} (C{str}) and optionally, additional
+                   B{C{Osgr}} keyword arguments, ignored if C{B{Osgr} is None}.
 
        @return: An (B{C{Osgr}}) instance or if C{B{Osgr} is None}, an
                 L{EasNor2Tuple}C{(easting, northing)}.

pygeodesy/props.py

@@ -26,7 +26,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, \
 from functools import wraps as _wraps
 
 __all__ = _ALL_LAZY.props
-__version__ = '24.10.19'
+__version__ = '24.11.06'
 
 _class_       = 'class'
 _DNL_         = _NL_ * 2  # PYCHOK used!
@@ -369,7 +369,7 @@ class _property_RO___(_PropertyBase):
         '''
         _PropertyBase.__init__(self, method, self._fget, self._fset_error, doc=doc)
 
-    def _fdel(self, unused):  # PYCHOK no cover
+    def _fdel(self, *unused):  # PYCHOK no cover
         '''Silently ignored, always.
         '''
         pass

pygeodesy/resections.py

@@ -34,7 +34,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d
 from math import cos, atan2, degrees, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.resections
-__version__ = '24.09.23'
+__version__ = '24.11.04'
 
 _concyclic_ = 'concyclic'
 _PA_        = 'PA'
@@ -200,11 +200,11 @@ def cassini(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
                              alpha=alpha, beta=beta, cause=x)
 
 
-def _Clas(where, point, Clas_and_kwds, *args):
+def _Clas(which, point, Clas_and_kwds, *args):
     '''(INTERNAL) Return a C{B{Clas}=point.classof} survey point.
     '''
     Clas, kwds = _xkwds_pop2(Clas_and_kwds, Clas=point.classof)
-    return Clas(*args, **_xkwds(kwds, name=where.__name__))
+    return Clas(*args, **_xkwds(kwds, name=which.__name__))
 
 
 def collins5(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
@@ -252,8 +252,8 @@ 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 =  A.x + d * s
-        y =  A.y + d * c
+        x =  d * s + A.x  # fma(d, s, A.x)
+        y =  d * c + A.y  # fma(d, c, A.y)
         z = _zidw(x, y, useZ, A, B, C)
         return x, y, z
 
@@ -282,11 +282,10 @@ def collins5(pointA, pointB, pointC, alpha, beta, useZ=False, **Clas_and_kwds):
         d =  b * sin(zb - zh) / sra  # A.minus(P).length
         r =  zh - ra  # zb - PI + (PI - ra - (zb - zh))
         P = _xyz(d, r, A, B, C, useZ)
-        P = _Clas(collins5, pointA, Clas_and_kwds, *P)
 
+        P = _Clas(collins5, pointA, Clas_and_kwds, *P)
         H = _Clas(collins5, pointA, Clas_and_kwds, *H)
         a =  B.minus(C).length
-
         return Collins5Tuple(P, H, a, b, c, name=collins5.__name__)
 
     except (TypeError, ValueError) as x:
@@ -312,7 +311,7 @@ def pierlot(point1, point2, point3, alpha12, alpha23, useZ=False, eps=EPS,
                      B{C{alpha3 - alpha2}}(C{degrees}).
        @kwarg useZ: If C{True}, interpolate the survey point's Z component,
                     otherwise use C{z=INT0} (C{bool}).
-       @kwarg eps: Tolerance for C{cot} (pseudo-)singularities (C{float}).
+       @kwarg eps: Tolerance for C{cot}angent (pseudo-)singularities (C{float}).
        @kwarg Clas_and_kwds: Optional class C{B{Clas}=B{point1}.classof} to
                    return the survey point with optionally other B{C{Clas}}
                    keyword arguments to instantiate the survey point.
@@ -427,8 +426,8 @@ def pierlotx(point1, point2, point3, alpha1, alpha2, alpha3, useZ=False,
                    return the survey point with optionally other B{C{Clas}}
                    keyword arguments to instantiate the survey point.
 
-       @return: The survey (or robot) point, an instance of B{C{Clas}} or B{C{point1}}'s
-                (sub-)class.
+       @return: The survey (or robot) point, an instance of B{C{Clas}} or
+                B{C{point1}}'s (sub-)class.
 
        @raise ResectionError: Near-coincident, -colinear or -concyclic points or
                               invalid B{C{alpha1}}, B{C{alpha2}} or B{C{alpha3}}.

pygeodesy/rhumb/__init__.py

@@ -9,7 +9,7 @@ u'''Package of lazily imported C{rhumb} modules L{rhumb.aux_}, L{rhumb.ekx} and
 from pygeodesy.lazily import _ALL_LAZY, _ALL_OTHER, _lazy_import_as, _unLazy0
 
 __all__ = _ALL_LAZY.rhumb
-__version__ = '24.09.02'
+__version__ = '24.11.07'
 
 if _unLazy0:  # or _isfrozen
     from pygeodesy.rhumb.aux_ import RhumbAux, RhumbLineAux

pygeodesy/rhumb/solve.py

@@ -20,7 +20,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.rhumb_solve
-__version__ = '24.10.12'
+__version__ = '24.11.07'
 
 
 class _RhumbSolveBase(_SolveGDictBase):
@@ -183,7 +183,7 @@ class RhumbSolve(_RhumbSolveBase):
     def _Inverse(self, ll1, ll2, wrap, **unused):
         '''(INTERNAL) Short-cut version, see .latlonBase.
         '''
-        if wrap:
+        if wrap:  # PYCHOK no cover
             ll2 = _unrollon(ll1, _Wrap.point(ll2))
         return self._GDictInverse(ll1.lat, ll1.lon, ll2.lat, ll2.lon)
 
@@ -201,7 +201,7 @@ class RhumbSolve(_RhumbSolveBase):
     def _InverseLine(self, ll1, ll2, wrap, **name_caps):
         '''(INTERNAL) Short-cut version, see .latlonBase.
         '''
-        if wrap:
+        if wrap:  # PYCHOK no cover
             ll2 = _unrollon(ll1, _Wrap.point(ll2))
         return self.InverseLine(ll1.lat, ll1.lon, ll2.lat, ll2.lon, **name_caps)
 

pygeodesy/simplify.py

@@ -76,7 +76,7 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 # from pygeodesy.basics import len2  # from .fmath
 from pygeodesy.constants import EPS, R_M, _1_0
 from pygeodesy.errors import _AttributeError, _ValueError
-from pygeodesy.fmath import len2, sqrt0
+from pygeodesy.fmath import fdot_, len2, sqrt0
 from pygeodesy.formy import equirectangular4
 from pygeodesy.interns import _small_, _too_
 from pygeodesy.iters import isNumpy2, isTuple2
@@ -86,7 +86,7 @@ from pygeodesy.units import _ALL_LAZY, _1mm, Radius_
 from math import degrees, fabs, radians
 
 __all__ = _ALL_LAZY.simplify
-__version__ = '24.08.13'
+__version__ = '24.11.07'
 
 
 # try:
@@ -222,11 +222,11 @@ class _Sy(object):
             # distance points[i] to -[s]
             d2, y01, x01, _ = _d2yxu4(s, i)
             if d2 > eps:
-                w = y01 * y21 + x01 * x21
+                w = fdot_(y01, y21, x01, x21)
                 if w > 0:
                     if w < d21:
                         # perpendicular distance squared
-                        d2 = (y01 * x21 - x01 * y21)**2 / d21
+                        d2 = fdot_(y01, x21, -x01, y21)**2 / d21
                     else:  # distance points[i] to -[e]
                         d2, _, _, _ = _d2yxu4(e, i)
                 if d2 > t2:
@@ -252,7 +252,7 @@ class _Sy(object):
         if d21 > self.eps:
             d01, y01, x01, _ = self.d2yxu4(i1, i0)
             if d01 > self.eps:
-                h2 = fabs(y01 * x21 - x01 * y21)
+                h2 = fabs(fdot_(y01, x21, -x01, y21))
                 # triangle height h = h2 / sqrt(d21) and
                 # the area = h * sqrt(d21) / 2 == h2 / 2
                 return h2  # double triangle area