pygeodesy 24.4.4__py2.py3-none-any.whl → 24.4.18__py2.py3-none-any.whl

pygeodesy/geodesicw.py

@@ -37,7 +37,7 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.03.22'
+__version__ = '24.04.07'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
@@ -479,7 +479,7 @@ class _wargs(object):  # see also .formy._idllmn6, .latlonBase._toCartesian3, .v
         try:
             yield args
         except Exception as x:
-            n = _DOT_(classname(inst), callername(up=3, underOK=True))
+            n = _DOT_(classname(inst), callername(up=2, underOK=True))
             raise GeodesicError(unstr(n, *args, **kwds), cause=x)
 
 _wargs = _wargs()  # PYCHOK singleton

pygeodesy/geodsolve.py

@@ -11,6 +11,7 @@ of the C{GeodSolve} executable.
 
 from pygeodesy.basics import _xinstanceof
 # from pygeodesy.errors import _xkwds  # from .karney
+# from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
 from pygeodesy.interns import NN, _a12_, _azi1_, _azi2_, \
                              _lat1_, _lat2_, _lon1_, _lon2_, _m12_, \
                              _M12_, _M21_, _s12_, _S12_, _UNDER_
@@ -25,7 +26,7 @@ from pygeodesy.solveBase import _SolveBase, _SolveLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.02.21'
+__version__ = '24.04.07'
 
 
 class GeodSolve12Tuple(_GTuple):
@@ -301,11 +302,11 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveLineBase):
 
     def Intersecant2(self, lat0, lon0, radius, **kwds):  # PYCHOK no cover
         '''B{Not implemented}, throws a C{NotImplementedError} always.'''
-        _MODS.named.notImplemented(self, lat0, lon0, radius, **kwds)
+        self._notImplemented(lat0, lon0, radius, **kwds)
 
     def PlumbTo(self, lat0, lon0, **kwds):  # PYCHOK no cover
         '''B{Not implemented}, throws a C{NotImplementedError} always.'''
-        _MODS.named.notImplemented(self, lat0, lon0, **kwds)
+        self._notImplemented(lat0, lon0, **kwds)
 
     def Position(self, s12, outmask=_UNUSED_):  # PYCHOK unused
         '''Find the position on the line given B{C{s12}}.

pygeodesy/geoids.py

@@ -99,7 +99,7 @@ from pygeodesy.interns import MISSING, NN, _4_, _COLONSPACE_, _COMMASPACE_, \
                              _scipy_, _SPACE_, _stdev_, _supported_, _tbd_, \
                              _W_, _width_, _version2
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
-from pygeodesy.named import _Named, _NamedTuple, notOverloaded
+from pygeodesy.named import _Named, _NamedTuple
 # from pygeodesy.namedTuples import LatLon3Tuple  # _MODS
 from pygeodesy.props import deprecated_method, Property_RO, property_RO
 from pygeodesy.streprs import attrs, Fmt, fstr, pairs
@@ -118,7 +118,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '24.03.22'
+__version__ = '24.04.07'
 
 _assert_ = 'assert'
 _bHASH_  =  b'#'
@@ -385,7 +385,7 @@ class _GeoidBase(_HeightsBase):
 
     def _g2ll2(self, lat, lon):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        notOverloaded(self, lat, lon)
+        self._notOverloaded(lat, lon)
 
     def _gyx2g2(self, y, x):
         # convert grid (y, x) indices to grid (lat, lon)
@@ -473,7 +473,7 @@ class _GeoidBase(_HeightsBase):
 
     def _ll2g2(self, lat, lon):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        notOverloaded(self, lat, lon)
+        self._notOverloaded(lat, lon)
 
     @property_RO
     def _LL3T(self):

pygeodesy/hausdorff.py

@@ -74,7 +74,7 @@ import pygeodesy.formy as _formy
 from pygeodesy.interns import NN, _i_, _j_, _units_
 # from pygeodesy.iters import points2  # from .points
 from pygeodesy.lazily import _ALL_LAZY, _FOR_DOCS
-from pygeodesy.named import _Named, _NamedTuple, notOverloaded, _Pass
+from pygeodesy.named import _Named, _NamedTuple, _Pass
 # from pygeodesy.namedTuples import PhiLam2Tuple  # from .points
 from pygeodesy.points import _distanceTo, points2 as _points2,  PhiLam2Tuple, radians
 from pygeodesy.props import Property_RO, property_doc_, property_RO
@@ -86,7 +86,7 @@ from pygeodesy.unitsBase import _Str_degrees, _Str_degrees2, _Str_meter, _Str_NN
 from random import Random
 
 __all__ = _ALL_LAZY.hausdorff
-__version__ = '24.03.24'
+__version__ = '24.04.07'
 
 
 class HausdorffError(PointsError):
@@ -273,7 +273,7 @@ class HausdorffDegrees(Hausdorff):
 
     def distance(self, point1, point2):  # PYCHOK no cover
         '''I{Must be overloaded}.'''
-        notOverloaded(self, point1, point2)
+        self._notOverloaded(point1, point2)
 
 
 class HausdorffRadians(Hausdorff):
@@ -290,7 +290,7 @@ class HausdorffRadians(Hausdorff):
     def distance(self, point1, point2):  # PYCHOK no cover
         '''Return the distance in C{radians} between B{C{point1}} and B{C{point2}}.
            I{Must be overloaded}.'''
-        notOverloaded(self, point1, point2)
+        self._notOverloaded(point1, point2)
 
     def point(self, point):
         '''Return B{C{point}} as L{PhiLam2Tuple} to maintain
