pygeodesy 24.10.10__py2.py3-none-any.whl → 24.11.11__py2.py3-none-any.whl

pygeodesy/interns.py

@@ -3,7 +3,7 @@
 u'''Single C{str}ing constants, C{intern}'ed across C{pygeodesy}
 modules and function L{pygeodesy.machine}.
 '''
-import sys as _sys
+import sys as _sys  # in .internals, .lazily
 try:
     _intern =  intern  # PYCHOK in .lazily, .trf
 except NameError:  # Python 3+
@@ -11,7 +11,7 @@ except NameError:  # Python 3+
 
 _COMMASPACE_  = ', '  # overriden below
 _SUB_PACKAGES = 'auxilats', 'deprecated', 'geodesicx', 'rhumb'  # PYCHOK in ...
-# ... .lazily, make._dist, MANIFEST, setup.setup, test.bases, .testModules
+# ... .lazily, make._dist, MANIFEST, setup.setup, test/bases, test/testModules
 
 
 class _Dash(str):
@@ -199,7 +199,8 @@ _distance_            = 'distance'           # PYCHOK OK
 _distant_     = _Prefix('distant')           # PYCHOK OK
 _doesn_t_exist_       = "doesn't exist"      # PYCHOK OK
 _DOT_            = Str_('.')                 # PYCHOK OK
-_dunder_name_         = '__name__'           # PYCHOK _DUNDER_(NN, _name_, NN)
+_DUNDER_all_          = '__all__'            # PYCHOK OK
+_DUNDER_name_         = '__name__'           # PYCHOK _DUNDER_(NN, _name_, NN)
 _duplicate_           = 'duplicate'          # PYCHOK OK
 _e_                   = 'e'                  # PYCHOK OK
 _E_                   = 'E'                  # PYCHOK OK
@@ -309,7 +310,6 @@ _negative_            = 'negative'           # PYCHOK OK
 _NL_             = Str_('\n')                # PYCHOK OK
 _NLATvar_        = Str_(_NL_ + '@var ')      # PYCHOK OK
 _NLHASH_         = Str_(_NL_ + '# ')         # PYCHOK OK
-# _NLNL_              = _DNL_                # PYCHOK OK
 _NN_                  = 'NN'                 # PYCHOK OK
 _no_          = _Prefix('no')                # PYCHOK OK
 _northing_            = 'northing'           # PYCHOK OK
@@ -341,7 +341,7 @@ _points_              = 'points'             # PYCHOK OK
 _pole_                = 'pole'               # PYCHOK OK
 _precision_           = 'precision'          # PYCHOK OK
 _prime_vertical_      = 'prime_vertical'     # PYCHOK OK
-_pygeodesy_           = 'pygeodesy'          # PYCHOK OK
+_pygeodesy_           = 'pygeodesy'          # PYCHOK OK  # in test/bases
 _pygeodesy_abspath_   = 'pygeodesy_abspath'  # PYCHOK OK
 _PyPy__       = _PyPy__('PyPy ')             # PYCHOK + _SPACE_
 _Python_     = _Python_('Python')            # PYCHOK singleton
@@ -429,7 +429,7 @@ _SW_       = _S_  + _W_   # PYCHOK negative ones
 
 _DDOT_     = Str_(_DOT_   * 2)  # PYCHOK OK
 # _DEQUAL_ = Str_(_EQUAL_ * 2)  # PYCHOK OK
-_DNL_      = Str_(_NL_    * 2)  # PYCHOK OK
+# _DNL_    = Str_(_NL_    * 2)  # PYCHOK OK
 # _DSLASH_ = Str_(_SLASH_ * 2)  # PYCHOK OK
 # _DSTAR_  = Str_(_STAR_  * 2)  # PYCHOK OK
 _DUNDER_   = Str_(_UNDER_ * 2)  # PYCHOK OK
