pygeodesy 24.5.15__py2.py3-none-any.whl → 24.6.1__py2.py3-none-any.whl

pygeodesy/geodesicx/gx.py

@@ -43,16 +43,16 @@ from pygeodesy.constants import EPS, EPS0, EPS02, MANT_DIG, NAN, PI, _EPSqrt, \
                                _4_0, _6_0, _8_0, _16_0, _90_0, _180_0, _1000_0
 from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
+from pygeodesy.errors import GeodesicError, _xkwds_pop2
 from pygeodesy.fmath import hypot as _hypot
 from pygeodesy.fsums import fsumf_, fsum1f_
 from pygeodesy.geodesicx.gxbases import _cosSeries, _GeodesicBase, \
                                         _sincos12, _sin1cos2, _xnC4
 from pygeodesy.geodesicx.gxline import _GeodesicLineExact, _TINY, _update_glXs
 from pygeodesy.interns import NN, _COMMASPACE_, _DOT_, _UNDER_
-from pygeodesy.karney import _around, _atan2d, Caps, _cbrt, _diff182, \
-                             _fix90, GDict, GeodesicError, _K_2_0, \
-                             _norm2, _norm180, _polynomial, _signBit, \
-                             _sincos2, _sincos2d, _sincos2de, _unsigned2
+from pygeodesy.karney import GDict, _around, _atan2d, Caps, _cbrt, _diff182, \
+                            _fix90, _K_2_0, _norm2, _norm180, _polynomial, \
+                            _signBit, _sincos2, _sincos2d, _sincos2de, _unsigned2
 from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import deprecated_Property, Property, Property_RO, property_RO
@@ -62,7 +62,7 @@ from pygeodesy.utily import atan2d as _atan2d_reverse, _unrollon, _Wrap, wrap360
 from math import atan2, copysign, cos, degrees, fabs, radians, sqrt
 
 __all__ = ()
-__version__ = '24.02.21'
+__version__ = '24.05.31'
 
 _MAXIT1 = 20
 _MAXIT2 = 10 + _MAXIT1 + MANT_DIG  # MANT_DIG == C++ digits
@@ -134,8 +134,7 @@ class GeodesicExact(_GeodesicBase):
     _datum = _WGS84
     _nC4   =  30  # default C4order
 
-    def __init__(self, a_ellipsoid=_EWGS84, f=None, name=NN, C4order=None,
-                       C4Order=None):  # for backward compatibility
+    def __init__(self, a_ellipsoid=_EWGS84, f=None, C4order=None, **name_C4Order):  # for backward compatibility
         '''New L{GeodesicExact} instance.
 
            @arg a_ellipsoid: An ellipsoid (L{Ellipsoid}) or datum (L{Datum}) or
@@ -143,20 +142,23 @@ class GeodesicExact(_GeodesicBase):
                              conventionally in C{meter}), see B{C{f}}.
            @arg f: The flattening of the ellipsoid (C{scalar}) if B{C{a_ellipsoid}}
                    is specified as C{scalar}.
-           @kwarg name: Optional name (C{str}).
            @kwarg C4order: Optional series expansion order (C{int}), see property
                            L{C4order}, default C{30}.
-           @kwarg C4Order: DEPRECATED, use keyword argument B{C{C4order}}.
+           @kwarg name_C4Order: Optional C{B{name}=NN} (C{str}) and the DEPRECATED
+                                keyword argument C{C4Order}, use B{C{C4order}} instead.
 
            @raise GeodesicError: Invalid B{C{C4order}}.
         '''
-        _earth_datum(self, a_ellipsoid, f=f, name=name)
-        if name:
-            self.name = name
+        if name_C4Order:
+            C4order, name = _xkwds_pop2(name_C4Order, C4Order=C4order)
+            if name:
+                self.name = name
+        else:
+            name = {}  # name_C4Order
+
+        _earth_datum(self, a_ellipsoid, f=f, **name)
         if C4order:  # XXX private copy, always?
             self.C4order = C4order
-        elif C4Order:  # for backward compatibility
-            self.C4Order = C4Order
 
     @Property_RO
     def a(self):
@@ -184,7 +186,7 @@ class GeodesicExact(_GeodesicBase):
         '''
         return self._GDictDirect(lat1, lon1, azi1, True, a12, outmask)
 
-    def ArcDirectLine(self, lat1, lon1, azi1, a12, caps=Caps.ALL, name=NN):
+    def ArcDirectLine(self, lat1, lon1, azi1, a12, caps=Caps.ALL, **name):
         '''Define a L{GeodesicLineExact} in terms of the I{direct} geodesic problem and as arc length.
 
            @arg lat1: Latitude of the first point (C{degrees}).
