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

pygeodesy/deprecated/functions.py

@@ -11,10 +11,10 @@ from pygeodesy.interns import NN, _area_, _COMMASPACE_, _negative_, \
 from pygeodesy.lazily import _ALL_DEPRECATED, _ALL_MODS as _MODS
 from pygeodesy.props import deprecated_function
 # from pygeodesy.resections import TriAngle5Tuple as _TriAngle5Tuple  # from .classes
-from pygeodesy.units import Number_, Scalar_
+from pygeodesy.units import _1mm, Number_, Scalar_
 
 __all__ = _ALL_DEPRECATED.deprecated_functions
-__version__ = '24.11.07'
+__version__ = '24.12.31'
 
 _WGS84 = _UTM = object()
 
@@ -84,6 +84,30 @@ def copysign(x, y):  # PYCHOK no cover
     return _MODS.basics.copysign0(x, y)
 
 
+@deprecated_function
+def cosineAndoyerLambert(lat1, lon1, lat2, lon2, **datum_wrap):
+    '''DEPRECATED on 2024.12.31, use function L{pygeodesy.cosineLaw} with C{B{corr}=1}.'''
+    return _MODS.formy.cosineLaw(lat1, lon1, lat2, lon2, corr=1, **datum_wrap)
+
+
+@deprecated_function
+def cosineAndoyerLambert_(phi2, phi1, lam21, **datum):
+    '''DEPRECATED on 2024.12.31, use function L{pygeodesy.cosineLaw_} with C{B{corr}=1}.'''
+    return _MODS.formy.cosineLaw_(phi2, phi1, lam21, corr=1, **datum)
+
+
+@deprecated_function
+def cosineForsytheAndoyerLambert(lat1, lon1, lat2, lon2, **datum_wrap):
+    '''DEPRECATED on 2024.12.31, use function L{pygeodesy.cosineLaw} with C{B{corr}=2}.'''
+    return _MODS.formy.cosineLaw(lat1, lon1, lat2, lon2, corr=2, **datum_wrap)
+
+
+@deprecated_function
+def cosineForsytheAndoyerLambert_(phi2, phi1, lam21, **datum):
+    '''DEPRECATED on 2024.12.31, use function L{pygeodesy.cosineLaw_} with C{B{corr}=2}.'''
+    return _MODS.formy.cosineLaw_(phi2, phi1, lam21, corr=2, **datum)
+
+
 @deprecated_function
 def decodeEPSG2(arg):  # PYCHOK no cover
     '''DEPRECATED, use function L{epsg.decode2}.
@@ -295,11 +319,21 @@ def scalar(value, low=EPS, high=1.0, name=_scalar_, Error=ValueError):  # PYCHOK
 
 
 @deprecated_function
-def simplify2(points, pipe, radius=R_M, shortest=False, indices=False, **options):  # PYCHOK no cover
-    '''DEPRECATED, use function L{pygeodesy.simplifyRW}.
-    '''
-    return _MODS.simplify.simplifyRW(points, pipe, radius=radius, shortest=shortest,
-                                                   indices=indices, **options)
+def simplify2(points, pipe=_1mm, **radius_shortest_indices_options):  # PYCHOK no cover
+    '''DEPRECATED, use function L{pygeodesy.simplifyRW}.'''
+    return _MODS.simplify.simplifyRW(points, pipe=pipe, **radius_shortest_indices_options)
+
+
+@deprecated_function
+def simplifyRDPm(points, distance=_1mm, **radius_shortest_indices_options):
+    '''DEPRECATED on 2024.11.28, use function L{pygeodesy.simplifyRDP}C{(points, modified=True, ...)}.'''
+    return _MODS.simplify.simplifyRDP(points, modified=True, distance=distance, **radius_shortest_indices_options)
+
+
+@deprecated_function
+def simplifyVWm(points, area=_1mm, **radius_attr_indices_options):
+    '''DEPRECATED on 2024.11.28, use function L{pygeodesy.simplifyVW}C{(points, modified=True, ...)}.'''
+    return _MODS.simplify.simplifyVW(points, modified=True, area=area, **radius_attr_indices_options)
 
 
 @deprecated_function
@@ -366,7 +400,7 @@ def utmZoneBand2(lat, lon):  # PYCHOK no cover
 
 # **) MIT License
 #
-# Copyright (C) 2018-2024 -- mrJean1 at Gmail -- All Rights Reserved.
+# Copyright (C) 2018-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/deprecated/nvector.py

@@ -27,7 +27,7 @@ assert (_ALL_OTHER(LatLonNvectorBase, Nvector, sumOf) +
 
 # **) 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/deprecated/rhumbBase.py

@@ -11,7 +11,7 @@ __version__ = '23.11.26'
 
 # **) 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/deprecated/rhumbaux.py

@@ -12,7 +12,7 @@ __version__ = '23.12.02'
 
 # **) 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/deprecated/rhumbsolve.py

@@ -12,7 +12,7 @@ __version__ = '23.11.26'
 
 # **) 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/deprecated/rhumbx.py

@@ -12,7 +12,7 @@ __version__ = '23.11.30'
 
 # **) 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/dms.py

@@ -941,7 +941,7 @@ def toDMS(deg, form=_F_DMS, prec=2, sep=S_SEP, ddd=2, neg=_MINUS_, pos=_PLUS_, *
 
 # **) 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/ecef.py

@@ -73,20 +73,23 @@ from pygeodesy.interns import NN, _a_, _C_, _datum_, _ellipsoid_, _f_, _height_,
                              _lat_, _lon_, _M_, _name_, _singular_, _SPACE_, \
                              _x_, _xyz_, _y_, _z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _name__, _name1__, _NamedBase, _NamedTuple, _Pass, _xnamed
+from pygeodesy.named import _name__, _name1__, _NamedBase, _NamedLocal, \
+                            _NamedTuple, _Pass, _xnamed
 from pygeodesy.namedTuples import LatLon2Tuple, LatLon3Tuple, \
                                   PhiLam2Tuple, Vector3Tuple, Vector4Tuple
-from pygeodesy.props import deprecated_method, Property_RO, property_ROver, property_doc_
+from pygeodesy.props import deprecated_method, Property_RO, property_RO, \
+                            property_ROver, property_doc_
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
 from pygeodesy.units import _isRadius, Degrees, Height, Int, Lam, Lat, Lon, Meter, \
                              Phi, Scalar, Scalar_
-from pygeodesy.utily import atan1, atan1d, atan2d, degrees90, degrees180, \
+from pygeodesy.utily import atan1, atan1d, atan2, atan2d, degrees90, degrees180, \
                             sincos2, sincos2_, sincos2d, sincos2d_
+# from pygeodesy.vector3d import Vector3d  # _MODS
 
-from math import atan2, cos, degrees, fabs, radians, sqrt
+from math import cos, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.ecef
-__version__ = '24.10.28'
+__version__ = '24.12.06'
 
 _Ecef_    = 'Ecef'
 _prolate_ = 'prolate'
@@ -266,7 +269,7 @@ class _EcefBase(_NamedBase):
         '''(INTERNAL) Get the valid geocentric classes. I{once}.
         '''
         return (Ecef9Tuple,  # overwrite property_ROver
-               _MODS.cartesianBase.CartesianBase)
+               _MODS.vector3d.Vector3d)  # _MODS.cartesianBase.CartesianBase
 
     @Property_RO
     def _isYou(self):
@@ -326,7 +329,8 @@ class EcefFarrell21(_EcefBase):
     def reverse(self, xyz, y=None, z=None, M=None, **lon00_name):  # PYCHOK unused M
         '''Convert from geocentric C{(x, y, z)} to geodetic C{(lat, lon, height)} using
            I{Farrell}'s U{Table 2.1<https://Books.Google.com/books?id=fW4foWASY6wC>},