@@ -441,23 +441,26 @@ _LR_PAIRS  = {_LANGLE_:  _RANGLE_,
 
 __all__ = (_NN_,  # NOT MISSING!
             Str_.__name__)  # classes
-__version__ = '24.08.30'
+__version__ = '24.10.19'
 
 if __name__ == '__main__':
 
-    from pygeodesy import itemsorted, printf
-
-    t = b = 0
-    for n, v in itemsorted(locals(), asorted=False, reverse=True):
-        if n.endswith(_UNDER_) and n.startswith(_UNDER_) and \
-                               not n.startswith(_DUNDER_):
-            t += 1
-            b += len(v)
-            m  = n[1:-1]
-            if m != v and m.replace(_UNDER_, _SPACE_) != v:
-                printf('%4d: %s = %r', t, n, v)
-    n = len(locals())
-    printf('%4d (%d) names, %s chars total, %.2f chars avg', t, n, b, float(b) / t, nl=1)
+    def _main():
+        from pygeodesy import itemsorted, printf
+
+        t = b = 0
+        for n, v in itemsorted(locals(), asorted=False, reverse=True):
+            if n.endswith(_UNDER_) and n.startswith(_UNDER_) and \
+                                   not n.startswith(_DUNDER_):
+                t += 1
+                b += len(v)
+                m  = n[1:-1]
+                if m != v and m.replace(_UNDER_, _SPACE_) != v:
+                    printf('%4d: %s = %r', t, n, v)
+        n = len(locals())
+        printf('%4d (%d) names, %s chars total, %.2f chars avg', t, n, b, float(b) / t, nl=1)
+
+    _main()
 
 # **) MIT License
 #

pygeodesy/karney.py

@@ -64,7 +64,7 @@ Karney-based functionality
     <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1Intersect.html>} from I{GeographicLib 2.3+}
 
   - L{JacobiConformal} -- U{JacobiConformal
-    <https://geographiclib.sourceforge.io/C++/doc/classGeographicLib_1_1experimental_1_1JacobiConformal.html>}
+    <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1experimental_1_1JacobiConformal.html>}
 
   - L{KTransverseMercator} - U{TransverseMercator
     <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1TransverseMercator.html>}
@@ -143,18 +143,18 @@ in C{pygeodesy} are based on I{Karney}'s post U{Area of a spherical polygon
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import _copysign, isint, neg, unsigned0, _xgeographiclib, \
-                             _zip,  _version_info
+from pygeodesy.basics import _copysign, isint, neg, unsigned0, \
+                             _xgeographiclib, _zip
 from pygeodesy.constants import NAN, _isfinite as _math_isfinite, _0_0, \
                                _1_16th, _1_0, _2_0, _180_0, _N_180_0, _360_0
 from pygeodesy.errors import GeodesicError, _ValueError, _xkwds
 from pygeodesy.fmath import cbrt, fremainder, norm2  # Fhorner, Fsum
-# from pygeodesy.internals import _version_info  # from .basics
-from pygeodesy.interns import NN, _2_, _a12_, _area_, _azi1_, _azi2_, _azi12_, \
+from pygeodesy.internals import _getenv, _popen2, _PYGEODESY, _version_info
+from pygeodesy.interns import NN, _a12_, _area_, _azi1_, _azi2_, _azi12_, \
                              _composite_, _lat1_, _lat2_, _lon1_, _lon2_, \
                              _m12_, _M12_, _M21_, _number_, _s12_, _S12_, \
-                             _UNDER_, _X_,  _BAR_  # PYCHOK used!
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
+                             _SPACE_, _UNDER_, _X_, _1_, _2_,  _BAR_  # PYCHOK used!
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import ADict, _NamedBase, _NamedTuple, notImplemented, _Pass
 from pygeodesy.props import deprecated_method, Property_RO, property_RO, \
                                                property_ROnce
@@ -165,11 +165,12 @@ from pygeodesy.utily import atan2d, sincos2d, tand, _unrollon,  fabs
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.karney
-__version__ = '24.09.13'
+__version__ = '24.11.09'
 
-_K_2_0      = _getenv('PYGEODESY_GEOGRAPHICLIB', _2_)
-_K_2_4      = _K_2_0 == '2.4'
-_K_2_0      = _K_2_0 == _2_ or _K_2_4
+_2_4_       = '2.4'
+_K_2_0      = _getenv(_PYGEODESY(_xgeographiclib, 1), _2_)
+_K_2_4      = _K_2_0 ==  _2_4_
+_K_2_0      = _K_2_4 or (_K_2_0 == _2_)
 _perimeter_ = 'perimeter'
 
 
@@ -576,8 +577,8 @@ class _kWrapped(object):  # in .geodesicw
 
     @property_RO
     def Math_K_2(self):
