pygeodesy 24.4.2__py2.py3-none-any.whl → 24.4.12__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

@@ -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.07'
 
 
 def _ALL_OTHER(*objs):

pygeodesy/ltp.py

@@ -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.07'
 
 _height0_ = _height_ + _0_
 _narrow_  = 'narrow'

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/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

@@ -13,9 +13,10 @@ L{triAngle}, L{triAngle5}, L{triSide}, L{triSide2} and L{triSide4}.
 from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import map1, map2, _zip,  _ALL_LAZY
-from pygeodesy.constants import EPS, EPS0, EPS02, INT0, NEG0, PI, PI2, PI_2, PI_4, \
-                               _0_0, _0_5, _1_0, _N_1_0, _2_0, _N_2_0, _4_0, _16_0, \
-                               _180_0, _360_0, isnear0, _over, _umod_360
+from pygeodesy.constants import EPS, EPS0, EPS02, INT0, PI, PI2, PI_2, PI_4, \
+                               _0_0, _0_5, _1_0, _N_1_0, _2_0, _N_2_0, _4_0, \
+                               _16_0, _180_0, _360_0, _copysign_0_0, isnear0, \
+                               _over, _umod_360
 from pygeodesy.errors import _and, _or, TriangleError, _ValueError, _xcallable, \
                              _xkwds, _xkwds_pop2
 from pygeodesy.fmath import favg, Fdot, fidw, fmean, hypot, hypot2_
@@ -33,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.03.26'
+__version__ = '24.04.04'
 
 _concyclic_ = 'concyclic'
 _PA_        = 'PA'
@@ -457,7 +458,7 @@ def pierlotx(point1, point2, point3, alpha1, alpha2, alpha3, useZ=False,
 
     def _cot(s, c):  # I{exact} cotangent
         try:
-            return (c / s) if c else (NEG0 if s < 0 else _0_0)
+            return (c / s) if c else _copysign_0_0(s)
         except ZeroDivisionError:
             raise ValueError(_or(_coincident_, _colinear_))
 

pygeodesy/rhumb/bases.py

@@ -39,7 +39,6 @@ from pygeodesy.karney import _atan2d, Caps, _CapsBase, _diff182, _fix90, \
                              _norm180, GDict
 # from pygeodesy.ktm import KTransverseMercator, _AlpCoeffs  # _MODS
 from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS
-# from pygeodesy.named import notOverloaded  # _MODS
 from pygeodesy.namedTuples import Distance2Tuple, LatLon2Tuple
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
                             property_RO, _update_all
@@ -52,7 +51,7 @@ from pygeodesy.vector3d import _intersect3d3, Vector3d  # in .Intersection below
 from math import cos, fabs
 
 __all__ = ()
-__version__ = '24.03.16'
+__version__ = '24.04.07'
 
 _anti_ = _Dash('anti')
 _rls   = []  # instances of C{RbumbLine...} to be updated
@@ -367,7 +366,7 @@ class RhumbBase(_CapsBase):
 
     def _Inverse4(self, lon12, r, outmask):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, lon12, r, Caps.toStr(outmask))