@@ -334,7 +334,7 @@ class _HausdorffMeterRadians(Hausdorff):
 
     def _func_(self, *args, **kwds):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        notOverloaded(self, *args, **kwds)
+        self._notOverloaded(*args, **kwds)
 
 
 class HausdorffCosineAndoyerLambert(_HausdorffMeterRadians):

pygeodesy/heights.py

@@ -81,7 +81,7 @@ from pygeodesy.interns import NN, _COMMASPACE_, _cubic_, _insufficient_, _knots_
                              _linear_, _NOTEQUAL_, _PLUS_, _scipy_, _SPACE_, \
                              _STAR_, _version2
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
-from pygeodesy.named import _Named, notOverloaded
+from pygeodesy.named import _Named
 from pygeodesy.points import _distanceTo, LatLon_,  Fmt, radians, _Wrap
 from pygeodesy.props import Property_RO, property_RO
 # from pygeodesy.streprs import Fmt  # from .points
@@ -91,7 +91,7 @@ from pygeodesy.units import _isDegrees, Float_, Int_
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.heights
-__version__ = '24.03.14'
+__version__ = '24.04.07'
 
 _error_     = 'error'
 _llis_      = 'llis'
@@ -245,7 +245,7 @@ class _HeightsBase(_HeightBase):  # in .geoids
 
            @raise SciPyWarning: A C{scipy} warning as exception.
         '''
-        notOverloaded(self, callername='__call__', *llis, **wrap)
+        self._notOverloaded(callername='__call__', *llis, **wrap)
 
     def _as_xyllis4(self, llis, **wrap):
         # convert lli C{LatLon}s to tuples or C{NumPy} arrays of
@@ -258,7 +258,7 @@ class _HeightsBase(_HeightBase):  # in .geoids
 
     def _ev(self, *args):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        notOverloaded(self, *args)
+        self._notOverloaded(*args)
 
     def _eval(self, llis, **wrap):  # XXX single arg, not *args
         _as, xis, yis, _ = self._as_xyllis4(llis, **wrap)
@@ -286,7 +286,7 @@ class _HeightsBase(_HeightBase):  # in .geoids
 
            @raise SciPyWarning: A C{scipy} warning as exception.
         '''
-        notOverloaded(self, lats, lons, **wrap)
+        self._notOverloaded(lats, lons, **wrap)
 
     def _np_sp2(self, throwarnings=False):
         '''(INTERNAL) Import C{numpy} and C{scipy}, once.
@@ -687,7 +687,7 @@ class _HeightIDW(_HeightBase):
         '''
         _f, kwds = self._func, self._kwds
         if not callable(_f):  # PYCHOK no cover
-            notOverloaded(self, distance_function=_f)
+            self._notOverloaded(distance_function=_f)
         try:
             for i, k in enumerate(self._knots):
                 yield _f(y, x, k.lat, k.lon, **kwds)

pygeodesy/latlonBase.py

@@ -35,7 +35,7 @@ from pygeodesy.interns import NN, _COMMASPACE_, _concentric_, _height_, \
 # from pygeodesy.karney import Caps  # _MODS
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 # from pygeodesy.ltp import Ltp, _xLtp  # _MODS
-from pygeodesy.named import _NamedBase, notImplemented, notOverloaded,  Fmt
+from pygeodesy.named import _NamedBase,  Fmt
 from pygeodesy.namedTuples import Bounds2Tuple, LatLon2Tuple, PhiLam2Tuple, \
                                   Trilaterate5Tuple
 # from pygeodesy.nvectorBase import _N_vector_  # _MODS
