pygeodesy 25.10.10__py2.py3-none-any.whl → 25.12.12__py2.py3-none-any.whl

pygeodesy/errors.py

@@ -28,7 +28,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _PYTHON_X_DEV
 from copy import copy as _copy
 
 __all__ = _ALL_LAZY.errors  # _ALL_DOCS('_InvalidError', '_IsnotError')  _under
-__version__ = '25.09.04'
+__version__ = '25.12.02'
 
 _argument_   = 'argument'
 _basics      = _MODS.into(basics=__name__)
@@ -214,7 +214,8 @@ class CrossError(_ValueError):
 
 class GeodesicError(_ValueError):
     '''Error raised for convergence or other issues in L{geodesicx<pygeodesy.geodesicx>},
-       L{geodesicw<pygeodesy.geodesicw>} or L{karney<pygeodesy.karney>}.
+       L{geodesicw<pygeodesy.geodesicw>}, L{geodsolve<pygeodesy.geodsolve>} or
+       L{karney<pygeodesy.karney>}.
     '''
     pass
 
@@ -626,7 +627,10 @@ def _xattr(obj, **name_default):
     '''
     if len(name_default) == 1:
         for n, d in name_default.items():
-            return getattr(obj, n, d)
+            try:  # obj is tuple
+                return getattr(obj, n, d)
+            except ValueError:
+                return d
     raise _xAssertionError(_xattr, obj, **name_default)
 
 
@@ -928,7 +932,7 @@ def _xStrError(*Refs, **name_value_Error):  # in .gars, .geohash, .wgrs
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/etm.py

@@ -1197,7 +1197,7 @@ if __name__ == _DMAIN_:  # MCCABE 16
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/fmath.py

@@ -25,7 +25,7 @@ from math import fabs, sqrt  # pow
 import operator as _operator  # in .datums, .trf, .utm
 
 __all__ = _ALL_LAZY.fmath
-__version__ = '25.09.15'
+__version__ = '25.12.02'
 
 # sqrt(2) - 1 <https://WikiPedia.org/wiki/Square_root_of_2>
 _0_4142  =  0.41421356237309504880  # ~ 3_730_904_090_310_553 / 9_007_199_254_740_992
@@ -260,7 +260,6 @@ def bqrt(x):
 
 try:
     from math import cbrt as _cbrt  # Python 3.11+
-
 except ImportError:  # Python 3.10-
 
     def _cbrt(x):
@@ -314,8 +313,9 @@ def euclid(x, y):
        @see: Function L{euclid_}.
     '''
     x, y = abs(x), abs(y)  # NOT fabs!
-    return (x + y * _0_4142) if x > y else \
-           (y + x * _0_4142)  # * _0_5 before 20.10.02
+    if x < y:
+        x, y = y, x
+    return x + y * _0_4142  # * _0_5 before 20.10.02
 
 
 def euclid_(*xs):
@@ -332,10 +332,17 @@ def euclid_(*xs):
     e = _0_0
     for x in sorted(map(abs, xs)):  # NOT fabs, reverse=True!
         # e = euclid(x, e)
-        if e < x:
-            e, x = x, e
         if x:
-            e += x * _0_4142
+            if e < x:
+                e, x = x, e
+            x *= _0_4142
+#           s  = e + x
+#           if e < x:  # like .fsums._2sum
+#               x -= s  # e = (x - s) + e
+#           else:
+#               e -= s  # e = (e - s) + x
+            e += x
+#           e += s
     return e
 
 
@@ -1115,7 +1122,7 @@ def zqrt(x):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/formy.py

@@ -11,7 +11,7 @@ from pygeodesy.basics import _copysign, _isin  # _args_kwds_count2
 from pygeodesy.constants import EPS, EPS0, EPS1, PI, PI2, PI3, PI_2, R_M, \
                                _0_0s, float0_, isnon0, remainder, _umod_PI2, \
                                _0_0, _0_125, _0_25, _0_5, _1_0, _2_0, _4_0, \
-                               _90_0, _180_0, _360_0
+                               _90_0, _180_0, _360_0, MANT_DIG as _DIG53
 from pygeodesy.datums import Datum, Ellipsoid, _ellipsoidal_datum, \
                             _mean_radius, _spherical_datum, _WGS84,  _EWGS84
 # from pygeodesy.ellipsoids import Ellipsoid, _EWGS84  # from .datums
@@ -27,7 +27,7 @@ from pygeodesy.named import _name__, _name2__, _NamedTuple, _xnamed,  typename
 from pygeodesy.namedTuples import Bearing2Tuple, Distance4Tuple, LatLon2Tuple, \
                                   Intersection3Tuple, PhiLam2Tuple
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
-# from pygeodesy.triaxials import _hartzell3  # _MODS
+# from pygeodesy.triaxials.triaxial5 import _hartzell3  # _MODS
 from pygeodesy.units import _isDegrees, _isHeight, _isRadius, Bearing, Degrees_, \
                              Distance, Distance_, Height, Lamd, Lat, Lon, Meter_, \
                              Phid, Radians, Radians_, Radius, Radius_, Scalar, _100km
@@ -42,10 +42,11 @@ from contextlib import contextmanager
 from math import atan, cos, degrees, fabs, radians, sin, sqrt  # pow
 
 __all__ = _ALL_LAZY.formy
-__version__ = '25.05.12'
+__version__ = '25.12.12'
 
 _RADIANS2 =  radians(_1_0)**2  # degree to radians-squared
 _ratio_   = 'ratio'
+_TOL53    =  sqrt(pow(_0_5, _DIG53))  # elliperim
 _xline_   = 'xline'
 
 
