pygeodesy 24.8.24__py2.py3-none-any.whl → 24.9.24__py2.py3-none-any.whl

pygeodesy/rhumb/aux_.py

@@ -31,7 +31,8 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 from pygeodesy.auxilats.auxAngle import AuxMu, AuxPhi,  hypot
 from pygeodesy.auxilats.auxDLat import AuxDLat, _DClenshaw
 # from pygeodesy.auxilats.auxDST import AuxDST  # _MODS
-from pygeodesy.auxilats.auxily import _Dlam, _Dp0Dpsi, _Ufloats
+from pygeodesy.auxilats.auxily import _Dlam, _Dp0Dpsi
+from pygeodesy.auxilats._CX_Rs import _Rdict, _Rtuple
 from pygeodesy.basics import copysign0, _reverange,  _xkwds_get1
 from pygeodesy.constants import EPS_2, MANT_DIG, PI4, isinf, \
                                _0_0, _4_0, _720_0, _log2, _over
@@ -47,7 +48,7 @@ from pygeodesy.rhumb.bases import RhumbBase, RhumbLineBase, \
 from math import ceil as _ceil, fabs, radians
 
 __all__ = _ALL_LAZY.rhumb_aux_
-__version__ = '24.06.11'
+__version__ = '24.09.02'
 
 # DIGITS = (sizeof(real) * 8) bits
 #        = (ctypes.sizeof(ctypes.c_double(1.0)) * 8) bits
@@ -302,73 +303,54 @@ def _RAseries(auxD):
     Cs = _RACoeffs[aL]
     # assert len(Cs) == (aL * (aL + 1)) // 2
     pP = []
-    _P =  pP.append
     _p = _polynomial
     for m in _reverange(aL):  # order
         j  = i + m + 1
-        _P(_p(n, Cs, i, j) * d)
+        pP.append(_p(n, Cs, i, j) * d)
         d *= n
         i  = j
     # assert i == len(pP)
     return pP
 
 
