pygeodesy 24.5.8__py2.py3-none-any.whl → 24.5.24__py2.py3-none-any.whl

pygeodesy/gars.py

@@ -13,14 +13,14 @@ by I{Charles Karney}.  See also U{Global Area Reference System
 <https://Earth-Info.NGA.mil/GandG/coordsys/grids/gars.html>}.
 '''
 
-# from pygeodesy.basics import isstr  # from .dms
+# from pygeodesy.basics import isstr  # from .named
 from pygeodesy.constants import _off90, _1_over, _0_5, \
                                 _1_0  # PYCHOK used!
-from pygeodesy.dms import parse3llh,   Fmt, isstr  # parseDMS2
+from pygeodesy.dms import parse3llh,   Fmt  # parseDMS2
 from pygeodesy.errors import _ValueError, _xkwds
 from pygeodesy.interns import NN, _0to9_, _AtoZnoIO_, _COMMA_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_OTHER
-from pygeodesy.named import nameof, Property_RO
+from pygeodesy.named import _name__,  isstr, Property_RO
 from pygeodesy.namedTuples import LatLon2Tuple, LatLonPrec3Tuple
 # from pygeodesy.props import Property_RO  # from .named
 # from pygeodesy.streprs import Fmt  # from .dms
@@ -30,7 +30,7 @@ from pygeodesy.units import Int_, Lat, Lon, Precision_, Scalar_, \
 from math import floor
 
 __all__ = _ALL_LAZY.gars
-__version__ = '23.10.07'
+__version__ = '24.05.24'
 
 _Digits  = _0to9_
 _LatLen  =    2
@@ -112,7 +112,7 @@ class Garef(Str):
     '''Garef class, a named C{str}.
     '''
     # no str.__init__ in Python 3
-    def __new__(cls, cll, precision=1, name=NN):
+    def __new__(cls, cll, precision=1, **name):
         '''New L{Garef} from an other L{Garef} instance or garef
            C{str} or from a C{LatLon} instance or lat-/longitude C{str}.
 
@@ -121,7 +121,7 @@ class Garef(Str):
            @kwarg precision: Optional, the desired garef resolution
                              and length (C{int} 0..2), see function
                              L{gars.encode} for more details.
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: New L{Garef}.
 
@@ -150,7 +150,7 @@ class Garef(Str):
             except AttributeError:
                 raise _xStrError(Garef, cll=cll)  # Error=GARSError
 
-        self = Str.__new__(cls, g, name=name or nameof(cll))
+        self = Str.__new__(cls, g, name=_name__(name, _or_nameof=cll))
         self._latlon    = ll
         self._precision = p
         return self
@@ -197,7 +197,7 @@ class Garef(Str):
               *self.latlon, **_xkwds(LatLon_kwds, name=self.name))
 
 
-def decode3(garef, center=True):
+def decode3(garef, center=True, **name):
     '''Decode a C{garef} to lat-, longitude and precision.
 
        @arg garef: To be decoded (L{Garef} or C{str}).
@@ -245,10 +245,11 @@ def decode3(garef, center=True):
         lon += _0_5
         lat += _0_5
 
+    n = _name__(name, _or_nameof=garef)
     r = _Resolutions[precision]  # == 1.0 / unit
     return LatLonPrec3Tuple(Lat(lat * r, Error=GARSError),
                             Lon(lon * r, Error=GARSError),
-                            precision, name=nameof(garef))
+                            precision, name=n)
 
 
 def encode(lat, lon, precision=1):  # MCCABE 14

pygeodesy/geodesicw.py

@@ -18,15 +18,15 @@ from pygeodesy.constants import EPS, NAN, _EPSqrt as _TOL, _0_5
 from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 # from pygeodesy.dms import F_D  # from .latlonBase
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
-from pygeodesy.errors import IntersectionError, GeodesicError, _xkwds_pop2
+from pygeodesy.errors import IntersectionError, GeodesicError
 from pygeodesy.fsums import Fsum,  Fmt, unstr
-from pygeodesy.interns import NN, _DOT_, _dunder_nameof, _SPACE_, \
-                             _to_, _too_,_under
+from pygeodesy.internals import _dunder_nameof, _under
+from pygeodesy.interns import NN, _DOT_, _SPACE_, _to_, _too_
 from pygeodesy.karney import _atan2d, Caps, Direct9Tuple, GDict, \
                              _kWrapped, Inverse10Tuple
 from pygeodesy.latlonBase import LatLonBase as _LLB,  F_D, Radius_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import callername, classname
+from pygeodesy.named import callername, classname, _name1__, _name2__
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import Property, Property_RO, property_RO
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
@@ -37,7 +37,7 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.04.07'
+__version__ = '24.05.24'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
@@ -66,20 +66,21 @@ class _gWrapped(_kWrapped):
             LINE_OFF =  0  # in .azimuthal._GnomonicBase and .css.CassiniSoldner
             _name    =  NN
 
-            def __init__(self, a_ellipsoid=_EWGS84, f=None, name=NN):  # PYCHOK signature
+            def __init__(self, a_ellipsoid=_EWGS84, f=None, **name):  # PYCHOK signature
                 '''New I{wrapped} C{geodesic.Geodesic} instance.
 
                    @arg a_ellipsoid: The equatorial radius I{a} (C{meter}, conventionally),
                                      an ellipsoid (L{Ellipsoid}) or a datum (L{Datum}).
                    @arg f: The ellipsoid's flattening (C{scalar}), ignored if B{C{a_ellipsoid})
                            is not C{meter}.