@@ -196,6 +198,7 @@ class GeodesicExact(_GeodesicBase):
                         should possess, i.e., which quantities can be
                         returned by calls to L{GeodesicLineExact.Position}
                         and L{GeodesicLineExact.ArcPosition}.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
 
@@ -208,15 +211,15 @@ class GeodesicExact(_GeodesicBase):
                  <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1GeodesicExact.html>} and
                  Python U{Geodesic.ArcDirectLine<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
-        return self._GenDirectLine(lat1, lon1, azi1, True, a12, caps, name=name)
+        return self._GenDirectLine(lat1, lon1, azi1, True, a12, caps, **name)
 
-    def Area(self, polyline=False, name=NN):
+    def Area(self, polyline=False, **name):
         '''Set up a L{GeodesicAreaExact} to compute area and
            perimeter of a polygon.
 
            @kwarg polyline: If C{True} perimeter only, otherwise
                             area and perimeter (C{bool}).
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicAreaExact} instance.
 
@@ -224,7 +227,7 @@ class GeodesicExact(_GeodesicBase):
                   to the returned L{GeodesicAreaExact} instance.
         '''
         gaX = _MODS.geodesicx.GeodesicAreaExact(self, polyline=polyline,
-                                                      name=name or self.name)
+                                                      name=self._name__(name))
         if self.debug:
             gaX.verbose = True
         return gaX
@@ -313,7 +316,7 @@ class GeodesicExact(_GeodesicBase):
         def _C4(nC4):
             i, n, cs = 0, self.n, _C4coeffs(nC4)
             _p = _polynomial
-            for r in range(nC4 + 1, 1, -1):
+            for r in range(nC4 + 1, 1, -1):  # _reverange
                 for j in range(1, r):
                     j = j + i  # (j - i - 1) order of polynomial
                     yield _p(n, cs, i, j) / cs[j]
@@ -362,7 +365,7 @@ class GeodesicExact(_GeodesicBase):
         '''
         return self.DirectLine(ll1.lat, ll1.lon, azi12, s12, **caps_name)
 
-    def DirectLine(self, lat1, lon1, azi1, s12, caps=Caps.STANDARD, name=NN):
+    def DirectLine(self, lat1, lon1, azi1, s12, caps=Caps.STANDARD, **name):
         '''Define a L{GeodesicLineExact} in terms of the I{direct} geodesic problem and as distance.
 
            @arg lat1: Latitude of the first point (C{degrees}).
@@ -373,6 +376,7 @@ class GeodesicExact(_GeodesicBase):
                         the capabilities the L{GeodesicLineExact} instance
                         should possess, i.e., which quantities can be
                         returned by calls to L{GeodesicLineExact.Position}.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
 
@@ -385,7 +389,7 @@ class GeodesicExact(_GeodesicBase):
                  <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1GeodesicExact.html>} and
                  Python U{Geodesic.DirectLine<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
-        return self._GenDirectLine(lat1, lon1, azi1, False, s12, caps, name=name)
+        return self._GenDirectLine(lat1, lon1, azi1, False, s12, caps, **name)
 
     def _dn(self, sbet, cbet):  # in gxline._GeodesicLineExact.__init__
         '''(INTERNAL) Helper.
@@ -691,7 +695,7 @@ class GeodesicExact(_GeodesicBase):
                         eFk2=eF.k2, eFa2=eF.alpha2)
             p.update(r)  # r overrides p
             r = p.toGDict()
-        return self._iter2tion(r, p)
+        return self._iter2tion(r, **p)
 
     def _GenDirect(self, lat1, lon1, azi1, arcmode, s12_a12, outmask=Caps.STANDARD):
         '''(INTERNAL) The general I{Inverse} geodesic calculation.
@@ -702,7 +706,7 @@ class GeodesicExact(_GeodesicBase):
         r = self._GDictDirect(lat1, lon1, azi1, arcmode, s12_a12, outmask)
         return r.toDirect9Tuple()
 
-    def _GenDirectLine(self, lat1, lon1, azi1, arcmode, s12_a12, caps, name=NN):
+    def _GenDirectLine(self, lat1, lon1, azi1, arcmode, s12_a12, caps, **name):
         '''(INTERNAL) Helper for C{ArcDirectLine} and C{DirectLine}.
 
            @return: A L{GeodesicLineExact} instance.
@@ -712,7 +716,7 @@ class GeodesicExact(_GeodesicBase):
         s, c = _sincos2d(_around(azi1))
         C    =  caps if arcmode else (caps | Caps.DISTANCE_IN)
         return _GeodesicLineExact(self, lat1, lon1, azi1, C,
-                                  self._debug, s, c, name=name)._GenSet(arcmode, s12_a12)
+                                  self._debug, s, c, **name)._GenSet(arcmode, s12_a12)
 
     def _GenInverse(self, lat1, lon1, lat2, lon2, outmask=Caps.STANDARD):
         '''(INTERNAL) The general I{Inverse} geodesic calculation.
@@ -784,7 +788,7 @@ class GeodesicExact(_GeodesicBase):
             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.STANDARD, name=NN):