-           page 29.
+           page 29, aka the I{Heikkinen application} of U{Ferrari's solution
+           <https://WikiPedia.org/wiki/Geographic_coordinate_conversion>}.
 
            @arg xyz: A geocentric (C{Cartesian}, L{Ecef9Tuple}) or C{scalar} ECEF C{x}
                      coordinate (C{meter}).
@@ -366,9 +370,9 @@ class EcefFarrell21(_EcefBase):
             p2 = p**2
             G  = p2 + ez - e2 * (a2 - b2)  # p2 + ez - e4 * a2
             F  = b2 * z2 * 54
-            t  = e4 * p2 * F / G**3
-            t  = cbrt(sqrt(t * (t + _2_0)) + t + _1_0)
-            G *= fsumf_(t , _1_0, _1_0 / t)
+            c  = e4 * p2 * F / G**3
+            s  = cbrt(sqrt(c * (c + _2_0)) + c + _1_0)
+            G *= fsumf_(s , _1_0, _1_0 / s)  # k
             P  = F / (G**2 * _3_0)
             Q  = sqrt(_2_0 * e4 * P + _1_0)
             Q1 = Q +  _1_0
@@ -376,7 +380,7 @@ class EcefFarrell21(_EcefBase):
                                                -P * ez / (Q * Q1),
                                                -P * p2 * _0_5))
             r = p + e2 * r0
