pygeodesy 25.4.8__py2.py3-none-any.whl → 25.5.5__py2.py3-none-any.whl

pygeodesy/geodesicw.py

@@ -21,7 +21,7 @@ from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 from pygeodesy.errors import _AssertionError, GeodesicError, \
                               IntersectionError
 from pygeodesy.fsums import Fsum,  Fmt, unstr
-from pygeodesy.internals import _DUNDER_nameof, _under
+from pygeodesy.internals import typename, _under
 from pygeodesy.interns import NN, _DOT_, _SPACE_, _to_, _too_
 from pygeodesy.karney import _atan2d, Caps, Direct9Tuple, GDict, \
                               Inverse10Tuple, _kWrapped
@@ -39,14 +39,14 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.11.02'
+__version__ = '25.04.14'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
 
 
 class _gWrapped(_kWrapped):
-    ''''(INTERNAL) Wrapper for some of I{Karney}'s U{geographiclib
+    '''(INTERNAL) Wrapper for some of I{Karney}'s U{geographiclib
         <https://PyPI.org/project/geographiclib>} classes.
     '''
 
@@ -65,6 +65,7 @@ class _gWrapped(_kWrapped):
                 Caps.REDUCEDLENGTH == _Geodesic.REDUCEDLENGTH and
                 Caps.GEODESICSCALE == _Geodesic.GEODESICSCALE and
                 Caps.AREA          == _Geodesic.AREA and
+                Caps.STANDARD      == _Geodesic.STANDARD and
                 Caps.ALL           == _Geodesic.ALL):
             raise _AssertionError(Caps=bin(Caps.ALL),
                                   Geodesic=bin(_Geodesic.ALL))
@@ -73,10 +74,11 @@ class _gWrapped(_kWrapped):
             '''I{Wrapper} for I{Karney}'s Python U{geodesic.Geodesic
                <https://PyPI.org/project/geographiclib>} class.
             '''
-            _datum   = _WGS84
-            _debug   =  0  # like .geodesicx.bases._GeodesicBase
-            LINE_OFF =  0  # in .azimuthal._GnomonicBase and .css.CassiniSoldner
-            _name    =  NN
+            _datum        = _WGS84
+            _debug        =  0  # like .geodesicx.bases._GeodesicBase
+            LINE_OFF      =  0  # in .azimuthal._GnomonicBase and .css.CassiniSoldner
+            _name         =  NN
+            STANDARD_LINE =  Caps.STANDARD_LINE
 
             def __init__(self, a_ellipsoid=_EWGS84, f=None, **name):  # PYCHOK signature
                 '''New I{wrapped} C{geodesic.Geodesic} instance.
@@ -94,14 +96,14 @@ class _gWrapped(_kWrapped):
                 if name:
                     self._name, _ = _name2__(name, _or_nameof=E)
 
-            def ArcDirect(self, lat1, lon1, azi1, a12, outmask=Caps._STD):  # PYCHOK no cover
+            def ArcDirect(self, lat1, lon1, azi1, a12, outmask=Caps.STANDARD):  # PYCHOK no cover
                 '''Return the C{_Geodesic.ArcDirect} result as L{GDict}.
                 '''
                 with _wargs(self, lat1, lon1, azi1, a12, outmask) as args:
                     d = _Geodesic.ArcDirect(self, *args)
                 return GDict(d)
 
-            def ArcDirectLine(self, lat1, lon1, azi1, a12, caps=Caps._STD_LINE, **name):  # PYCHOK no cover
+            def ArcDirectLine(self, lat1, lon1, azi1, a12, caps=Caps.STANDARD_LINE, **name):  # PYCHOK no cover
                 '''Return the C{_Geodesic.ArcDirectLine} as I{wrapped} C{GeodesicLine}.
                 '''
                 return self._GenDirectLine(lat1, lon1, azi1, True, a12, caps, **name)
@@ -127,7 +129,7 @@ class _gWrapped(_kWrapped):
                 '''
                 self._debug = Caps._DEBUG_ALL if debug else 0
 
-            def Direct(self, lat1, lon1, azi1, s12=0, outmask=Caps._STD):
+            def Direct(self, lat1, lon1, azi1, s12=0, outmask=Caps.STANDARD):
                 '''Return the C{_Geodesic.Direct} result as L{GDict}.
                 '''
                 with _wargs(self, lat1, lon1, azi1, s12, outmask) as args:
@@ -146,7 +148,7 @@ class _gWrapped(_kWrapped):
                 '''
                 return self.DirectLine(ll1.lat, ll1.lon, azi12, s12, **caps_name)
 