+    def InverseLine(self, lat1, lon1, lat2, lon2, caps=Caps.STANDARD, **name):
         '''Define a L{GeodesicLineExact} in terms of the I{Inverse} geodesic problem.
 
            @arg lat1: Latitude of the first point (C{degrees}).
@@ -796,6 +800,7 @@ class GeodesicExact(_GeodesicBase):
                         should possess, i.e., which quantities can be
                         returned by calls to L{GeodesicLineExact.Position}
                         and L{GeodesicLineExact.ArcPosition}.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
 
@@ -813,7 +818,7 @@ class GeodesicExact(_GeodesicBase):
         C  = (caps | Cs.DISTANCE) if (caps & (Cs.DISTANCE_IN & Cs._OUT_MASK)) else caps
         azi1 = _atan2d(r.salp1, r.calp1)
         return _GeodesicLineExact(self, lat1, lon1, azi1, C,  # ensure a12 is distance
-                                  self._debug, r.salp1, r.calp1, name=name)._GenSet(True, r.a12)
+                                  self._debug, r.salp1, r.calp1, **name)._GenSet(True, r.a12)
 
     def _InverseArea(self, _meridian, salp1, calp1,  # PYCHOK 9 args
                                       salp2, calp2,
@@ -1100,7 +1105,7 @@ class GeodesicExact(_GeodesicBase):
 
         return s12b, m12b, m0, M12, M21
 
-    def Line(self, lat1, lon1, azi1, caps=Caps.ALL, name=NN):
+    def Line(self, lat1, lon1, azi1, caps=Caps.ALL, **name):
         '''Set up a L{GeodesicLineExact} to compute several points
            on a single geodesic.
 
@@ -1112,6 +1117,7 @@ class GeodesicExact(_GeodesicBase):
                         should possess, i.e., which quantities can be
                         returnedby calls to L{GeodesicLineExact.Position}
                         and L{GeodesicLineExact.ArcPosition}.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicLineExact} instance.
 
@@ -1123,7 +1129,7 @@ class GeodesicExact(_GeodesicBase):
                  <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1GeodesicExact.html>}
                  and Python U{Geodesic.Line<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
-        return _GeodesicLineExact(self, lat1, lon1, azi1, caps, self._debug, name=name)
+        return _GeodesicLineExact(self, lat1, lon1, azi1, caps, self._debug, **name)
 
     @Property_RO
     def n(self):
@@ -1265,7 +1271,7 @@ class GeodesicLineExact(_GeodesicLineExact):
        geographiclib/geographiclib-python>}.
     '''
 
-    def __init__(self, geodesic, lat1, lon1, azi1, caps=Caps.STANDARD, name=NN):
+    def __init__(self, geodesic, lat1, lon1, azi1, caps=Caps.STANDARD, **name):
         '''New L{GeodesicLineExact} instance, allowing points to be found along
            a geodesic starting at C{(B{lat1}, B{lon1})} with azimuth B{C{azi1}}.
 
