pygeodesy 24.9.29__py2.py3-none-any.whl → 24.10.24__py2.py3-none-any.whl

pygeodesy/sphericalTrigonometry.py

@@ -10,7 +10,7 @@ L{perimeterOf}, I{all spherical}.
 
 Pure Python implementation of geodetic (lat-/longitude) methods using
 spherical trigonometry, transcoded from JavaScript originals by
-I{(C) Chris Veness 2011-2016} published under the same MIT Licence**, see
+I{(C) Chris Veness 2011-2024} published under the same MIT Licence**, see
 U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>}.
 '''
 # make sure int/int division yields float quotient, see .basics
@@ -54,7 +54,7 @@ from pygeodesy.vector3d import sumOf, Vector3d
 from math import asin, atan2, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '24.09.23'
+__version__ = '24.10.12'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -885,13 +885,14 @@ def intersecant2(center, circle, point, other, **radius_exact_height_wrap):
        two points or as a point and bearing.
 
        @arg center: Center of the circle (L{LatLon}).
-       @arg circle: Radius of the circle (C{meter}, same units as B{C{radius}})
-                    or a point on the circle (L{LatLon}).
+       @arg circle: Radius of the circle (C{meter}, same units as the earth
+                    B{C{radius}}) or a point on the circle (L{LatLon}).
        @arg point: A point on the (great circle) line (L{LatLon}).
        @arg other: An other point on the (great circle) line (L{LatLon}) or
                    the bearing at the B{C{point}} (compass C{degrees360}).
-       @kwarg radius_exact_height_wrap: Optional keyword arguments, see
-                     method L{LatLon.intersecant2} for further details.
+       @kwarg radius_exact_height_wrap: Optional keyword arguments, see method
+                     L{intersecant2<pygeodesy.sphericalBase.LatLonSphericalBase.
+                     intersecant2>} for further details.
 
        @return: 2-Tuple of the intersection points (representing a chord), each
                 an instance of the B{C{point}} class.  Both points are the same
@@ -899,8 +900,8 @@ def intersecant2(center, circle, point, other, **radius_exact_height_wrap):
 
        @raise IntersectionError: The circle and line do not intersect.
 
-       @raise TypeError: If B{C{center}} or B{C{point}} not L{LatLon} or
-                         B{C{circle}} or B{C{other}} invalid.
+       @raise TypeError: If B{C{center}}, B{C{point}}, B{C{circle}} or B{C{other}}
+                         not L{LatLon}.
 
        @raise UnitError: Invalid B{C{circle}}, B{C{other}}, B{C{radius}},
                          B{C{exact}}, B{C{height}} or B{C{napieradius}}.

pygeodesy/streprs.py

@@ -9,7 +9,7 @@ from pygeodesy.basics import isint, islistuple, isscalar, isstr, itemsorted, \
 # from pygeodesy.constants import _0_0
 from pygeodesy.errors import _or, _IsnotError, _TypeError, _ValueError, \
                              _xkwds_get, _xkwds_item2
-# from pygeodesy.internals import _dunder_nameof  # from .lazily
+from pygeodesy.internals import _DUNDER_nameof
 from pygeodesy.interns import NN, _0_, _0to9_, MISSING, _BAR_, _COMMASPACE_, \
                              _DOT_, _E_, _ELLIPSIS_, _EQUAL_, _H_, _LR_PAIRS, \
                              _N_, _name_, _not_scalar_, _PERCENT_, _SPACE_, \
@@ -17,12 +17,12 @@ from pygeodesy.interns import NN, _0_, _0to9_, MISSING, _BAR_, _COMMASPACE_, \
 from pygeodesy.interns import _convergence_, _distant_, _e_, _eps_, _exceeds_, \
                               _EQUALSPACED_, _f_, _F_, _g_, _limit_, _no_, \
                               _tolerance_  # PYCHOK used!
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _dunder_nameof
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 
 from math import fabs, log10 as _log10
 
 __all__ = _ALL_LAZY.streprs
-__version__ = '24.09.28'
+__version__ = '24.10.14'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
@@ -545,23 +545,26 @@ def unstr(where, *args, **kwds_):
 
        @return: Representation (C{str}).
     '''