-            v = b2 / (sqrt(r**2 + ez) * a)
+            v = b2 / (sqrt(r**2 + ez) * a)  # z0 / z
 
             h   = hypot(r, z) * (_1_0 - v)
             lat = atan1d((e2_ * v + _1_0) * z, p)
@@ -1014,12 +1018,12 @@ class EcefMatrix(_NamedTuple):
         return xyz_
 
 
-class Ecef9Tuple(_NamedTuple):
-    '''9-Tuple C{(x, y, z, lat, lon, height, C, M, datum)} with I{geocentric}
-       C{x}, C{y} and C{z} plus I{geodetic} C{lat}, C{lon} and C{height}, case
-       C{C} (see the C{Ecef*.reverse} methods) and optionally, the rotation
-       matrix C{M} (L{EcefMatrix}) and C{datum}, with C{lat} and C{lon} in
-       C{degrees} and C{x}, C{y}, C{z} and C{height} in C{meter}, conventionally.
+class Ecef9Tuple(_NamedTuple, _NamedLocal):
+    '''9-Tuple C{(x, y, z, lat, lon, height, C, M, datum)} with I{geocentric} C{x},
+       C{y} and C{z} plus I{geodetic} C{lat}, C{lon} and C{height}, case C{C} (see
+       the C{Ecef*.reverse} methods) and optionally, rotation matrix C{M} (L{EcefMatrix})
+       and C{datum}, with C{lat} and C{lon} in C{degrees} and C{x}, C{y}, C{z} and
+       C{height} in C{meter}, conventionally.
     '''
     _Names_ = (_x_,   _y_,   _z_,   _lat_, _lon_, _height_, _C_,  _M_,   _datum_)
     _Units_ = ( Meter, Meter, Meter, Lat,   Lon,   Height,   Int, _Pass, _Pass)
@@ -1035,6 +1039,10 @@ class Ecef9Tuple(_NamedTuple):
         '''DEPRECATED, use method L{toDatum}.'''
         return self.toDatum(datum2)
 
+    @property_RO
+    def _ecef9(self):
+        return self
+
     @Property_RO
     def lam(self):
         '''Get the longitude in C{radians} (C{float}).
@@ -1088,12 +1096,19 @@ class Ecef9Tuple(_NamedTuple):
     @Property_RO
     def lonVermeille(self):
         '''Get the longitude in C{degrees [-225..+225]} after U{Vermeille
-           <https://Search.ProQuest.com/docview/639493848>} (2004), p 95.
+           <https://Search.ProQuest.com/docview/639493848>} 2004, p 95.
 
            @see: Property C{lamVermeille}.
         '''
         return Lon(Vermeille=degrees(self.lamVermeille))
 
+    def _ltp_toLocal(self, ltp, Xyz_kwds, **Xyz):  # overloads C{_NamedLocal}'s
+        '''(INTERNAL) Invoke C{ltp._xLtp(ltp)._ecef2local}.
+        '''
+        Xyz_ = self._ltp_toLocal2(Xyz_kwds, **Xyz)  # in ._NamedLocal
+        ltp  = self._ltp._xLtp(ltp, self._Ltp)  # both in ._NamedLocal
+        return ltp._ecef2local(self, *Xyz_)
+
     @Property_RO
     def phi(self):
         '''Get the latitude in C{radians} (C{float}).
@@ -1134,13 +1149,13 @@ class Ecef9Tuple(_NamedTuple):
                              L{ellipsoidalNvector.Cartesian}, L{ellipsoidalVincenty.Cartesian},
                              L{sphericalNvector.Cartesian} or L{sphericalTrigonometry.Cartesian})
                              or C{None}.
-           @kwarg Cartesian_kwds: Optional, additional B{C{Cartesian}} keyword arguments, ignored
+           @kwarg Cartesian_kwds: Optionally, additional B{C{Cartesian}} keyword arguments, ignored
                                   if C{B{Cartesian} is None}.
 
-           @return: A C{B{Cartesian}(x, y, z, **B{Cartesian_kwds})} instance or
-                    a L{Vector4Tuple}C{(x, y, z, h)} if C{B{Cartesian} is None}.
+           @return: A B{C{Cartesian}} instance or a L{Vector4Tuple}C{(x, y, z, h)} if C{B{Cartesian}
+                    is None}.
 
-           @raise TypeError: Invalid B{C{Cartesian}} or B{C{Cartesian_kwds}}.
+           @raise TypeError: Invalid B{C{Cartesian}} or B{C{Cartesian_kwds}} item.
         '''
         if Cartesian in (None, Vector4Tuple):
             r = self.xyzh