-        return ('_K_2_4' if _K_2_4 else
-               ('_K_2_0' if _K_2_0 else '_K_1_0')) if self.Math else NN
+        return (_2_4_ if _K_2_4 else
+               (_2_   if _K_2_0 else _1_)) if self.Math else NN
 
 _wrapped = _kWrapped()  # PYCHOK singleton, .datum, .test/base.py
 
@@ -639,6 +640,54 @@ class Rhumb8Tuple(_GTuple):
         return _MODS.deprecated.classes.Rhumb7Tuple(self[:-1])
 
 
+class _Xables(object):
+    '''(INTERNAL) Get I{Karney}'s executable paths from/and env vars.
+    '''
+    bin_ = '/opt/local/bin/'  # '/opt/local/Cellar/geographiclib/2.3/bin/'  # HomeBrew on macOS
+    ENV  =  NN
+
+    def GeoConvert(self, *dir_):
+        return self._path(self.GeoConvert, *dir_)
+
+    def GeodSolve(self, *dir_):
+        return self._path(self.GeodSolve, *dir_)
+
+    def IntersectTool(self, *dir_):
+        return self._path(self.IntersectTool, *dir_)
+
+    def RhumbSolve(self, *dir_):
+        return self._path(self.RhumbSolve, *dir_)
+
+    def name_version(self, path, base=True):
+        # return C{(path + ' ' + version)} of an executable
+        if path:
+            try:
+                r, s = _popen2((path, '--version'))
+                if base:
+                    path = _MODS.os.path.basename(path)
+                    r    = _SPACE_(path, r.split()[-1])
+                else:
+                    r    = _MODS.streprs.Fmt.PARENSPACED(r, s)
+                return r
+            except (IndexError, IOError, OSError):
+                pass
+        return NN
+
+    def _path(self, which, *dir_):
+        self.ENV = E = _PYGEODESY(which)
+        return _getenv(E, NN) or \
+               (NN(dir_[0], which.__name__) if dir_ else E)
+
+    def X_not(self, path):
+        return 'env %s=%r not executable' % (self.ENV, path)
+
+    def X_OK(self, path):  # is C{path} an executable?
+        os = _MODS.os  # import os
+        return os.access(path, os.X_OK) if path else False
+
+_Xables = _Xables()  # PYCHOK singleton
+
+
 def _around(x):  # in .utily.sincos2d
     '''I{Coarsen} a scalar by rounding small values to underflow to C{0.0}.
 

pygeodesy/ktm.py

@@ -49,8 +49,7 @@ from pygeodesy.constants import INF, _K0_UTM, PI, PI_2, _0_0s, _0_0, \
 from pygeodesy.datums import Datum, _spherical_datum, _WGS84,  _EWGS84
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
 from pygeodesy.errors import _ValueError, _xkwds_pop2, _Xorder
-from pygeodesy.fmath import hypot, hypot1
-from pygeodesy.fsums import fsum1f_
+from pygeodesy.fmath import fdot_, hypot, hypot1
 from pygeodesy.interns import _COMMASPACE_, _singular_
 from pygeodesy.karney import _atan2d, _diff182, _fix90, _norm180, \
                              _polynomial, _unsigned2
@@ -67,7 +66,7 @@ from cmath import polar
 from math import atan2, asinh, cos, cosh, degrees, fabs, sin, sinh, sqrt, tanh
 
 __all__ = _ALL_LAZY.ktm
-__version__ = '24.08.31'
+__version__ = '24.11.11'
 
 
 class KTMError(_ValueError):
@@ -433,10 +432,10 @@ def _cma(a, b0, b1, Cn):
        @see: CPython function U{_Py_c_prod<https://GitHub.com/python/
              cpython/blob/main/Objects/complexobject.c>}.
 
-       @note: Python function C{cmath.fsum} is no longer available.
+       @note: Python function C{cmath.fsum} no longer exists.
     '''
-    r = fsum1f_(a.real * b0.real, -a.imag * b0.imag, -b1.real, Cn)
-    j = fsum1f_(a.real * b0.imag,  a.imag * b0.real, -b1.imag)
+    r = fdot_(a.real, b0.real, -a.imag, b0.imag, -b1.real, _1_0, start=Cn)
+    j = fdot_(a.real, b0.imag,  a.imag, b0.real, -b1.imag, _1_0)
     return complex(r, j)
 
 