-            def DirectLine(self, lat1, lon1, azi1, s12, caps=Caps._STD_LINE, **name):
+            def DirectLine(self, lat1, lon1, azi1, s12, caps=Caps.STANDARD_LINE, **name):
                 '''Return the C{_Geodesic.DirectLine} as I{wrapped} C{GeodesicLine}.
                 '''
                 return self._GenDirectLine(lat1, lon1, azi1, False, s12, caps, **name)
@@ -163,14 +165,14 @@ class _gWrapped(_kWrapped):
                 '''
                 return getattr(self, _under(Geodesic.f1.name), self.ellipsoid.f1)
 
-            def _GDictDirect(self, lat, lon, azi, arcmode, s12_a12, outmask=Caps._STD):
+            def _GDictDirect(self, lat, lon, azi, arcmode, s12_a12, outmask=Caps.STANDARD):
                 '''(INTERNAL) Get C{_Geodesic._GenDirect} result as C{GDict}.
                 '''
                 with _wargs(self, lat, lon, azi, arcmode, s12_a12, outmask) as args:
                     t = _Geodesic._GenDirect(self, *args)
                 return Direct9Tuple(t).toGDict()  # *t
 
-            def _GDictInverse(self, lat1, lon1, lat2, lon2, outmask=Caps._STD):
+            def _GDictInverse(self, lat1, lon1, lat2, lon2, outmask=Caps.STANDARD):
                 '''(INTERNAL) Get C{_Geodesic._GenInverse} result as L{Inverse10Tuple}.
                 '''
                 with _wargs(self, lat1, lon1, lat2, lon2, outmask) as args:
@@ -192,7 +194,7 @@ class _gWrapped(_kWrapped):
                     ll2 = _unrollon(ll1, _Wrap.point(ll2))
                 return self.Inverse(ll1.lat, ll1.lon, ll2.lat, ll2.lon, **outmask)
 
-            def Inverse(self, lat1, lon1, lat2, lon2, outmask=Caps._STD):
+            def Inverse(self, lat1, lon1, lat2, lon2, outmask=Caps.STANDARD):
                 '''Return the C{_Geodesic.Inverse} result as L{GDict}.
                 '''
                 with _wargs(self, lat1, lon1, lat2, lon2, outmask) as args:
@@ -227,14 +229,14 @@ class _gWrapped(_kWrapped):
                     ll2 = _unrollon(ll1, _Wrap.point(ll2))
                 return self.InverseLine(ll1.lat, ll1.lon, ll2.lat, ll2.lon, **caps_name)
 
-            def InverseLine(self, lat1, lon1, lat2, lon2, caps=Caps._STD_LINE, **name):
+            def InverseLine(self, lat1, lon1, lat2, lon2, caps=Caps.STANDARD_LINE, **name):
                 '''Return the C{_Geodesic.InverseLine} as I{wrapped} C{GeodesicLine}.
                 '''
                 with _wargs(self, lat1, lon1, lat2, lon2, caps, **name) as args:
                     t = _Geodesic.InverseLine(self, *args)
                 return self._Line13(t, **name)
 
-            def Line(self, lat1, lon1, azi1, caps=Caps._STD_LINE, **name):
+            def Line(self, lat1, lon1, azi1, caps=Caps.STANDARD_LINE, **name):
                 '''Set up a I{wrapped} C{GeodesicLine} to compute several points
                    along a single, I{wrapped} (this) geodesic.
                 '''
@@ -289,10 +291,10 @@ class _gWrapped(_kWrapped):
                    @arg lon1: Longitude of the first points (C{degrees}).
                    @arg azi1: Azimuth at the first points (compass C{degrees360}).
                    @kwarg caps_name_: Optional keyword arguments C{B{caps}=Caps.STANDARD},
-                               a bit-or'ed combination of L{Caps} values specifying the
-                               capabilities the C{GeodesicLine} instance should possess,
-                               an optional C{B{name}=NN} plus C{salp1=NAN} and C{calp1=NAN}
-                               for I{INTERNAL} use.
+                               a bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                               values specifying the capabilities the C{GeodesicLine} instance
+                               should possess, an optional C{B{name}=NN} plus C{salp1=NAN} and
+                               C{calp1=NAN} for I{INTERNAL} use.
                 '''
                 _xinstanceof(_wrapped.Geodesic, geodesic=geodesic)
                 with _wargs(self, geodesic, lat1, lon1, azi1, **caps_name_) as args:
@@ -322,7 +324,7 @@ class _gWrapped(_kWrapped):
                 '''
                 return self.a13
 
-            def ArcPosition(self, a12, outmask=Caps._STD):
+            def ArcPosition(self, a12, outmask=Caps.STANDARD):
                 '''Return the position at C{B{a12} degrees} on this line.
 
                    @arg a12: Angular distance from this line's first point
@@ -412,12 +414,12 @@ class _gWrapped(_kWrapped):
                 '''
                 return _PlumbTo(self, lat0, lon0, est=est, tol=tol)
 
-            def Position(self, s12, outmask=Caps._STD):
+            def Position(self, s12, outmask=Caps.STANDARD):
                 '''Return the position at distance C{B{s12} meter} on this line.
 
                    @arg s12: Distance from this line's first point (C{meter}).
-                   @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                                   the quantities to be returned.
+                   @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                                   values specifying the quantities to be returned.
 
                    @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                             lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},
@@ -467,7 +469,7 @@ class GeodesicLine(_gWrapped):  # overwritten by 1st instance
     '''I{Wrapper} around I{Karney}'s class U{geographiclib.geodesicline.GeodesicLine
        <https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
     '''
-    def __new__(unused, geodesic, lat1, lon1, azi1, caps=Caps._STD_LINE, **name):
+    def __new__(unused, geodesic, lat1, lon1, azi1, caps=Caps.STANDARD_LINE, **name):
         '''Return a I{wrapped} C{geodesicline.GeodesicLine} instance from I{Karney}'s
            Python U{geographiclib<https://PyPI.org/project/geographiclib>}, provided
            the latter is installed, otherwise an C{ImportError}.
@@ -476,9 +478,9 @@ class GeodesicLine(_gWrapped):  # overwritten by 1st instance
            @arg lat1: Latitude of the first points (C{degrees}).
            @arg lon1: Longitude of the first points (C{degrees}).
            @arg azi1: Azimuth at the first points (compass C{degrees360}).
-           @kwarg caps: Optional, bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the C{GeodesicLine} instance should possess,
-                        i.e., which quantities can be returned by methods
+           @kwarg caps: Optional, bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                        values specifying the capabilities the C{GeodesicLine} instance
+                        should possess, i.e., which quantities can be returned by methods
                         C{GeodesicLine.Position} and C{GeodesicLine.ArcPosition}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
         '''
@@ -515,10 +517,10 @@ _wargs = _wargs()  # PYCHOK singleton
 def _Intersecant2(gl, lat0, lon0, radius, tol=_TOL, form=F_D):  # MCCABE in LatLonEllipsoidalBaseDI.intersecant2, .geodesicx.gxline.Intersecant2
     # (INTERNAL) Return the intersections of a circle at C{lat0, lon0}
     # and a geodesic line as a 2-Tuple C{(P, Q)}, each a C{GDict}.
-    r  =  Radius_(radius)
-    n  = _DUNDER_nameof(_Intersecant2)[1:]
-    _P =  gl.Position
-    _I =  gl.geodesic.Inverse
+    r  = Radius_(radius)
+    n  = typename(_Intersecant2)[1:]
+    _P = gl.Position
+    _I = gl.geodesic.Inverse
 
     def _R3(s):
         # radius, intersection, etc. at distance C{s}

pygeodesy/geodesicx/__init__.py

@@ -23,7 +23,7 @@ from pygeodesy.karney import Caps, GeodesicError
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY
 
 __all__ = _ALL_LAZY.geodesicx + _ALL_DOCS(Caps, GeodesicError)
-__version__ = '24.12.31'
+__version__ = '25.04.14'
 
 # **) MIT License
 #

pygeodesy/geodesicx/__main__.py

@@ -5,16 +5,16 @@ u'''Print L{geodesicx} version, etc. using C{python -m pygeodesy.geodesicx}.
 '''
 
 __all__ = ()
