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

pygeodesy/solveBase.py

@@ -505,7 +505,7 @@ __all__ += _ALL_DOCS(_SolveBase, _SolveCapsBase, _SolveGDictBase, _SolveGDictLin
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/sphericalBase.py

@@ -701,7 +701,7 @@ __all__ += _ALL_DOCS(CartesianSphericalBase, LatLonSphericalBase)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/sphericalNvector.py

@@ -55,13 +55,13 @@ from pygeodesy.sphericalBase import _m2radians, CartesianSphericalBase, \
                                     _intersecant2, LatLonSphericalBase, \
                                     _radians2m,  Datums
 from pygeodesy.units import Bearing, Bearing_, _isDegrees, Radius, Scalar
-from pygeodesy.utily import atan2, degrees360, fabs, sincos2, sincos2_, \
-                            sincos2d, _unrollon, _Wrap
+from pygeodesy.utily import atan2, degrees360, sincos2, sincos2_, sincos2d, \
+                           _unrollon, _Wrap,  fabs
 
-# from math import atan2, fabs  # from utily
+# from math import fabs  # from utily
 
 __all__ = _ALL_LAZY.sphericalNvector
-__version__ = '24.11.07'
+__version__ = '24.11.24'
 
 _lines_ = 'lines'
 
@@ -1201,7 +1201,7 @@ __all__ += _ALL_OTHER(Cartesian, LatLon, Nvector,  # classes
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/sphericalTrigonometry.py

@@ -46,15 +46,16 @@ from pygeodesy.sphericalBase import _m2radians, CartesianSphericalBase, \
 # from pygeodesy.streprs import Fmt as _Fmt  # from .points XXX shadowed
 from pygeodesy.units import Bearing_, Height, _isDegrees, _isRadius, Lamd, \
                               Phid, Radius_, Scalar
-from pygeodesy.utily import acos1, asin1, atan1d, atan2d, degrees90, degrees180, \
-                            degrees2m, m2radians, radiansPI2, sincos2_, tan_2, \
-                            unrollPI, _unrollon, _unrollon3, _Wrap, wrap180, wrapPI
+from pygeodesy.utily import acos1, asin1, atan1d, atan2, atan2d, degrees90, \
+                            degrees180, degrees2m, m2radians, radiansPI2, \
+                            sincos2_, tan_2, unrollPI, _unrollon, _unrollon3, \
+                            wrap180, wrapPI, _Wrap
 from pygeodesy.vector3d import sumOf, Vector3d
 
-from math import asin, atan2, cos, degrees, fabs, radians, sin
+from math import asin, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '24.11.07'
+__version__ = '24.11.24'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -1409,7 +1410,7 @@ __all__ += _ALL_OTHER(Cartesian, LatLon,  # classes
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/streprs.py

@@ -14,19 +14,20 @@ from pygeodesy.interns import NN, _0_, _0to9_, MISSING, _BAR_, _COMMASPACE_, \
                              _DOT_, _E_, _ELLIPSIS_, _EQUAL_, _H_, _LR_PAIRS, \
                              _N_, _name_, _not_scalar_, _PERCENT_, _SPACE_, \
                              _STAR_, _UNDER_
-from pygeodesy.interns import _convergence_, _distant_, _e_, _eps_, _exceeds_, \
-                              _EQUALSPACED_, _f_, _F_, _g_, _limit_, _no_, \
-                              _tolerance_  # PYCHOK used!
+from pygeodesy.interns import _convergence_, _distant_, _e_, _exceeds_, \
+                              _EQUALSPACED_, _f_, _F_, _g_, _limit_, \
+                              _no_, _tolerance_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 
 from math import fabs, log10 as _log10
 
 __all__ = _ALL_LAZY.streprs
-__version__ = '24.10.14'
+__version__ = '24.11.26'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
 _EN_WIDE    =  5           # number of MGRS/OSGR units, log10(_100km)
+_eps_       = 'eps'        # PYCHOK used!
 _OKd_       = '._-'        # acceptable name characters
 _PAREN_g    = '(%g)'       # PYCHOK used!
 _RESIDUAL_  = 'RESIDUAL'   # PYCHOK used!
@@ -191,6 +192,9 @@ _Gg     = (Fmt.G, Fmt.g)
 _FfEeGg = (Fmt.F, Fmt.f, Fmt.E, Fmt.e) + _Gg  # float formats
 _Fspec_ = NN('[%[<flags>][<width>]', _DOTSTAR_, ']', _BAR_.join(_FfEeGg))  # in testStreprs
 
+del _convergence_, _distant_, _e_, _eps_, _exceeds_, _EQUALSPACED_,\
+    _f_, _F_, _g_, _limit_, _PAREN_g, _RESIDUAL_
+
 
 def anstr(name, OKd=_OKd_, sub=_UNDER_):
     '''Make a valid name of alphanumeric and OKd characters.
@@ -598,9 +602,10 @@ def _xzipairs(names, values, sep=_COMMASPACE_, fmt=NN, pair_fmt=Fmt.COLON):
         raise _ValueError(names=names, values=values, cause=x)
     return (fmt % (t,)) if fmt else t  # enc
 
+
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/trf.py

@@ -1784,7 +1784,7 @@ if __name__ == '__main__':
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/triaxials.py

@@ -7,7 +7,7 @@ I{Charles Karney}'s C++ class U{JacobiConformal<https://GeographicLib.SourceForg
 classGeographicLib_1_1JacobiConformal.html#details>} to pure Python and miscellaneous classes
 L{BetaOmega2Tuple}, L{BetaOmega3Tuple}, L{Jacobi2Tuple} and L{TriaxialError}.
 
-Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2023).  For more information,
+Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2024).  For more information,
 see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 
 @see: U{Geodesics on a triaxial ellipsoid<https://WikiPedia.org/wiki/Geodesics_on_an_ellipsoid#
@@ -53,13 +53,13 @@ from pygeodesy.props import Property_RO, property_ROver
 # from pygeodesy.streprs import Fmt  # from .datums
 from pygeodesy.units import Degrees, Float, Height_, Meter, Meter2, Meter3, \
                             Radians, Radius, Scalar_
-from pygeodesy.utily import asin1, atan2d, km2m, m2km, SinCos2, sincos2d_
+from pygeodesy.utily import asin1, atan2, atan2d, km2m, m2km, SinCos2, sincos2d_
 from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 
-from math import atan2, fabs, sqrt
+from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '24.10.15'
+__version__ = '24.11.24'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -213,7 +213,7 @@ class Triaxial_(_NamedEnumItem):
                             C{meter}) or an other L{Triaxial} or L{Triaxial_} instance.
            @kwarg b: Middle, C{Y} semi-axis (C{meter}, same units as B{C{a}}), required
                      if C{B{a_triaxial} is scalar}, ignored otherwise.
-           @kwarg c: Small, C{Z} semi-axis (C{meter}, B{C{b}}).
+           @kwarg c: Small, C{Z} semi-axis (C{meter}, like B{C{b}}).
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise TriaxialError: Invalid semi-axis or -axes.
@@ -396,8 +396,10 @@ class Triaxial_(_NamedEnumItem):
            @raise TriaxialError: Non-cartesian B{C{xyz}}, invalid B{C{eps}}, no convergence in
                   root finding or validation failed.
 
-           @see: Methods L{Triaxial.normal3d} and L{Ellipsoid.height4} and I{Eberly}'s U{Distance from a
-                 Point to ...<https://www.GeometricTools.com/Documentation/DistancePointEllipseEllipsoid.pdf>}.
+           @see: Methods L{Triaxial.normal3d} and L{Ellipsoid.height4}, I{Eberly}'s U{Distance from a Point to ...
+                 <https://www.GeometricTools.com/Documentation/DistancePointEllipseEllipsoid.pdf>} and I{Bektas}'
+                 U{Shortest Distance from a Point to Triaxial Ellipsoid<https://www.ResearchGate.net/publication/
+                 272149005_SHORTEST_DISTANCE_FROM_A_POINT_TO_TRIAXIAL_ELLIPSOID>}.
         '''
         v, r = _otherV3d_(x_xyz, y, z), self.isSpherical
 
@@ -420,7 +422,7 @@ class Triaxial_(_NamedEnumItem):
                 raise TriaxialError(x=x, y=y, z=z, cause=e)
             if h > 0 and self.sideOf(v, eps=EPS0) < 0:
                 h = -h  # inside
-        n = _name__(name, name__=self.height4)
+        n = _name__(name, name__=self.height4)  # _DUNDER_nameof
         return Vector4Tuple(x, y, z, h, iteration=i, name=n)
 
     @Property_RO
@@ -863,7 +865,8 @@ class Triaxial(Triaxial_):
         return BetaOmega3Tuple(Radians(beta=a), Radians(omega=b), h, **name)
 
     def reverseCartesian(self, x_xyz, y=None, z=None, h=0, normal=True, eps=_EPS2e4, **name):
-        '''"Unproject" a cartesian on to a cartesion I{off} this triaxial's surface.
+        '''Unproject" a cartesian I{on} this triaxial's surface to a cartesion I{off}
+           this triaxial's surface.
 
            @arg x_xyz: X component (C{scalar}) or a cartesian (C{Cartesian},
                        L{Ecef9Tuple}, L{Vector3d}, L{Vector3Tuple} or L{Vector4Tuple}).
@@ -871,7 +874,7 @@ class Triaxial(Triaxial_):
                        ignored otherwise.
            @kwarg z: Z component (C{scalar}), like B{C{y}}.
            @arg h: Height above or below this triaxial's surface (C{meter}, same units
-                   as the axes).
+                   as this triaxial's axes).
            @kwarg normal: If C{True}, the height is C{normal} to the surface, otherwise
                           C{radially} to the center of this triaxial (C{bool}).
            @kwarg eps: Tolerance for on-surface test (C{scalar}), see method L{Triaxial.sideOf}.
@@ -941,7 +944,7 @@ class JacobiConformal(Triaxial):
        by C{sqrt(B{a}**2 - B{c}**2) / (2 * B{b})} so that the customary results are
        returned in the case of an ellipsoid of revolution.
 
-       Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2014-2023) and
+       Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2014-2024) and
        licensed under the MIT/X11 License.
 
        @note: This constructor can I{not be used to specify a sphere}, see alternate