@@ -1174,17 +1189,15 @@ class Ecef9Tuple(_NamedTuple):
     def toLatLon(self, LatLon=None, **LatLon_kwds):
         '''Return the geodetic C{(lat, lon, height[, datum])} coordinates.
 
-           @kwarg LatLon: Optional class to return C{(lat, lon, height[, datum])}
-                          or C{None}.
-           @kwarg LatLon_kwds: Optional B{C{height}}, B{C{datum}} and other
-                               B{C{LatLon}} keyword arguments.
+           @kwarg LatLon: Optional class to return C{(lat, lon, height[, datum])} or C{None}.
+           @kwarg LatLon_kwds: Optional B{C{height}}, B{C{datum}} and other B{C{LatLon}}
+                               keyword arguments.
 
-           @return: An instance of C{B{LatLon}(lat, lon, **B{LatLon_kwds})}
-                    or if C{B{LatLon} is None}, a L{LatLon3Tuple}C{(lat, lon,
-                    height)} respectively L{LatLon4Tuple}C{(lat, lon, height,
-                    datum)} depending on whether C{datum} is un-/specified.
+           @return: A B{C{LatLon}} instance or if C{B{LatLon} is None}, a L{LatLon4Tuple}C{(lat,
+                    lon, height, datum)} or L{LatLon3Tuple}C{(lat, lon, height)} if C{datum} is
+                    specified or not.
 
-           @raise TypeError: Invalid B{C{LatLon}} or B{C{LatLon_kwds}}.
+           @raise TypeError: Invalid B{C{LatLon}} or B{C{LatLon_kwds}} item.
         '''
         lat, lon, D = self.lat, self.lon, self.datum  # PYCHOK Ecef9Tuple
         kwds = _name1__(LatLon_kwds, _or_nameof=self)
@@ -1202,33 +1215,17 @@ class Ecef9Tuple(_NamedTuple):
         _xdatum(_xattr(r, datum=D), D)
         return r
 
-    def toLocal(self, ltp, Xyz=None, **Xyz_kwds):
-        '''Convert this geocentric to I{local} C{x}, C{y} and C{z}.
-
-           @kwarg ltp: The I{local tangent plane} (LTP) to use (L{Ltp}).
-           @kwarg Xyz: Optional class to return C{x}, C{y} and C{z}
-                       (L{XyzLocal}, L{Enu}, L{Ned}) or C{None}.
-           @kwarg Xyz_kwds: Optional, additional B{C{Xyz}} keyword
-                            arguments, ignored if C{B{Xyz} is None}.
-
-           @return: An B{C{Xyz}} instance or if C{B{Xyz} is None},
-                    a L{Local9Tuple}C{(x, y, z, lat, lon, height,
-                    ltp, ecef, M)} with C{M=None}, always.
-
-           @raise TypeError: Invalid B{C{ltp}}.
-        '''
-        return _MODS.ltp._xLtp(ltp)._ecef2local(self, Xyz, Xyz_kwds)
-
     def toVector(self, Vector=None, **Vector_kwds):
-        '''Return the geocentric C{(x, y, z)} coordinates as vector.
+        '''Return these geocentric C{(x, y, z)} coordinates as vector.
+
+           @kwarg Vector: Optional vector class to return C{(x, y, z)} or C{None}.
+           @kwarg Vector_kwds: Optional, additional B{C{Vector}} keyword arguments,
+                               ignored if C{B{Vector} is None}.
 
-           @kwarg Vector: Optional vector class to return C{(x, y, z)} or
-                          C{None}.
-           @kwarg Vector_kwds: Optional, additional B{C{Vector}} keyword
-                               arguments, ignored if C{B{Vector} is None}.
+           @return: A B{C{Vector}} instance or a L{Vector3Tuple}C{(x, y, z)} if
+                    C{B{Vector} is None}.
 