-__version__ = '25.04.04'
+__version__ = '25.04.14'
 
 
 def _main(**C4order):  # PYCHOK no cover
 
     try:
-        from pygeodesy import GeodesicExact, geodesicx
-        from pygeodesy.internals import _fper, _name_version, \
-                                         printf, _sizeof, _versions
-        from pygeodesy.interns import _COMMASPACE_, _EQUAL_
+        from pygeodesy import ADict, GeodesicExact, geodesicx
+        from pygeodesy.internals import _fper, _name_version, printf, \
+                                        _sizeof, typename, _versions
+        from pygeodesy.interns import _COMMASPACE_
         try:
             import numpy
         except ImportError:
@@ -24,10 +24,9 @@ def _main(**C4order):  # PYCHOK no cover
         cs = geodesicx.gx._C4coeffs(gX.C4order)
         n  = len(cs)
         u  = n if numpy else len(set(cs))
-        p  = dict(C4order=gX.C4order, C4n=n, C4u=u,
-                  C4u_n=_fper(u, n), C4x=len(gX._C4x),
-                  C4t=type(cs).__name__, C4z=_sizeof(cs))
-        p  = list(_EQUAL_(*t) for t in p.items())
+        p  = ADict(C4order=gX.C4order, C4n=n, C4u=u,
+                   C4u_n=_fper(u, n), C4x=len(gX._C4x),
+                   C4t=typename(type(cs)), C4z=_sizeof(cs))._toL()
         if numpy:
             p.append(_name_version(numpy))
         try:
@@ -47,6 +46,9 @@ def _main(**C4order):  # PYCHOK no cover
 from sys import argv  # .internals._isPyChOK
 _main(C4order=int(argv[1])) if len(argv) == 2 and argv[1].isdigit() else _main()
 
+# % python3.13 -m pygeodesy.geodesicx
+# pygeodesy.geodesicx 25.04.14: C4order=30, C4n=5425, C4u=5107, C4u_n=94.1%, C4x=465, C4t=tuple, C4z=166008, geographiclib 2.0 (pygeodesy 25.4.24 Python 3.13.3 64bit arm64 macOS 15.4)
+
 # % python3.13 -m pygeodesy.geodesicx 30
 # pygeodesy.geodesicx 24.09.06: C4order=30, C4n=5425, C4u=5107, C4u_n=94.1%, C4x=465, C4t=tuple, C4z=166008 (pygeodesy 24.9.6 Python 3.13.0rc1 64bit arm64 macOS 14.6.1)
 # % python3.12 -m pygeodesy.geodesicx 30

pygeodesy/geodesicx/gx.py

@@ -36,7 +36,7 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 # - a 12 suffix means a difference, e.g., s12 = s2 - s1.
 # - s and c prefixes mean sin and cos
 
-from pygeodesy.basics import _copysign, _xinstanceof, _xor, unsigned0
+from pygeodesy.basics import _copysign, _xinstanceof, _xor, unsigned0,  typename
 from pygeodesy.constants import EPS, EPS0, EPS02, MANT_DIG, NAN, PI, _EPSqrt, \
                                _SQRT2_2, isnan, _0_0, _0_001, _0_01, _0_1, _0_5, \
                                _1_0, _N_1_0, _1_75, _2_0, _N_2_0, _2__PI, _3_0, \
@@ -50,6 +50,7 @@ from pygeodesy.geodesicx.gxbases import _cosSeries, _GeodesicBase, \
                                         _sincos12, _sin1cos2, _sinf1cos2d, \
                                         _TINY, _xnC4
 from pygeodesy.geodesicx.gxline import _GeodesicLineExact, _update_glXs
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _DOT_, _UNDER_
 from pygeodesy.karney import GDict, _around, _atan2d, Caps, _cbrt, _diff182, \
                             _fix90, _K_2_0, _norm2, _norm180, _polynomial, \
@@ -64,7 +65,7 @@ from pygeodesy.utily import atan2, atan2d as _atan2d_reverse, _unrollon, \
 from math import copysign, cos, degrees, fabs, radians, sqrt
 
 __all__ = ()
-__version__ = '24.11.24'
+__version__ = '25.04.14'
 
 _MAXIT1 = 20
 _MAXIT2 = 10 + _MAXIT1 + MANT_DIG  # MANT_DIG == C++ digits