-_f, _u = float, _Ufloats()
-_RACoeffs = {  # Rhumb Area Coefficients in matrix Q
- 4: _u(  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 4
-    596 / _f(2025), -398 / _f(945), 22 / _f(45), -1 / _f(3),
-    1543 / _f(4725), -118 / _f(315), 1 / _f(5),
-    152 / _f(945), -17 / _f(315),
-    5 / _f(252)),
- 5: _u(  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 5
-   -102614 / _f(467775), 596 / _f(2025), -398 / _f(945), 22 / _f(45),
-   -1 / _f(3),
-   -24562 / _f(155925), 1543 / _f(4725), -118 / _f(315), 1 / _f(5),
-   -38068 / _f(155925), 152 / _f(945), -17 / _f(315),
-   -752 / _f(10395), 5 / _f(252),
-   -101 / _f(17325)),
- 6: _u(  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 6
-    138734126 / _f(638512875), -102614 / _f(467775), 596 / _f(2025),
-    -398 / _f(945), 22 / _f(45), -1 / _f(3),
-    17749373 / _f(425675250), -24562 / _f(155925), 1543 / _f(4725),
-    -118 / _f(315), 1 / _f(5),
-    1882432 / _f(8513505), -38068 / _f(155925), 152 / _f(945),
-    -17 / _f(315),
-    268864 / _f(2027025), -752 / _f(10395), 5 / _f(252),
-    62464 / _f(2027025), -101 / _f(17325),
-    11537 / _f(4054050)),
- 7: _u(  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 7
-    -565017322 / _f(1915538625), 138734126 / _f(638512875),
-    -102614 / _f(467775), 596 / _f(2025), -398 / _f(945), 22 / _f(45),
-    -1 / _f(3),
-    -1969276 / _f(58046625), 17749373 / _f(425675250), -24562 / _f(155925),
-    1543 / _f(4725), -118 / _f(315), 1 / _f(5),
-    -58573784 / _f(638512875), 1882432 / _f(8513505), -38068 / _f(155925),
-    152 / _f(945), -17 / _f(315),
-    -6975184 / _f(42567525), 268864 / _f(2027025), -752 / _f(10395),
-    5 / _f(252),
-    -112832 / _f(1447875), 62464 / _f(2027025), -101 / _f(17325),
-    -4096 / _f(289575), 11537 / _f(4054050),
-    -311 / _f(525525)),
- 8: _u(  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 8
-    188270561816 / _f(488462349375), -565017322 / _f(1915538625),
-    138734126 / _f(638512875), -102614 / _f(467775), 596 / _f(2025),
-    -398 / _f(945), 22 / _f(45), -1 / _f(3),
-    2332829602 / _f(23260111875), -1969276 / _f(58046625),
-    17749373 / _f(425675250), -24562 / _f(155925), 1543 / _f(4725),
-    -118 / _f(315), 1 / _f(5),
-    -41570288 / _f(930404475), -58573784 / _f(638512875),
-    1882432 / _f(8513505), -38068 / _f(155925), 152 / _f(945),
-    -17 / _f(315),
-    1538774036 / _f(10854718875), -6975184 / _f(42567525),
-    268864 / _f(2027025), -752 / _f(10395), 5 / _f(252),
-    436821248 / _f(3618239625), -112832 / _f(1447875),
-    62464 / _f(2027025), -101 / _f(17325),
-    3059776 / _f(80405325), -4096 / _f(289575), 11537 / _f(4054050),
-    4193792 / _f(723647925), -311 / _f(525525),
-    1097653 / _f(1929727800))
-}
-del _f, _u, _Ufloats
+_RACoeffs = _Rdict(110,  # Rhumb Area Coefficients in matrix Q
+ _Rtuple(4, 10,  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 4
+    '596/2025, -398/945, 22/45, -1/3',
+    '1543/4725, -118/315, 1/5',
+    '152/945, -17/315',
+    '5/252'),
+ _Rtuple(5, 15,  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 5
+    '-102614/467775, 596/2025, -398/945, 22/45, -1/3',
+    '-24562/155925, 1543/4725, -118/315, 1/5',
+    '-38068/155925, 152/945, -17/315',
+    '-752/10395, 5/252',
+    '-101/17325'),
+ _Rtuple(6, 21,  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 6
+    '138734126/638512875, -102614/467775, 596/2025, -398/945, 22/45, -1/3',
+    '17749373/425675250, -24562/155925, 1543/4725, -118/315, 1/5',
+    '1882432/8513505, -38068/155925, 152/945, -17/315',
+    '268864/2027025, -752/10395, 5/252',
+    '62464/2027025, -101/17325',
+    '11537/4054050'),
+ _Rtuple(7, 28,  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 7
+    '-565017322/1915538625, 138734126/638512875, -102614/467775, 596/2025, -398/945, 22/45, -1/3',
+    '-1969276/58046625, 17749373/425675250, -24562/155925, 1543/4725, -118/315, 1/5',
+    '-58573784/638512875, 1882432/8513505, -38068/155925, 152/945, -17/315',
+    '-6975184/42567525, 268864/2027025, -752/10395, 5/252',
+    '-112832/1447875, 62464/2027025, -101/17325',
+    '-4096/289575, 11537/4054050',
+    '-311/525525'),
+ _Rtuple(8, 36,  # GEOGRAPHICLIB_RHUMBAREA_ORDER == 8
+    '188270561816/488462349375, -565017322/1915538625, 138734126/638512875, -102614/467775, 596/2025, -398/945, 22/45, -1/3',
+    '2332829602/23260111875, -1969276/58046625, 17749373/425675250, -24562/155925, 1543/4725, -118/315, 1/5',
+    '-41570288/930404475, -58573784/638512875, 1882432/8513505, -38068/155925, 152/945, -17/315',
+    '1538774036/10854718875, -6975184/42567525, 268864/2027025, -752/10395, 5/252',
+    '436821248/3618239625, -112832/1447875, 62464/2027025, -101/17325',
+    '3059776/80405325, -4096/289575, 11537/4054050',
+    '4193792/723647925, -311/525525',
+    '1097653/1929727800')
+)
+del _Rdict, _Rtuple
 
 __all__ += _ALL_DOCS(Caps)
 