@@ -367,6 +368,107 @@ def _dS(fun_, radius, wrap, *lls, **adjust):
     return r * radius
 
 
+def elliperim(a, b):
+    '''Compute the perimeter of an ellipse with semi-axes C{a} and C{b} using U{SciPy's
+       ellipe<https://www.JohnDCook.com/perimeter_ellipse.html>} function or the U{AGM
+       <https://PaulBourke.net/geometry/ellipsecirc>} (Arithmetic Geometric Mean) method.
+
+       @return: The perimeter (C{scalar}, same units as C{a} and C{b}).
+    '''
+    if a < b:
+        a, b = b, a
+    if 0 < b < a:
+        try:
+            from scipy.special import ellipe
+            a *= float(ellipe(_1_0 - (b / a)**2)) * _4_0
+        except (AttributeError, ImportError):
+            # relative accuracy is about _TOL53**2
+            if (b * _DIG53) > (a * _TOL53):
+                c = a + b
+                d = a - b
+                m, s = -1, [c**2]
+                _s = s.append
+                while d > (b * _TOL53) and len(s) < 32:  # 4..5 trips
+                    b  = sqrt(a * b)
+                    a  = c * _0_5
+                    c  = a + b
+                    d  = a - b
+                    m *= 2
+                    _s(m * d**2)
+                a = fsumf_(*s) * PI / c
+            else:  # near flat
+                a *= _4_0
+    elif b < 0:
+        raise _ValueError(unstr(elliperim, a, b))
+    else:  # circle or flat
+        a *= PI2 if b else _4_0
+    return a
+
+
+# def elliperimR2(a, b):
+#     '''Compute the perimeter of an ellipse with semi-axes C{a} and C{b} using
+#        Ramanujan's U{2nd approximation<https://PaulBourke.net/geometry/ellipsecirc>}.
+#     '''
+#     if a < 0 or b < 0:
+#         raise ValueError(unstr(elliperimR2, a, b))
+#     p = a + b
+#     if p:
+#         t  = ((a - b) / p)**2 * _3_0
+#         t  = t / (_10_0 + sqrt(_4_0 - t)) + _1_0
+#         p *= t * PI
+#     return p
+
+
+# def elliperim4arc3(a, b):
+#     '''Compute the perimeter of an ellipse with semi-axes C{a} and C{b} using
+#        the U{4 arc approximation<https://PaulBourke.net/geometry/ellipsecirc>}.
+#
+#        @return: 3-Tuple C{(p, ra, rb)} with perimeter C{p}, arc radius C{ra}
+#                 at the major and arc radius C{rb} at the minor semi-axes.
+#     '''
+#     _r = a < b
+#     if _r:
+#         a, b = b, a
+#     if 0 < b < a:
+#         h = hypot(a, b)
+#         L = (h - b) * _0_5
+#         p = atan2(b, a)
+#         s, c = sincos2(p)
+#         ra =  L / c
+#         rb = (h - L) / s
+#         p  = rb * p + ra * (PI_2 - p)
+#     elif b < 0:
+#         raise ValueError(unstr(elliperim4arc3, a, b))
+#     elif b == a:
+#         ra = rb = a
+#         p = a * PI_2
+#     else:  # b == 0
+#         ra, rb = _0_0, a
+#         p = a
+#     p *= _4_0
+#     if _r:
+#         ra, rb = rb, ra
+#     return p, ra, rb
+
+
+# def elliperimGKS(a, b):
+#     '''Compute the perimeter of an ellipse with semi-axes C{a} and C{b} using the U{Gauss-Kummer
+#        Series<https://www.JohnDCook.com/blog/2023/05/28/approximate-ellipse-perimeter/>}.
+#     '''
+#     if a < b:
+#         a, b = b, a
+#     if b < 0:
+#         raise ValueError(unstr(elliperimGKS, a, b))
+#     if b:
+#         p  =  a + b
+#         h  = (a - b) / p
+#         h *=  h
+#         p *= (1 + h * (1 / 4 + h * (1 / 64 + h * (1 / 256 + h * (25 / 16384 + h * (49 / 65536)))))) * PI
+#     else:
+#         p  = _4_0 * a
+#     return p
+
+
 def _ellipsoidal(earth, where):
     '''(INTERNAL) Helper for distances.
     '''
@@ -926,7 +1028,7 @@ def hartzell(pov, los=False, earth=_WGS84, **name_LatLon_and_kwds):
     n, kwds = _name2__(name_LatLon_and_kwds, name__=hartzell)
     try:
         D = _spherical_datum(earth, name__=hartzell)
-        r, h, i = _MODS.triaxials._hartzell3(pov, los, D.ellipsoid._triaxial)
+        r, h, i = _MODS.triaxials.triaxial5._hartzell3(pov, los, D.ellipsoid._triaxial)
 
         C = _MODS.cartesianBase.CartesianBase
         if kwds:
@@ -1663,7 +1765,7 @@ def vincentys_(phi2, phi1, lam21):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/frechet.py

@@ -906,7 +906,7 @@ if __name__ == _DMAIN_:
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/fstats.py

@@ -804,7 +804,7 @@ __all__ += _ALL_DOCS(_FstatsBase, _FstatsNamed)
 
 # **) MIT License
 #
-# Copyright (C) 2021-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2021-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/fsums.py

@@ -2863,7 +2863,7 @@ if __name__ == _DMAIN_:
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/gars.py

@@ -344,7 +344,7 @@ __all__ += _ALL_DOCS(decode3,  # functions
 
 # **) MIT License
 #
-# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2026 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),