@@ -175,8 +176,8 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first point (compass C{degrees}).
            @arg a12: Arc length between the points (C{degrees}), can be negative.
-           @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                           the quantities to be returned.
+           @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                           values specifying the quantities to be returned.
 
            @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                     lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},
@@ -195,11 +196,10 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first point (compass C{degrees}).
            @arg a12: Arc length between the points (C{degrees}), can be negative.
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the L{GeodesicLineExact} instance
-                        should possess, i.e., which quantities can be
-                        returned by calls to L{GeodesicLineExact.Position}
-                        and L{GeodesicLineExact.ArcPosition}.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineExact} instance
+                        should possess, i.e., which quantities can be returned by methods
+                        L{GeodesicLineExact.Position} and L{GeodesicLineExact.ArcPosition}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
@@ -340,8 +340,8 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first point (compass C{degrees}).
            @arg s12: Distance between the points (C{meter}), can be negative.
-           @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                           the quantities to be returned.
+           @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                           values specifying the quantities to be returned.
 
            @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                     lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},
@@ -374,10 +374,10 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first point (compass C{degrees}).
            @arg s12: Distance between the points (C{meter}), can be negative.
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the L{GeodesicLineExact} instance
-                        should possess, i.e., which quantities can be
-                        returned by calls to L{GeodesicLineExact.Position}.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineExact} instance
+                        should possess, i.e., which quantities can be returned by methods
+                        L{GeodesicLineExact.Position}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
@@ -734,8 +734,8 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg lat2: Latitude of the second point (C{degrees}).
            @arg lon2: Longitude of the second point (C{degrees}).
-           @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                           the quantities to be returned.
+           @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                           values specifying the quantities to be returned.
 
            @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                     lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},
@@ -788,11 +788,10 @@ class GeodesicExact(_GeodesicBase):
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg lat2: Latitude of the second point (C{degrees}).
            @arg lon2: Longitude of the second point (C{degrees}).
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the L{GeodesicLineExact} instance
-                        should possess, i.e., which quantities can be
-                        returned by calls to L{GeodesicLineExact.Position}
-                        and L{GeodesicLineExact.ArcPosition}.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineExact} instance
+                        should possess, i.e., which quantities can be returned by methods
+                        L{GeodesicLineExact.Position} and L{GeodesicLineExact.ArcPosition}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
@@ -1103,11 +1102,10 @@ class GeodesicExact(_GeodesicBase):
            @arg lat1: Latitude of the first point (C{degrees}).
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first point (compass C{degrees}).
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the L{GeodesicLineExact} instance
-                        should possess, i.e., which quantities can be
-                        returnedby calls to L{GeodesicLineExact.Position}
-                        and L{GeodesicLineExact.ArcPosition}.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineExact} instance
+                        should possess, i.e., which quantities can be returned by methods
+                        L{GeodesicLineExact.Position} and L{GeodesicLineExact.ArcPosition}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
@@ -1259,11 +1257,10 @@ class GeodesicLineExact(_GeodesicLineExact):
            @arg lat1: Latitude of the first point (C{degrees}).
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first points (compass C{degrees}).
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying
-                        the capabilities the L{GeodesicLineExact} instance
-                        should possess, i.e., which quantities can be
-                        returned by calls to L{GeodesicLineExact.Position}
-                        and L{GeodesicLineExact.ArcPosition}.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineExact} instance
+                        should possess, i.e., which quantities can bereturned by methods
+                        L{GeodesicLineExact.Position} and L{GeodesicLineExact.ArcPosition}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise TypeError: Invalid B{C{geodesic}}.
@@ -1333,7 +1330,7 @@ def _C4coeffs(nC4):  # in .geodesicx.__main__
     '''(INTERNAL) Get the C{C4_24}, C{_27} or C{_30} series coefficients.
     '''
     try:  # from pygeodesy.geodesicx._C4_xx import _coeffs_xx as _coeffs
-        _C4_xx  = _DOT_(_MODS.geodesicx.__name__, _UNDER_('_C4', nC4))
+        _C4_xx  = _DOT_(typename(_MODS.geodesicx), _UNDER_('_C4', nC4))
         _coeffs = _MODS.getattr(_C4_xx, _UNDER_('_coeffs', nC4))
     except (AttributeError, ImportError, TypeError) as x:
         raise GeodesicError(nC4=nC4, cause=x)

