pygeodesy 25.1.9__py2.py3-none-any.whl → 25.4.25__py2.py3-none-any.whl

pygeodesy/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 u'''A pure Python implementation of geodesy tools for various ellipsoidal and spherical earth
-models using precision trigonometric, vector-based, exact, elliptic, iterative and approximate
+models using precision exact, elliptic, trigonometric, vector-based, iterative and approximate
 methods for geodetic (lat-/longitude), geocentric (U{ECEF<https://WikiPedia.org/wiki/ECEF>}
 cartesian) and certain U{triaxial ellipsoidal<https://GeographicLib.SourceForge.io/1.44/triaxial.html>}
 coordinates.
@@ -17,14 +17,7 @@ and a geocentric B{C{Cartesian}} class with methods and functions to compute dis
 forward and reverse azimuth, initial and final bearing, intermediate and nearest points, intersections of geodesic,
 great circle and rhumb lines, circle intersections and secants, U{3-point resections
 <https://WikiPedia.org/wiki/Position_resection_and_intersection>}, triangulation, trilateration (by intersection,
-by overlap and in 3-D), conversions and unrolling, among other things.  For more information and further details see
-the U{documentation<https://mrJean1.GitHub.io/PyGeodesy>}, the descriptions of U{Latitude/Longitude
-<https://www.Movable-Type.co.UK/scripts/latlong.html>}, U{Vincenty
-<https://www.Movable-Type.co.UK/scripts/latlong-vincenty.html>} and U{Vector-based
-<https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>} geodesy, the original U{JavaScript source
-<https://GitHub.com/ChrisVeness/geodesy>} or U{docs<https://www.Movable-Type.co.UK/scripts/geodesy/docs>}
-and I{Karney}'s Python U{geographiclib<https://PyPI.org/project/geographiclib>} and C++ U{GeographicLib
-<https://GeographicLib.SourceForge.io/C++/doc/index.html>}.
+by overlap and in 3-D), conversions and unrolling, among other things.
 
 Also included are modules for conversions to and from U{Cassini-Soldner
 <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1CassiniSoldner.html>},
@@ -55,16 +48,25 @@ points (or a U{NumPy array<https://docs.SciPy.org/doc/numpy/reference/generated/
 including implementations of the U{Ramer-Douglas-Peucker<https://WikiPedia.org/wiki/
 Ramer-Douglas-Peucker_algorithm>}, the U{Visvalingam-Whyatt<https://hydra.Hull.ac.UK/
 resources/hull:8338>} and the U{Reumann-Witkam<https://psimpl.SourceForge.net/reumann-witkam.html>}
-algorithms and modified versions of the former.  Other classes provide I{boolean} operations between
-(composite) polygons or U{interpolate <https://docs.SciPy.org/doc/scipy/reference/interpolate.html>}
-the L{height<pygeodesy.heights>} of C{LatLon} points and L{Geoid<pygeodesy.geoids>} models, compute
-various U{Fréchet<https://WikiPedia.org/wiki/Frechet_distance>} or U{Hausdorff<https://WikiPedia.org/
-wiki/Hausdorff_distance>} distances.
+algorithms and modified versions of the former.
+
+Plus modules and classes to U{interpolate<https://docs.SciPy.org/doc/scipy/reference/interpolate.html>} the
+L{height<pygeodesy.heights>} of C{LatLon} points and L{Geoid<pygeodesy.geoids>} models, compute various U{Fréchet
+<https://WikiPedia.org/wiki/Frechet_distance>} or U{Hausdorff<https://WikiPedia.org/wiki/Hausdorff_distance>}
+distances or perform I{boolean} operations between (composite) polygons.
+
+For further details see the U{documentation<https://mrJean1.GitHub.io/PyGeodesy>}, the descriptions of
+U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>}, U{Vincenty
+<https://www.Movable-Type.co.UK/scripts/latlong-vincenty.html>} and U{Vector-based
+<https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>} geodesy, the original U{JavaScript source
+<https://GitHub.com/ChrisVeness/geodesy>} or U{docs<https://www.Movable-Type.co.UK/scripts/geodesy/docs>}
+and I{Karney}'s Python U{geographiclib<https://PyPI.org/project/geographiclib>} and C++ U{GeographicLib
+<https://GeographicLib.SourceForge.io/C++/doc/index.html>}.
 
 Installation
 ============
 
-To install PyGeodesy, type C{python[3] -m pip install pygeodesy} or C{python[3] -m easy_install
+To install C{pygeodesy}, type C{python[3] -m pip install pygeodesy} or C{python[3] -m easy_install
 pygeodesy} in a terminal or command window.
 
 If the wheel C{pygeodesy-yy.m.d-py2.py3-none-any.whl} is missing in U{PyPI Download files<https://
@@ -76,22 +78,23 @@ Alternatively, download C{pygeodesy-yy.m.d.tar.gz} from U{PyPI<https://PyPI.org/
 or U{GitHub<https://GitHub.com/mrJean1/PyGeodesy>}, C{unzip} the downloaded file, C{cd} to
 directory C{pygeodesy-yy.m.d} and type C{python[3] setup.py install}.
 
-To run all PyGeodesy tests, type C{python[3] test/run.py} or type C{python[3] test/unitTestSuite.py}
+To run all C{pygeodesy} tests, type C{python[3] test/run.py} or type C{python[3] test/unitTestSuite.py}
 before or after installation.
 
 Dependencies
 ============
 
 Installation of I{Karney}'s Python package U{geographiclib<https://PyPI.org/project/geographiclib>}
-is optional, but required to use modules L{ellipsoidalKarney} and L{css}, L{azimuthal} classes
-L{EquidistantKarney} and L{GnomonicKarney} and the L{HeightIDWkarney} interpolator.
+is optional, but required for module L{ellipsoidalKarney}, L{azimuthal} classes L{EquidistantKarney}
+and L{GnomonicKarney} and the L{HeightIDWkarney} interpolator.
 
 Both U{numpy<https://PyPI.org/project/numpy>} and U{scipy<https://PyPI.org/project/scipy>} must be
 installed for most L{Geoid...<pygeodesy.geoids>} and L{Height...<pygeodesy.heights>} interpolators,
 except L{GeoidKarney} and the L{HeightIDW...<pygeodesy.heights>} ones.
 
-Functions and C{LatLon} methods L{circin6}, L{circum3}, L{circum4_}, L{soddy4}, L{trilaterate3d2} do and
-C{trilaterate5} and modules L{auxilats} and L{rhumb} may require U{numpy<https://PyPI.org/project/numpy>}.
+Functions and C{LatLon} methods L{circin6}, L{circum3}, L{circum4_} and L{soddy4} and functions
+L{triaxum5} and L{trilaterate3d2} require U{numpy<https://PyPI.org/project/numpy>} to be installed,
+modules L{auxilats} and L{rhumb} may need U{numpy<https://PyPI.org/project/numpy>}.
 
 Modules L{ellipsoidalGeodSolve} and L{geodsolve} and L{azimuthal} classes L{EquidistantGeodSolve}
 and L{GnomonicGeodSolve} depend on I{Karney}'s C++ utility U{GeodSolve
@@ -113,7 +116,7 @@ env variable C{PYGEODESY_RHUMBSOLVE} or with property L{Ellipsoid.rhumbsolve}.
 Documentation
 =============
 
-In addition to the C{pygeodesy} package, the U{PyGeodesy<https://PyPI.org/project/pygeodesy>}
+In addition to the C{pygeodesy} package, the U{pygeodesy<https://PyPI.org/project/pygeodesy>}
 U{distribution files<https://GitHub.com/mrJean1/PyGeodesy/tree/master/dist>} contain the tests,
 the test results (on macOS only) and the complete U{documentation<https://mrJean1.GitHub.io/PyGeodesy>}
 (generated by U{Epydoc<https://PyPI.org/project/epydoc>} using command line:
@@ -122,7 +125,7 @@ C{epydoc --html --no-private --no-source --name=pygeodesy --url=... -v pygeodesy
 Tests
 =====
 
-The tests ran with Python 3.13.1 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0),
+The tests ran with Python 3.13.3 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0),
 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.3,
@@ -139,20 +142,21 @@ U{numpy<https://PyPI.org/project/numpy>} 1.16.6, U{scipy<https://PyPI.org/projec
 U{GeoConvert<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.3,
 U{GeodSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.3,
 U{IntersectTool<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.3 and
-U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.3), all in 64-bit on macOS 14.6.1 Sonoma.
+U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.3), all in 64-bit on
+macOS 15.4.1 Sequoia.
 
 All tests ran with and without C{lazy import} for Python 3 and with command line option C{-W default} and
 env variable C{PYGEODESY_WARNINGS=on} for all Python versions.  The results of those tests are included in
 the distribution files.
 
 Test coverage has been measured with U{coverage<https://PyPI.org/project/coverage>} 7.6.1 using Python
-3.13.1, 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.3, 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.1, 3.12.7, 3.11.5 and 3.10.8 run on Apple M1 Silicon (C{arm64}), I{natively}.  Python 2.7.18 runs
+Python 3.13.3, 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.1 (and U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0) on
+The tests also ran with Python 3.13.3 (and U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0) on
 U{Debian 12<https://Cirrus-CI.com/github/mrJean1/PyGeodesy/master>} in 64-bit only, with Python 3.12.5 (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
@@ -162,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, 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-2, 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,
@@ -171,7 +175,7 @@ U{PyPy<https://PyPy.org>} 7.3.12 (Python 3.10.12), 7.3.1 (Python 3.6.9) and U{Py
 1.16.5, 1.16.2, 1.15.2, 1.14.0, 1.13.1, 1.8.0rc1 or 1.6.2 and U{scipy<https://PyPI.org/project/scipy>} 1.5.0), U{PyPy
 <https://PyPy.org>} 7.3.0 (Python 2.7.13 and 3.6.9), U{PyPy<https://PyPy.org>} 6.0.0 (Python 2.7.13 and 3.5.3)
 and U{Intel-Python<https://software.Intel.com/en-us/distribution-for-python>} 3.5.3 (and U{numpy
-<https://PyPI.org/project/numpy>} 1.11.3) on macOS 14.0-5 Sonoma, 13.0-5.2 Ventura, 12.1-6 Monterey, 11.0-5.2-6.1
+<https://PyPI.org/project/numpy>} 1.11.3) on macOS 14.0-6.1 Sonoma, 13.0-5.2 Ventura, 12.1-6 Monterey, 11.0-5.2-6.1
 Big Sur (aka 10.16), 10.15.3, 10.15.5-7 Catalina, 10.14 Mojave, 10.13.6 High Sierra and 10.12 Sierra, MacOS X
 10.11 El Capitan and/or MacOS X 10.10 Yosemite, with U{Pythonista<https://OMZ-Software.com/pythonista>}3.2 (with
 geographiclib 1.50 or 1.49 and numpy 1.8.0) on iOS 14.4.2, 11.4.1, 12.0-3 on iPad4, iPhone6, iPhone10 and/or
@@ -186,7 +190,7 @@ All Python source code has been statically U{checked<https://GitHub.com/ActiveSt
 Python/546532_PyChecker_postprocessor>} with U{PyChecker<https://PyPI.org/project/pychecker>}, U{PyFlakes
 <https://PyPI.org/project/pyflakes>}, U{PyCodeStyle<https://PyPI.org/project/pycodestyle>} (formerly Pep8) and
 U{McCabe<https://PyPI.org/project/mccabe>} using Python 2.7.18 and with U{Flake8<https://PyPI.org/project/flake8>}
-using Python 3.11.5, both in 64-bit on macOS 14.6.1 Sonoma.
+using Python 3.11.5, both in 64-bit on macOS 15.4.1 Sequoia.
 
 For a summary of all I{Karney}-based functionality in C{pygeodesy}, see module U{karney
 <https://mrJean1.GitHub.io/PyGeodesy/docs/pygeodesy.karney-module.html>}.
@@ -582,7 +586,7 @@ if _init__all__ and not _lazy_import2:  # import and set __all__
                     raise ImportError('missing %s%s: %s' % (_attribute_, s, t))
                 ns.extend(attrs)
 # XXX       if ps:  # check that mod is a _pygeodesy_ module
-# XXX           m = globalocals[mod]  # assert(_DUNDER_nameof(m) == mod)
+# XXX           m = globalocals[mod]  # assert(typename(m) == mod)
 # XXX           f = getattr(m, _dunder_file_, _NN)
 # XXX           d = _os_path.dirname(_os_path.abspath(f)) if f else pygeodesy_abspath
 # XXX           p = getattr(m, _dunder_package_, _NN) or _pygeodesy_
@@ -598,7 +602,7 @@ else:
 
 from pygeodesy.internals import _version2,  _DOT_  # PYCHOK import
 # from pygeodesy.interns import _DOT_  # from .internals
-__version__ = '25.01.09'
+__version__ = '25.04.25'
 # see setup.py for similar logic
 version     = _DOT_(*_version2(__version__, n=3))
 

pygeodesy/__main__.py

@@ -5,7 +5,7 @@ u'''Print L{pygeodesy} version, etc. using C{python -m pygeodesy}.
 '''
 
 __all__ = ()
-__version__ = '24.10.14'
+__version__ = '25.04.12'
 
 from os.path import basename, dirname
 
@@ -16,7 +16,7 @@ def _main():  # PYCHOK no cover
         from pygeodesy import constants, _isfrozen, pygeodesy_abspath, version
         from pygeodesy.basics import _xcoverage,_xgeographiclib, _xnumpy, _xscipy
         from pygeodesy.internals import _name_version, printf, _usage, _versions
-        from pygeodesy.interns import NN, _COMMASPACE_, _DEPRECATED_, _DOT_, _DUNDER_all_, \
+        from pygeodesy.interns import NN, _COMMASPACE_, _DALL_, _DEPRECATED_, _DOT_, \
                                      _EQUAL_, _pygeodesy_abspath_, _version_
         from pygeodesy.lazily import _all_deprecates, _all_imports, isLazy
 
@@ -28,7 +28,7 @@ def _main():  # PYCHOK no cover
                                  ('isLazy',                       isLazy),
                                  ('_isfrozen',                 _isfrozen),
                                  ('_floats',      len(constants._floats)),
-                                 (_DUNDER_all_,      len(_all_imports())),
+                                 (_DALL_,            len(_all_imports())),
                                  (_DEPRECATED_,   len(_all_deprecates()))))
 
         def _nv(_xpkg, p):

pygeodesy/albers.py

@@ -15,7 +15,7 @@ and the Albers Conical Equal-Area examples on pp 291-294.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import neg, neg_
+from pygeodesy.basics import _isin, neg, neg_
 from pygeodesy.constants import EPS0, EPS02, _EPSqrt as _TOL, \
                                _0_0, _0_5, _1_0, _N_1_0, _2_0, \
                                _N_2_0, _4_0, _6_0, _90_0, _N_90_0
@@ -38,10 +38,10 @@ from pygeodesy.utily import atan1, atan1d, atan2, degrees360, sincos2, \
 from math import atanh, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.albers
-__version__ = '24.11.24'
+__version__ = '25.04.14'
 
 _k1_    = 'k1'
-_NUMIT  =   8  # XXX 4?
+_NUMIT  =   9  # XXX 4?
 _NUMIT0 =  41  # XXX 21?
 _TERMS  =  31  # XXX 16?
 _TOL0   =  sqrt3(_TOL)
@@ -115,7 +115,7 @@ class _AlbersBase(_NamedBase):
         '''(INTERNAL) New C{AlbersEqualArea...} instance.
         '''
         qZ = self._qZ
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _ellipsoidal_datum(datum, **name)
             qZ = _qZx(self)
         elif qZ is None:
@@ -143,10 +143,8 @@ class _AlbersBase(_NamedBase):
         ca2, ta2 = _ct2(sa2, ca2)
 
         par1 = fabs(ta1 - ta2) < EPS02  # ta1 == ta2
-        if par1 or polar:
-            ta0, C = ta2, _1_0
-        else:
-            ta0, C = self._ta0C2(ca1, sa1, ta1, ca2, sa2, ta2)
+        ta0, C = (ta2, _1_0) if par1 or polar else \
+                  self._ta0C2(ca1, sa1, ta1, ca2, sa2, ta2)
 
         self._lat0 = _Lat(lat0=self._sign * atan1d(ta0))
         self._m02  =  m02 = _1_x21(E.f1 * ta0)
@@ -155,8 +153,8 @@ class _AlbersBase(_NamedBase):
             self._polar = True
 #           self._nrho0 = self._m0 = _0_0
         else:  # m0 = nrho0 / E.a
-            self._m0    = sqrt(m02)
-            self._nrho0 = self._m0 * E.a
+            self._m0    = t = sqrt(m02)
+            self._nrho0 = t * E.a
         t = self._txi0  = self._txif(ta0)
         h = hypot1(t)
         s = self._sxi0  = t / h
@@ -476,12 +474,13 @@ class _AlbersBase(_NamedBase):
         axi, bxi, sxi = self._a_b_sxi3((ca1, sa1, ta1, scb12),
                                        (ca2, sa2, ta2, scb22))
 
-        dsxi = ((esa12 / esa1_2) + _DatanheE(sa2, sa1, E)) * dsn_2 / self._qx
-        C = _Fsum1f_(sxi * dtb12 / dsxi, scb22, scb12).fover(scb22 * scb12 * _2_0)
+        dsxi  = ((esa12 / esa1_2) + _DatanheE(sa2, sa1, E)) * dsn_2 / self._qx
+        C     = _Fsum1f_(sxi * dtb12 / dsxi, scb22, scb12).fover(scb22 * scb12 * _2_0)
 
         S     = _Fsum1f_(sa1, sa2, sa12)
         axi  *= (S * e2 + _1).fover(S + _1, raiser=False)
-        bxi  *= _Fsum1f_(sa1, sa2, esa12).fover(esa1_2) * e2 + _D2atanheE(sa1, sa2, E) * E.e21
+        bxi  *= _Fsum1f_(  sa1, sa2, esa12).fover(esa1_2) * e2 + \
+                _D2atanheE(sa1, sa2, E) * E.e21
         s1_qZ = (axi * self._qZ - bxi) * dsn_2 / dtb12
         ta0   =  self._ta0(s1_qZ, (ta1 + ta2) * _0_5, E)
         return ta0, C
@@ -489,23 +488,19 @@ class _AlbersBase(_NamedBase):
     def _tanf(self, txi):  # in .Ellipsoid.auxAuthalic
         '''(INTERNAL) Function M{tan-phi from tan-xi}.
         '''
-        tol = _tol(_TOL, txi)
-        e2  =  self.ellipsoid.e2
-        qx  =  self._qx
-
-        ta    =  txi
-        _Ta2  =  Fsum(ta).fsum2f_
-        _txif =  self._txif
-        _1    = _1_0
+        e2   =  self.ellipsoid.e2
+        ta   =  txi
+        tol  = _tol(_TOL, ta)
+        _Ta2 =  Fsum(ta).fsum2f_
         for self._iteration in range(1, _NUMIT):  # max 2, mean 1.99
             # dtxi / dta = (scxi / sca)^3 * 2 * (1 - e^2)
             #            / (qZ * (1 - e^2 * sa^2)^2)
-            ta2  =  ta**2
-            sca2 = _1 + ta2
-            txia = _txif(ta)
-            s3qx =  sqrt3(sca2 / (txia**2 + _1)) * qx  # * _1_x21(txia)
-            eta2 = (_1 - e2 * ta2 / sca2)**2
-            ta, d = _Ta2((txi - txia) * s3qx * eta2)
+            ta2   =  ta**2
+            sca2  = _1_0 + ta2
+            txia  =  self._txif(ta)
+            s3    =  sqrt3(sca2 / (txia**2 + _1_0))  # * _1_x21(txia)
+            s3   *= (e2 * ta2 / sca2 - _1_0)**2 * self._qx
+            ta, d = _Ta2((txi - txia) * s3)
             if fabs(d) < tol:
                 return ta
         raise AlbersError(Fmt.no_convergence(d, tol), txt=repr(self))
@@ -546,20 +541,18 @@ class _AlbersBase(_NamedBase):
         '''(INTERNAL) Function M{tan-xi from tan-phi}.
         '''
         E   =  self.ellipsoid
-        _1  = _1_0
-
         ca2 = _1_x21(ta)
         sa  =  sqrt(ca2) * fabs(ta)  # enforce odd parity
-        sa1 = _1 + sa
+        sa1 = _1_0 + sa
 
         es1    =  sa  * E.e2
-        es1m1  =  sa1 * (_1 - es1)
-        es1p1  =  sa1 / (_1 + es1)
-        es2m1  = _1   -  sa * es1
+        es1m1  =  sa1 * (_1_0 - es1)
+        es1p1  =  sa1 / (_1_0 + es1)
+        es2m1  = _1_0 -    sa * es1
         es2m1a =  es2m1 * E.e21  # e2m
-        s =  sqrt((ca2 / (es1p1 * es2m1a) + _atanheE(ca2 / es1m1, E))
-                       * (es1m1 / es2m1a  + _atanheE(es1p1, E)))
-        t = _Fsum1f_(sa / es2m1, _atanheE(sa, E)).fover(s)
+        s  = ca2 / (es1p1 * es2m1a) + _atanheE(ca2 / es1m1, E)
+        s *=        es1m1 / es2m1a  + _atanheE(      es1p1, E)
+        t  = _Fsum1f_( sa / es2m1,    _atanheE(         sa, E)).fover(sqrt(s))
         return neg(t) if ta < 0 else t
 
 

pygeodesy/auxilats/_CX_4.py

@@ -6,13 +6,13 @@ u'''Coefficients for C{_AUXLATITUDE_ORDER} 4 from I{Karney}'s C++ class U{AuxLat
 transcoded to a Python C{_Rdict[auxout][auxin]} of C{_Rtuple}s.
 
 Copyright (C) Charles Karney (2022-2024) Karney@Alum.MIT.edu> and licensed under the
