pygeodesy 25.8.25__py2.py3-none-any.whl → 25.9.9__py2.py3-none-any.whl

pygeodesy/__init__.py

@@ -125,7 +125,7 @@ C{epydoc --html --no-private --no-source --name=pygeodesy --url=... -v pygeodesy
 Tests
 =====
 
-The tests ran with Python 3.13.5 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0),
+The tests ran with Python 3.13.7 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.1),
 Python 3.12.7 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0,
 U{numpy<https://PyPI.org/project/numpy>} 2.1.0, U{scipy<https://PyPI.org/project/scipy>} 1.14.1,
 U{GeodSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.5,
@@ -150,13 +150,13 @@ env variable C{PYGEODESY_WARNINGS=on} for all Python versions.  The results of t
 the distribution files.
 
 Test coverage has been measured with U{coverage<https://PyPI.org/project/coverage>} 7.6.1 using Python
-3.13.5, 3.12.7, 3.11.5 and 3.10.8.  The complete coverage report in HTML and a PDF summary are included in
+3.13.7, 3.12.7, 3.11.5 and 3.10.8.  The complete coverage report in HTML and a PDF summary are included in
 the distribution files.
 
-Python 3.13.5, 3.12.7, 3.11.5 and 3.10.8 run on Apple M4 Si (C{arm64}), I{natively}.  Python 2.7.18 runs
+Python 3.13.7, 3.12.7, 3.11.5 and 3.10.8 run on Apple M4 Si (C{arm64}), I{natively}.  Python 2.7.18 runs
 on Intel (C{x86_64}) or Intel I{emulation} ("C{arm64_x86_64}", see function L{machine<pygeodesy.machine>}).
 
-The tests also ran with Python 3.13.5 (and U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0) on
+The tests also ran with Python 3.13.7 (and U{geographiclib<https://PyPI.org/project/geographiclib>} 2.1) on
 U{Debian 12<https://Cirrus-CI.com/github/mrJean1/PyGeodesy/master>} in 64-bit only, with Python 3.12.8 (and
 U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0) on U{Windows 2019Server
 <https://CI.AppVeyor.com/project/mrJean1/pygeodesy>} in 64-bit only and with Python 2.7.18 (and U{geographiclib
@@ -166,7 +166,7 @@ in 64- and 32-bit.
 A single-File and single-Directory application with C{pygeodesy} has been bundled using U{PyInstaller
 <https://PyPI.org/project/pyinstaller>} 3.4 and 64-bit Python 3.7.3 on macOS 10.13.6 High Sierra.
 
-Previously, the tests were run with Python 3.13.0-4, 3.12.0-6, 3.11.2-4, 3.10.1-7, 3.9.6, 3.9.1, 3.8.7, 3.7.1, 2.7.15,
+Previously, the tests were run with Python 3.13.0-5, 3.12.0-6, 3.11.2-4, 3.10.1-7, 3.9.6, 3.9.1, 3.8.7, 3.7.1, 2.7.15,
 U{PyPy<https://PyPy.org>} 7.3.12 (Python 3.10.12), 7.3.1 (Python 3.6.9) and U{PyPy<https://PyPy.org>} 7.1.1 (Python
 2.7.13) (and U{geographiclib <https://PyPI.org/project/geographiclib>} 1.52, U{numpy<https://PyPI.org/project/numpy>}
 1.16.3, 1.16.4, 1.16.6, 1.19.0, 1.19.4, 1.19.5 or 1.22.4 and U{scipy<https://PyPI.org/project/scipy>} 1.2.1, 1.4.1,
@@ -329,6 +329,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.}
 @var PI_3:  One third PI, M{PI / 3} (C{float}).
 @var PI4:   Four PI, M{PI * 4} (C{float}).
 @var PI_4:  Quarter PI, M{PI / 4} (C{float}).
+@var PI_6:  One sixth PI, M{PI / 6} (C{float}).
 
 @var R_MA: Equatorial earth radius (C{meter}), WGS84, EPSG:3785.
 @var R_MB: Polar earth radius (C{meter}), WGS84, EPSG:3785.
@@ -604,7 +605,7 @@ else:
 
 from pygeodesy.internals import _version2,  _DOT_  # noqa: E402
 # from pygeodesy.interns import _DOT_  # from .internals
-__version__ = '25.08.25'
+__version__ = '25.09.09'
 # see setup.py for similar logic
 version     = _DOT_(*_version2(__version__, n=3))
 

pygeodesy/auxilats/__init__.py

@@ -29,7 +29,7 @@ from pygeodesy.lazily import _ALL_OTHER
 # no modules: auxAngle, auxDLat, auxDST, auxily, auxLat
 __all__ = _ALL_OTHER(Aux, AuxAngle, AuxDLat, AuxDST, AuxLat,
                      AuxBeta, AuxChi, AuxMu, AuxPhi, AuxTheta, AuxXi)
-__version__ = '25.04.14'
+__version__ = '25.08.28'
 
 # **) MIT License
 #

pygeodesy/auxilats/auxAngle.py

@@ -17,7 +17,7 @@ from __future__ import division as _; del _  # noqa: E702 ;
 from pygeodesy.auxilats.auxily import Aux, _Aux2Greek,  AuxError
 from pygeodesy.basics import map1, map2, _xinstanceof
 from pygeodesy.constants import EPS, _INF_NAN_NINF, MAX, NAN, _0_0, _0_5, _1_0, \
-                               _copysign_1_0, _over, _pos_self, isfinite, isnan
+                               _copysign_1_0, isfinite, isnan, _over, _pos_self
 # from pygeodesy.errors import AuxError  # from .auxilats.auxily
 from pygeodesy.fmath import hypot,  unstr
 from pygeodesy.fsums import _add_op_, _iadd_op_, _isub_op_, _sub_op_
@@ -32,7 +32,7 @@ from pygeodesy.utily import atan2, atan2d, sincos2, sincos2d
 from math import asinh, copysign, degrees, fabs, radians, sinh
 
 __all__ = ()
-__version__ = '25.05.12'
+__version__ = '25.08.31'
 
 _0_INF_NAN_NINF = (0, _0_0) + _INF_NAN_NINF
 _MAX_2          =  MAX * _0_5  # PYCHOK used!
@@ -505,6 +505,7 @@ _AUXClass = {Aux.BETA:  AuxBeta,
              Aux.CHI:   AuxChi,
              Aux.MU:    AuxMu,
              Aux.PHI:   AuxPhi,
+#            Aux.PSI:   AuxPSI,  # Isometric
              Aux.THETA: AuxTheta,
              Aux.XI:    AuxXi}
 
@@ -525,7 +526,7 @@ def _yx2(yx):
     return y, x
 
 
-__all__ += _ALL_DOCS(AuxAngle, AuxBeta, AuxChi, AuxMu, AuxPhi, AuxTheta, AuxXi)
+__all__ += _ALL_DOCS(AuxAngle, *_AUXClass.values())
 
 # **) MIT License
 #

pygeodesy/auxilats/auxily.py

@@ -29,7 +29,7 @@ from pygeodesy.utily import atan1
 from math import asinh, copysign
 
 __all__ = ()
-__version__ = '25.05.12'
+__version__ = '25.08.31'
 
 
 class Aux(object):

pygeodesy/basics.py

@@ -37,7 +37,7 @@ from math import copysign as _copysign
 # import inspect as _inspect  # _MODS
 
 __all__ = _ALL_LAZY.basics
-__version__ = '25.04.14'
+__version__ = '25.09.04'
 
 _below_           = 'below'
 _list_tuple_types = (list, tuple)
@@ -201,7 +201,7 @@ def copytype(x, y):
 
 
 def _enumereverse(iterable):
-    '''(INTERNAL) Reversed C{enumberate}.
+    '''(INTERNAL) Reversed C{enumerate}.
     '''
     for j in _reverange(len(iterable)):
         yield j, iterable[j]
@@ -714,11 +714,11 @@ def _reverange(n, stop=-1, step=-1):
 
 
 def signBit(x):
-    '''Return C{signbit(B{x})}, like C++.
+    '''Return C{signbit(B{x})}, like C++, see also L{isneg}.
 
        @return: C{True} if C{B{x} < 0} or C{NEG0} (C{bool}).
     '''
-    return x < 0 or _MODS.constants.isneg0(x)
+    return (x or _copysign(1, x)) < 0
 
 
 def _signOf(x, ref):  # in .fsums

pygeodesy/booleans.py

@@ -45,7 +45,7 @@ from pygeodesy.utily import fabs, _unrollon, _Wrap
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.booleans
-__version__ = '25.05.26'
+__version__ = '25.09.04'
 
 _0EPS  =  EPS  # near-zero, positive
 _EPS0  = -EPS  # near-zero, negative
@@ -60,26 +60,26 @@ _corners_ = 'corners'
 _open_    = 'open'
 
 
-def _Enum(txt, enum):  # PYCHOK unused
+def _Cnum(txt, enum):  # PYCHOK unused
     return txt  # NN(txt, _TILDE_, enum)
 
 
 class _L(object):  # Intersection labels
-    CROSSING      = _Enum(_X_, 1)  # C++ enum
-    CROSSING_D    = _Enum(_X_ + _d_, 8)
+    CROSSING      = _Cnum(_X_, 1)  # C++ enum
+    CROSSING_D    = _Cnum(_X_ + _d_, 8)
     CROSSINGs     = (CROSSING, CROSSING_D)
-    BOUNCING      = _Enum(_B_, 2)
-    BOUNCING_D    = _Enum(_B_ + _d_, 9)
+    BOUNCING      = _Cnum(_B_, 2)
+    BOUNCING_D    = _Cnum(_B_ + _d_, 9)
     BOUNCINGs     = (BOUNCING, BOUNCING_D) + CROSSINGs
-    LEFT_ON       = _Enum('Lo', 3)
-    ON_ON         = _Enum('oo', 5)
-    ON_LEFT       = _Enum('oL', 6)
-    ON_RIGHT      = _Enum('oR', 7)
-    RIGHT_ON      = _Enum('Ro', 4)
+    LEFT_ON       = _Cnum('Lo', 3)
+    ON_ON         = _Cnum('oo', 5)
+    ON_LEFT       = _Cnum('oL', 6)
+    ON_RIGHT      = _Cnum('oR', 7)
+    RIGHT_ON      = _Cnum('Ro', 4)
     RIGHT_LEFT_ON = (RIGHT_ON, LEFT_ON)
     # Entry/Exit flags
-    ENTRY         = _Enum(_e_, 1)
-    EXIT          = _Enum(_x_, 0)
+    ENTRY         = _Cnum(_e_, 1)
+    EXIT          = _Cnum(_x_, 0)
     Toggle        = {ENTRY: EXIT,
                      EXIT: ENTRY,
                      None: None}
@@ -88,10 +88,10 @@ _L = _L()  # PYCHOK singleton
 
 
 class _RP(object):  # RelativePositions
-    IS_Pm = _Enum('Pm', 2)  # C++ enum
-    IS_Pp = _Enum('Pp', 3)
-    LEFT  = _Enum('L',  0)
-    RIGHT = _Enum(_R_,  1)
+    IS_Pm = _Cnum('Pm', 2)  # C++ enum
+    IS_Pp = _Cnum('Pp', 3)
+    LEFT  = _Cnum('L',  0)
+    RIGHT = _Cnum(_R_,  1)
 
 _RP = _RP()  # PYCHOK singleton
 
@@ -1521,16 +1521,16 @@ class _CompositeGH(_CompositeBase):
 class _EdgeFHP(object):
     # An edge between two L{LatLonFHP} points.
 
-    X_INTERSECT = _Enum('Xi', 1)  # C++ enum
-    X_OVERLAP   = _Enum('Xo', 5)
-    P_INTERSECT = _Enum('Pi', 3)
-    P_OVERLAP   = _Enum('Po', 7)
+    X_INTERSECT = _Cnum('Xi', 1)  # C++ enum
+    X_OVERLAP   = _Cnum('Xo', 5)
+    P_INTERSECT = _Cnum('Pi', 3)
+    P_OVERLAP   = _Cnum('Po', 7)
     Ps          = (P_INTERSECT, P_OVERLAP, X_OVERLAP)
-    Q_INTERSECT = _Enum('Qi', 2)
-    Q_OVERLAP   = _Enum('Qo', 6)
+    Q_INTERSECT = _Cnum('Qi', 2)
+    Q_OVERLAP   = _Cnum('Qo', 6)
     Qs          = (Q_INTERSECT, Q_OVERLAP, X_OVERLAP)
-    V_INTERSECT = _Enum('Vi', 4)
-    V_OVERLAP   = _Enum('Vo', 8)
+    V_INTERSECT = _Cnum('Vi', 4)
+    V_OVERLAP   = _Cnum('Vo', 8)
     Vs          = (V_INTERSECT, V_OVERLAP)
 
     def __init__(self, p1, p2, **unused):

pygeodesy/constants.py

@@ -10,7 +10,7 @@ L{pygeodesy.isnon0} and L{pygeodesy.remainder}.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # noqa: E702 ;
 
-from pygeodesy.basics import _copysign, isbool, iscomplex, isint
+from pygeodesy.basics import _copysign, isbool, iscomplex, isint, signBit
 from pygeodesy.errors import _xError, _xError2, _xkwds_get1, _xkwds_item2
 # from pygeodesy.fsums import _isFsum_2Tuple  # _MODS
 from pygeodesy.internals import _0_0, _100_0, typename
@@ -26,25 +26,31 @@ except ImportError:  # Python 2-
     _inf, _nan = float(_INF_), float(_NAN_)
 
 __all__ = _ALL_LAZY.constants
-__version__ = '25.05.26'
+__version__ = '25.09.09'
 
 
 def _copysign_0_0(y):
     '''(INTERNAL) copysign(0.0, y), only C{float}.
     '''
-    return _N_0_0 if y < 0 else _0_0
+    return _N_0_0 if signBit(y) else _0_0
 
 
 def _copysign_1_0(y):
     '''(INTERNAL) copysign(1.0, y), only C{float}.
     '''
-    return _N_1_0 if y < 0 else _1_0
+    return _N_1_0 if signBit(y) else _1_0
 
 
 def _copysignINF(y):
     '''(INTERNAL) copysign(INF, y), only C{float}.
     '''
-    return NINF if y < 0 else INF
+    return NINF if signBit(y) else INF
+
+
+def _flipsign(x, y):
+    '''(INTERNAL) Negate C{x} for negative C{y}.
+    '''
+    return (-x) if signBit(y) else x
 
 
 def _Float(**name_arg):
@@ -137,7 +143,7 @@ def _naninf(p, *xs):
 
 
 def _over(p, q):
-    '''(INTERNAL) Return C{B{p} / B{q}} avoiding C{ZeroDivisionError} exceptions.
+    '''(INTERNAL) Return C{B{p} / B{q}} without C{ZeroDivisionError} exceptions.
     '''
     try:
         return (p / q)  # if p else _copysign_0_0(q)
@@ -145,6 +151,18 @@ def _over(p, q):
         return (_copysignINF(p) if isfinite(p) else NAN) if p else p
 
 
+def _over_1(p, q):
+    '''(INTERNAL) Return C{B{p} / B{q}} with exact C{1.0} and without C{ZeroDivisionError} exceptions.
+    '''
+    if fabs(p) != fabs(q):
+        r = _over(p, q)
+    else:
+        r = _flipsign(p, q)
+        if p:
+            r = _copysign_1_0(r)
+    return r
+
+
 def _1_over(x):
     '''(INTERNAL) Return reciprocal C{1 / B{x}} avoiding C{ZeroDivisionError} exceptions.
     '''
@@ -245,7 +263,7 @@ _EPStol  = _Float(_EPStol=_EPSqrt * _0_1)   # PYCHOK = 1.49011611938e5-09 == sqr
 
 _89_999  = _Float(_89_999=_90_0 * EPS1)  # just below 90.0
 # <https://Numbers.Computation.Free.FR/Constants/Miscellaneous/digits.html>
-_1__90   = _Float(_1__90 =_1_0 / _90_0)  # PYCHOK = 0.011_111_111_111_111_111_111_111_111_111_111_111_111_111_111_11111
+# _1__90 = _Float(_1__90 =_1_0 / _90_0)  # PYCHOK = 0.011_111_111_111_111_111_111_111_111_111_111_111_111_111_111_11111
 _2__PI   = _Float(_2__PI =_2_0 / _pi)    # PYCHOK = 0.636_619_772_367_581_343_075_535_053_490_057_448_137_838_582_96182
 
 _1_16th  = _Float(_1_16th=_1_0 / _16_0)  # PYCHOK in .ellipsoids, .karney
@@ -273,6 +291,7 @@ PI3_2 = _Float(PI3_2=_pi * _1_5)  # PYCHOK PI and a half, M{PI * 3 / 2}
 PI_3  = _Float(PI_3 =_pi / _3_0)  # PYCHOK One third PI, M{PI / 3}
 PI4   = _Float(PI4  =_pi * _4_0)  # PYCHOK Four PI, M{PI * 4}
 PI_4  = _Float(PI_4 =_pi / _4_0)  # PYCHOK Quarter PI, M{PI / 4}
+PI_6  = _Float(PI_6 =_pi / _6_0)  # PYCHOK One sixth PI, M{PI / 6}
 
 R_MA  = _Radius(R_MA=6378137.0)       # PYCHOK equatorial earth radius (C{meter}), WGS84, EPSG:3785
 R_MB  = _Radius(R_MB=6356752.3)       # PYCHOK polar earth radius (C{meter}), WGS84, EPSG:3785
@@ -417,6 +436,17 @@ def isnear90(x, eps90=EPS0):
     return bool(eps90 > (x - _90_0) > -eps90)
 
 
+def isneg(x):
+    '''Check for negative C{x}, including L{NEG0}.
+
+       @arg x: Value (C{scalar}).
+
+       @return: C{True} if C{B{x} < 0 or NEG0},
+                C{False} otherwise.
+    '''
+    return signBit(x)
+
+
 def isneg0(x):
     '''Check for L{NEG0}, negative C{0.0}.
 

pygeodesy/deprecated/functions.py

@@ -4,6 +4,7 @@
 u'''DEPRECATED functions kept for backward compatibility.
 '''
 
+# from pygeodesy.basics import copysign0  # _MODS_
 from pygeodesy.constants import EPS, R_M, float0_
 from pygeodesy.deprecated.classes import ClipCS3Tuple, TriAngle4Tuple, _TriAngle5Tuple
 from pygeodesy.interns import NN, _area_, _COMMASPACE_, _negative_, \

pygeodesy/dms.py

@@ -63,7 +63,7 @@ U{Vector-based geodesy<https://www.Movable-Type.co.UK/scripts/latlong-vectors.ht
 
 from pygeodesy.basics import copysign0, isLatLon, isodd, issequence, isstr, \
                              neg as _neg,  typename  # in .ups
-from pygeodesy.constants import _umod_360, _0_0, _0_5, _60_0, _360_0, _3600_0
+from pygeodesy.constants import _0_0, _0_5, _60_0, _360_0, _3600_0, _umod_360
 from pygeodesy.errors import ParseError, RangeError, _TypeError, _ValueError, \
                             _parseX, rangerrors, _xError, _xkwds,  _envPYGEODESY
 # from pygeodesy.internals import _envPYGEODESY, typename  # from .errors
@@ -86,7 +86,7 @@ except ImportError:  # Python 3+
     from string import ascii_letters as _LETTERS
 
 __all__ = _ALL_LAZY.dms
-__version__ = '25.04.14'
+__version__ = '25.08.31'
 
 _beyond_      = 'beyond'
 _deg_min_     = 'deg+min'

pygeodesy/ecef.py

@@ -62,8 +62,8 @@ plane} as opposed to I{geocentric} (ECEF) ones.
 from pygeodesy.basics import copysign0, _isin, isscalar, issubclassof, neg, map1, \
                             _xinstanceof, _xsubclassof,  typename  # _args_kwds_names
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS1, INT0, PI, PI_2, _0_0, \
-                               _0_5, _1_0, _1_0_1T, _2_0, _3_0, _4_0, _6_0, \
-                               _90_0, _copysign_1_0,  isnon0  # PYCHOK used!
+                               _0_5, _1_0, _1_0_1T, _2_0, _3_0, _4_0, _6_0, _90_0, \
+                               _copysign_1_0,  isnon0  # PYCHOK used!
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84,  a_f2Tuple, _EWGS84
 from pygeodesy.ecefLocals import _EcefLocal
 # from pygeodesy.ellipsoids import a_f2Tuple, _EWGS84  # from .datums
@@ -91,7 +91,7 @@ from pygeodesy.utily import atan1, atan1d, atan2, atan2d, degrees90, degrees180,
 from math import cos, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.ecef
-__version__ = '25.08.25'
+__version__ = '25.08.31'
 
 _Ecef_    = 'Ecef'
 _prolate_ = 'prolate'

pygeodesy/ellipsoidalExact.py

@@ -11,20 +11,20 @@ L{GeodesicExact}, L{GeodesicAreaExact} and L{GeodesicLineExact}.
 
 # from pygeodesy.datums import _WGS84  # from .ellipsoidalBase
 from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase, \
-                                     _nearestOn,  _WGS84
+                                     _nearestOn,  Property_RO, _WGS84
 from pygeodesy.ellipsoidalBaseDI import LatLonEllipsoidalBaseDI, \
                                        _intersection3, _intersections2, \
                                        _TOL_M, intersecant2
 # from pygeodesy.errors import _xkwds  # from .karney
-from pygeodesy.karney import _polygon,  fabs, Property_RO, _xkwds
+from pygeodesy.karney import _polygon,  fabs, _xkwds
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
 from pygeodesy.points import _areaError, ispolar  # PYCHOK exported
-# from pygeodesy.props import Property_RO  # from .karney
+# from pygeodesy.props import Property_RO  # from .ellipsoidalBase
 
 # from math import fabs  # from .karney
 
 __all__ = _ALL_LAZY.ellipsoidalExact
-__version__ = '25.05.28'
+__version__ = '25.08.28'
 
 
 class Cartesian(CartesianEllipsoidalBase):

pygeodesy/ellipsoidalGeodSolve.py

@@ -12,11 +12,11 @@ L{geodsolve}, a wrapper invoking I{Karney}'s U{GeodSolve
 
 # from pygeodesy.datums import _WGS84  # from .ellipsoidalBase
 from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase, \
-                                     _nearestOn, _WGS84
+                                     _nearestOn,  Property_RO, _WGS84
 from pygeodesy.ellipsoidalBaseDI import LatLonEllipsoidalBaseDI, _TOL_M, \
                                        _intersection3, _intersections2
 # from pygeodesy.errors import _xkwds  # from .karney
-from pygeodesy.karney import fabs, _polygon,  Property_RO, _xkwds
+from pygeodesy.karney import fabs, _polygon,  _xkwds
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
 from pygeodesy.points import _areaError, ispolar  # PYCHOK exported
 # from pygeodesy.props import Property_RO  # from .karney
@@ -24,7 +24,7 @@ from pygeodesy.points import _areaError, ispolar  # PYCHOK exported
 # from math import fabs  # from .karney
 
 __all__ = _ALL_LAZY.ellipsoidalGeodSolve
-__version__ = '25.05.28'
+__version__ = '25.08.28'
 
 
 class Cartesian(CartesianEllipsoidalBase):

pygeodesy/ellipsoids.py

@@ -67,8 +67,8 @@ from __future__ import division as _; del _  # noqa: E702 ;
 # from pygeodesy.albers import AlbersEqualAreaCylindrical  # _MODS
 from pygeodesy.basics import copysign0, isbool, _isin, isint,  typename
 from pygeodesy.constants import EPS, EPS_2, EPS0, EPS02, EPS1, INF, NINF, \
-                               _over, PI_2, PI_3, PI4, R_M, R_MA, R_FM, \
-                               _EPSqrt, _EPStol as _TOL, _floatuple as _T, _isfinite, \
+                               _over, PI_2, PI_3, PI4, R_M, R_MA, R_FM, _EPSqrt, \
+                               _EPStol as _TOL, _floatuple as _T, _isfinite, \
                                _0_0s, _0_0, _0_5, _1_0, _1_EPS, _2_0, _4_0, _90_0, \
                                _0_25, _3_0  # PYCHOK used!
 from pygeodesy.errors import _AssertionError, IntersectionError, _ValueError, _xattr, _xkwds_not
@@ -96,7 +96,7 @@ from pygeodesy.utily import atan1, atan1d, atan2b, degrees90, m2radians, radians
 from math import asinh, atan, atanh, cos, degrees, exp, fabs, radians, sin, sinh, sqrt, tan  # as _tan
 
 __all__ = _ALL_LAZY.ellipsoids
-__version__ = '25.08.25'
+__version__ = '25.08.31'
 
 _f_0_0    = Float(f =_0_0)  # zero flattening
 _f__0_0   = Float(f_=_0_0)  # zero inverse flattening
@@ -443,7 +443,7 @@ class Ellipsoid(_NamedEnumItem):
                                 eps=eps, f0=f0, **name_value))
 
     def auxAuthalic(self, lat, inverse=False):
-        '''Compute the I{authalic} auxiliary latitude or the I{inverse} thereof.
+        '''Compute the I{authalic} auxiliary latitude (Xi) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{authalic}) latitude (C{degrees90}).
            @kwarg inverse: If C{True}, B{C{lat}} is the I{authalic} and
@@ -463,7 +463,7 @@ class Ellipsoid(_NamedEnumItem):
         return _aux(lat, inverse, Ellipsoid.auxAuthalic)
 
     def auxConformal(self, lat, inverse=False):
-        '''Compute the I{conformal} auxiliary latitude or the I{inverse} thereof.
+        '''Compute the I{conformal} auxiliary latitude (Chi) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{conformal}) latitude (C{degrees90}).
            @kwarg inverse: If C{True}, B{C{lat}} is the I{conformal} and
@@ -481,12 +481,13 @@ class Ellipsoid(_NamedEnumItem):
             lat = atan1d(f(tan(Phid(lat))))  # PYCHOK attr
         return _aux(lat, inverse, Ellipsoid.auxConformal)
 
-    def auxGeocentric(self, lat, inverse=False):
-        '''Compute the I{geocentric} auxiliary latitude or the I{inverse} thereof.
+    def auxGeocentric(self, lat, inverse=False, height=_0_0):
+        '''Compute the I{geocentric} auxiliary latitude (Theta) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{geocentric}) latitude (C{degrees90}).
            @kwarg inverse: If C{True}, B{C{lat}} is the geocentric and
                            return the I{geocentric} latitude (C{bool}).
+           @kwarg height: Optional, ellipsoidal height (C{meter}).
 
            @return: The I{geocentric} (or geodetic) latitude in C{degrees90}.
 
@@ -495,13 +496,24 @@ class Ellipsoid(_NamedEnumItem):
                  <https://WikiPedia.org/wiki/Latitude#Geocentric_latitude>}, and
                  U{Snyder<https://Pubs.USGS.gov/pp/1395/report.pdf>}, pp 17-18.
         '''
-        if self.f:
-            f   = self.a2_b2 if inverse else self.b2_a2
-            lat = atan1d(tan(Phid(lat)) * f)
+        if self.f:  # and lat
+            t = tan(Phid(lat))
+            f = self.b2_a2
+            if height:
+                if inverse:
+                    lat = atan1d(t * f)  # geodetic n
+                    d, f = f, _1_0
+                else:
+                    d = _1_0
+                n =  self.rocPrimeVertical(lat)
+                f = _over(n * f + height, n * d + height)
+            elif inverse:
+                f = self.a2_b2
+            lat = atan1d(t * f)
         return _aux(lat, inverse, Ellipsoid.auxGeocentric)
 
     def auxIsometric(self, lat, inverse=False):
-        '''Compute the I{isometric} auxiliary latitude or the I{inverse} thereof.
+        '''Compute the I{isometric} auxiliary latitude (Psi) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{isometric}) latitude (C{degrees}).
            @kwarg inverse: If C{True}, B{C{lat}} is the I{isometric} and
@@ -510,8 +522,8 @@ class Ellipsoid(_NamedEnumItem):
            @return: The I{isometric} (or geodetic) latitude in C{degrees}.
 
            @note: The I{isometric} latitude for geodetic C{+/-90} is far
-                  outside the C{[-90..+90]} range but the inverse
-                  thereof is the original geodetic latitude.
+                  outside the C{[-90..+90]} range but the inverse thereof
+                  is the original geodetic latitude.
 
            @see: U{Inverse-/IsometricLatitude<https://GeographicLib.SourceForge.io/
                  C++/doc/classGeographicLib_1_1Ellipsoid.html>}, U{Isometric latitude
@@ -526,7 +538,7 @@ class Ellipsoid(_NamedEnumItem):
         return _aux(lat, inverse, Ellipsoid.auxIsometric, clip=0)
 
     def auxParametric(self, lat, inverse=False):
-        '''Compute the I{parametric} auxiliary latitude or the I{inverse} thereof.
+        '''Compute the I{parametric} auxiliary latitude (Beta) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{parametric}) latitude (C{degrees90}).
            @kwarg inverse: If C{True}, B{C{lat}} is the I{parametric} and
@@ -546,7 +558,7 @@ class Ellipsoid(_NamedEnumItem):
     auxReduced = auxParametric  # synonymous
 
     def auxRectifying(self, lat, inverse=False):
-        '''Compute the I{rectifying} auxiliary latitude or the I{inverse} thereof.
+        '''Compute the I{rectifying} auxiliary latitude (Mu) or the I{inverse} thereof.
 
            @arg lat: The geodetic (or I{rectifying}) latitude (C{degrees90}).
            @kwarg inverse: If C{True}, B{C{lat}} is the I{rectifying} and
@@ -692,23 +704,23 @@ class Ellipsoid(_NamedEnumItem):
         '''
         lat = Lat(lat)
         if lat:
-            b = lat
+            B = lat  # beta
             if fabs(lat) < _90_0:
                 if self.f:
-                    b = self._beta(lat)
-                z, r = sincos2d(b)
+                    B = self._beta(lat)
+                z, r = sincos2d(B)
                 r *= self.a
                 z *= self.b
             else:  # near-polar
                 r, z = _0_0, copysign0(self.b, lat)
         else:  # equator
             r = self.a
-            z = lat = b = _0_0
-        return Circle4Tuple(r, z, lat, b)
+            z = lat = B = _0_0
+        return Circle4Tuple(r, z, lat, B)
 
     def degrees2m(self, deg, lat=0):
-        '''Convert an angle to the distance along the equator or
-           along a parallel of (geodetic) latitude.
+        '''Convert an angle along the equator or along a parallel
+           of (geodetic) latitude to the distance.
 
            @arg deg: The angle (C{degrees}).
            @kwarg lat: Parallel latitude (C{degrees90}, C{str}).
@@ -878,10 +890,10 @@ class Ellipsoid(_NamedEnumItem):
 
            @raise ValueError: Invalid B{C{s}}.
         '''
-        r = _1_0
-        if self.e2:
+        r, e2 = _1_0, self.e2
+        if e2:  # and s
             try:
-                r -= self.e2 * Scalar(s=s)**2
+                r -= e2 * Scalar(s=s)**2
                 if r < 0:
                     raise ValueError(_negative_)
             except (TypeError, ValueError) as x:
@@ -1468,19 +1480,18 @@ class Ellipsoid(_NamedEnumItem):
            @see: U{Geocentric Radius
                  <https://WikiPedia.org/wiki/Earth_radius#Geocentric_radius>}
         '''
-        r, a = self.a, Phid(lat)
-        if a and self.f:
-            if fabs(a) < PI_2:
-                s2, c2 = _s2_c2(a)
-                b2_a2_s2 = self.b2_a2 * s2
+        r, p = self.a, Phid(lat)
+        if p and self.f:
+            if fabs(p) < PI_2:
+                s2, c2 = _s2_c2(p)
                 # R == sqrt((a2**2 * c2 + b2**2 * s2) / (a2 * c2 + b2 * s2))
                 #   == sqrt(a2**2 * (c2 + (b2 / a2)**2 * s2) / (a2 * (c2 + b2 / a2 * s2)))
                 #   == sqrt(a2 * (c2 + (b2 / a2)**2 * s2) / (c2 + (b2 / a2) * s2))
                 #   == a * sqrt((c2 + b2_a2 * b2_a2 * s2) / (c2 + b2_a2 * s2))
-                #   == a * sqrt((c2 + b2_a2 * b2_a2_s2) / (c2 + b2_a2_s2))
-                r *= sqrt((c2 + b2_a2_s2 * self.b2_a2) / (c2 + b2_a2_s2))
+                s2 *= self.b2_a2
+                r  *= sqrt((c2 + self.b2_a2 * s2) / (c2 + s2))
             else:
-                r  = self.b
+                r = self.b
         return Radius(Rgeocentric=r)
 
     @Property_RO
@@ -1653,18 +1664,18 @@ class Ellipsoid(_NamedEnumItem):
                  and the meridional and prime vertical U{Radii of Curvature
                  <https://WikiPedia.org/wiki/Earth_radius#Radii_of_curvature>}.
         '''
-        a = fabs(Phi(phi))
+        p = fabs(Phi(phi))
         if self.f:
-            r = self.e2s2(sin(a))
+            r = self.e2s2(sin(p))
             if r > EPS02:
-                n = self.a / sqrt(r)
-                m = n *  self.e21 / r
+                n = sqrt(self.a2 / r)
+                m = n * self.e21 / r
             else:
                 m = n = _0_0
         else:
             m = n = self.a
-        if scaled and a:
-            n *= cos(a) if a < PI_2 else _0_0
+        if scaled and p:
+            n *= cos(p) if p < PI_2 else _0_0
         return Curvature2Tuple(m, n)
 
     def rocAzimuth(self, lat, azimuth):
@@ -1795,8 +1806,8 @@ class Ellipsoid(_NamedEnumItem):
                  U{Radii of Curvature<https://WikiPedia.org/wiki/
                  Earth_radius#Radii_of_curvature>}.
         '''
-        r = self.roc2_(Phid(lat)) if lat else self.rocEquatorial2
-        return Radius(rocPrimeVertical=r.prime_vertical)
+        r = self.roc1_(sin(Phid(lat))) if lat else self.a
+        return Radius(rocPrimeVertical=r)
 
     rocTransverse = rocPrimeVertical  # synonymous