-           @return: A C{Vector}C{(x, y, z, **Vector_kwds)} instance or a
-                    L{Vector3Tuple}C{(x, y, z)} if C{B{Vector} is None}.
+           @raise TypeError: Invalid B{C{Vector}} or B{C{Vector_kwds}} item.
 
            @see: Propertes C{xyz} and C{xyzh}
         '''
@@ -1316,7 +1313,7 @@ __all__ += _ALL_DOCS(_EcefBase)
 
 # **) 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/elevations.py

@@ -254,7 +254,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/ellipsoidalBase.py

@@ -35,7 +35,7 @@ from pygeodesy.units import Epoch, _isDegrees, Radius_, _1mm as _TOL_M
 # from math import fabs  # from .latlonBase
 
 __all__ = _ALL_LAZY.ellipsoidalBase
-__version__ = '24.11.07'
+__version__ = '24.12.04'
 
 
 class CartesianEllipsoidalBase(CartesianBase):
@@ -666,7 +666,7 @@ class LatLonEllipsoidalBase(LatLonBase):
                         B{C{point2}} (C{bool}).
            @kwarg equidistant: An azimuthal equidistant projection (I{class} or function
                                L{pygeodesy.equidistant}) or C{None} for this point's preferred
-                               C{Equidistant}, like L{Equidistant<LatLonEllipsoidalBase.Equistant>}.
+                               C{Equidistant}, like L{Equidistant<LatLonEllipsoidalBase.Equidistant>}.
            @kwarg tol: Convergence tolerance (C{meter}, conventionally).
 
            @return: Closest point (C{LatLon}).
@@ -1148,7 +1148,7 @@ __all__ += _ALL_DOCS(CartesianEllipsoidalBase, LatLonEllipsoidalBase)
 
 # **) 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/ellipsoidalBaseDI.py

@@ -885,7 +885,7 @@ del _1_0, _0_01
 
 # **) 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/ellipsoidalExact.py

@@ -320,7 +320,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/ellipsoidalGeodSolve.py

@@ -314,7 +314,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/ellipsoidalKarney.py

@@ -359,7 +359,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/ellipsoidalNvector.py

@@ -657,7 +657,7 @@ __all__ += _ALL_OTHER(Cartesian, LatLon, Ned, 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/ellipsoidalVincenty.py

@@ -67,12 +67,13 @@ from pygeodesy.props import deprecated_function, deprecated_method, \
                             property_doc_, property_RO
 # from pygeodesy.streprs import Fmt  # from .points
 from pygeodesy.units import Number_, Scalar_
-from pygeodesy.utily import atan2b, atan2d, sincos2, sincos2d, unroll180, wrap180
+from pygeodesy.utily import atan2, atan2b, atan2d, sincos2, sincos2d, \
+                            unroll180, wrap180
 
-from math import atan2, cos, degrees, fabs, radians, tan
+from math import cos, degrees, fabs, radians, tan as _tan
 
 __all__ = _ALL_LAZY.ellipsoidalVincenty
-__version__ = '24.10.12'
+__version__ = '24.11.26'
 
 _antipodal_to_ = _SPACE_(_antipodal_, _to_)
 
@@ -383,7 +384,7 @@ def _sincos22(sa):
 def _sincostan3r(a, f):
     # I{Reduced} 3-tuple C{(sin(B{a}), cos(B{a}), tan(B{a}))}
     if a:  # see L{sincostan3}
-        t = (_1_0 - f) * tan(a)
+        t = (_1_0 - f) * _tan(a)
         if t:
             c = _1_0 / hypot1(t)
             s =  c * t
@@ -567,7 +568,7 @@ __all__ += _ALL_DOCS(Cartesian, LatLon, intersecant2,  # from .ellipsoidalBaseDI
 
 # **) 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/ellipsoids.py

@@ -90,10 +90,10 @@ from pygeodesy.units import Bearing_, Distance, Float, Float_, Height, Lamd, Lat
                             Meter2, Meter3, Phi, Phid, Radius, Radius_, Scalar
 from pygeodesy.utily import atan1, atan1d, atan2b, degrees90, m2radians, radians2m, sincos2d
 
-from math import asinh, atan, atanh, cos, degrees, exp, fabs, radians, sin, sinh, sqrt, tan
+from math import asinh, atan, atanh, cos, degrees, exp, fabs, radians, sin, sinh, sqrt, tan  # as _tan
 
 __all__ = _ALL_LAZY.ellipsoids
-__version__ = '24.10.15'
+__version__ = '24.11.26'
 
 _f_0_0    = Float(f =_0_0)  # zero flattening
 _f__0_0   = Float(f_=_0_0)  # zero inverse flattening
@@ -660,8 +660,7 @@ class Ellipsoid(_NamedEnumItem):
 
            @arg lat: Geodetic latitude (C{degrees90}, C{str}).
 
-           @return: A L{Circle4Tuple}C{(radius, height, lat, beta)}
-                    instance.
+           @return: A L{Circle4Tuple}C{(radius, height, lat, beta)}.
 
            @raise RangeError: Latitude B{C{lat}} outside valid range and
                               L{rangerrors<pygeodesy.rangerrors>} is C{True}.
@@ -2427,7 +2426,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/elliptic.py

@@ -24,7 +24,7 @@ Following is a copy of I{Karney}'s U{EllipticFunction.hpp
 <https://GeographicLib.SourceForge.io/C++/doc/EllipticFunction_8hpp_source.html>}
 file C{Header}.
 
-Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2023)
+Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2024)
 and licensed under the MIT/X11 License.  For more information, see the
 U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 
@@ -93,13 +93,13 @@ from pygeodesy.named import _Named, _NamedTuple,  _ALL_LAZY, Fmt, unstr
 from pygeodesy.props import _allPropertiesOf_n, Property_RO, _update_all
 # from pygeodesy.streprs import Fmt, unstr  # from .named
 from pygeodesy.units import Scalar, Scalar_
-# from pygeodesy.utily import sincos2 as _sincos2  # from .karney
+from pygeodesy.utily import atan2  # sincos2 as _sincos2
 
-from math import asin, asinh, atan, atan2, ceil, cosh, fabs, floor, \
-                 radians, sin, sinh, sqrt, tan, tanh
+from math import asin, asinh, atan, ceil, cosh, fabs, floor, radians, \
+                 sin, sinh, sqrt, tan, tanh  # tan as _tan
 
 __all__ = _ALL_LAZY.elliptic
-__version__ = '24.10.14'
+__version__ = '24.11.26'
 
 _TolRD  =  zqrt(EPS * 0.002)
 _TolRF  =  zqrt(EPS * 0.030)
@@ -1246,7 +1246,7 @@ def _RJ(inst, x, y, z, p, *over):
 
 # **) 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/epsg.py

@@ -223,7 +223,7 @@ __all__ += _ALL_DOCS(decode2, encode)
 
 # **) 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/errors.py

@@ -914,7 +914,7 @@ def _xStrError(*Refs, **name_value_Error):  # in .gars, .geohash, .wgrs
 
 # **) 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/etm.py

@@ -17,7 +17,7 @@ Following is a copy of I{Karney}'s U{TransverseMercatorExact.hpp
 <https://GeographicLib.SourceForge.io/C++/doc/TransverseMercatorExact_8hpp_source.html>}
 file C{Header}.
 
-Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2023) and licensed
+Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2008-2024) and licensed
 under the MIT/X11 License.  For more information, see the U{GeographicLib<https://
 GeographicLib.SourceForge.io>} documentation.
 
@@ -86,14 +86,14 @@ from pygeodesy.props import deprecated_method, deprecated_property_RO, \
                             property_doc_,  _allPropertiesOf_n
 from pygeodesy.streprs import Fmt, pairs, unstr
 from pygeodesy.units import Degrees, Scalar_
-from pygeodesy.utily import atan1d, atan2d, _loneg, sincos2
+from pygeodesy.utily import atan1d, atan2, atan2d, _loneg, sincos2
 from pygeodesy.utm import _cmlon, _LLEB, _parseUTM5, _toBand, _toXtm8, \
                           _to7zBlldfn, Utm, UTMError
 
-from math import asinh, atan2, degrees, radians, sinh, sqrt
+from math import asinh, degrees, radians, sinh, sqrt
 
 __all__ = _ALL_LAZY.etm
-__version__ = '24.11.04'
+__version__ = '24.11.24'
 
 _OVERFLOW = _1_EPS**2  # ~2e+31
 _TAYTOL   =  pow(EPS,  0.6)
@@ -1197,7 +1197,7 @@ if __name__ == '__main__':  # MCCABE 16
 
 # **) 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"),