-MIT/X11 License.  For more information, see <https:#GeographicLib.SourceForge.io>.
+MIT/X11 License.  For more information, see <https://GeographicLib.SourceForge.io>.
 '''
 from pygeodesy.auxilats.auxily import Aux
 from pygeodesy.auxilats._CX_Rs import _Rcoeffs, _Rdict, _Rtuple
 
 __all__ = ()
-__version__ = '24.09.03'
+__version__ = '25.04.09'
 
 _coeffs_4 = _Rcoeffs(4, {  # GEOGRAPHICLIB_AUXLATITUDE_ORDER == 4
     Aux.PHI: _Rdict(38,

pygeodesy/auxilats/_CX_6.py

@@ -6,13 +6,13 @@ u'''Coefficients for C{_AUXLATITUDE_ORDER} 6 from I{Karney}'s C++ class U{AuxLat
 transcoded to a Python C{_Rdict[auxout][auxin]} of C{_Rtuple}s.
 
 Copyright (C) Charles Karney (2022-2024) Karney@Alum.MIT.edu> and licensed under the
-MIT/X11 License.  For more information, see <https:#GeographicLib.SourceForge.io>.
+MIT/X11 License.  For more information, see <https://GeographicLib.SourceForge.io>.
 '''
 from pygeodesy.auxilats.auxily import Aux
 from pygeodesy.auxilats._CX_Rs import _Rcoeffs, _Rdict, _Rtuple
 
 __all__ = ()
-__version__ = '24.09.02'
+__version__ = '25.04.09'
 
 _coeffs_6 = _Rcoeffs(6, {  # GEOGRAPHICLIB_AUXLATITUDE_ORDER == 6
     Aux.PHI: _Rdict(78,

pygeodesy/auxilats/_CX_8.py

@@ -6,13 +6,13 @@ u'''Coefficients for C{_AUXLATITUDE_ORDER} 8 from I{Karney}'s C++ class U{AuxLat
 transcoded to a Python C{_Rdict[auxout][auxin]} of C{_Rtuple}s.
 
 Copyright (C) Charles Karney (2022-2024) Karney@Alum.MIT.edu> and licensed under the