@@ -1278,8 +1281,8 @@ def hartzell4(pov, los=False, tri_biax=_WGS84, **name):
         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
-                                          name=_name__(name, name__=hartzell4))
+    n = _name__(name, name__=hartzell4)  # _DUNDER_nameof
+    return Vector4Tuple(v.x, v.y, v.z, h, iteration=i, name=n)
 
 
 def _hypot2_1(x, y, z=0):
@@ -1319,8 +1322,8 @@ def _plumbTo3(px, py, E, eps=EPS):  # in .ellipsoids.Ellipsoid.height4
     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
+        ex = tx**3 * a2
+        ey = ty**3 * b2
 
         qx = px - ex
         qy = py - ey
@@ -1529,13 +1532,17 @@ if __name__ == '__main__':
     from pygeodesy import printf
     from pygeodesy.interns import _COMMA_, _NL_, _NLATvar_
 
+    t = Triaxial_(6378388.0, 6378318.0, 6356911.9461)
+    t = t.height4(3909863.9271, 3909778.123, 3170932.5016)
+    printf('# Bektas: %r', t)
+
     # __doc__ of this file, force all into registery
     t = [NN] + Triaxials.toRepr(all=True, asorted=True).split(_NL_)
     printf(_NLATvar_.join(i.strip(_COMMA_) for i in t))
 
 # **) MIT License
 #