-                   @kwarg name: Optional name (C{str}).
+                   @kwarg name: Optional C{B{name}=NN} (C{str}).
                 '''
-                _earth_datum(self, a_ellipsoid, f=f, name=name)  # raiser=NN
-                with _wargs(self, *self.ellipsoid.a_f, name=name) as args:
+                _earth_datum(self, a_ellipsoid, f=f, **name)  # raiser=NN
+                E = self.ellipsoid
+                with _wargs(self, *E.a_f, **name) as args:
                     _Geodesic.__init__(self, *args)
                 if name:
-                    self._name = str(name)
+                    self._name, _ = _name2__(name, _or_nameof=E)
 
             def ArcDirect(self, lat1, lon1, azi1, a12, outmask=Caps._STD):
                 '''Return the C{_Geodesic.ArcDirect} result as L{GDict}.
@@ -266,7 +267,7 @@ class _gWrapped(_kWrapped):
             _geodesic = None
             _name     = NN
 
-            def __init__(self, geodesic, lat1, lon1, azi1, **caps_name_):  # salp1=NAN, calp1=NAN, name=NN
+            def __init__(self, geodesic, lat1, lon1, azi1, **caps_name_):  # salp1=NAN, calp1=NAN
                 '''New I{wrapped} C{geodesicline.GeodesicLine} instance.
 
                    @arg geodesic: A I{wrapped} C{Geodesic} instance.
@@ -281,10 +282,10 @@ class _gWrapped(_kWrapped):
                 '''
                 _xinstanceof(_wrapped.Geodesic, geodesic=geodesic)
                 with _wargs(self, geodesic, lat1, lon1, azi1, **caps_name_) as args:
-                    name, caps_ = _xkwds_pop2(caps_name_, name=geodesic.name)
-                    _GeodesicLine.__init__(self, *args, **caps_)
+                    name, caps_ = _name2__(caps_name_, _or_nameof=geodesic)
+                    _GeodesicLine.__init__(self, *args, **caps_)  # XXX avoid updates?
                     if name:
-                        self._name = str(name)
+                        self._name = name
                 self._geodesic = geodesic
 
             @Property_RO
@@ -353,17 +354,17 @@ class _gWrapped(_kWrapped):
                    @arg radius: Radius of the circle (C{meter}, conventionally).
                    @kwarg tol: Convergence tolerance (C{scalar}).
 
-                   @return: 2-Tuple C{(P, Q)} with both intersections (representing a
-                            geodesic chord), each a L{GDict} from method L{Position}
-                            extended to 14 items by C{lon0, lat0, azi0, a02, s02, at}
-                            with the circle center C{lat0}, C{lon0}, azimuth C{azi0} at,
-                            distance C{a02} in C{degrees} and C{s02} in C{meter} along
-                            the geodesic from the circle center to the intersection
-                            C{lat2}, C{lon2} and the angle C{at} between the geodesic
-                            and this line at the intersection.  The I{geodesic} azimuth
-                            at the intersection is C{(at + azi2)}.  If this line is
-                            tangential to the circle, both intersections are the same
-                            L{GDict} instance.
+                   @return: 2-Tuple C{(P, Q)} with both intersections points (representing
+                            a geodesic chord), each a L{GDict} from method L{Position} and
+                            extended to 14 items C{lat1, lon1, azi1, lat2, lon2, azi2, a12,
+                            s12, lat0, lon0, azi0, a02, s02, at} with the circle center
+                            C{lat0}, C{lon0}, azimuth C{azi0} at the intersection, distance
+                            C{a02} in C{degrees} and C{s02} in C{meter} along the geodesic
+                            from the circle center to the intersection C{lat2, lon2} and
+                            the angle C{at} between the geodesic and this line at the
+                            intersection.  The I{geodesic} azimuth at the intersection is
+                            C{(at + azi2)}.  If this line is tangential to the circle, both
+                            intersections are the same L{GDict} instance.
 
                    @raise IntersectionError: The circle and this geodesic line do not
                                              intersect.