pygeodesy/sphericalNvector.py

@@ -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__ = '24.06.11'
+__version__ = '24.09.23'
 
 _lines_ = 'lines'
 
@@ -491,7 +491,7 @@ class LatLon(LatLonNvectorBase, LatLonSphericalBase):
         # an exterior point will sum to 0°.  On a sphere, enclosed
         # point angles will sum to less than 360° (due to spherical
         # excess), exterior point angles will be small but non-zero.
-        s = fsum(_subtangles(points, wrap), floats=True)  # normal vector
+        s = fsum(_subtangles(points, wrap))  # normal vector
         # XXX are winding number optimisations equally applicable to
         # spherical surface?
         return fabs(s) > PI
@@ -846,7 +846,7 @@ def areaOf(points, radius=R_M, wrap=False):
         # angle between edges is π−α or π+α, where α is angle between
         # great-circle vectors; so sum α, then take n·π − |Σα| (cannot
         # use Σ(π−|α|) as concave polygons would fail)
-        s = fsum(_interangles(points, wrap), floats=True)
+        s = fsum(_interangles(points, wrap))
         # using Girard’s theorem: A = [Σθᵢ − (n−2)·π]·R²
         # (PI2 - abs(s) == (n*PI - abs(s)) - (n-2)*PI)
         r = fabs(PI2 - fabs(s))
@@ -1138,7 +1138,7 @@ def perimeterOf(points, closed=False, radius=R_M, wrap=False):
             notImplemented(None, closed=closed, points=_composite_)
         r = points._sum2(LatLon, perimeterOf, closed=True, radius=None, wrap=wrap)
     else:
-        r = fsum(_rads(points, closed, wrap), floats=True)
+        r = fsum(_rads(points, closed, wrap))
     return r if radius is None else (Radius(radius) * r)
 
 

pygeodesy/sphericalTrigonometry.py

@@ -54,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.08.13'
+__version__ = '24.09.23'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -1302,7 +1302,7 @@ def perimeterOf(points, closed=False, radius=R_M, wrap=True):
             raise _ValueError(closed=closed, points=_composite_)
         r = points._sum2(LatLon, perimeterOf, closed=True, radius=radius, wrap=wrap)
     else:
-        r = fsum(_rads(points, closed, wrap), floats=True)
+        r = fsum(_rads(points, closed, wrap))
     return _radians2m(r, radius)
 
 

pygeodesy/triaxials.py

@@ -33,7 +33,7 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 from pygeodesy.basics import isLatLon, isscalar, _ValueError
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INT0, PI2, PI_3, PI4, \
                                _EPS2e4, float0_, isfinite, isnear1, _over, \
-                               _0_0, _0_5, _1_0, _N_1_0,  _4_0  # PYCHOK used!
+                               _0_0, _0_5, _1_0, _N_1_0, _64_0,  _4_0  # PYCHOK used!
 from pygeodesy.datums import Datum, _spherical_datum, _WGS84,  Ellipsoid, _EWGS84, Fmt
 # from pygeodesy.ellipsoids import Ellipsoid, _EWGS84  # from .datums
 # from pygeodesy.elliptic import Elliptic  # _MODS
@@ -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.08.18'
+__version__ = '24.08.26'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -1157,7 +1157,7 @@ Triaxials = Triaxials(Triaxial, Triaxial_)  # PYCHOK singleton
 # <https://link.Springer.com/article/10.1007/s00190-022-01650-9>
 _abc84_35 = (_EWGS84.a + 35), (_EWGS84.a - 35), _EWGS84.b
 Triaxials._assert(                 # a (Km)       b (Km)     c (Km)     planet
-    Amalthea  = _lazy('Amalthea',  125.0,        73.0,      64.0),    # Jupiter
+    Amalthea  = _lazy('Amalthea',  125.0,        73.0,     _64_0),    # Jupiter
     Ariel     = _lazy('Ariel',     581.1,       577.9,     577.7),    # Uranus
     Earth     = _lazy('Earth',    6378.173435, 6378.1039, 6356.7544),
     Enceladus = _lazy('Enceladus', 256.6,       251.4,     248.3),    # Saturn