-MIT/X11 License.  For more information, see <https:#GeographicLib.SourceForge.io>.
+MIT/X11 License.  For more information, see <https://GeographicLib.SourceForge.io>.
 '''
 from pygeodesy.auxilats.auxily import Aux
 from pygeodesy.auxilats._CX_Rs import _Rcoeffs, _Rdict, _Rtuple
 
 __all__ = ()
-__version__ = '24.09.03'
+__version__ = '25.04.09'
 
 _coeffs_8 = _Rcoeffs(8, {  # GEOGRAPHICLIB_AUXLATITUDE_ORDER == 8
     Aux.PHI: _Rdict(132,

pygeodesy/auxilats/_CX_Rs.py

@@ -6,13 +6,15 @@ Python versions of coefficients from I{Karney}'s C++ class U{AuxLatitude
 <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1AuxLatitude.html>}.
 
 Copyright (C) Charles Karney (2022-2024) Karney@Alum.MIT.edu> and licensed under the
-MIT/X11 License.  For more information, see <https:#GeographicLib.SourceForge.io>.
+MIT/X11 License.  For more information, see <https://GeographicLib.SourceForge.io>.
 '''
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.constants import _floats
+# from pygeodesy.basics import _splituple  # _MODS
+from pygeodesy.constants import _floats as _constants_floats
 from pygeodesy.errors import _AssertionError,  _MODS