+        self._notOverloaded(lon12, r, Caps.toStr(outmask))  # underOK=True
 
     def Inverse8(self, lat1, lon1, azi12, s12, outmask=Caps.AZIMUTH_DISTANCE_AREA):
         '''Like method L{Rhumb.Inverse} but returning a L{Rhumb8Tuple} with area C{S12}.
@@ -417,11 +416,11 @@ class RhumbBase(_CapsBase):
     @property_RO
     def _RhumbLine(self):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, underOK=True)
+        self._notOverloaded(underOK=True)
 
     def _S12d(self, s1, s2, lon):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, s1, s2, lon)
+        self._notOverloaded(s1, s2, lon)  # underOK=True
 
     @Property
     def TMorder(self):
@@ -787,11 +786,11 @@ class RhumbLineBase(_CapsBase):
     @property_RO
     def _mu1(self):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, underOK=True)
+        self._notOverloaded(underOK=True)
 
     def _mu2lat(self, mu2):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, mu2, underOK=True)
+        self._notOverloaded(mu2)  # underOK=True
 
     @deprecated_method
     def nearestOn4(self, lat0, lon0, **exact_eps_est_tol):  # PYCHOK no cover
@@ -808,27 +807,27 @@ class RhumbLineBase(_CapsBase):
         return self.PlumbTo(lat0, lon0, **exact_eps_est_tol)
 
     def PlumbTo(self, lat0, lon0, exact=None, eps=EPS, est=None, tol=_TOL):
-        '''Compute the I{perpendicular} intersection of this rumb line with a geodesic
-           from the given point, in part transcoded from I{Karney}'s C++ U{rhumb-intercept
-           <https://SourceForge.net/p/geographiclib/discussion/1026620/thread/2ddc295e/>}.
-
-           @arg lat0: Latitude of the point (C{degrees}).
-           @arg lon0: Longitude of the point (C{degrees}).
-           @kwarg exact: If C{None}, use a rhumb line perpendicular to this rhumb
-                         line, otherwise use an I{exact} C{Geodesic...} from the
-                         given point perpendicular to this rhumb line (C{bool} or
-                         C{Geodesic...}), see method L{Ellipsoid.geodesic_}.
+        '''Compute the I{perpendicular} intersection of this rhumb line with a geodesic
+           from the given point (transcoded from I{Karney}'s C++ U{rhumb-intercept
+           <https://SourceForge.net/p/geographiclib/discussion/1026620/thread/2ddc295e/>}).
+
+           @arg lat0: Latitude of the point on the geodesic (C{degrees}).
+           @arg lon0: Longitude of the point on the geodesic (C{degrees}).
+           @kwarg exact: If C{None}, use a rhumb line perpendicular to this rhumb line,
+                         otherwise use an I{exact} C{Geodesic...} from the given point
+                         perpendicular to this rhumb line (C{bool} or C{Geodesic...}),
+                         see method L{Ellipsoid.geodesic_}.
            @kwarg eps: Optional tolerance for L{pygeodesy.intersection3d3} (C{EPS}),
                        used only if C{B{exact} is None}.
-           @kwarg est: Optional, initial estimate for the distance C{s12} of the
-                       intersection I{along} this rhumb line (C{meter}), used only
-                       if C{B{exact} is not None}.
+           @kwarg est: Optionally, an initial estimate for the distance C{s12} of the
+                       intersection I{along} this rhumb line (C{meter}), used only if
+                       C{B{exact} is not None}.
            @kwarg tol: Longitudinal convergence tolerance (C{degrees}) or distance
                        tolerance (C(meter)) when C{B{exact} is None}, respectively
                        C{not None}.
 
            @return: The intersection point on this rhumb line, a L{GDict} from method
-                    L{Intersection} if B{C{exact}=None}.  If B{C{exact}} is not C{None},
+                    L{Intersection} if B{C{exact}=None}.  If C{B{exact} is not None},
                     a L{Position}-like L{GDict} of 13 items C{azi12, a12, s12, lat2,
                     lat1, lat0, lon2, lon1, lon0, azi0, a02, s02, at} with distance
                     C{a02} in C{degrees} and C{s02} in C{meter} between the given point
@@ -876,7 +875,7 @@ class RhumbLineBase(_CapsBase):
                 _d2  = _diff182
                 _ErT =  E.rocPrimeVertical  # aka rocTransverse
                 _ovr = _over
-                _S12 =  Fsum(s12).fsum2_
+                _S12 =  Fsum(s12).fsum2f_
                 _scd =  sincos2d_
                 for i in range(1, _TRIPS):  # 9+, suffix 1 == C++ 2, 2 == C++ 3
                     P =  self.Position(s12)  # outmask=Cs.LATITUDE_LONGITUDE
@@ -886,7 +885,7 @@ class RhumbLineBase(_CapsBase):
                     c2 *= _ErT(r.lat2)
                     s  *= _ovr(s2 * self._salp, c2) - _ovr(s * r.M21, r.m12)
                     s12, t = _S12(c / s)  # XXX _ovr?
-                    if _abs(t) < tol:  # or fabs(c) < EPS
+                    if _abs(t) < tol:  # or _abs(c) < EPS
                         break
                 P.set_(azi0=r.azi1, a02=r.a12, s02=r.s12,  # azi2=r.azi2,
                        lat0=lat0, lon0=lon0, iteration=i, at=r.azi2 - self.azi12,
@@ -967,7 +966,7 @@ class RhumbLineBase(_CapsBase):
 
     def _Position4(self, a12, mu2, s12, mu12):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        _MODS.named.notOverloaded(self, a12, s12, mu2, mu12)
+        self._notOverloaded(a12, s12, mu2, mu12)  # underOK=True
 
     @Property_RO
     def rhumb(self):
@@ -1085,7 +1084,7 @@ if __name__ == '__main__':
         r = rh.Inverse8(40.6, -73.8, 35.8, 140.3)  # JFK to Tokyo Narita
         _ref('# JFK-NRT azi12=%.12f, s12=%.3f S12=%.1f', (r.azi12, r.s12, r.S12), NRT)
 
-# % python3 -m pygeodesy.rhumb.bases
+# % python3.10 -m pygeodesy3.rhumb.Bases
 
 # Position.lon2 11.61455846901637 vs 11.61455846901637, diff 3.05885e-16
 # Position.lon2 7.58982302826842 vs 7.58982302826842, diff 2.34045e-16

pygeodesy/sphericalNvector.py

@@ -43,12 +43,12 @@ from pygeodesy.fmath import fmean, fsum
 from pygeodesy.interns import _composite_, _end_, _Nv00_, _other_, \
                               _point_, _pole_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
-# from pygeodesy.named import notImplemented  # from .nvectorBase
+# from pygeodesy.named import notImplemented  # from .points
 # from pygeodesy.namedTuples import NearestOn3Tuple  # from .points
-from pygeodesy.nvectorBase import LatLonNvectorBase, NorthPole, \
-                                  notImplemented, NvectorBase, _nsumOf, \
-                                  _triangulate, _trilaterate
-from pygeodesy.points import NearestOn3Tuple, ispolar  # PYCHOK exported
+from pygeodesy.nvectorBase import LatLonNvectorBase, NorthPole, _nsumOf, \
+                                  NvectorBase, _triangulate, _trilaterate
+from pygeodesy.points import NearestOn3Tuple, notImplemented, \
+                             ispolar  # PYCHOK exported
 from pygeodesy.props import deprecated_function, deprecated_method, \
                             property_RO
 from pygeodesy.sphericalBase import _m2radians, CartesianSphericalBase, \
@@ -61,7 +61,7 @@ from pygeodesy.utily import atan2, degrees360, fabs, sincos2, sincos2_, \
 # from math import atan2, fabs  # from utily
 
 __all__ = _ALL_LAZY.sphericalNvector
-__version__ = '23.12.18'
+__version__ = '24.04.07'
 
 _lines_ = 'lines'
 

pygeodesy/sphericalTrigonometry.py

@@ -34,12 +34,11 @@ from pygeodesy.interns import _1_, _2_, _coincident_, _composite_, _colinear_, \
                               _line_, _near_, _not_, _null_, _parallel_, _point_, \
                               _SPACE_, _too_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
-# from pygeodesy.named import notImplemented  # from .points
 # from pygeodesy.nvectorBase import NvectorBase, sumOf  # _MODE
 from pygeodesy.namedTuples import LatLon2Tuple, LatLon3Tuple, NearestOn3Tuple, \
                                   Triangle7Tuple, Triangle8Tuple
 from pygeodesy.points import ispolar, nearestOn5 as _nearestOn5, \
-                             Fmt as _Fmt, notImplemented  # XXX shadowed
+                             Fmt as _Fmt  # XXX shadowed
 from pygeodesy.props import deprecated_function, deprecated_method
 from pygeodesy.sphericalBase import _m2radians, CartesianSphericalBase, \
                                     _intersecant2, LatLonSphericalBase, \
@@ -55,7 +54,7 @@ from pygeodesy.vector3d import sumOf, Vector3d
 from math import asin, atan2, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '24.02.18'
+__version__ = '24.04.07'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -567,7 +566,7 @@ class LatLon(LatLonSphericalBase):
         # remove kwarg B{C{within}} if present
         w, kwds = _xkwds_pop2(wrap_adjust_limit, within=True)
         if not w:
-            notImplemented(self, within=w)
+            self._notImplemented(within=w)
 
 #       # UNTESTED - handle C{B{within}=False} and C{B{within}=True}
 #       wrap = _xkwds_get(options, wrap=False)