@@ -53,7 +53,7 @@ from contextlib import contextmanager
 from math import asin, cos, degrees, fabs, radians
 
 __all__ = _ALL_LAZY.latlonBase
-__version__ = '24.03.15'
+__version__ = '24.04.07'
 
 
 class LatLonBase(_NamedBase):
@@ -418,7 +418,7 @@ class LatLonBase(_NamedBase):
     @property_RO
     def datum(self):  # PYCHOK no cover
         '''I{Must be overloaded}.'''
-        notOverloaded(self)
+        self._notOverloaded()
 
     def destinationXyz(self, delta, LatLon=None, **LatLon_kwds):
         '''Calculate the destination using a I{local} delta from this point.
@@ -735,7 +735,7 @@ class LatLonBase(_NamedBase):
 
     def intersecant2(self, *args, **kwds):  # PYCHOK no cover
         '''B{Not implemented}, throws a C{NotImplementedError} always.'''
-        notImplemented(self, *args, **kwds)
+        self._notImplemented(*args, **kwds)
 
     def _intersecend2(self, p, q, wrap, height, g_or_r, P, Q, unused):  # in .LatLonEllipsoidalBaseDI.intersecant2
         '''(INTERNAL) Interpolate 2 heights along a geodesic or rhumb
@@ -1021,7 +1021,7 @@ class LatLonBase(_NamedBase):
 
     def nearestTo(self, *args, **kwds):  # PYCHOK no cover
         '''B{Not implemented}, throws a C{NotImplementedError} always.'''
-        notImplemented(self, *args, **kwds)
+        self._notImplemented(*args, **kwds)
 
     def normal(self):
         '''Normalize this point I{in-place} to C{abs(lat) <= 90} and
@@ -1424,7 +1424,7 @@ class LatLonBase(_NamedBase):
 
     def toDatum(self, datum2, height=None, name=NN):
         '''I{Must be overloaded}.'''
-        notOverloaded(self, datum2, height=height, name=name)
+        self._notOverloaded(datum2, height=height, name=name)
 
     def toEcef(self, height=None, M=False):
         '''Convert this point to I{geocentric} coordinates, also known as

pygeodesy/lazily.py

@@ -256,7 +256,7 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                                    'crosserrors', 'exception_chaining', 'isError', 'limiterrors', 'rangerrors'),
                             etm=_i('Etm', 'ETMError', 'ExactTransverseMercator',
                                    'parseETM5', 'toEtm8'),