+# from pygeodesy.internals import _sizeof  # _MODS
 from pygeodesy.interns import NN, MISSING, _COMMA_, _duplicate_, _NL_, \
                              _QUOTE3_, _SLASH_,  _ELLIPSIS4_  # PYCHOK used!
 # from pygeodesy.lazily import _ALL_MODS as _MODS  # from .errors
@@ -20,7 +22,7 @@ from pygeodesy.named import ADict,  Property_RO
 # from pygeodesy.props import Property_RO  # from .named
 
 __all__ = ()
-__version__ = '24.09.04'
+__version__ = '25.04.11'
 
 
 class _Rcoeffs(ADict):
@@ -31,17 +33,19 @@ class _Rcoeffs(ADict):
         '''
         try:
             if not isinstance(coeffs, dict):
-                raise _RdictError(coeffs=type(coeffs))
+                raise _RsError(coeffs=type(coeffs))
             n = 0
             for k, d in coeffs.items():
+                if not isinstance(k, _Rkey):
+                    raise _RsError(k=type(k))
                 if not isinstance(d, _Rdict):
-                    raise _RdictError(k=k, d=type(d))
+                    raise _RsError(k=k, d=type(d))
                 n += d.n
 
             ADict.__init__(self, coeffs)
             self.set_(ALorder=ALorder, n=n)  # in .validate
         except Exception as x:
-            raise _RdictError(ALorder=ALorder, cause=x)
+            raise _RsError(ALorder=ALorder, cause=x)
 
     def bnuz4(self):  # in .auxilats.__main__  # PYCHOK no cover
         # get C{(strB, number, unique, floatB)} rationals
@@ -53,8 +57,8 @@ class _Rcoeffs(ADict):
             t  =  R._tuple
             z += _zB(t)  # Float
             # assert R.Rdict is None
-            n += len(t)
-            u += sum(1 for f in t if f in _floats)
+            n +=  len(t)
+            u +=  sum(1 for f in t if f in _constants_floats)
         return b, n, (n - u), z
 
     def items(self):  # string-ify keys  # PYCHOK no cover
@@ -70,68 +74,79 @@ class _Rcoeffs(ADict):
 
     def _validate(self, aL, lenAux):
         # in .auxily.Aux._CXcoeffs(al, Aux.len(aL))
-        a, n = self.ALorder, self.n  # PYCHOK Adict!
+        a, n = self.ALorder, self.n  # PYCHOK ADict!
 #       for R in self._Rtuples():
 #           assert isinstance(R, _Rtuple)
         if aL != a or lenAux != n:
-            raise _RdictError(aL=aL, ALorder=a, lenAux=lenAux, n=n)
+            raise _RsError(aL=aL, ALorder=a, lenAux=lenAux, n=n)
         return self
 
 
 class _Rdict(dict):  # in ._CX_#, .auxLat, .rhumb.aux_
     '''(INTERNAL) Dict of C{_Rtuple}s.
     '''
-    n = 0  # sum(R.k_n_k[1] for r in Rtuples)
+    n = 0  # sum(R.k_n_k[1] for R in Rtuples)
 
     def __init__(self, nt, *Rtuples):
         '''New C{_Rdict}.
         '''
         if not Rtuples:
-            raise _RdictError(Rtuples=MISSING)
+            raise _RsError(Rtuples=MISSING)
 
         for R in Rtuples:
             if not isinstance(R, _Rtuple):
-                raise _RdictError(R, R=type(R))
+                raise _RsError(R, R=type(R))
             k, n, _ = R.k_n_rs
             if k in self:
-                raise _RdictError(_duplicate_, k=k)
+                raise _RsError(_duplicate_, k=k)
             R.Rdict = self
             self[k] = R  # overwritten in self._floatuple
             self.n += n
         if self.n != nt:
-            raise _RdictError(n=n, nt=nt)
+            raise _RsError(n=n, nt=nt)
 
     def _floats(self, rs):
         # yield floats from a string of comma-separated rationals
         def _p_q(p=NN, q=1, *x):
             return (NN if x else p), q
 
-        _get = _floats.get
-        for r in NN(*rs.split()).split(_COMMA_):
+        _get = _constants_floats.get
+        for r in _MODS.basics._splituple(rs):
             p, q = _p_q(*r.split(_SLASH_))
             if p:
                 f = int(p) / int(q)  # fractions.Fraction?
                 if not isinstance(f, float):
-                    raise _RdictError(rs, f=f, p=p, q=q, r=r)
-                yield _get(f, f)  # from .constants?
+                    raise _RsError(rs, f=f, p=p, q=q, r=r)
+                yield _get(f, f)  # from .constants
             else:
-                raise _RdictError(rs, r=r)
+                raise _RsError(rs, r=r)
 
     def _floatuple(self, Rtuple):
         # return a tuple of floats from an C{_Rtuple}
         k, n, rs = Rtuple.k_n_rs
         t = tuple(f for m in map(self._floats, rs)
-                        for f in m)  # ... yield f
+                        for f in m)  # == yield f
         # @see: <https://StackOverflow.com/questions/10632839/>
         #       and <https://realPython.com/python-flatten-list/>
         if len(t) != n:
-            raise _RdictError(*rs, len=len(t), n=n)
-        self[k] = t
+            raise _RsError(*rs, len=len(t), n=n)
+        self[k] = t  # replace _Rtuple with tuple instance
         return t
 
 
-class _RdictError(_AssertionError):
-    '''(INTERNAL) For C{_Rdict} issues.
+class _Rkey(int):
+    '''(INTERNAL) For C{_Rcoeffs}, C{_Rdict} and C{_Rtuple} keys.
+    '''
+    def __new__(cls, k):
+        if not isinstance(k, int):
+            raise _RsError(k=type(k))
+        if not 0 <= k <= 8:  # 0.._MODS.auxilats.auxily.Aux.N + 2
+            raise _RsError(k=k)
+        return int.__new__(cls, k)
+
+
+class _RsError(_AssertionError):
+    '''(INTERNAL) For C{_Rcoeffs}, C{_Rdict or} C{_Rtuple} issues.
     '''
     def __init__(self, *rs, **kwds_cause):  # PYCHOK no cover
         if rs:
@@ -147,7 +162,7 @@ class _RdictError(_AssertionError):
 class _Rtuple(list):  # MUST be list, NOT tuple!
     '''(INTERNAL) I{Pseudo-tuple} of float rationals used in C{_Rdict}s.
     '''
-    Rdict  = None
+    Rdict  = None  # set by _Rdict.__init__
     k_n_rs = None, 0, ()
 
     def __init__(self, k, n, *rs):
@@ -156,20 +171,26 @@ class _Rtuple(list):  # MUST be list, NOT tuple!
            where C{p} and C{q} are C{int} digits only.
         '''
         try:
+            if not isinstance(k, _Rkey):
+                raise _RsError(k=type(k))
+            if not (isinstance(n, int) and n > 0):
+                raise _RsError(n=type(n))
             if not rs:
-                raise _RdictError(rs=MISSING)
+                raise _RsError(rs=MISSING)
             for t in rs:
                 if not isinstance(t, str):
-                    raise _RdictError(rs=type(t))
-            if not (isinstance(n, int) and n > 0):
-                raise _RdictError(n=type(n))
+                    raise _RsError(rs=type(t))
             self.k_n_rs = k, n, rs
         except Exception as x:
-            raise _RdictError(*rs, k=k, n=n, cause=x)
+            raise _RsError(*rs, k=k, n=n, cause=x)
 
     def __getitem__(self, i):
         return self._tuple[i]
 
+    if _MODS.sys_version_info2 < (3, 0):
+        def __getslice__(self, *i_j):  # PYCHOK 3 args
+            return self._tuple[slice(*i_j)]
+
     def __iter__(self):
         return iter(self._tuple)
 
@@ -178,26 +199,24 @@ class _Rtuple(list):  # MUST be list, NOT tuple!
 
     @Property_RO
     def _tuple(self):
-        # build the C{tuple} once, replace C{_Rdict}
-        # item at C{key} with the C{tuple} and fill
-        # this C{_Rlist} with the C{tuple} values
-        # for the initial __getitem__ retrieval[s]
+        # build the C{tuple} I{once} and replace
+        # C{_Rdict[key]} item with the C{tuple}
         try:
-            k, n, rs = self.k_n_rs
+            k, n, rs = self.k_n_rs  # for except ...
             t = self.Rdict._floatuple(self)
-            self[:] = t  # MUST copy into self!
+#           self[:] = t  # MUST copy into self?
         except Exception as x:
             if len(rs) > 1 and _QUOTE3_ in str(x):
                 rs = rs[0], _ELLIPSIS4_
-            raise _RdictError(k=k, n=n, rs=rs, cause=x)
+            raise _RsError(k=k, n=n, rs=rs, cause=x)
         del self.Rdict, self.k_n_rs  # trash refs
         return t
 
     def append(self, arg):
-        raise _RdictError(append=arg)
+        raise _RsError(append=arg)
 
     def extend(self, arg):
-        raise _RdictError(extend=arg)
+        raise _RsError(extend=arg)
 
 # **) MIT License
 #

pygeodesy/auxilats/__init__.py

@@ -14,8 +14,8 @@ License.  For more information, see the U{GeographicLib<https://GeographicLib.So
 @note: Class L{AuxDST} requires U{numpy<https://PyPI.org/project/numpy>} to be installed, version 1.16
        or newer.
 
-@see: U{Auxiliary latitudes<https:#GeographicLib.SourceForge.io/C++/doc/auxlat.html>} and
-      U{On auxiliary latitudes<https:#ArXiv.org/abs/2212.05818>}.
+@see: U{Auxiliary latitudes<https://GeographicLib.SourceForge.io/C++/doc/auxlat.html>} and
+      U{On auxiliary latitudes<https://ArXiv.org/abs/2212.05818>}.
 '''
 
 from pygeodesy.auxilats.auxAngle import AuxAngle, AuxBeta, AuxChi, AuxMu, \
@@ -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__ = '24.09.04'
+__version__ = '25.04.14'
 
 # **) MIT License
 #