pygeodesy 25.5.28__py2.py3-none-any.whl → 25.8.25__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.3 (with U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0),
+The tests ran with Python 3.13.5 (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.5,
@@ -143,20 +143,20 @@ U{GeoConvert<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.5,
 U{GeodSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.5,
 U{IntersectTool<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.5 and
 U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/utilities.html>} 2.5), all in 64-bit on
-macOS 15.5 Sequoia.
+macOS 15.6.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.3, 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.5, 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.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
+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
 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.3 (and U{geographiclib<https://PyPI.org/project/geographiclib>} 2.0) on
+The tests also ran with Python 3.13.5 (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.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-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,
+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,
 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,
@@ -175,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 15.0-4 Sequoia, 14.0-6.1 Sonoma, 13.0-5.2 Ventura, 12.1-6 Monterey,
+<https://PyPI.org/project/numpy>} 1.11.3) on macOS 15.0-5 Sequoia, 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
@@ -187,10 +187,10 @@ Notes
 =====
 
 All Python source code has been statically U{checked<https://GitHub.com/ActiveState/code/tree/master/recipes/Python/
-546532_PyChecker_postprocessor>} with U{Ruff<https://GitHub.com/astral-sh/ruff>} using Python 3.13.3 and with
+546532_PyChecker_postprocessor>} with U{Ruff<https://GitHub.com/astral-sh/ruff>} using Python 3.13.5 and 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, both in 64-bit on macOS 15.5 Sequoia only.
+2.7.18, both in 64-bit on macOS 15.6.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>}.
@@ -604,7 +604,7 @@ else:
 
 from pygeodesy.internals import _version2,  _DOT_  # noqa: E402
 # from pygeodesy.interns import _DOT_  # from .internals
-__version__ = '25.05.28'
+__version__ = '25.08.25'
 # see setup.py for similar logic
 version     = _DOT_(*_version2(__version__, n=3))
 

pygeodesy/cartesianBase.py

@@ -27,11 +27,11 @@ from pygeodesy.interns import _COMMASPACE_, _datum_, _no_, _phi_
 from pygeodesy.interns import _ellipsoidal_, _spherical_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name2__, _Pass
-from pygeodesy.namedTuples import LatLon4Tuple, _NamedTupleTo , Vector3Tuple, \
+from pygeodesy.namedTuples import LatLon4Tuple, _NamedTupleTo, Vector3Tuple, \
                                   Vector4Tuple
-# from pygeodesy.nvectorBase import _N_vector  # _MODS
-from pygeodesy.props import deprecated_method, Property, Property_RO, property_doc_, \
-                            property_RO, _update_all
+# from pygeodesy.nvectorBase import _N_Vector  # _MODS
+from pygeodesy.props import deprecated_method, Property, Property_RO, \
+                            property_doc_, property_RO, _update_all
 # from pygeodesy import resections as _resections  # _MODS.into
 # from pygeodesy.streprs import Fmt  # from .fsums
 # from pygeodesy.triaxials import Triaxial_  # _MODS
@@ -39,12 +39,11 @@ from pygeodesy.units import Degrees, Height, _heigHt, _isMeter, Meter, Radians
 from pygeodesy.utily import acos1, atan2, sincos2d, sincos2_,  degrees, radians
 from pygeodesy.vector3d import Vector3d, _xyzhdlln4
 # from pygeodesy.vector3dBase import _xyz3  # _MODS
-# from pygeodesy import ltp  # _MODS
 
 # from math import degrees, fabs, radians, sqrt  # from .fmath, .utily
 
 __all__ = _ALL_LAZY.cartesianBase
-__version__ = '25.05.07'
+__version__ = '25.08.24'
 
 _r_         = 'r'
 _resections = _MODS.into(resections=__name__)
@@ -172,12 +171,13 @@ class CartesianBase(Vector3d, _EcefLocal):
            @raise TypeError: The B{C{datum}} is not a L{Datum}.
         '''
         d = _spherical_datum(datum, name=self.name)
-        if self._datum:  # is not None
-            if d.isEllipsoidal and not self._datum.isEllipsoidal:
+        D =  self._datum
+        if D:  # is not None
+            if d.isEllipsoidal and not D.isEllipsoidal:
                 raise _IsnotError(_ellipsoidal_, datum=datum)
-            elif d.isSpherical and not self._datum.isSpherical:
+            elif d.isSpherical and not D.isSpherical:
                 raise _IsnotError(_spherical_, datum=datum)
-        if self._datum != d:
+        if D != d:  # or (D and D.name != d.name)
             _update_all(self)
             self._datum = d
 
@@ -302,8 +302,6 @@ class CartesianBase(Vector3d, _EcefLocal):
            @note: Include keyword argument C{B{datum}=None} if class B{C{Cartesian}}
                   does not accept a B{C{datum}} keyword agument.
 
-           @raise TriaxialError: No convergence in triaxial root finding.
-
            @raise TypeError: Invalid or undefined B{C{earth}} or C{datum}.
         '''
         n = typename(self.height3)
@@ -410,13 +408,12 @@ class CartesianBase(Vector3d, _EcefLocal):
 
     @Property_RO
     def _N_vector(self):
-        '''(INTERNAL) Get the (C{nvectorBase._N_vector_}).
+        '''(INTERNAL) Get the (C{nvectorBase._N_Vector}).
         '''
-        _N = _MODS.nvectorBase._N_vector_
-        x, y, z, h = self._n_xyzh4(self.datum)
-        return _N(x, y, z, h=h, name=self.name)
+        _N = _MODS.nvectorBase._N_Vector
+        return self._n_xyzh4(self.datum, Vector=_N)
 
-    def _n_xyzh4(self, datum):
+    def _n_xyzh4(self, datum, Vector=Vector4Tuple):
         '''(INTERNAL) Get the n-vector components as L{Vector4Tuple}.
         '''
         def _ErrorEPS0(x):
@@ -434,7 +431,11 @@ class CartesianBase(Vector3d, _EcefLocal):
         p = hypot2(x, y) * E.a2_
         q = z**2 * E.e21 * E.a2_
         r = fsumf_(p, q, -E.e4) / _6_0
+        if isnear0(r):
+            raise _ErrorEPS0(r)
         s = (p * q * E.e4) / (_4_0 * r**3)
+        if s < 0:
+            raise _ErrorEPS0(s)
         t = cbrt(fsumf_(_1_0, s, sqrt(s * (_2_0 + s))))
         if isnear0(t):
             raise _ErrorEPS0(t)
@@ -458,7 +459,7 @@ class CartesianBase(Vector3d, _EcefLocal):
             raise _ErrorEPS0(t)
         h = fsumf_(k, E.e2, _N_1_0) / k * t
         s = e / t  # == e * tmp
-        return Vector4Tuple(x * s, y * s, z / t, h, name=self.name)
+        return Vector(x * s, y * s, z / t, h, name=self.name)
 
     @Property_RO
     def philam(self):
@@ -980,8 +981,8 @@ def xyz2rtp_(x_xyz, y=0, z=0, **name):
        @kwarg name: Optional C{B{name}=NN} (C{str}).
 
        @return: L{RadiusThetaPhi3Tuple}C{(r, theta, phi)} with radial distance C{r} (C{meter},
-                same units as C{x}, C{y} and C{z}), inclination C{theta} (with respect to the
-                positive z-axis) and azimuthal angle C{phi}, both in L{Radians}.
+                same units as C{x}, C{y} and C{z}), inclination C{theta} (polar angle with
+                respect to the positive z-axis) and azimuthal angle C{phi}, both in L{Radians}.
 
        @see: U{Physics convention<https://WikiPedia.org/wiki/Spherical_coordinate_system>}
              (ISO 80000-2:2019), class L{RadiusThetaPhi3Tuple} and function L{xyz2rtp}.