@@ -428,7 +429,7 @@ class _gWrapped(_kWrapped):
 _wrapped = _gWrapped()  # PYCHOK singleton, .ellipsoids, .test/base.py
 
 
-def Geodesic(a_ellipsoid, f=None, name=NN):
+def Geodesic(a_ellipsoid, f=None, **name):
     '''Return a I{wrapped} C{geodesic.Geodesic} instance from I{Karney}'s
        Python U{geographiclib<https://PyPI.org/project/geographiclib>},
        provide the latter is installed, otherwise an C{ImportError}.
@@ -437,9 +438,10 @@ def Geodesic(a_ellipsoid, f=None, name=NN):
               or the equatorial radius I{a} of the ellipsoid (C{meter}).
        @arg f: The flattening of the ellipsoid (C{scalar}), ignored if
                B{C{a_ellipsoid}}) is not specified as C{meter}.
-       @kwarg name: Optional ellipsoid name (C{str}), ignored like B{C{f}}.
+       @kwarg name: Optional ellipsoid C{B{name}=NN} (C{str}), ignored
+                    like B{C{f}}.
     '''
-    return _wrapped.Geodesic(a_ellipsoid, f=f, name=name)
+    return _wrapped.Geodesic(a_ellipsoid, f=f, **name)
 
 
 def GeodesicLine(geodesic, lat1, lon1, azi1, caps=Caps._STD_LINE):
@@ -479,8 +481,8 @@ class _wargs(object):  # see also .formy._idllmn6, .latlonBase._toCartesian3, .v
         try:
             yield args
         except Exception as x:
-            n = _DOT_(classname(inst), callername(up=2, underOK=True))
-            raise GeodesicError(unstr(n, *args, **kwds), cause=x)
+            u = _DOT_(classname(inst), callername(up=2, underOK=True))
+            raise GeodesicError(unstr(u, *args, **_name1__(kwds)), cause=x)
 
 _wargs = _wargs()  # PYCHOK singleton
 

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__ = '23.12.03'
+__version__ = '24.05.24'
 
 # **) MIT License
 #

pygeodesy/geodesicx/__main__.py

@@ -5,7 +5,7 @@ u'''Print L{geodesicx} version, etc. using C{python -m pygeodesy.geodesicx}.
 '''
 
 __all__ = ()
-__version__ = '23.06.19'
+__version__ = '24.05.13'
 
 
 def _C4stats(nC4=None):  # PYCHOK no cover
@@ -28,8 +28,8 @@ def _main():  # PYCHOK no cover
     try:
         from pygeodesy import geodesicx as _gx, GeodesicError, \
                               GeodesicSolve, printf, pygeodesy_abspath
-        from pygeodesy.interns import _COMMASPACE_, _DOT_, _pythonarchine, \
-                                      _SPACE_, _usage, _version_
+        from pygeodesy.internals import _Pythonarchine, _usage
+        from pygeodesy.interns import _COMMASPACE_, _DOT_, _SPACE_, _version_
         from pygeodesy.streprs import Fmt
 
         def _dot_attr(name, value):
@@ -41,7 +41,7 @@ def _main():  # PYCHOK no cover
         def _name_version(pkg):
             return _SPACE_(pkg.__name__, pkg.__version__)
 
-        v = _pythonarchine()
+        v = _Pythonarchine()
         try:
             import geographiclib
             v.append(_name_version(geographiclib))

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.20'
 
 _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,25 @@ 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 C4Order:  # for backward compatibility
+                self.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 +188,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 +200,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 +213,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 +229,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
@@ -362,7 +367,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 +378,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 +391,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 +697,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 +708,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 +718,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 +790,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 +802,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 +820,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 +1107,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 +1119,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 +1131,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 +1273,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 +1286,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,18 +19,18 @@ 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
 
-from math import fmod
+from math import fmod as _fmod
 
 __all__ = ()
-__version__ = '24.03.24'
+__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}}.
         '''
@@ -198,8 +198,8 @@ class GeodesicAreaExact(_NamedBase):
             # Since we only need the parity of the result we
             # can use std::remquo but this is buggy with g++
             # 4.8.3 and requires C++11.  So instead we do:
-            lon1 = fmod(  lon1, _720_0)  # r.lon1
-            lon2 = fmod(r.lon2, _720_0)
+            lon1 = _fmod(  lon1, _720_0)  # r.lon1
+            lon2 = _fmod(r.lon2, _720_0)
             # int(True) == 1, int(False) == 0
             r.set_(xing=int(lon2 > 360 or -360 < lon2 <= 0) -
                         int(lon1 > 360 or -360 < lon1 <= 0))
@@ -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)