@@ -461,19 +460,18 @@ def _Cyxgk4(E, xi_, eta_, C):
             y0 = complex(Cn)  # +0j
             z0 = complex(Cn * (n * 2))
             n -= 1
-        _c = _cma
         while n > 0:
             Cn =  C[n]
-            y1 = _c(a, y0, y1, Cn)
-            z1 = _c(a, z0, z1, Cn * (n * 2))
+            y1 = _cma(a, y0, y1, Cn)
+            z1 = _cma(a, z0, z1, Cn * (n * 2))
             n -=  1
             Cn =  C[n]
-            y0 = _c(a, y1, y0, Cn)
-            z0 = _c(a, z1, z0, Cn * (n * 2))
+            y0 = _cma(a, y1, y0, Cn)
+            z0 = _cma(a, z1, z0, Cn * (n * 2))
             n -=  1
         # assert n == 0
-        x = _c(s, y0, -x, _0_0)
-        c = _c(c, z0, z1, _1_0)
+        x = _cma(s, y0, -x, _0_0)
+        c = _cma(c, z0, z1, _1_0)
 
         # Gauss-Schreiber to Gauss-Krueger TM
         # C{cmath.polar} handles INF, NAN, etc.

pygeodesy/latlonBase.py

@@ -3,7 +3,7 @@
 
 u'''(INTERNAL) Base class L{LatLonBase} for all elliposiodal, spherical and N-vectorial C{LatLon} classes.
 
-@see: I{(C) Chris Veness}' U{latlong<https://www.Movable-Type.co.UK/scripts/latlong.html>},
+@see: I{(C) Chris Veness 2005-2024}' U{latlong<https://www.Movable-Type.co.UK/scripts/latlong.html>},
       U{-ellipsoidal<https://www.Movable-Type.co.UK/scripts/geodesy/docs/latlon-ellipsoidal.js.html>} and
       U{-vectors<https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>} and I{Charles Karney}'s
       U{Rhumb<https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1Rhumb.html>} and
@@ -47,14 +47,14 @@ from pygeodesy.units import _isDegrees, _isRadius, Distance_, Lat, Lon, \
                              Height, Radius, Radius_, Scalar, Scalar_
 from pygeodesy.utily import _unrollon, _unrollon3, _Wrap
 # from pygeodesy.vector2d import _circin6, Circin6Tuple, _circum3, circum4_, \
-#                                 Circum3Tuple, _radii11ABC  # _MODS
+#                                 Circum3Tuple, _radii11ABC4  # _MODS
 # from pygeodesy.vector3d import nearestOn6, Vector3d  # _MODS
 
 from contextlib import contextmanager
 from math import asin, cos, degrees, fabs, radians
 
 __all__ = _ALL_LAZY.latlonBase
-__version__ = '24.08.18'
+__version__ = '24.11.10'
 
 _formy = _MODS.into(formy=__name__)
 
@@ -1142,7 +1142,7 @@ class LatLonBase(_NamedBase):
                  Circles<https://MathWorld.Wolfram.com/TangentCircles.html>}.
         '''
         with _toCartesian3(self, point2, point3, wrap) as cs:
-            return _MODS.vector2d._radii11ABC(*cs, useZ=True)[0]
+            return _MODS.vector2d._radii11ABC4(*cs, useZ=True)[0]
 
     def _rhumb3(self, exact, radius):  # != .sphericalBase._rhumbs3
         '''(INTERNAL) Get the C{rhumb} for this point's datum or for
@@ -1250,10 +1250,10 @@ class LatLonBase(_NamedBase):
            points or as a point and azimuth.
 
            @arg circle: Radius of the circle centered at this location (C{meter}),
-                        or a point on the circle (this C{LatLon}).
-           @arg point: The start point of the rhumb line (this C{LatLon}).
-           @arg other: An other point I{on} (this C{LatLon}) or the azimuth I{of}
-                       (compass C{degrees}) the rhumb line.
+                        or a point on the circle (same C{LatLon} class).
+           @arg point: The start point of the rhumb line (same C{LatLon} class).
+           @arg other: An other point I{on} (same C{LatLon} class) or the azimuth
+                       I{of} (compass C{degrees}) the rhumb line.
            @kwarg height: Optional height for the intersection points (C{meter},
                           conventionally) or C{None} for interpolated heights.
            @kwarg exact_radius_wrap_eps_tol: Optional keyword arguments, see
@@ -1266,8 +1266,7 @@ class LatLonBase(_NamedBase):
 
            @raise IntersectionError: The circle and rhumb line do not intersect.
 
-           @raise TypeError: If B{C{point}} is not this C{LatLon} or B{C{circle}}
-                             or B{C{other}} invalid.
+           @raise TypeError: Invalid B{C{point}}, B{C{circle}} or B{C{other}}.
 
            @raise ValueError: Invalid B{C{circle}}, B{C{other}}, B{C{height}}
                               or B{C{exact_radius_wrap}}.
@@ -1297,7 +1296,7 @@ class LatLonBase(_NamedBase):
            this and an other point.
 
            @arg other: The azimuth I{of} (compass C{degrees}) or an other point
-                       I{on} (this C{LatLon}) the rhumb line.
+                       I{on} (same C{LatLon} class) the rhumb line.
            @kwarg exact: Exact C{Rhumb...} to use (C{bool} or C{Rhumb...}), see
                          method L{Ellipsoid.rhumb_}.
            @kwarg radius: Optional earth radius (C{meter}) or earth model
@@ -1311,7 +1310,7 @@ class LatLonBase(_NamedBase):
            @return: A C{RhumbLine} instance.
 
            @raise TypeError: Invalid B{C{radius}} or B{C{other}} not C{scalar} nor
-                             this C{LatLon}.
+                             same C{LatLon} class.
 
            @see: Modules L{rhumb.aux_} and L{rhumb.ekx}.
         '''
@@ -1326,7 +1325,7 @@ class LatLonBase(_NamedBase):
         '''Return the (loxodromic) midpoint on the rhumb line between this and
            an other point.
 
-           @arg other: The other point (this C{LatLon}).
+           @arg other: The other point (same C{LatLon} class).
            @kwarg exact: Exact C{Rhumb...} to use (C{bool} or C{Rhumb...}), see
                          method L{Ellipsoid.rhumb_}.
            @kwarg radius: Optional earth radius (C{meter}) or earth model (L{Datum},
@@ -1341,7 +1340,7 @@ class LatLonBase(_NamedBase):
                        and unroll the B{C{other}} point (C{bool}).
 
            @return: The midpoint at the given B{C{fraction}} along the rhumb line
-                    (this C{LatLon}).
+                    (same C{LatLon} class).
 
            @raise TypeError: The B{C{other}} point is incompatible or B{C{radius}}
                              is invalid.
@@ -1506,9 +1505,9 @@ class LatLonBase(_NamedBase):
            @kwarg h: Optional height, overriding this point's height (C{meter}).
            @kwarg Nvector: Optional class to return the C{n-vector} components
                            (C{Nvector}) or C{None}.
-           @kwarg name_Nvector_kwds: Optional C{B{name}=NN} (C{str}) and optional,
-                       additional B{C{Nvector}} keyword arguments, ignored if
-                       C{B{Nvector} is None}.
+           @kwarg name_Nvector_kwds: Optional C{B{name}=NN} (C{str}) and optionally,
+                       additional B{C{Nvector}} keyword arguments, ignored if C{B{Nvector}
+                       is None}.
 
            @return: An named B{C{Nvector}} or if C{B{Nvector} is None} a named
                     L{Vector4Tuple}C{(x, y, z, h)}.
@@ -1539,9 +1538,8 @@ class LatLonBase(_NamedBase):
            @kwarg m: Optional unit of the height (C{str}), use C{None} to
                      exclude height from the returned string.
            @kwarg prec_sep_s_D_M_S: Optional C{B{prec}ision}, C{B{sep}arator},
-                      B{C{s_D}}, B{C{s_M}}, B{C{s_S}} and B{C{s_DMS}} keyword
-                      arguments, see function L{pygeodesy.latDMS} or
-                      L{pygeodesy.lonDMS}.
+                       B{C{s_D}}, B{C{s_M}}, B{C{s_S}} and B{C{s_DMS}} keyword
+                       arguments, see function L{pygeodesy.toDMS} for details.
 
            @return: This point in the specified C{B{form}at}, etc. (C{str} or
                     a 2- or 3-tuple C{(lat_str, lon_str[, height_str])} if