-                          fmath=_i('Fdot', 'Fhorner', 'Fhypot', 'Fpolynomial', 'Fpowers', 'Fn_rt', 'Fcbrt', 'Fsqrt',
+                          fmath=_i('Fdot', 'Fhorner', 'Fhypot', 'Fpolynomial', 'Fpowers', 'Fcbrt', 'Froot', 'Fsqrt',
                                    'bqrt', 'cbrt', 'cbrt2', 'euclid', 'euclid_',
                                    'facos1', 'fasin1', 'fatan', 'fatan1', 'fatan2', 'favg',
                                    'fdot', 'fdot3', 'fmean', 'fmean_', 'fhorner', 'fidw', 'fpolynomial',
@@ -407,7 +407,7 @@ _ALL_DEPRECATED = _NamedEnum_RO(_name='_ALL_DEPRECATED',
                            deprecated=_i('bases', 'datum', 'nvector',  # DEPRECATED modules and ...
                                          'rhumbaux', 'rhumbBase', 'rhumbsolve', 'rhumbx'),  # ... names
                      deprecated_bases=_i('LatLonHeightBase', 'points2'),
-                   deprecated_classes=_i('ClipCS3Tuple', 'EasNorExact4Tuple', 'EcefCartesian',
+                   deprecated_classes=_i('ClipCS3Tuple', 'EasNorExact4Tuple', 'EcefCartesian', 'Fn_rt',
                                          'HeightIDW', 'HeightIDW2', 'HeightIDW3', 'Helmert7Tuple',
                                          'LatLonExact4Tuple', 'NearestOn4Tuple', 'Ned3Tuple',
                                          'RefFrameError', 'Rhumb7Tuple', 'RhumbOrder2Tuple',
@@ -504,7 +504,7 @@ class _ALL_MODS(object):
 _ALL_MODS = _ALL_MODS()  # PYCHOK singleton
 
 __all__ = _ALL_LAZY.lazily
-__version__ = '24.03.29'
+__version__ = '24.04.17'
 
 
 def _ALL_OTHER(*objs):

pygeodesy/ltp.py

@@ -22,7 +22,7 @@ from pygeodesy.ecef import _EcefBase, EcefKarney, _llhn4, _xyzn4
 from pygeodesy.errors import _NotImplementedError, _TypesError, _ValueError, \
                              _xattr, _xkwds, _xkwds_get
 from pygeodesy.fmath import fabs, fdot, Fhorner
-from pygeodesy.fsums import _floor, Fsum, fsumf_, fsum1f_
+from pygeodesy.fsums import _floor, _Fsumf_, fsumf_, fsum1f_
 from pygeodesy.interns import NN, _0_, _COMMASPACE_, _DOT_, _ecef_, _height_, \
                              _invalid_, _lat0_, _lon0_, _ltp_, _M_, _name_, _too_
 # from pygeodesy.lazily import _ALL_LAZY  # from vector3d
@@ -42,7 +42,7 @@ from pygeodesy.vector3d import _ALL_LAZY, Vector3d
 # from math import fabs, floor as _floor  # from .fmath, .fsums
 
 __all__ = _ALL_LAZY.ltp
-__version__ = '24.02.16'
+__version__ = '24.04.14'
 
 _height0_ = _height_ + _0_
 _narrow_  = 'narrow'
@@ -964,15 +964,15 @@ class ChLVa(_ChLV, LocalCartesian):
         a, b, h      =  _ChLV._YXh_2abh3(Y, X, h_)
         ab_d, a2, b2 =   ChLV._ab_d, a**2, b**2
 
-        lat = Fsum(16.9023892, 3.238272 * b,
-                              -0.270978 * a2,
-                              -0.002528 * b2,
-                              -0.0447   * a2 * b,
-                              -0.014    * b2 * b).fover(ab_d)
-        lon = Fsum( 2.6779094, 4.728982 * a,
-                               0.791484 * a * b,
-                               0.1306   * a * b2,
-                              -0.0436   * a * a2).fover(ab_d)
+        lat = _Fsumf_(16.9023892, 3.238272 * b,
+                                 -0.270978 * a2,
+                                 -0.002528 * b2,
+                                 -0.0447   * a2 * b,
+                                 -0.014    * b2 * b).fover(ab_d)
+        lon = _Fsumf_( 2.6779094, 4.728982 * a,
+                                  0.791484 * a * b,
+                                  0.1306   * a * b2,
+                                 -0.0436   * a * a2).fover(ab_d)
         return self._ChLV9Tuple(False, M, name, Y, X, h_, lat, lon, h)
 
 

pygeodesy/ltpTuples.py

@@ -22,8 +22,7 @@ from pygeodesy.interns import NN, _4_, _azimuth_, _center_, _COMMASPACE_, \
                              _lat_, _lon_, _ltp_, _M_, _north_, _not_, _up_, \
                              _X_, _x_, _xyz_, _Y_, _y_, _z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _NamedBase, _NamedTuple, notOverloaded, \
-                            _Pass, _xnamed
+from pygeodesy.named import _NamedBase, _NamedTuple, _Pass, _xnamed
 from pygeodesy.namedTuples import LatLon2Tuple, PhiLam2Tuple, Vector3Tuple
 from pygeodesy.props import deprecated_method, deprecated_Property_RO, \
                             Property_RO, property_RO
@@ -36,7 +35,7 @@ from pygeodesy.vector3d import Vector3d
 from math import cos, radians
 
 __all__ = _ALL_LAZY.ltpTuples
-__version__ = '24.03.15'
+__version__ = '24.04.07'
 
 _aer_        = 'aer'
 _alt_        = 'alt'
@@ -183,7 +182,7 @@ class _NamedAerNed(_NamedBase):
     @property_RO
     def xyz4(self):  # PYCHOK no cover
         '''I{Must be overloaded}.'''
-        notOverloaded(self)
+        self._notOverloaded()
 
     @Property_RO
     def xyzLocal(self):

pygeodesy/named.py

@@ -32,7 +32,7 @@ from pygeodesy.props import _allPropertiesOf_n, deprecated_method, _hasProperty,
 from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 
 __all__ = _ALL_LAZY.named
-__version__ = '24.03.22'
+__version__ = '24.04.07'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
@@ -45,6 +45,7 @@ _Names_             = '_Names_'
 _registered_        = 'registered'  # PYCHOK used!
 _std_NotImplemented = _getenv('PYGEODESY_NOTIMPLEMENTED', NN).lower() == _std_
 _Units_             = '_Units_'
+_UP                 =  2
 
 
 def _xjoined_(prefix, name):
@@ -377,6 +378,16 @@ class _Named(object):
         '''
         return _xjoined_(_DOT_(self.__module__, self.__class__.__name__),  self.name)
 
+    def _notImplemented(self, *args, **kwds):
+        '''(INTERNAL) See function L{notImplemented}.
+        '''
+        notImplemented(self, *args, **_xkwds(kwds, up=_UP + 1))
+
+    def _notOverloaded(self, *args, **kwds):
+        '''(INTERNAL) See function L{notOverloaded}.
+        '''
+        notOverloaded(self, *args, **_xkwds(kwds, up=_UP + 1))
+
     def rename(self, name):
         '''Change the name.
 
@@ -1148,7 +1159,7 @@ def callername(up=1, dflt=NN, source=False, underOK=False):
     return dflt
 
 
-def _callername2(args, callername=NN, source=False, underOK=False, up=2, **kwds):
+def _callername2(args, callername=NN, source=False, underOK=False, up=_UP, **kwds):
     '''(INTERNAL) Extract C{callername}, C{source}, C{underOK} and C{up} from C{kwds}.
     '''
     n = callername or _MODS.named.callername(up=up + 1, source=source,
@@ -1265,7 +1276,7 @@ def notImplemented(inst, *args, **kwds):  # PYCHOK no cover
     '''Raise a C{NotImplementedError} for a missing instance method or
        property or for a missing caller feature.
 
-       @arg inst: Instance (C{any}) or C{None} for caller.
+       @arg inst: Caller instance (C{any}) or C{None} for function.
        @arg args: Method or property positional arguments (any C{type}s).
        @arg kwds: Method or property keyword arguments (any C{type}s),
                   except C{B{callername}=NN}, C{B{underOK}=False} and

pygeodesy/nvectorBase.py

@@ -25,7 +25,7 @@ from pygeodesy.interns import NN, _1_, _2_, _3_, _bearing_, _coincident_, \
                              _pole_, _SPACE_, _SouthPole_, _under
 from pygeodesy.latlonBase import LatLonBase,  _ALL_DOCS, _ALL_LAZY, _MODS
 # from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS  # from .latlonBase
-from pygeodesy.named import notImplemented, _xother3
+from pygeodesy.named import _xother3
 from pygeodesy.namedTuples import Trilaterate5Tuple, Vector3Tuple, \
                                   Vector4Tuple,  map1
 from pygeodesy.props import deprecated_method, Property_RO, property_doc_, \
@@ -38,7 +38,7 @@ from pygeodesy.vector3d import Vector3d, _xyzhdn3
 from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.nvectorBase
-__version__ = '24.02.18'
+__version__ = '24.04.07'
 
 
 class NvectorBase(Vector3d):  # XXX kept private
@@ -413,11 +413,11 @@ class LatLonNvectorBase(LatLonBase):
 
 #   def distanceTo(self, other, **kwds):  # PYCHOK no cover
 #       '''I{Must be overloaded}.'''
-#       _MODS.named.notOverloaded(self, other, **kwds)
+#       self._notOverloaded(other, **kwds)
 
     def intersections2(self, radius1, other, radius2, **kwds):  # PYCHOK expected
         '''B{Not implemented}, throws a C{NotImplementedError} always.'''
-        notImplemented(self, radius1, other, radius2, **kwds)
+        self._notImplemented(radius1, other, radius2, **kwds)
 
     def others(self, *other, **name_other_up):
         '''Refined class comparison.
@@ -528,7 +528,7 @@ class LatLonNvectorBase(LatLonBase):
            @see: Method L{trilaterate} for other and more details.
         '''
         if area:
-            notImplemented(self, area=area)
+            self._notImplemented(area=area)
 
         t = _trilaterate(self, distance1, self.others(point2=point2), distance2,
                                           self.others(point3=point3), distance3,

pygeodesy/osgr.py

@@ -34,8 +34,8 @@ from pygeodesy.datums import Datums, _ellipsoidal_datum, _WGS84
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
 from pygeodesy.errors import _parseX, _TypeError, _ValueError, \
                              _xkwds, _xkwds_get
-from pygeodesy.fmath import Fdot, fpowers, Fsum
-# from pygeodesy.fsums import Fsum  # from .fmath
+from pygeodesy.fmath import Fdot, fpowers
+from pygeodesy.fsums import _Fsumf_
 from pygeodesy.interns import MISSING, NN, _A_, _COLON_, _COMMA_, \
                              _COMMASPACE_, _DOT_, _ellipsoidal_, \
                              _latlon_, _not_, _SPACE_
@@ -121,10 +121,10 @@ class _NG(object):
     @Property_RO
     def Mabcd(self):  # meridional coefficients (a, b, c, d)
         n, n2, n3 = fpowers(self.ellipsoid.n, 3)
-        M = (Fsum(4,  4 * n,  5 * n2,  5 * n3) / 4,
-             Fsum(   24 * n, 24 * n2, 21 * n3) / 8,
-             Fsum(           15 * n2, 15 * n3) / 8,
-                                     (35 * n3 / 24))
+        M = (_Fsumf_(4,  4 * n,  5 * n2,  5 * n3) / 4,
+             _Fsumf_(   24 * n, 24 * n2, 21 * n3) / 8,
+             _Fsumf_(           15 * n2, 15 * n3) / 8,
+                                        (35 * n3 / 24))
         return M
 
     def Mabcd0(self, a):  # meridional arc, scaled
@@ -327,10 +327,10 @@ class Osgr(_NamedBase):
             e0 =     self.easting  - NG.eas0
             n0 = m = self.northing - NG.nor0
 
-            _M = NG.Mabcd0
-            a0 = NG.a0
-            a  = NG.phi0
-            _A = Fsum(a).fsum_
+            _M =  NG.Mabcd0
+            a0 =  NG.a0
+            a  =  NG.phi0
+            _A = _Fsumf_(a).fsum_
             for self._iteration in range(1, _TRIPS):
                 a = _A(m / a0)
                 m = n0 - _M(a)  # meridional arc
@@ -354,14 +354,14 @@ class Osgr(_NamedBase):
             d2  = d**2
 
             a = (d2 * ta * (-1 +  # Horner-like
-                 d2 / 12 * (Fsum( 5,  3 * ta2, -9 * ta2 * n2, n2) -
-                 d2 / 30 *  Fsum(61, 90 * ta2, 45 * ta4)))).fsum_(a)
+                 d2 / 12 * (_Fsumf_( 5,  3 * ta2, -9 * ta2 * n2, n2) -
+                 d2 / 30 *  _Fsumf_(61, 90 * ta2, 45 * ta4)))).fsum_(a)
 
-            b = (d  / ca * (1 -  # Horner-like
-                 d2 /  6 * (Fsum(v_r,  2 * ta2) -
-                 d2 / 20 * (Fsum( 5,  28 * ta2,   24 * ta4) +
-                 d2 / 42 *  Fsum(61, 662 * ta2, 1320 * ta4,
-                                     720 * ta2 * ta4))))).fsum_(NG.lam0)
+            b = (d  / ca * ( 1 -  # Horner-like
+                 d2 /  6 * (_Fsumf_(v_r,  2 * ta2) -
+                 d2 / 20 * (_Fsumf_( 5,  28 * ta2,   24 * ta4) +
+                 d2 / 42 *  _Fsumf_(61, 662 * ta2, 1320 * ta4,
+                                        720 * ta2 * ta4))))).fsum_(NG.lam0)
 
             r = _LLEB(degrees90(a), degrees180(b), datum=self.datum, name=self.name)
             r._iteration = self._iteration  # only ellipsoidal LatLon
@@ -652,14 +652,14 @@ def toOsgr(latlon, lon=None, kTM=False, datum=_WGS84, Osgr=Osgr, name=NN,  # MCC
         ta2 = -(ta**2)
         ta4 =   ta2**2
 
-        e = (d  *  v * (1 +  # Horner-like
-             d2 /  6 * (Fsum(v_r, ta2) +
-             d2 / 20 *  Fsum(5,  18 * ta2, ta4, 14 * n2,
-                            58 * n2 * ta2)))).fsum_(NG.eas0)
+        e = (d  *  v * ( 1 +  # Horner-like
+             d2 /  6 * (_Fsumf_(v_r, ta2) +
+             d2 / 20 *  _Fsumf_(5,  18 * ta2, ta4, 14 * n2,
+                               58 * n2 * ta2)))).fsum_(NG.eas0)
 
-        n = (d  *  t * (1 +  # Horner-like
-             d2 / 12 * (Fsum( 5, ta2,  9 * n2) +
-             d2 / 30 *  Fsum(61, ta4, 58 * ta2)))).fsum_(m0, NG.nor0)
+        n = (d  *  t * ( 1 +  # Horner-like
+             d2 / 12 * (_Fsumf_( 5, ta2,  9 * n2) +
+             d2 / 30 *  _Fsumf_(61, ta4, 58 * ta2)))).fsum_(m0, NG.nor0)
 
     p, kwds = _prec_kwds2(**prec_Osgr_kwds)
     if p is not MISSING:

pygeodesy/points.py

@@ -47,8 +47,8 @@ from pygeodesy.iters import LatLon2PsxyIter, PointsIter, points2
 from pygeodesy.latlonBase import LatLonBase, _latlonheight3, \
                                 _ALL_DOCS, _ALL_LAZY, _MODS
 # from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import classname, nameof, notImplemented, notOverloaded, \
-                           _NamedTuple
+from pygeodesy.named import classname, _NamedTuple, nameof, \
+                            notImplemented, notOverloaded
 from pygeodesy.namedTuples import Bounds2Tuple, Bounds4Tuple, LatLon2Tuple, \
                                   NearestOn3Tuple, NearestOn5Tuple, \
                                   Point3Tuple, Vector3Tuple, \
@@ -62,7 +62,7 @@ from pygeodesy.utily import atan2b, degrees90, degrees180, degrees2m, \
 from math import cos, fabs, fmod, radians, sin
 
 __all__ = _ALL_LAZY.points
-__version__ = '24.03.12'
+__version__ = '24.04.07'
 
 _ilat_  = 'ilat'
 _ilon_  = 'ilon'

pygeodesy/resections.py

@@ -20,7 +20,7 @@ from pygeodesy.constants import EPS, EPS0, EPS02, INT0, PI, PI2, PI_2, PI_4, \
 from pygeodesy.errors import _and, _or, TriangleError, _ValueError, _xcallable, \
                              _xkwds, _xkwds_pop2
 from pygeodesy.fmath import favg, Fdot, fidw, fmean, hypot, hypot2_
-from pygeodesy.fsums import Fsum, fsumf_, fsum1, fsum1f_
+from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1, fsum1f_
 from pygeodesy.interns import _a_, _A_, _area_, _b_, _B_, _c_, _C_, _coincident_, \
                               _colinear_, _d_, _eps_, _invalid_, _negative_, _not_, \
                               _rIn_, _SPACE_
@@ -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.04.04'
+__version__ = '24.04.14'
 
 _concyclic_ = 'concyclic'
 _PA_        = 'PA'
@@ -57,14 +57,6 @@ class Collins5Tuple(_NamedTuple):
     _Units_ = (_Pass,    _Pass,     Distance, Distance, Distance)
 
 
-def _F1(*xs):  # class
-    '''(INTERNAL) An L{Fsum}, 1-primed.
-    '''
-    F  =  Fsum(_1_0, *xs)
-    F += _N_1_0
-    return F
-
-
 class ResectionError(_ValueError):
     '''Error raised for issues in L{pygeodesy.resections}.
     '''
@@ -376,8 +368,8 @@ def _pierlot3(B1, B2, B3, a12, a23, useZ, cot):
     cot31 = cot(fsum1f_(c12 * s23,  s12 * c23),  # s31
                 fsum1f_(s12 * s23, -c12 * c23))  # c31
 
-    K = _F1(x3_ * x1_,  cot31 * (y3_ * x1_),
-            y3_ * y1_, -cot31 * (x3_ * y1_))
+    K = _Fsumf_(x3_ * x1_,  cot31 * (y3_ * x1_),
+                y3_ * y1_, -cot31 * (x3_ * y1_))
     if K:
         cot12 = cot(s12, c12)
         cot23 = cot(s23, c23)
@@ -392,16 +384,16 @@ def _pierlot3(B1, B2, B3, a12, a23, useZ, cot):
         # y31 = y3_ + y1_ - cot31 * (x3_ - x1_)
 
         # x12 - x23 = x1_ + cot12 * y1_ - x3_ + cot23 * y3_
-        X12_23 = _F1(x1_,  cot12 * y1_, -x3_,  cot23 * y3_)
+        X12_23 = _Fsumf_(x1_,  cot12 * y1_, -x3_,  cot23 * y3_)
         # y12 - y23 = y1_ - cot12 * x1_ - y3_ - cot23 * x3_
-        Y12_23 = _F1(y1_, -cot12 * x1_, -y3_, -cot23 * x3_)
+        Y12_23 = _Fsumf_(y1_, -cot12 * x1_, -y3_, -cot23 * x3_)
 
         # x31 - x23 = x3_ + x1_ + cot31 * (y3_ - y1_) - x3_ + cot23 * y3_
         #           = x1_ + cot31 * y3_ - cot31 * y1_ + cot23 * y3_
-        X31_23 = _F1(x1_, -cot31 * y1_,  cot31 * y3_,  cot23 * y3_)
+        X31_23 = _Fsumf_(x1_, -cot31 * y1_,  cot31 * y3_,  cot23 * y3_)
         # y31 - y23 = y3_ + y1_ - cot31 * (x3_ - x1_) - y3_ - cot23 * x3_
         #           = y1_ - cot31 * x3_ + cot31 * x1_ - cot23 * x3_
-        Y31_23 = _F1(y1_,  cot31 * x1_, -cot31 * x3_, -cot23 * x3_)
+        Y31_23 = _Fsumf_(y1_,  cot31 * x1_, -cot31 * x3_, -cot23 * x3_)
 
         # d = (x12 - x23) * (y23 - y31) + (x31 - x23) * (y12 - y23)
         #   = (x31 - x23) * (y12 - y23) - (x12 - x23) * (y31 - y23)
@@ -495,7 +487,7 @@ def _pierlotx3(a_z_Bs, useZ, cot, Cs):
     x1_, y1_, _ = B1.minus(B3).xyz
     x2_, y2_, _ = B2.minus(B3).xyz
 
-    K = _F1(y1_ * x2_, -x1_ * y2_)
+    K = _Fsumf_(y1_ * x2_, -x1_ * y2_)
     if K:
         cot23 = cot(*sincos2d(a23))
 
@@ -506,15 +498,15 @@ def _pierlotx3(a_z_Bs, useZ, cot, Cs):
         # y31 = y1_ - cot23 * x1_
 
         # x31 - x23 = x1_ + cot23 * y1_ - x2_ - cot23 * y2_
-        X31_23 = _F1(x1_,  cot23 * y1_, -x2_, -cot23 * y2_)
+        X31_23 = _Fsumf_(x1_,  cot23 * y1_, -x2_, -cot23 * y2_)
         # y31 - y23 = y1_ - cot23 * x1_ - y2_ + cot23 * x2_
-        Y31_23 = _F1(y1_, -cot23 * x1_, -y2_,  cot23 * x2_)
+        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 * _F1(x2_, -x1_) +
-                                                   Y31_23 * _F1(y2_, -y1_)))
+        x, y = _pierlotxy2(B3, K, Y31_23, X31_23, (X31_23 * _Fsumf_(x2_, -x1_) +
+                                                   Y31_23 * _Fsumf_(y2_, -y1_)))
     else:
         x, y, _ = B3.xyz
     return x, y, _zidw(x, y, useZ, B1, B2, B3)
@@ -974,7 +966,7 @@ def wildberger3(a, b, c, alpha, beta, R3=min):
     def _vpa(r3, q2, q3, s2, s3):
         r1 = s2 * q3 / s3
         r  = r1 * r3 * _4_0
-        n  = (r - _F1(r1, r3, -q2)**2).fover(s3)
+        n  = (r - _Fsumf_(r1, r3, -q2)**2).fover(s3)
         if n < 0 or r < EPS0:
             raise ValueError(_coincident_)
         return sqrt((n / r) * q3) if n else _0_0
@@ -994,11 +986,11 @@ def wildberger3(a, b, c, alpha, beta, R3=min):
             raise ValueError(_or(_coincident_, _colinear_))
 
         q4 =  hypot2_(*q) * _2_0  # a**4 + ...
-        Qs = _F1(*q)   # == hypot2_(a, b, c)
+        Qs = _Fsumf_(*q)   # == hypot2_(a, b, c)
         d0 = (Qs**2 - q4).fmul(s1 * s2).fover(s3)
         if d0 < 0:
             raise ValueError(_negative_)
-        s += _F1(*s),  # == fsum1(s),
+        s += _Fsumf_(*s),  # == fsum1(s),
         C0 =  Fdot(s, q1, q2, q3, -Qs * _0_5)
         r3 =  C0.fover(-s3)  # C0 /= -s3
         if d0 > EPS02:  # > c0