@@ -1278,15 +1284,15 @@ class GeodesicLineExact(_GeodesicLineExact):
                         should possess, i.e., which quantities can be
                         returned by calls to L{GeodesicLineExact.Position}
                         and L{GeodesicLineExact.ArcPosition}.
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise TypeError: Invalid B{C{geodesic}}.
         '''
         _xinstanceof(GeodesicExact, geodesic=geodesic)
         if (caps & Caps.LINE_OFF):  # copy to avoid updates
-            geodesic = geodesic.copy(deep=False, name=NN(_UNDER_, geodesic.name))
+            geodesic = geodesic.copy(deep=False, name=_UNDER_(NN, geodesic.name))  # NOT _under!
 #           _update_all(geodesic)
-        _GeodesicLineExact.__init__(self, geodesic, lat1, lon1, azi1, caps, 0, name=name)
+        _GeodesicLineExact.__init__(self, geodesic, lat1, lon1, azi1, caps, 0, **name)
 
 
 def _Astroid(x, y):

pygeodesy/geodesicx/gxarea.py

@@ -19,10 +19,10 @@ 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.interns import NN, _COMMASPACE_
+# from pygeodesy.interns import _COMMASPACE_  # from .lazily
 from pygeodesy.karney import Area3Tuple, _diff182, GeodesicError, \
                             _norm180, _remainder, _sum2_
-from pygeodesy.lazily import _ALL_DOCS, printf
+from pygeodesy.lazily import _ALL_DOCS, printf,  _COMMASPACE_
 from pygeodesy.named import ADict, callername, _NamedBase,  pairs
 from pygeodesy.props import Property, Property_RO, property_RO
 # from pygeodesy.streprs import pairs  # from .named
@@ -30,7 +30,7 @@ from pygeodesy.props import Property, Property_RO, property_RO
 from math import fmod as _fmod
 
 __all__ = ()
-__version__ = '24.05.10'
+__version__ = '24.05.19'
 
 
 class GeodesicAreaExact(_NamedBase):
@@ -55,14 +55,14 @@ class GeodesicAreaExact(_NamedBase):
     _verbose =  False
     _xings   =  0
 
-    def __init__(self, geodesic, polyline=False, name=NN):
+    def __init__(self, geodesic, polyline=False, **name):
         '''New L{GeodesicAreaExact} instance.
 
            @arg geodesic: A geodesic (L{GeodesicExact}, I{wrapped}
                           C{Geodesic} or L{GeodesicSolve}).
            @kwarg polyline: If C{True}, compute the perimeter only,
                             otherwise area and perimeter (C{bool}).
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise GeodesicError: Invalid B{C{geodesic}}.
         '''
@@ -408,18 +408,18 @@ class GeodesicAreaExact(_NamedBase):
 class PolygonArea(GeodesicAreaExact):
     '''For C{geographiclib} compatibility, sub-class of L{GeodesicAreaExact}.
     '''
-    def __init__(self, earth, polyline=False, name=NN):
+    def __init__(self, earth, polyline=False, **name):
         '''New L{PolygonArea} instance.
 
            @arg earth: A geodesic (L{GeodesicExact}, I{wrapped}
                        C{Geodesic} or L{GeodesicSolve}).
            @kwarg polyline: If C{True} perimeter only, otherwise
                             area and perimeter (C{bool}).
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise GeodesicError: Invalid B{C{earth}}.
         '''
-        GeodesicAreaExact.__init__(self, earth, polyline=polyline, name=name)
+        GeodesicAreaExact.__init__(self, earth, polyline=polyline, **name)
 
 
 class _Accumulator(_NamedBase):
@@ -432,8 +432,11 @@ class _Accumulator(_NamedBase):
     _n =  0  # len()
     _s = _t = _0_0
 
-    def __init__(self, y=0, name=NN):
+    def __init__(self, y=0, **name):
         '''New L{_Accumulator}.