-    def _C_e_g_kwds3(_Cdot=None, _ELLIPSIS=False, _fmt=Fmt.g, **kwds):
+    def _C_e_g_kwds3(_Cdot=None, _ELLIPSIS=0, _fmt=Fmt.g, **kwds):
         return _Cdot, _ELLIPSIS, _fmt, kwds
 
     C, e, g, kwds = _C_e_g_kwds3(**kwds_)
-    t = reprs(args, fmt=g) if args else ()
-    if e:
+    if e and len(args) > (e + 1):
+        t  =  reprs(args[:e], fmt=g)
         t += _ELLIPSIS_,
+        t +=  reprs(args[-1:], fmt=g)
+    else:
+        t  =  reprs(args, fmt=g) if args else ()
     if kwds:
         t += pairs(itemsorted(kwds), fmt=g)
-    n = where if isstr(where) else _dunder_nameof(where)  # _NN_
+    n = where if isstr(where) else _DUNDER_nameof(where)  # _NN_
     if C and hasattr(C, n):
         try:  # bound method of class C?
             where = where.__func__
         except AttributeError:
             pass  # method of C?
         if getattr(C, n, None) is where:
-            n = _DOT_(_dunder_nameof(C), n)
+            n = _DOT_(_DUNDER_nameof(C), n)
     return Fmt.PAREN(n, _COMMASPACE_.join(t))
 
 

pygeodesy/trf.py

@@ -5,7 +5,7 @@ u'''I{Veness}' Terrestrial Reference Frames (TRF).
 
 Classes L{RefFrame}, registry L{RefFrames} and L{TRFError}.
 
-Transcoded from I{Chris Veness'} (C) 2006-2022 JavaScript originals U{latlon-ellipsoidal-referenceframe.js
+Transcoded from I{Chris Veness'} (C) 2006-2024 JavaScript originals U{latlon-ellipsoidal-referenceframe.js
 <https://GitHub.com/ChrisVeness/geodesy/blob/master/latlon-ellipsoidal-referenceframe.js>} and
 U{latlon-ellipsoidal-referenceframe-txparams.js
 <https://GitHub.com/ChrisVeness/geodesy/blob/master/latlon-ellipsoidal-referenceframe-txparams.js>}.
@@ -91,7 +91,7 @@ from math import ceil as _ceil, fabs
 # import operator as _operator  # from .datums
 
 __all__ = _ALL_LAZY.trf
-__version__ = '24.06.09'
+__version__ = '24.10.14'
 
 _EP0CH    =  Epoch(0, low=0)
 _Es       = {_EP0CH: _EP0CH}  # L{Epoch}s, deleted below
@@ -391,7 +391,9 @@ class TransformXform(Transform):
            @return: Inverse (L{TransformXform}), unregistered.
         '''
         r = Transform.inverse(self, **name)
-        r._Xform = r.Xform.inverse()
+        X = self.Xform
+        if X:  # unregistered
+            r._Xform = X.inverse()
         return r
 
     def rename(self, name=NN):
@@ -1778,7 +1780,7 @@ if __name__ == '__main__':
                 raise AssertionError(_SPACE_(n, _vs_, t))
 
     _main()
-    del _main
+#   del _main
 
 # **) MIT License
 #

pygeodesy/triaxials.py

@@ -30,14 +30,14 @@ see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isLatLon, isscalar, _ValueError
+from pygeodesy.basics import isLatLon, isscalar
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INT0, PI2, PI_3, PI4, \
-                               _EPS2e4, float0_, isfinite, isnear1, _over, \
+                               _EPS2e4, _SQRT2_2, float0_, isfinite, isnear1, _over, \
                                _0_0, _0_5, _1_0, _N_1_0, _64_0,  _4_0  # PYCHOK used!
 from pygeodesy.datums import Datum, _spherical_datum, _WGS84,  Ellipsoid, _EWGS84, Fmt
 # from pygeodesy.ellipsoids import Ellipsoid, _EWGS84  # from .datums
 # from pygeodesy.elliptic import Elliptic  # _MODS
-# from pygeodesy.errors import _ValueError  # from .basics
+from pygeodesy.errors import _AssertionError, _ValueError
 from pygeodesy.fmath import Fdot, fdot, fmean_, hypot, hypot_, norm2, sqrt0
 from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
 from pygeodesy.interns import NN, _a_, _b_, _beta_, _c_, _distant_, _finite_, \