-# Copyright (C) 2022-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2022-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/units.py

@@ -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.11.06'
+__version__ = '24.11.14'
 
 
 class Float_(Float):
@@ -798,36 +798,36 @@ class Zone(Int):
         return Int_.__new__(cls, arg=arg, name=name, **Error_name_arg)
 
 
-_ScalarU =  Float, Float_, Scalar, Scalar_
-_Degrees = (Azimuth, Bearing, Bearing_, Degrees, Degrees_) + _ScalarU
-_Meters  = (Distance, Distance_, Meter, Meter_) + _ScalarU
-_Radians = (Radians, Radians_) + _ScalarU  # PYCHOK unused
+_Degrees = (Azimuth, Bearing, Bearing_, Degrees, Degrees_)
+_Meters  = (Distance, Distance_, Meter, Meter_)
+_Radians = (Radians, Radians_)  # PYCHOK unused
 _Radii   = _Meters + (Radius, Radius_)
+_ScalarU =  Float, Float_, Scalar, Scalar_
 
 
-def _isDegrees(obj):
+def _isDegrees(obj, iscalar=True):
     # Check for valid degrees types.
-    return isinstance(obj, _Degrees) or _isScalar(obj)
+    return isinstance(obj, _Degrees) or (iscalar and _isScalar(obj))
 
 
-def _isHeight(obj):
+def _isHeight(obj, iscalar=True):
     # Check for valid height types.