+
+           @kwarg y: Initial value (C{scalar}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
         '''
         if isinstance(y, _Accumulator):
             self._s, self._t, self._n = y._s, y._t, 1

pygeodesy/geodesicx/gxbases.py

@@ -10,16 +10,15 @@ U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 
 from pygeodesy.basics import isodd,  _MODS
 from pygeodesy.constants import _0_0, _100_0
-from pygeodesy.errors import _or, _xkwds_item2,  _not_
+from pygeodesy.errors import _or, _xkwds_item2
 from pygeodesy.fmath import hypot as _hypot
-# from pygeodesy.interns import _not_  # from .errors
 from pygeodesy.karney import _CapsBase, GeodesicError, _2cos2x, _sum2_
 # from pygeodesy.lazily import _MODS, printf  # .basics, _MODS
 
 from math import ldexp as _ldexp
 
 __all__ = ()
-__version__ = '24.03.15'
+__version__ = '24.05.19'
 
 # valid C{nC4}s and C{C4order}s, see _xnC4 below
 _nC4s = {24: 2900, 27: 4032, 30: 5425}
@@ -127,7 +126,7 @@ def _xnC4(**name_nC4):
     '''
     n, nC4 = _xkwds_item2(name_nC4)
     if nC4 not in _nC4s or not isinstance(nC4, int):
-        raise GeodesicError(n, nC4, txt=_not_(_or(*map(str, _nC4s))))
+        raise GeodesicError(n, nC4, txt_not_=_or(*map(str, _nC4s)))
     return _nC4s[nC4]
 
 

pygeodesy/geodesicx/gxline.py

@@ -39,12 +39,12 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 # from pygeodesy.basics import _xinstanceof  # _MODS
 from pygeodesy.constants import NAN, _EPSmin, _EPSqrt as _TOL, _0_0, \
                                _1_0, _180_0, _2__PI, _copysign_1_0
-from pygeodesy.errors import _xError, _xkwds_get
+from pygeodesy.errors import _xError,  _COMMASPACE_
 from pygeodesy.fsums import fsumf_, fsum1f_
 from pygeodesy.geodesicx.gxbases import _cosSeries, _GeodesicBase, \
                                         _sincos12, _sin1cos2
 # from pygeodesy.geodesicw import _Intersecant2  # _MODS
-from pygeodesy.interns import NN, _COMMASPACE_
+# from pygeodesy.interns import _COMMASPACE_  # from .errors
 from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS
 from pygeodesy.karney import _around, _atan2d, Caps, GDict, _fix90, \
                              _K_2_0, _norm2, _norm180, _sincos2, _sincos2d
@@ -55,7 +55,7 @@ from pygeodesy.utily import atan2d as _atan2d_reverse, sincos2
 from math import atan2, cos, degrees, fabs, floor, radians, sin
 
 __all__ = ()
-__version__ = '24.02.21'
+__version__ = '24.05.19'
 
 _glXs = []  # instances of C{[_]GeodesicLineExact} to be updated
 # underflow guard, we require _TINY * EPS > 0, _TINY + EPS == EPS
@@ -95,7 +95,7 @@ class _GeodesicLineExact(_GeodesicBase):
 #   _somg1 = _comg1 = NAN
 #   _ssig1 = _csig1 = NAN
 
-    def __init__(self, gX, lat1, lon1, azi1, caps, _debug, *salp1_calp1, **name):  # name=NN
+    def __init__(self, gX, lat1, lon1, azi1, caps, _debug, *salp1_calp1, **name):
         '''(INTERNAL) New C{[_]GeodesicLineExact} instance.
         '''
         _xGeodesicExact(gX=gX)
@@ -110,10 +110,8 @@ class _GeodesicLineExact(_GeodesicBase):
             # guard against salp0 underflow,
             # also -0 is converted to +0
             salp1, calp1 = _sincos2d(_around(azi1))
-        if name:  # *args, name=NN): Python3
-            name = _xkwds_get(name, name=NN)
-            if name:
-                self.name = name
+        if name:
+            self.name = name
 
         self._gX    = gX  # GeodesicExact only
         self._lat1  = lat1 = _fix90(lat1)

pygeodesy/geodsolve.py

@@ -10,24 +10,23 @@ of the C{GeodSolve} executable.
 '''
 
 from pygeodesy.basics import _xinstanceof
-# from pygeodesy.errors import _xkwds  # from .karney
 # from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
-# from pygeodesy.internals import printf  # from .lazily
 from pygeodesy.interns import NN, _a12_, _azi1_, _azi2_, \
                              _lat1_, _lat2_, _lon1_, _lon2_, _m12_, \
                              _M12_, _M21_, _s12_, _S12_, _UNDER_
 from pygeodesy.interns import _UNUSED_, _not_  # PYCHOK used!
 from pygeodesy.karney import _Azi, Caps, _Deg, GeodesicError, _GTuple, \
-                             _Pass, _Lat, _Lon, _M, _M2, _sincos2d,  _xkwds
+                             _Pass, _Lat, _Lon, _M, _M2, _sincos2d
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
-                             _getenv, _PYGEODESY_GEODSOLVE_,  printf
+                             _getenv, _PYGEODESY_GEODSOLVE_
+from pygeodesy.named import _name1__
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import Property, Property_RO
 from pygeodesy.solveBase import _SolveBase, _SolveLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.05.13'
+__version__ = '24.05.31'
 
 
 class GeodSolve12Tuple(_GTuple):
@@ -117,21 +116,20 @@ class GeodesicSolve(_GeodesicSolveBase):
               executable for I{every} method call.
     '''
 
-    def Area(self, polyline=False, name=NN):
+    def Area(self, polyline=False, **name):
         '''Set up a L{GeodesicAreaExact} to compute area and
            perimeter of a polygon.
 
            @kwarg polyline: If C{True} perimeter only, otherwise
                             area and perimeter (C{bool}).
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{GeodesicAreaExact} instance.
 
            @note: The B{C{debug}} setting is passed as C{verbose}
                   to the returned L{GeodesicAreaExact} instance.
         '''
-        gaX = _MODS.geodesicx.GeodesicAreaExact(self, polyline=polyline,
-                                                      name=name or self.name)
+        gaX = _MODS.geodesicx.GeodesicAreaExact(self, polyline=polyline, **name)
         if self.verbose or self.debug:  # PYCHOK no cover
             gaX.verbose = True
         return gaX
@@ -160,9 +158,10 @@ class GeodesicSolve(_GeodesicSolveBase):
            @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_name: Bit-or'ed combination of L{Caps} values specifying
-                       the capabilities the L{GeodesicLineSolve} instance should
-                       possess, C{caps=Caps.ALL} always.
+           @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.
 
            @return: A L{GeodesicLineSolve} instance.
 
@@ -174,7 +173,7 @@ class GeodesicSolve(_GeodesicSolveBase):
                  <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1GeodesicExact.html>}
                  and Python U{Geodesic.Line<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
-        return GeodesicLineSolve(self, lat1, lon1, azi1, **_xkwds(caps_name, name=self.name))
+        return GeodesicLineSolve(self, lat1, lon1, azi1, **_name1__(caps_name, _or_nameof=self))
 
     Line = DirectLine
 
@@ -210,9 +209,10 @@ class GeodesicSolve(_GeodesicSolveBase):
            @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_name: Bit-or'ed combination of L{Caps} values specifying
-                       the capabilities the L{GeodesicLineSolve} instance should
-                       possess, C{caps=Caps.ALL} always.
+           @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.
 
            @return: A L{GeodesicLineSolve} instance.
 
@@ -223,7 +223,7 @@ class GeodesicSolve(_GeodesicSolveBase):
                  Python U{Geodesic.InverseLine<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
         r = self.Inverse(lat1, lon1, lat2, lon2)
-        return GeodesicLineSolve(self, lat1, lon1, r.azi1, **_xkwds(caps_name, name=self.name))
+        return GeodesicLineSolve(self, lat1, lon1, r.azi1, **_name1__(caps_name, _or_nameof=self))
 
 
 class GeodesicLineSolve(_GeodesicSolveBase, _SolveLineBase):
@@ -238,7 +238,7 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveLineBase):
               executable for I{every} method call.
     '''
 
-    def __init__(self, geodesic, lat1, lon1, azi1, caps=Caps.ALL, name=NN):
+    def __init__(self, geodesic, lat1, lon1, azi1, caps=Caps.ALL, **name):
         '''New L{GeodesicLineSolve} instance, allowing points to be found along
            a geodesic starting at C{(B{lat1}, B{lon1})} with azimuth B{C{azi1}}.
 
@@ -246,14 +246,14 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveLineBase):
            @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, always C{Caps.ALL}.  Use C{Caps.LINE_OFF}