@@ -59,7 +59,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 from math import atan2, fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '24.08.26'
+__version__ = '24.10.15'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -1272,13 +1272,13 @@ def hartzell4(pov, los=False, tri_biax=_WGS84, **name):
         T = tri_biax
     else:
         D = tri_biax if isinstance(tri_biax, Datum) else \
-                  _spherical_datum(tri_biax, name__=hartzell4)  # _dunder_nameof
+                  _spherical_datum(tri_biax, name__=hartzell4)  # _DUNDER_nameof
         T = D.ellipsoid._triaxial
     try:
         v, h, i = _hartzell3(pov, los, T)
     except Exception as x:
         raise TriaxialError(pov=pov, los=los, tri_biax=tri_biax, cause=x)
-    return Vector4Tuple(v.x, v.y, v.z, h, iteration=i,  # _dunder_nameof
+    return Vector4Tuple(v.x, v.y, v.z, h, iteration=i,  # _DUNDER_nameof
                                           name=_name__(name, name__=hartzell4))
 
 
@@ -1308,12 +1308,49 @@ def _over02(p, q):
     return (p / q)**2 if p and q else _0_0
 
 
+def _plumbTo3(px, py, E, eps=EPS):  # in .ellipsoids.Ellipsoid.height4
+    '''(INTERNAL) Nearest point on a 2-D ellipse in 1st quadrant.
+    '''
+    a, b = E.a, E.b
+    if min(px, py, a, b) < EPS0:
+        raise _AssertionError(px=px, py=py, a=a, b=b, E=E)
+
+    a2 = a - b * E.b_a
+    b2 = b - a * E.a_b
+    tx = ty = _SQRT2_2
+    for i in range(16):  # max 5
+        ex = a2 * tx**3
+        ey = b2 * ty**3
+
+        qx = px - ex
+        qy = py - ey
+        q  = hypot(qx, qy)
+        if q < EPS0:  # PYCHOK no cover
+            break
+        r = hypot(ex - tx * a,
+                  ey - ty * b) / q
+
+        sx, tx = tx, min(_1_0, max(0, (ex + qx * r) / a))
+        sy, ty = ty, min(_1_0, max(0, (ey + qy * r) / b))
+        t = hypot(ty, tx)
+        if t < EPS0:  # PYCHOK no cover
+            break
+        tx = tx / t  # /= chokes PyChecker
+        ty = ty / t
+        if fabs(sx - tx) < eps and \
+           fabs(sy - ty) < eps:
+            break
+
+    tx *= a / px
+    ty *= b / py
+    return tx, ty, i  # x and y as fractions
+
+
 def _plumbTo4(x, y, a, b, eps=EPS):
     '''(INTERNAL) Nearest point on and distance to a 2-D ellipse, I{unordered}.
 
-       @see: Function C{pygeodesy.ellipsoids._plumbTo3} and I{Eberly}'s U{Distance
-             from a Point to ... an Ellipse ...<https://www.GeometricTools.com/
-             Documentation/DistancePointEllipseEllipsoid.pdf>}.
+       @see: Function C{_plumbTo3} and I{Eberly}'s U{Distance from a Point to ... an Ellipse ...
+             <https://www.GeometricTools.com/Documentation/DistancePointEllipseEllipsoid.pdf>}.
     '''
     if b > a:
         b, a, d, i = _plumbTo4(y, x, b, a, eps=eps)

pygeodesy/units.py

@@ -18,7 +18,7 @@ from pygeodesy.interns import NN, _azimuth_, _band_, _bearing_, _COMMASPACE_, \
                              _NS_, _NSEW_, _number_, _PERCENT_, _phi_, _precision_, \
                              _radians_, _radians2_, _radius_, _S_, _scalar_, \
                              _units_, _W_, _zone_,  _std_  # PYCHOK used!
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 # from pygeodesy.named import _name__  # _MODS
 from pygeodesy.props import Property_RO
 # from pygeodesy.streprs import Fmt, fstr  # from .unitsBase
@@ -27,7 +27,7 @@ from pygeodesy.unitsBase import Float, Int, _NamedUnit, Radius, Str,  Fmt, fstr
 from math import degrees, isnan, radians
 
 __all__ = _ALL_LAZY.units
-__version__ = '24.08.13'
+__version__ = '24.10.12'
 
 
 class Float_(Float):
@@ -858,13 +858,14 @@ def _xlimits(arg, low, high, g=False):
 def _std_repr(*Classes):
     '''(INTERNAL) Use standard C{repr} or named C{toRepr}.
     '''
+    from pygeodesy.internals import _getenv
     for C in Classes:
         if hasattr(C, _std_repr.__name__):  # PYCHOK del _std_repr
             env = 'PYGEODESY_%s_STD_REPR' % (C.__name__.upper(),)
             if _getenv(env, _std_).lower() != _std_:
                 C._std_repr = False
 
-_std_repr(Azimuth, Bearing, Bool, Degrees, Float, Int, Meter, Radians, Str)  # PYCHOK expected
+_std_repr(Azimuth, Bearing, Bool, Degrees, Epoch, Float, Int, Meter, Radians, Str)  # PYCHOK expected
 del _std_repr
 
 __all__ += _ALL_DOCS(_NamedUnit)

pygeodesy/ups.py

@@ -28,12 +28,12 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, _neg, parseDMS2
 from pygeodesy.errors import RangeError, _ValueError, _xkwds_pop2
 from pygeodesy.fmath import hypot, hypot1, sqrt0
-# from pygeodesy.internals import _under  # from .named
+from pygeodesy.internals import _getPYGEODESY, _under
 from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, \
                              _pole_, _range_, _S_, _scale0_, \
                              _SPACE_, _std_, _to_, _UTM_
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _getenv
-from pygeodesy.named import nameof,  _under
+# from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS  # from .named
+from pygeodesy.named import nameof,  _ALL_LAZY, _MODS
 from pygeodesy.namedTuples import EasNor2Tuple, UtmUps5Tuple, \
                                   UtmUps8Tuple, UtmUpsLatLon5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, \
@@ -49,9 +49,9 @@ from pygeodesy.utmupsBase import Fmt, _LLEB, _hemi, _parseUTMUPS5, _to4lldn, \
 from math import atan2, fabs, radians, tan
 
 __all__ = _ALL_LAZY.ups
-__version__ = '24.06.11'
+__version__ = '24.10.14'
 
-_BZ_UPS  = _getenv('PYGEODESY_UPS_POLES', _std_) == _std_
+_BZ_UPS  = _getPYGEODESY('UPS_POLES', _std_) == _std_
 _Falsing =  Meter(2000e3)  # false easting and northing (C{meter})
 _K0_UPS  =  Float(_K0_UPS= 0.994)  # scale factor at central meridian
 _K1_UPS  =  Float(_K1_UPS=_1_0)    # rescale point scale factor
@@ -229,7 +229,7 @@ class Ups(UtmUpsBase):
 
         r = hypot(x, y)
         t = (r * E.es_c / (self.scale0 * E.a * _2_0)) if r > 0 else EPS0
-        t = E.es_tauf((_1_0 / t - t) * _0_5)
+        t = E.es_tauf(_0_5 / t - _0_5 * t)
         a = atan1d(t)
         if self._pole == _N_:
             b, g    = atan2(x, -y), 1

pygeodesy/utily.py

@@ -3,7 +3,7 @@
 
 u'''Various utility functions.
 
-After I{(C) Chris Veness 2011-2015} published under the same MIT Licence**, see
+After I{(C) Chris Veness 2011-2024} published under the same MIT Licence**, see
 U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>} and
 U{Vector-based geodesy<https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>}.
 '''
@@ -27,7 +27,7 @@ from pygeodesy.units import Degrees, Degrees_, Feet, Float, Lam, Lamd, \
 from math import acos, asin, atan2, cos, degrees, fabs, radians, sin, tan  # pow
 
 __all__ = _ALL_LAZY.utily
-__version__ = '24.06.15'
+__version__ = '24.10.12'
 
 # read constant name "_M_Unit" as "meter per Unit"
 _M_CHAIN     = _F(  20.1168)     # yard2m(1) * 22

pygeodesy/utm.py

@@ -8,7 +8,7 @@ L{utmZoneBand5}.
 
 Pure Python implementation of UTM / WGS-84 conversion functions using
 an ellipsoidal earth model, transcoded from JavaScript originals by
-I{(C) Chris Veness 2011-2016} published under the same MIT Licence**, see
+I{(C) Chris Veness 2011-2024} published under the same MIT Licence**, see
 U{UTM<https://www.Movable-Type.co.UK/scripts/latlong-utm-mgrs.html>} and
 U{Module utm<https://www.Movable-Type.co.UK/scripts/geodesy/docs/module-utm.html>}.
 
@@ -63,7 +63,7 @@ from math import asinh, atanh, atan2, cos, cosh, degrees, fabs, \
 # import operator as _operator  # from .fmath
 
 __all__ = _ALL_LAZY.utm
-__version__ = '24.06.11'
+__version__ = '24.10.12'
 
 _Bands = 'CDEFGHJKLMNPQRSTUVWXX'  # UTM latitude bands C..X (no
 # I|O) 8° each, covering 80°S to 84°N and X repeated for 80-84°N

pygeodesy/vector3d.py

@@ -11,9 +11,9 @@ from pygeodesy.constants import EPS, EPS0, EPS1, EPS4, INT0, isnear0, \
                                _0_0, _1_0
 from pygeodesy.errors import IntersectionError, _ValueError, VectorError, \
                             _xattr, _xError, _xkwds, _xkwds_get, _xkwds_item2
-from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt,  fsum1_
-# from pygeodesy.fsums import fsum1_  # from .fmath
-# from pygeodesy.formy import _radical2  # in _intersects2 below
+from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt
+# from pygeodesy.fsums import fsum1_  # from _MODS
+# from pygeodesy.formy import _radical2  # _MODS
 from pygeodesy.interns import _COMMA_, _concentric_, _intersection_, \
                               _near_, _negative_, _no_, _too_
 from pygeodesy.iters import PointsIter,  Fmt
@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector3d
-__version__ = '24.08.18'
+__version__ = '24.10.01'
 
 _vector2d = _MODS.into(vector2d=__name__)
 
@@ -595,7 +595,7 @@ def _intersects2(center1, r1, center2, r2, sphere=True, too_d=None,  # in Cartes
     if d < max(r2 - r1, EPS):
         raise IntersectionError(_near_(_concentric_))  # XXX ConcentricError?
 
-    o = fsum1_(-d, r1, r2)  # overlap == -(d - (r1 + r2))
+    o = _MODS.fsums.fsum1_(-d, r1, r2)  # overlap == -(d - (r1 + r2))
     # compute intersections with c1 at (0, 0) and c2 at (d, 0), like
     # <https://MathWorld.Wolfram.com/Circle-CircleIntersection.html>
     if o > EPS:  # overlapping, r1, r2 == R, r

pygeodesy/vector3dBase.py

@@ -4,7 +4,7 @@
 u'''(INTERNAL) Private, 3-D vector base class C{Vector3dBase}.
 
 A pure Python implementation of vector-based functions by I{(C) Chris Veness
-2011-2015} published under the same MIT Licence**, see U{Vector-based geodesy
+2011-2024} published under the same MIT Licence**, see U{Vector-based geodesy
 <https://www.Movable-Type.co.UK/scripts/latlong-vectors.html>}.
 '''
 
@@ -16,8 +16,7 @@ from pygeodesy.constants import EPS, EPS0, INT0, PI, PI2, _copysignINF, \
 from pygeodesy.errors import CrossError, VectorError, _xcallable, _xError
 from pygeodesy.fmath import euclid_, fdot, hypot_, hypot2_
 from pygeodesy.interns import _coincident_, _colinear_, _COMMASPACE_, _xyz_
-from pygeodesy.lazily import _ALL_LAZY, _ALL_DOCS, _ALL_MODS as _MODS, \
-                             _sys_version_info2
+from pygeodesy.lazily import _ALL_LAZY, _ALL_DOCS, _ALL_MODS as _MODS
 from pygeodesy.named import _NamedBase, _NotImplemented, _xother3
 # from pygeodesy.namedTuples import Vector3Tuple  # _MODS
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
@@ -29,7 +28,7 @@ from pygeodesy.utily import sincos2,  atan2, fabs
 from math import ceil as _ceil, floor as _floor, trunc as _trunc
 
 __all__ = _ALL_LAZY.vector3dBase
-__version__ = '24.08.18'
+__version__ = '24.10.12'
 
 
 class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
@@ -421,7 +420,7 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
         '''
         return self._mapped(_trunc)
 
-    if _sys_version_info2 < (3, 0):  # PYCHOK no cover
+    if _MODS.sys_version_info2 < (3, 0):  # PYCHOK no cover
         # <https://docs.Python.org/2/library/operator.html#mapping-operators-to-functions>
         __div__     = __truediv__
         __idiv__    = __itruediv__