pygeodesy/geodesicx/gxarea.py

@@ -19,7 +19,7 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import isodd, unsigned0
 from pygeodesy.constants import NAN, _0_0, _0_5, _720_0
-from pygeodesy.internals import printf
+from pygeodesy.internals import printf, typename
 # from pygeodesy.interns import _COMMASPACE_  # from .lazily
 from pygeodesy.karney import Area3Tuple, _diff182, GeodesicError, \
                             _norm180, _remainder, _sum3
@@ -308,7 +308,7 @@ class GeodesicAreaExact(_NamedBase):
         self._lat1 = self._lon1 = NAN
         self._num  = self._xings = n = 0
         if self.verbose:  # PYCHOK no cover
-            printf('%s %s: (%s)', self.named2, n, self.Reset.__name__)
+            printf('%s %s: (%s)', self.named2, n, typename(self.Reset))
         return n
 
     Clear = Reset

pygeodesy/geodesicx/gxline.py

@@ -55,7 +55,7 @@ from pygeodesy.utily import atan2, atan2d as _atan2d_reverse, sincos2
 from math import cos, degrees, fabs, floor, radians, sin
 
 __all__ = ()
-__version__ = '24.11.24'
+__version__ = '25.04.12'
 
 _glXs = []  # instances of C{[_]GeodesicLineExact} to be updated
 
@@ -185,8 +185,8 @@ class _GeodesicLineExact(_GeodesicBase):
 
            @arg a12: Spherical arc length from the first point to the
                      second point (C{degrees}).
-           @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                           the quantities to be returned.
+           @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                           values specifying the quantities to be returned.
 
            @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                     lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},
@@ -571,8 +571,8 @@ class _GeodesicLineExact(_GeodesicBase):
         '''Find the position on the line given B{C{s12}}.
 
            @arg s12: Distance from this this line's first point (C{meter}).
-           @kwarg outmask: Bit-or'ed combination of L{Caps} values specifying
-                           the quantities to be returned.
+           @kwarg outmask: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>}
+                           values specifying the quantities to be returned.
 
            @return: A L{GDict} with up to 12 items C{lat1, lon1, azi1, lat2,
                     lon2, azi2, m12, a12, s12, M12, M21, S12} with C{lat1},

pygeodesy/geodsolve.py

@@ -9,10 +9,10 @@ Set env variable C{PYGEODESY_GEODSOLVE} to the (fully qualified) path
 of the C{GeodSolve} executable.
 '''
 
-from pygeodesy.basics import _xinstanceof
+from pygeodesy.basics import _xinstanceof  # typename
 # from pygeodesy.constants import NAN, _0_0  # from .karney
 # from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
-from pygeodesy.interns import NN, _UNDER_
+from pygeodesy.interns import _DMAIN_, NN, _UNDER_
 from pygeodesy.karney import Caps, GeodesicError, GeodSolve12Tuple, \
                             _sincos2d, _Xables,  _0_0, NAN
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
@@ -23,7 +23,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.11.02'
+__version__ = '25.04.14'
 
 
 class _GeodesicSolveBase(_SolveGDictBase):
@@ -32,7 +32,7 @@ class _GeodesicSolveBase(_SolveGDictBase):
     _Error         =  GeodesicError
     _Names_Direct  = \
     _Names_Inverse =  GeodSolve12Tuple._Names_
-    _Xable_name    = _Xables.GeodSolve.__name__
+    _Xable_name    = _Xables.GeodSolve.__name__  # typename
     _Xable_path    = _Xables.GeodSolve()
 
     @Property_RO
@@ -140,8 +140,9 @@ class GeodesicSolve(_GeodesicSolveBase):
            @arg azi1: Azimuth at the first point (compass C{degrees}).
            @kwarg caps_name: Optional C{B{name}=NN} (C{str}) and keyword
                        argument C{B{caps}=Caps.ALL}, bit-or'ed combination
-                       of L{Caps} values specifying the capabilities the
-                       L{GeodesicLineSolve} instance should possess.
+                       of L{Caps<pygeodesy.karney.Caps>} values specifying
+                       the capabilities the L{GeodesicLineSolve} instance
+                       should possess.
 
            @return: A L{GeodesicLineSolve} instance.
 