-                        if updates to the B{C{geodesic}} should I{not} be
-                        reflected in this L{GeodesicLineSolve} instance.
-           @kwarg name: Optional name (C{str}).
-
-           @raise GeodesicError: Invalid path for the C{GeodSolve} executable or
+           @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 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}.
 
@@ -261,8 +261,8 @@ class GeodesicLineSolve(_GeodesicSolveBase, _SolveLineBase):
         '''
         _xinstanceof(GeodesicSolve, geodesic=geodesic)
         if (caps & Caps.LINE_OFF):  # copy to avoid updates
-            geodesic = geodesic.copy(deep=False, name=NN(_UNDER_, geodesic.name))
-        _SolveLineBase.__init__(self, geodesic, lat1, lon1, caps, name, azi1=azi1)
+            geodesic = geodesic.copy(deep=False, name=_UNDER_(NN, geodesic.name))  # NOT _under!
+        _SolveLineBase.__init__(self, geodesic, lat1, lon1, caps, azi1=azi1, **name)
         try:
             self.GeodSolve = geodesic.GeodSolve  # geodesic or copy of geodesic
         except GeodesicError:
@@ -338,6 +338,7 @@ __all__ += _ALL_DOCS(_GeodesicSolveBase)
 
 if __name__ == '__main__':
 
+    from pygeodesy import printf
     from sys import argv
 
     gS = GeodesicSolve(name='Test')