-    return isinstance(obj, _Meters) or _isScalar(obj)
+    return isinstance(obj, _Meters) or (iscalar and _isScalar(obj))
 
 
-def _isMeter(obj):
+def _isMeter(obj, iscalar=True):
     # Check for valid meter types.
-    return isinstance(obj, _Meters) or _isScalar(obj)
+    return isinstance(obj, _Meters) or (iscalar and _isScalar(obj))
 
 
-def _isRadius(obj):
+def _isRadius(obj, iscalar=True):
     # Check for valid earth radius types.
-    return isinstance(obj, _Radii) or _isScalar(obj)
+    return isinstance(obj, _Radii) or (iscalar and _isScalar(obj))
 
 
-def _isScalar(obj):
+def _isScalar(obj, iscalar=True):
     # Check for pure scalar types.
-    return isscalar(obj) and not isinstance(obj, _NamedUnit)
+    return isinstance(obj, _ScalarU) or (iscalar and isscalar(obj) and not isinstance(obj, _NamedUnit))
 
 
 def _toUnit(Unit, arg, name=NN, **Error):
@@ -872,7 +872,7 @@ __all__ += _ALL_DOCS(_NamedUnit)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/unitsBase.py

@@ -349,7 +349,7 @@ __all__ += _ALL_DOCS(_NamedUnit)
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),

pygeodesy/ups.py

@@ -40,16 +40,16 @@ from pygeodesy.props import deprecated_method, property_doc_, \
                             Property_RO, _update_all
 # from pygeodesy.streprs import Fmt  # from .utmupsBase
 from pygeodesy.units import Float, Float_, Meter, Lat
-from pygeodesy.utily import atan1d, degrees180, sincos2d
+from pygeodesy.utily import atan1d, atan2, degrees180, sincos2d
 from pygeodesy.utmupsBase import Fmt, _LLEB, _hemi, _parseUTMUPS5, _to4lldn, \
                                 _to3zBhp, _to3zll, _UPS_BANDS as _Bands, \
                                 _UPS_LAT_MAX, _UPS_LAT_MIN, _UPS_ZONE, \
                                 _UPS_ZONE_STR, UtmUpsBase
 
-from math import atan2, fabs, radians, tan
+from math import fabs, radians, tan  # as _tan
 
 __all__ = _ALL_LAZY.ups
-__version__ = '24.10.14'
+__version__ = '24.11.26'
 
 _BZ_UPS  = _getPYGEODESY('UPS_POLES', _std_) == _std_
 _Falsing =  Meter(2000e3)  # false easting and northing (C{meter})
@@ -509,7 +509,7 @@ def upsZoneBand5(lat, lon, strict=True, **name):
 
 # **) MIT License
 #
-# Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2016-2025 -- mrJean1 at Gmail -- All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),