@@ -191,8 +192,9 @@ class GeodesicSolve(_GeodesicSolveBase):
            @arg lon2: Longitude of the second point (C{degrees}).
            @kwarg caps_name: Optional C{B{name}=NN} (C{str}) and keyword
                        argument C{B{caps}=Caps.ALL}, bit-or'ed combination
-                       of L{Caps} values specifying the capabilities the
-                       L{GeodesicLineSolve} instance should possess.
+                       of L{Caps<pygeodesy.karney.Caps>} values specifying
+                       the capabilities the L{GeodesicLineSolve} instance
+                       should possess.
 
            @return: A L{GeodesicLineSolve} instance.
 
@@ -231,16 +233,15 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveGDictLineBase):
            @arg lat1: Latitude of the first point (C{degrees}).
            @arg lon1: Longitude of the first point (C{degrees}).
            @arg azi1: Azimuth at the first points (compass C{degrees}).
-           @kwarg caps: Bit-or'ed combination of L{Caps} values specifying the
-                        capabilities the L{GeodesicLineSolve} instance should possess,
-                        C{B{caps}=Caps.ALL} always.  Include C{Caps.LINE_OFF} if
-                        updates to the B{C{geodesic}} should I{not} be reflected in
-                        this L{GeodesicLineSolve} instance.
+           @kwarg caps: Bit-or'ed combination of L{Caps<pygeodesy.karney.Caps>} values
+                        specifying the capabilities the L{GeodesicLineSolve} instance
+                        should possess, C{B{caps}=Caps.ALL} always.  Include C{Caps.LINE_OFF}
+                        if updates to the B{C{geodesic}} should I{not be reflected} in this
+                        L{GeodesicLineSolve} instance.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
-           @raise GeodesicError: Invalid path for the C{GeodSolve} executable
-                                 or isn't the C{GeodSolve} executable, see
-                                 property C{geodesic.GeodSolve}.
+           @raise GeodesicError: Invalid path for the C{GeodSolve} executable or isn't the
+                                 C{GeodSolve} executable, see property C{geodesic.GeodSolve}.
 
            @raise TypeError: Invalid B{C{geodesic}}.
         '''
@@ -384,7 +385,7 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveGDictLineBase):
 
 __all__ += _ALL_DOCS(_GeodesicSolveBase)
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     def _main():
         from pygeodesy import printf

pygeodesy/geohash.py

@@ -21,9 +21,9 @@ from pygeodesy.basics import isstr, map2, _splituple
 from pygeodesy.constants import EPS, R_M, _0_0, _0_5, _180_0, _360_0, \
                                _90_0, _N_90_0, _N_180_0  # PYCHOK used!
 from pygeodesy.errors import _ValueError, _xkwds, _xStrError
-# from pygeodesy import formy as _formy  # _MODS
-from pygeodesy.interns import NN, _DOT_, _E_, _height_, _N_, _NE_, _NW_, \
-                             _radius_, _S_, _SE_, _SW_, _W_, _width_  # _INV_
+# from pygeodesy import formy as _formy  # _MODS.into
+from pygeodesy.interns import NN, _DMAIN_, _DOT_, _E_, _height_, _N_, _NE_, \
+                             _NW_, _radius_, _S_, _SE_, _SW_, _W_, _width_  # _INV_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name__, _NamedDict, _NamedTuple, nameof, _xnamed
 from pygeodesy.namedTuples import Bounds2Tuple, Bounds4Tuple, LatLon2Tuple, \
@@ -37,7 +37,7 @@ from pygeodesy.units import Degrees_, Int, Lat_, Lon_, Meter, Precision_, Str
 from math import fabs, ldexp, log10, radians
 
 __all__ = _ALL_LAZY.geohash
-__version__ = '25.01.15'
+__version__ = '25.04.21'
 
 _formy   = _MODS.into(formy=__name__)
 _MASK5   =  16, 8, 4, 2, 1  # PYCHOK used!
@@ -1069,7 +1069,7 @@ __all__ += _ALL_DOCS(bounds,  # functions
                      neighbors, precision, resolution2, sizes3, vincentys_,
                      decode_error, sizes)  # DEPRECATED
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     from pygeodesy.internals import printf, _versions
     from timeit import timeit