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

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)

pygeodesy/triaxials.py

@@ -40,7 +40,7 @@ from pygeodesy.datums import Datum, _spherical_datum, _WGS84,  Ellipsoid, _EWGS8
 # from pygeodesy.elliptic import Elliptic  # _MODS
 # from pygeodesy.errors import _ValueError  # from .basics
 from pygeodesy.fmath import Fdot, fdot, fmean_, hypot, hypot_, norm2, sqrt0
-from pygeodesy.fsums import Fsum, fsumf_, fsum1f_
+from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
 from pygeodesy.interns import NN, _a_, _b_, _beta_, _c_, _distant_, _finite_, \
                              _height_, _inside_, _near_, _negative_, _not_, \
                              _NOTEQUAL_, _null_, _opposite_, _outside_, _SPACE_, \
@@ -59,7 +59,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 from math import atan2, fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '24.01.21'
+__version__ = '24.04.14'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -805,8 +805,8 @@ class Triaxial(Triaxial_):
         c2_a2   = -self._1e2ac  # == -(c/a)**2
         a2c2_a2 =  self.  e2ac  # (a**2 - c**2) / a**2 == 1 - (c/a)**2
 
-        x2 = Fsum(_1_0, -b2_a2 * sa**2, c2_a2 * ca**2).fover(a2c2_a2)
-        z2 = Fsum(c2_a2,         sb**2, b2_a2 * cb**2).fover(a2c2_a2)
+        x2 = _Fsumf_(_1_0, -b2_a2 * sa**2, c2_a2 * ca**2).fover(a2c2_a2)
+        z2 = _Fsumf_(c2_a2,         sb**2, b2_a2 * cb**2).fover(a2c2_a2)
 
         x, y, z = self._abc3
         x *= cb * sqrt0(x2, Error=TriaxialError)

pygeodesy/utmupsBase.py

@@ -17,7 +17,7 @@ from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, \
                              _gamma_, _n_a_, _not_, _N_, _NS_, _PLUS_, \
                              _scale_, _SPACE_, _Y_, _Z_, _under
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _NamedBase, nameof, notOverloaded, _xnamed
+from pygeodesy.named import _NamedBase, nameof, _xnamed
 from pygeodesy.namedTuples import EasNor2Tuple, LatLonDatum5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, _update_all, \
                             deprecated_property_RO, Property_RO, property_RO
@@ -26,7 +26,7 @@ from pygeodesy.units import Band, Easting, Northing, Scalar, Zone
 from pygeodesy.utily import _Wrap, wrap360
 
 __all__ = _ALL_LAZY.utmupsBase
-__version__ = '23.11.29'
+__version__ = '24.04.07'
 
 _UPS_BANDS = _A_, _B_, _Y_, _Z_  # UPS polar bands SE, SW, NE, NW
 # _UTM_BANDS = _MODS.utm._Bands
@@ -170,7 +170,7 @@ class UtmUpsBase(_NamedBase):
         '''
         E = self._Error
         if not E:  # PYCHOK no cover
-            notOverloaded(self, callername=_under(_Error_))
+            self._notOverloaded(callername=_under(_Error_))
 
         self._easting  = Easting(easting,   Error=E)
         self._northing = Northing(northing, Error=E)
@@ -203,7 +203,7 @@ class UtmUpsBase(_NamedBase):
         if band:
             _xinstanceof(str, band=band)
 #           if not self._Bands:  # PYCHOK no cover
-#               notOverloaded(self, callername=_under('Bands'))
+#               self._notOverloaded(callername=_under('Bands'))
             if band not in self._Bands:
                 t = _or(*sorted(set(map(repr, self._Bands))))
                 raise self._Error(band=band, txt=_not_(t))
@@ -276,7 +276,7 @@ class UtmUpsBase(_NamedBase):
     @Property_RO
     def falsed2(self):  # PYCHOK no cover
         '''I{Must be overloaded}.'''
-        notOverloaded(self)
+        self._notOverloaded(self)
 
     @Property_RO
     def gamma(self):
@@ -374,7 +374,7 @@ class UtmUpsBase(_NamedBase):
 
     def _toLLEB(self, **kwds):  # PYCHOK no cover
         '''(INTERNAL) I{Must be overloaded}.'''
-        notOverloaded(self, **kwds)
+        self._notOverloaded(**kwds)
 
     def toMgrs(self, center=False):
         '''Convert this UTM/UPS coordinate to an MGRS grid reference.

pygeodesy/vector2d.py

@@ -12,7 +12,7 @@ from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INF, INT0, \
 from pygeodesy.errors import _and, _AssertionError, IntersectionError, NumPyError, \
                               PointsError, TriangleError, _xError, _xkwds
 from pygeodesy.fmath import fabs, fdot, hypot, hypot2_, sqrt
-from pygeodesy.fsums import Fsum, fsumf_, fsum1f_
+from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
 from pygeodesy.interns import NN, _a_, _and_, _b_, _c_, _center_, _coincident_, \
                              _colinear_, _COMMASPACE_, _concentric_, _few_, \
                              _intersection_, _invalid_, _near_, _no_, _of_, \
@@ -30,7 +30,7 @@ from contextlib import contextmanager
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector2d
-__version__ = '23.11.17'
+__version__ = '24.04.18'
 
 _cA_        = 'cA'
 _cB_        = 'cB'
@@ -354,10 +354,11 @@ def _meeus4(A, point2, point3, circum=False, useZ=True, clas=None, **clas_kwds):
         a, c, A, C = c, a, C, A
 
     if a > EPS02 and (circum or a < (b + c)):  # circumradius
-        b = sqrt(b / a)
-        c = sqrt(c / a)
-        R = Fsum(_1_0, b, c) * Fsum(_1_0, b, -c) * Fsum(_1_0, -b, c) * Fsum(_N_1_0, b, c)
-        r = R.fover(a)
+        b =  sqrt(b / a)
+        c =  sqrt(c / a)
+        R = _Fsumf_(_1_0,  b, c) * _Fsumf_(_1_0,   b, -c) * \
+            _Fsumf_(_1_0, -b, c) * _Fsumf_(_N_1_0, b,  c)
+        r =  R.fover(a)
         if r < EPS02:
             raise IntersectionError(_coincident_ if b < EPS0 or c < EPS0 else (
                                     _colinear_ if _iscolinearWith(A, B, C) else _invalid_))
@@ -503,8 +504,8 @@ def _radii11ABC(point1, point2, point3, useZ=True):
     b = C.minus(A).length
     c = A.minus(B).length
 
-    S = Fsum(a, b, c) * _0_5
-    s = float(S)  # semi-perimeter
+    S = _Fsumf_(a, b, c) * _0_5
+    s =  float(S)  # semi-perimeter
     if s > EPS0:
         rs = float(S - a), float(S - b), float(S - c)
         r3, r2, r1 = sorted(rs)  # r3 <= r2 <= r1