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

pygeodesy/utm.py

@@ -35,16 +35,17 @@ and Henrik Seidel U{'Die Mathematik der Gauß-Krueger-Abbildung'
 
 from pygeodesy.basics import len2, map2, neg  # splice
 from pygeodesy.constants import EPS, EPS0, _K0_UTM, _0_0, _0_0001
-from pygeodesy.datums import _ellipsoidal_datum, _WGS84
+from pygeodesy.datums import _ellipsoidal_datum, _WGS84,  _under
 from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.errors import MGRSError, RangeError, _ValueError, \
-                            _xkwds_get
+                            _xkwds_get, _xkwds_pop2
 from pygeodesy.fmath import fdot3, hypot, hypot1,  _operator
+# from pygeodesy.internals import _under  # from .datums
 from pygeodesy.interns import MISSING, NN, _by_, _COMMASPACE_, _N_, \
                              _NS_, _outside_, _range_, _S_, _scale0_, \
-                             _SPACE_, _UTM_, _V_, _X_, _zone_, _under
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
-# from pygeodesy.named import _xnamed  # from .utmupsBase
+                             _SPACE_, _UTM_, _V_, _X_, _zone_
+# from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS  # from .named
+from pygeodesy.named import _name__, _name2__,  _ALL_LAZY, _MODS
 from pygeodesy.namedTuples import EasNor2Tuple, UtmUps5Tuple, \
                                   UtmUps8Tuple, UtmUpsLatLon5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, \
@@ -56,14 +57,14 @@ from pygeodesy.utmupsBase import _hemi, _LLEB, _parseUTMUPS5, _to4lldn, \
                                  _to3zBhp, _to3zll, _UPS_LATS, _UPS_ZONE, \
                                  _UTM_LAT_MAX, _UTM_ZONE_MAX, \
                                  _UTM_LAT_MIN, _UTM_ZONE_MIN, \
-                                 _UTM_ZONE_OFF_MAX, UtmUpsBase, _xnamed
+                                 _UTM_ZONE_OFF_MAX, UtmUpsBase
 
 from math import asinh, atanh, atan2, cos, cosh, degrees, fabs, \
                  radians, sin, sinh, tan, tanh
 # import operator as _operator  # from .fmath
 
 __all__ = _ALL_LAZY.utm
-__version__ = '24.02.29'
+__version__ = '24.05.21'
 
 _Bands = 'CDEFGHJKLMNPQRSTUVWXX'  # UTM latitude bands C..X (no
 # I|O) 8° each, covering 80°S to 84°N and X repeated for 80-84°N
@@ -229,12 +230,13 @@ def _to4zBll(lat, lon, cmoff=True, strict=True, Error=RangeError):
     return Zone(z), (Band(B) if B else None), Lat(lat), Lon(lon)
 
 
-def _to7zBlldfn(latlon, lon, datum, falsed, name, zone, strict, Error, **cmoff):
+def _to7zBlldfn(latlon, lon, datum, falsed, zone, strict, Error, **name_cmoff):
     '''(INTERNAL) Determine 7-tuple (zone, band, lat, lon, datum,
         falsed, name) for methods L{toEtm8} and L{toUtm8}.
     '''
-    f = falsed and _xkwds_get(cmoff, cmoff=True)  # DEPRECATED
-    lat, lon, d, name = _to4lldn(latlon, lon, datum, name)
+    f, n = _xkwds_pop2(name_cmoff, cmoff=falsed)  # DEPRECATED
+    n    = _name__(**n)  # _UnexpectedError
+    lat, lon, d, n = _to4lldn(latlon, lon, datum, n)
     z, B, lat, lon = _to4zBll(lat, lon, cmoff=f, strict=strict)
     if zone:  # re-zone for ETM/UTM
         r, _, _ = _to3zBhp(zone, B)
@@ -244,7 +246,7 @@ def _to7zBlldfn(latlon, lon, datum, falsed, name, zone, strict, Error, **cmoff):
             if f:  # re-offset from central meridian
                 lon += _cmlon(z) - _cmlon(r)
             z = r
-    return z, B, lat, lon, d, f, name
+    return z, B, lat, lon, d, f, n
 
 
 class Utm(UtmUpsBase):
@@ -259,7 +261,7 @@ class Utm(UtmUpsBase):
 
     def __init__(self, zone=31, hemisphere=_N_, easting=166022,  # PYCHOK expected
                                 northing=0, band=NN, datum=_WGS84, falsed=True,
-                                gamma=None, scale=None, name=NN, **convergence):
+                                gamma=None, scale=None, **name_convergence):
         '''New L{Utm} UTM coordinate.
 
            @kwarg zone: Longitudinal UTM zone (C{int}, 1..60) or zone with/-out
@@ -276,8 +278,8 @@ class Utm(UtmUpsBase):
            @kwarg gamma: Optional meridian convergence, bearing off grid North,
                          clockwise from true North (C{degrees}) or C{None}.
            @kwarg scale: Optional grid scale factor (C{scalar}) or C{None}.
-           @kwarg name: Optional name (C{str}).
-           @kwarg convergence: DEPRECATED, use keyword argument C{B{gamma}=None}.
+           @kwarg name_convergence: Optional C{B{name}=NN} (C{str}) and DEPRECATED
+                       C{B{convergence}=None}, instead use C{B{gamma}=None}.
 
            @raise TypeError: Invalid or near-spherical B{C{datum}}.
 
@@ -285,8 +287,11 @@ class Utm(UtmUpsBase):
                             B{C{northing}}, B{C{band}}, B{C{convergence}} or
                             B{C{scale}}.
         '''
-        if name:
-            self.name = name
+        c = name_convergence
+        if c:
+            n, c = _name2__(**c)
+            if n:
+                self.name = n
 
         self._zone, B, _ = _to3zBlat(zone, band)
 
@@ -308,7 +313,7 @@ class Utm(UtmUpsBase):
 
         self._hemisphere = h
         UtmUpsBase.__init__(self, e, n, band=B, datum=datum, falsed=falsed,
-                                        gamma=gamma, scale=scale, **convergence)
+                                        gamma=gamma, scale=scale, **c)
 
     def __eq__(self, other):
         return isinstance(other, Utm) and other.zone       == self.zone \
@@ -324,7 +329,7 @@ class Utm(UtmUpsBase):
     def __str__(self):
         return self.toStr()
 
-    def _xcopy2(self, Xtm, name=NN):
+    def _xcopy2(self, Xtm, **name):
         '''(INTERNAL) Make copy as an B{C{Xtm}} instance.
 
            @arg Xtm: Class to return the copy (C{Xtm=Etm}, C{Xtm=Utm} or
@@ -332,7 +337,7 @@ class Utm(UtmUpsBase):
         '''
         return Xtm(self.zone, self.hemisphere, self.easting, self.northing,
                    band=self.band, datum=self.datum, falsed=self.falsed,
-                   gamma=self.gamma, scale=self.scale, name=name or self.name)
+                   gamma=self.gamma, scale=self.scale, name=self._name__(name))
 
     @property_doc_(''' the I{latitudinal} band.''')
     def band(self):
@@ -370,7 +375,7 @@ class Utm(UtmUpsBase):
                 n = _FalseNorthing
         return EasNor2Tuple(e, n)
 
-    def parse(self, strUTM, name=NN):
+    def parse(self, strUTM, **name):
         '''Parse a string to a similar L{Utm} instance.
 
            @arg strUTM: The UTM coordinate (C{str}),
@@ -385,7 +390,7 @@ class Utm(UtmUpsBase):
            @see: Functions L{pygeodesy.parseUPS5} and L{pygeodesy.parseUTMUPS5}.
         '''
         return parseUTM5(strUTM, datum=self.datum, Utm=self.classof,
-                                 name=name or self.name)
+                                 name=self._name__(name))
 
     @deprecated_method
     def parseUTM(self, strUTM):  # PYCHOK no cover
@@ -575,7 +580,7 @@ class Utm(UtmUpsBase):
         return self._zone
 
 
-def _parseUTM5(strUTM, datum, Xtm, falsed, Error=UTMError, name=NN):  # imported by .etm
+def _parseUTM5(strUTM, datum, Xtm, falsed, Error=UTMError, **name):  # imported by .etm
     '''(INTERNAL) Parse a string representing a UTM coordinate,
        consisting of C{"zone[band] hemisphere easting northing"},
        see L{pygeodesy.parseETM5} and L{parseUTM5}.
@@ -584,16 +589,11 @@ def _parseUTM5(strUTM, datum, Xtm, falsed, Error=UTMError, name=NN):  # imported
     if _UTM_ZONE_MIN > z or z > _UTM_ZONE_MAX or (B and B not in _Bands):
         raise Error(strUTM=strUTM, zone=z, band=B)
 
-    if Xtm is None:
-        r = UtmUps5Tuple(z, h, e, n, B, Error=Error, name=name)
-    else:
-        r = Xtm(z, h, e, n, band=B, datum=datum, falsed=falsed)
-        if name:
-            r = _xnamed(r, name, force=True)
-    return r
+    return UtmUps5Tuple(z, h, e, n, B, Error=Error, **name) if Xtm is None else \
+                    Xtm(z, h, e, n, band=B, datum=datum, falsed=falsed, **name)
 
 
-def parseUTM5(strUTM, datum=_WGS84, Utm=Utm, falsed=True, name=NN):
+def parseUTM5(strUTM, datum=_WGS84, Utm=Utm, falsed=True, **name):
     '''Parse a string representing a UTM coordinate, consisting
        of C{"zone[band] hemisphere easting northing"}.
 
@@ -614,28 +614,29 @@ def parseUTM5(strUTM, datum=_WGS84, Utm=Utm, falsed=True, name=NN):
 
        @raise TypeError: Invalid B{C{datum}}.
     '''
-    return _parseUTM5(strUTM, datum, Utm, falsed, name=name)
+    return _parseUTM5(strUTM, datum, Utm, falsed, **name)
 
 
 def toUtm8(latlon, lon=None, datum=None, Utm=Utm, falsed=True,
-                                         name=NN, strict=True,
-                                         zone=None, **cmoff):
+                             strict=True, zone=None, **name_cmoff):
     '''Convert a lat-/longitude point to a UTM coordinate.
 
        @arg latlon: Latitude (C{degrees}) or an (ellipsoidal)
                     geodetic C{LatLon} point.
-       @kwarg lon: Optional longitude (C{degrees}) or C{None}.
+       @kwarg lon: Optional longitude (C{degrees}), required
+                   if B{C{latlon}} is in C{degrees}.
        @kwarg datum: Optional datum for this UTM coordinate,
                      overriding B{C{latlon}}'s datum (L{Datum},
                      L{Ellipsoid}, L{Ellipsoid2} or L{a_f2Tuple}).
        @kwarg Utm: Optional class to return the UTM coordinate
                    (L{Utm}) or C{None}.
        @kwarg falsed: False both easting and northing (C{bool}).
-       @kwarg name: Optional B{C{Utm}} name (C{str}).
        @kwarg strict: Restrict B{C{lat}} to UTM ranges (C{bool}).
        @kwarg zone: Optional UTM zone to enforce (C{int} or C{str}).
-       @kwarg cmoff: DEPRECATED, use B{C{falsed}}.  Offset longitude
-                     from the zone's central meridian (C{bool}).
+       @kwarg name_cmoff: Optional B{C{Utm}} C{B{name}=NN} (C{str})
+                   and DEPRECATED C{B{cmoff}=True} to offset longitude
+                   from the zone's central meridian (C{bool}), instead
+                   use C{B{falsed}=True}.
 
        @return: The UTM coordinate (B{C{Utm}}) or if B{C{Utm}} is
                 C{None} or not B{C{falsed}}, a L{UtmUps8Tuple}C{(zone,
@@ -650,17 +651,17 @@ def toUtm8(latlon, lon=None, datum=None, Utm=Utm, falsed=True,
 
        @raise UTMError: Invalid B{C{zone}}.
 
-       @raise ValueError: If B{C{lon}} value is missing or if
-                          B{C{latlon}} is invalid.
+       @raise ValueError: If B{C{lon}} value is missing or B{C{latlon}}
+                          is invalid.
 
        @note: Implements Karney’s method, using 8-th order Krüger series,
               giving results accurate to 5 nm (or better) for distances
               up to 3,900 Km from the central meridian.
     '''
-    z, B, lat, lon, d, f, name = _to7zBlldfn(latlon, lon, datum,
-                                             falsed, name, zone,
-                                             strict, UTMError, **cmoff)
-    d = _ellipsoidal_datum(d, name=name)
+    z, B, lat, lon, d, f, n = _to7zBlldfn(latlon, lon, datum,
+                                          falsed, zone, strict,
+                                          UTMError, **name_cmoff)
+    d = _ellipsoidal_datum(d, name=n)
     E = d.ellipsoid
 
     a, b = radians(lat), radians(lon)
@@ -680,8 +681,8 @@ def toUtm8(latlon, lon=None, datum=None, Utm=Utm, falsed=True,
     A0 = E.A * getattr(Utm, _under(_scale0_), _K0_UTM)  # Utm is class or None
 
     K = _Kseries(E.AlphaKs, x, y)  # Krüger series
-    y = K.ys(y) * A0  # ξ
-    x = K.xs(x) * A0  # η
+    y =  K.ys(y) * A0  # ξ
+    x =  K.xs(x) * A0  # η
 
     # convergence: Karney 2011 Eq 23, 24
     p_ = K.ps(1)
@@ -691,21 +692,21 @@ def toUtm8(latlon, lon=None, datum=None, Utm=Utm, falsed=True,
     k  = E.e2s(sin(a)) * T12 / H * (A0 / E.a * hypot(p_, q_))
 
     return _toXtm8(Utm, z, lat, x, y,
-                        B, d, g, k, f, name, latlon, EPS)
+                        B, d, g, k, f, n, latlon, EPS)
 
 
 def _toXtm8(Xtm, z, lat, x, y, B, d, g, k, f,  # PYCHOK 13+ args
-                 name, latlon, eps, Error=UTMError):
+                 n, latlon, eps, Error=UTMError):
     '''(INTERNAL) Helper for methods L{toEtm8} and L{toUtm8}.
     '''
     h = _hemi(lat)
     if f:
         x, y = _false2(x, y, h)
     if Xtm is None:  # DEPRECATED
-        r = UtmUps8Tuple(z, h, x, y, B, d, g, k, Error=Error, name=name)
+        r = UtmUps8Tuple(z, h, x, y, B, d, g, k, Error=Error, name=n)
     else:
-        r = _xnamed(Xtm(z, h, x, y, band=B, datum=d, falsed=f,
-                                            gamma=g, scale=k), name)
+        r = Xtm(z, h, x, y, band=B, datum=d, falsed=f,
+                                    gamma=g, scale=k, name=n)
         if isinstance(latlon, _LLEB) and d is latlon.datum:  # see ups.toUtm8
             r._latlon5args(latlon, _toBand, f, eps)  # XXX weakref(latlon)?
             latlon._gamma = g
@@ -715,7 +716,7 @@ def _toXtm8(Xtm, z, lat, x, y, B, d, g, k, f,  # PYCHOK 13+ args
     return r
 
 
-def utmZoneBand5(lat, lon, cmoff=False, name=NN):
+def utmZoneBand5(lat, lon, cmoff=False, **name):
     '''Return the UTM zone number, Band letter, hemisphere and
        (clipped) lat- and longitude for a given location.
 
@@ -737,7 +738,7 @@ def utmZoneBand5(lat, lon, cmoff=False, name=NN):
     '''
     lat, lon = parseDMS2(lat, lon)
     z, B, lat, lon = _to4zBll(lat, lon, cmoff=cmoff)
-    return UtmUpsLatLon5Tuple(z, B, _hemi(lat), lat, lon, name=name)
+    return UtmUpsLatLon5Tuple(z, B, _hemi(lat), lat, lon, **name)
 
 # **) MIT License
 #

pygeodesy/utmupsBase.py

@@ -11,13 +11,14 @@ from pygeodesy.constants import _float, _0_0, _0_5, _N_90_0, _180_0
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
-from pygeodesy.errors import _or, ParseError, _parseX, _ValueError, \
-                             _xkwds, _xkwds_get, _xkwds_not
+from pygeodesy.errors import _or, ParseError, _parseX, _UnexpectedError, \
+                             _ValueError, _xkwds, _xkwds_not, _xkwds_pop2
+# from pygeodesy.internals import _name__, _under  # from .named
 from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, \
                              _gamma_, _n_a_, _not_, _N_, _NS_, _PLUS_, \
-                             _scale_, _SPACE_, _Y_, _Z_, _under
+                             _scale_, _SPACE_, _Y_, _Z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _NamedBase, nameof, _xnamed
+from pygeodesy.named import _NamedBase, _xnamed,  _name__, _under
 from pygeodesy.namedTuples import EasNor2Tuple, LatLonDatum5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, _update_all, \
                             deprecated_property_RO, Property_RO, property_RO
@@ -26,7 +27,7 @@ from pygeodesy.units import Band, Easting, Northing, Scalar, Zone
 from pygeodesy.utily import _Wrap, wrap360
 
 __all__ = _ALL_LAZY.utmupsBase
-__version__ = '24.04.07'
+__version__ = '24.05.19'
 
 _UPS_BANDS = _A_, _B_, _Y_, _Z_  # UPS polar bands SE, SW, NE, NW
 # _UTM_BANDS = _MODS.utm._Bands
@@ -84,7 +85,7 @@ def _to4lldn(latlon, lon, datum, name, wrap=False):
         lat, lon = _Wrap.latlonDMS2(latlon, lon) if wrap else \
                           parseDMS2(latlon, lon)  # clipped
         d = datum or _WGS84
-    return lat, lon, d, (name or nameof(latlon))
+    return lat, lon, d, _name__(name, _or_nameof=latlon)
 
 
 def _to3zBhp(zone, band, hemipole=NN, Error=_ValueError):  # imported by .epsg, .ups, .utm, .utmups
@@ -185,7 +186,9 @@ class UtmUpsBase(_NamedBase):
             self._falsed = False
 
         if convergence:  # for backward compatibility
-            gamma = _xkwds_get(convergence, convergence=gamma)
+            gamma, kwds = _xkwds_pop2(convergence, convergence=gamma)
+            if kwds:
+                raise _UnexpectedError(**kwds)
         if gamma is not self._gamma:
             self._gamma = Scalar(gamma=gamma, Error=E)
         if scale is not self._scale:
@@ -206,7 +209,7 @@ class UtmUpsBase(_NamedBase):
 #               self._notOverloaded(callername=_under('Bands'))
             if band not in self._Bands:
                 t = _or(*sorted(set(map(repr, self._Bands))))
-                raise self._Error(band=band, txt=_not_(t))
+                raise self._Error(band=band, txt_not_=t)
             self._band = band
         elif self._band:  # reset
             self._band = NN

pygeodesy/vector2d.py

@@ -30,7 +30,7 @@ from contextlib import contextmanager
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector2d
-__version__ = '24.05.04'
+__version__ = '24.05.17'
 
 _cA_        = 'cA'
 _cB_        = 'cB'
@@ -282,11 +282,10 @@ def circum4_(*points, **useZ_Vector_and_kwds):
         C = map2(float, C)
         R = map2(float, R)  # empty if rk < 4 or n <= 4
 
-    n = circum4_.__name__
-    c = Vector3d(*C[:3], name=n)
-    r = Radius(sqrt(fsumf_(C[3], *c.x2y2z2)), name=n)
+    c = Vector3d(*C[:3], name__=circum4_)  # .__name__
+    r = Radius(sqrt(fsumf_(C[3], *c.x2y2z2)), name=c.name)
 
-    c = _nVc(c, **_xkwds(kwds, clas=ps[0].classof, name=n))
+    c = _nVc(c, **_xkwds(kwds, clas=ps[0].classof, name=c.name))
     return Circum4Tuple(r, c, rk, R)
 
 
@@ -416,8 +415,8 @@ class _numpy(object):  # see also .formy._idllmn6, .geodesicw._wargs, .latlonBas
                  <https://StackOverflow.com/questions/2992947>} and U{here
                  <https://StackOverflow.com/questions/5889142>}.
         '''
-        def _Error(txt=self.null_space2.__name__, **kwds):
-            return _AssertionError(txt=txt, **kwds)
+        def _Error(**kwds):
+            return _AssertionError(txt__=self.null_space2, **kwds)
 
         np = self.np
         A  = np.array(A)

pygeodesy/vector3d.py

@@ -14,11 +14,11 @@ from pygeodesy.errors import IntersectionError, _ValueError, VectorError, \
 from pygeodesy.fmath import euclid, fabs, fdot, hypot, sqrt,  fsum1_
 # from pygeodesy.fsums import fsum1_  # from .fmath
 # from pygeodesy.formy import _radical2  # in _intersects2 below
-from pygeodesy.interns import NN, _COMMA_, _concentric_, _intersection_, \
-                             _near_, _negative_, _no_, _too_
+from pygeodesy.interns import _COMMA_, _concentric_, _intersection_, \
+                              _near_, _negative_, _no_, _too_
 from pygeodesy.iters import PointsIter,  Fmt
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _xnamed, _xotherError
+from pygeodesy.named import _name__, _name2__, _xnamed, _xotherError
 from pygeodesy.namedTuples import Intersection3Tuple, NearestOn2Tuple, \
                                   NearestOn6Tuple, Vector3Tuple  # Vector4Tuple
 # from pygeodesy.nvectorBase import _nsumOf  # _MODS
@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector3d
-__version__ = '24.02.20'
+__version__ = '24.05.21'
 
 
 class Vector3d(Vector3dBase):
@@ -236,18 +236,18 @@ class Vector3d(Vector3dBase):
         '''
         return nearestOn6(self, points, closed=closed, useZ=useZ)  # Vector=self.classof
 
-    def parse(self, str3d, sep=_COMMA_, name=NN):
+    def parse(self, str3d, sep=_COMMA_, **name):
         '''Parse an C{"x, y, z"} string to a L{Vector3d} instance.
 
            @arg str3d: X, y and z string (C{str}), see function L{parse3d}.
            @kwarg sep: Optional separator (C{str}).
-           @kwarg name: Optional instance name (C{str}), overriding this name.
+           @kwarg name: Optional instance C{B{name}=NN} (C{str}), overriding this name.
 
            @return: The instance (L{Vector3d}).
 
            @raise VectorError: Invalid B{C{str3d}}.
         '''
-        return parse3d(str3d, sep=sep, Vector=self.classof, name=name or self.name)
+        return parse3d(str3d, sep=sep, Vector=self.classof, name=self._name__(name))
 
     def radii11(self, point2, point3):
         '''Return the radii of the C{Circum-}, C{In-}, I{Soddy} and C{Tangent}
@@ -677,16 +677,15 @@ def nearestOn(point, point1, point2, within=True, useZ=True, Vector=None, **Vect
     p1 = _otherV3d(useZ=useZ, point1=point1)
     p2 = _otherV3d(useZ=useZ, point2=point2)
 
-    n    =  nearestOn.__name__
     p, _ = _nearestOn2(p0, p1, p2, within=within)
     if Vector is not None:
-        p = Vector(p.x, p.y, **_xkwds(Vector_kwds, z=p.z, name=n))
+        p = Vector(p.x, p.y, **_xkwds(Vector_kwds, z=p.z, name__=nearestOn))
     elif p is p1:
         p = point1
     elif p is p2:
         p = point2
     else:  # ignore Vector_kwds
-        p = point.classof(p.x, p.y, _xkwds_get(Vector_kwds, z=p.z), name=n)
+        p = point.classof(p.x, p.y, _xkwds_get(Vector_kwds, z=p.z), name__=nearestOn)
     return p
 
 
@@ -765,8 +764,9 @@ def nearestOn6(point, points, closed=False, useZ=True, **Vector_and_kwds):  # ep
     return NearestOn6Tuple(v, sqrt(c2), f, j, s, e)
 
 
-def _nVc(v, clas=None, name=NN, Vector=None, **Vector_kwds):  # in .vector2d
+def _nVc(v, clas=None, Vector=None, **Vector_kwds_name):  # in .vector2d
     # return a named C{Vector} or C{clas} instance
+    name, Vector_kwds = _name2__(**Vector_kwds_name)
     if Vector is not None:
         v = Vector(v.x, v.y, v.z, **Vector_kwds)
     elif clas is not None:
@@ -810,7 +810,7 @@ def parse3d(str3d, sep=_COMMA_, Vector=Vector3d, **Vector_kwds):
     except (TypeError, ValueError) as x:
         raise VectorError(str3d=str3d, cause=x)
     return _xnamed((Vector3Tuple(v) if Vector is None else  # *v
-                    Vector(*v, **Vector_kwds)), parse3d.__name__)
+                    Vector(*v, **Vector_kwds)), name__=parse3d)  # .__name__
 
 
 def sumOf(vectors, Vector=Vector3d, **Vector_kwds):
@@ -831,9 +831,8 @@ def sumOf(vectors, Vector=Vector3d, **Vector_kwds):
     except (TypeError, ValueError) as x:
         raise VectorError(vectors=vectors, Vector=Vector, cause=x)
     x, y, z = t[:3]
-    n = sumOf.__name__
-    return Vector3Tuple(x, y, z, name=n) if Vector is None else \
-           Vector(x, y, z, **_xkwds(Vector_kwds, name=n))
+    return Vector3Tuple(x, y, z, name__=sumOf) if Vector is None else \
+           Vector(x, y, z, **_xkwds(Vector_kwds, name__=sumOf))  # .__name__
 
 
 def trilaterate2d2(x1, y1, radius1, x2, y2, radius2, x3, y3, radius3,
@@ -930,7 +929,7 @@ def trilaterate3d2(center1, radius1, center2, radius2, center3, radius3,
                          center3=center3, radius3=radius3)
 
 
-def _xyzhdn3(xyz, height, datum, ll):  # in .cartesianBase, .nvectorBase
+def _xyzhdn3(xyz, height, datum, ll, **name):  # in .cartesianBase, .nvectorBase
     '''(INTERNAL) Get a C{(h, d, name)} 3-tuple.
     '''
     h = height or _xattr(xyz, height=None) \
@@ -940,7 +939,7 @@ def _xyzhdn3(xyz, height, datum, ll):  # in .cartesianBase, .nvectorBase
     d = datum or _xattr(xyz, datum=None) \
               or _xattr(ll,  datum=None)
 
-    return h, d, _xattr(xyz, name=NN)
+    return h, d, _name__(name, _or_nameof=xyz)
 
 
 __all__ += _ALL_DOCS(intersections2, sumOf, Vector3dBase)

pygeodesy/vector3dBase.py

@@ -15,8 +15,7 @@ from pygeodesy.constants import EPS, EPS0, INT0, PI, PI2, _copysignINF, \
                                _pos_self, _0_0, _1_0
 from pygeodesy.errors import CrossError, VectorError, _xcallable, _xError
 from pygeodesy.fmath import euclid_, fdot, hypot_, hypot2_
-from pygeodesy.interns import NN, _coincident_, _colinear_, \
-                             _COMMASPACE_, _xyz_
+from pygeodesy.interns import _coincident_, _colinear_, _COMMASPACE_, _xyz_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_DOCS, _ALL_MODS as _MODS, \
                              _sys_version_info2
 from pygeodesy.named import _NamedBase, _NotImplemented, _xother3
@@ -27,10 +26,11 @@ from pygeodesy.streprs import Fmt, strs, unstr
 from pygeodesy.units import Float, Scalar
 # from pygeodesy.utily import sincos2  # _MODS
 
+# from builtints import hash, int, isinstance, map, max, round, type, zip
 from math import atan2, ceil, fabs, floor, trunc
 
 __all__ = _ALL_LAZY.vector3dBase
-__version__ = '24.03.24'
+__version__ = '24.05.19'
 
 
 class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
@@ -43,7 +43,7 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
 #   _y  = INT0  # Y component
 #   _z  = INT0  # Z component
 
-    def __init__(self, x_xyz, y=INT0, z=INT0, ll=None, name=NN):
+    def __init__(self, x_xyz, y=INT0, z=INT0, ll=None, **name):
         '''New L{Vector3d} or C{Vector3dBase} instance.
 
            The vector may be normalised or use x, y, z for position and
@@ -59,7 +59,7 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
            @kwarg z: Z component of vector (C{scalar}), ignored if B{C{x_xyz}}
                      is not C{scalar}, otherwise same units as B{C{x_xyz}}.
            @kwarg ll: Optional latlon reference (C{LatLon}).
-           @kwarg name: Optional name (C{str}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @raise VectorError: Invalid B{C{x_xyz}}.
         '''

PyGeodesy-24.5.8.dist-info/RECORD

@@ -1,115 +0,0 @@
-pygeodesy/LICENSE,sha256=YfgAiyxOwY6P9Kkb1_5XN81nueTLrpb3Ffkv3EuPgFU,1144
-pygeodesy/__init__.py,sha256=aWftpUqOeH1Uul8uN_kDAXbFL0TqLXDhynBhCmgpxoQ,40733
-pygeodesy/__main__.py,sha256=qMFG3caY8ZXWu6uGiemzyT4OqTFZnsFtlxcGCAgkVJw,4637
-pygeodesy/albers.py,sha256=g2AVlpV8JO2AYFCthoIbRC2h1OJqjb9P3hpwF0C3TI8,30994
-pygeodesy/azimuthal.py,sha256=tc4JxgLi-0jzU08m4Bvi-t-kzHXYPeGuzL3j_tyVFUA,50125
-pygeodesy/basics.py,sha256=GWsiv-Zl2qOZoW7wPwIG7yLd2FwYLUvsq8c6hZdgsFE,28453
-pygeodesy/booleans.py,sha256=HZbwoL-S7Ww9d4C2D1BVqXfmcuqqVpEVSU9_S0uyUyo,74204
-pygeodesy/cartesianBase.py,sha256=I3q29mRdBB3NCDmPoJsJ0QOFfLzkdMWc8X9zG4IwJyA,47264
-pygeodesy/clipy.py,sha256=VU3ynQ1IZ0v5hJlicqD48oW0imRgiL5_ZzRPrIjpfPw,27683
-pygeodesy/constants.py,sha256=RxO8dMe_3AEfmZyKaRIy_44QnOTdEpzgYwimN0_w9Qs,19113
-pygeodesy/css.py,sha256=sKXsahUiyruDcUk-tGjA6mxq-xzwBoBKxKo9_b2uBmY,25394
-pygeodesy/datums.py,sha256=gJZPgV4bELZvZ8Sj2zE3MBysVtsLxqsN8zm0xjOKvpo,33851
-pygeodesy/dms.py,sha256=op3MU-59CoJQRdybnu21aVM9wtocd_-XFNAZFqmozSo,44439
-pygeodesy/ecef.py,sha256=47zX9rr7MdWY0K9shMqLbxGIb13MkNEUDDxtGigFwHE,59682
-pygeodesy/elevations.py,sha256=ZTxzLWHLUrghFI9Fkl0ZGHzdiLDe0y3ImGUsfxFg6Qc,10814
-pygeodesy/ellipsoidalBase.py,sha256=dqEmBFguS_Q0K95VaBN7oZOVEaxHuicLCrqIuj1QM7w,56639
-pygeodesy/ellipsoidalBaseDI.py,sha256=MSuQI3PlJAHL7gtVy4t0qkm1QP3zeHqbkG4tnMDWDIg,38510
-pygeodesy/ellipsoidalExact.py,sha256=a_2C6S6hGRumavy5giRoC9QAhnjqpujiXyu92od6nKo,16951
-pygeodesy/ellipsoidalGeodSolve.py,sha256=xfNcb70AuPbIiJUqhisIfg6pCQBqXyQffBNuESEGCfU,16833
-pygeodesy/ellipsoidalKarney.py,sha256=FoOsfNf96oHuGa9k4AB42y_UUBuOkh4xMW7PFGF63SA,19246
-pygeodesy/ellipsoidalNvector.py,sha256=vHVKSfR86LnIapGlwl5_uCaEuQGdm0e89mwE6Ay-394,30323
-pygeodesy/ellipsoidalVincenty.py,sha256=Uk93B8GFcMnWiwKUOA84TlLwbBlvzVnsAXAx0cU7cn4,26004
-pygeodesy/ellipsoids.py,sha256=SxMsivNnE9ibUjQGd0d24H0SzoSjh6jfhLWjasOWpao,119946
-pygeodesy/elliptic.py,sha256=XRVpmpdm3hbztM4P-qhWKQizbgsXDUxWujgmOrIpgiQ,42428
-pygeodesy/epsg.py,sha256=ldHoLWqJWR4FUiBVnDTtrI_e7TNjjtr9OkxDlri1g5E,8165
-pygeodesy/errors.py,sha256=RHZ_f1zcOIyLQYProiQznaAOhojbDPDR4XbblXJMuS0,27232
-pygeodesy/etm.py,sha256=joEhU2lw9ehRv101nRpZvXq8hOYAEzdcYFpif9_obfk,44585
-pygeodesy/fmath.py,sha256=MylYc4nkVtDWI6U-R4hGmXcq-9tUUBmnlM795weezec,33477
-pygeodesy/formy.py,sha256=Rces4Q5ecED0WVfuI9mQzeyHE54LDowYfI6faBHpyeA,74536
-pygeodesy/frechet.py,sha256=qgee-ISBtT7Ov3rJkcd_t-WeXTbeNoMSQuMa0j3MyQc,33512
-pygeodesy/fstats.py,sha256=23XqQRoegfeE4xEbbcgcsuw4JGEAe0OPvR8Jn2W8U-8,28414
-pygeodesy/fsums.py,sha256=M9btYPykj5JHvO4gg6wkKPGKlg9R4ZfdoFFKcgmQVno,78284
-pygeodesy/gars.py,sha256=fCiWBJ4kOJxPfNOxadX-OzBGDXj7C9g02NuGHiZa_88,11342
-pygeodesy/geodesicw.py,sha256=5yjJ2rLekSsjT7e-Km6v592ZcFlA41flQP_E42jU9Sw,26901
-pygeodesy/geodsolve.py,sha256=3GLI2_4gglzTpZwKchNzAv-XhWFBzWRKjcWsjCC3dvI,21900
-pygeodesy/geohash.py,sha256=HwukecfkWvyfz9LHKfoA-WddQHYot_mB04o0lyWrKyU,32382
-pygeodesy/geoids.py,sha256=EwZJ50qRXeZb1591N99hnamM_EC2NP6MIhLb5swVHf4,80605
-pygeodesy/hausdorff.py,sha256=LJULGbDop4xqiWeRH5-Uayvk5WVCZQpxK4PCYu4kqSs,34192
-pygeodesy/heights.py,sha256=tjr-5eb8UXn2MAp6-157sb6qxPREFk5dtDjHtBgIgZ8,42528
-pygeodesy/interns.py,sha256=WuQe08kItPIwSJ9J1bUxI5yVOX_eNfpGIMpKHzoCqAw,30245
-pygeodesy/iters.py,sha256=CfU365eE9F4oWZbBx0qTEvfodMhpa8rGOepLIv67xF8,20181
-pygeodesy/karney.py,sha256=lYdsSHis8xQJVS1V0F3cphx6Dhgd77xTlMOdVR8MN8I,34994
-pygeodesy/ktm.py,sha256=sCvbLvJItavlruilAyjeZ0sOZx2yJumzGe_UiIVbGi4,27315
-pygeodesy/latlonBase.py,sha256=LimCMj91J3Q4D_rTu7VN7c63cLL_KzxXagFQfedobmc,77730
-pygeodesy/lazily.py,sha256=YeOQQ2Tu0LTD-AMDABc0bemeLRKTteTEJXJDl3_7vZU,48645
-pygeodesy/lcc.py,sha256=yNpmAdOwv3HNh2ZLopF5QtvDokeQYCmnxSc8UFUPHO4,25737
-pygeodesy/ltp.py,sha256=8se8dYG7LG__Ru0FoK939DJBF9GCQGeJik_Un1Im8Xw,48609
-pygeodesy/ltpTuples.py,sha256=iKzvDfv33HfmEevjNISUS4c9KXIkiISEkVlQopyKgfY,55769
-pygeodesy/mgrs.py,sha256=GJ-vG54E2zSLtROyqJ_kj8fHH-8jWGf3kVe7gb8993o,28978
-pygeodesy/named.py,sha256=MzYSWAckYfwJKIdG7duN-6pt1byb9_ZZ7772czjma50,48269
-pygeodesy/namedTuples.py,sha256=msEYvQKj4oCW35Kx80RpeQXY85A1G0O3GEqsysLaV2M,27288
-pygeodesy/nvectorBase.py,sha256=WJY5ylZ_HCeM1wGL7ryEecJphEYibp-EAWL0piKlMG8,28766
-pygeodesy/osgr.py,sha256=voC1rbOe4dnS_EjaDaRDRUQ4MoG7puMBEMV6lcAuIBI,31029
-pygeodesy/points.py,sha256=QNAAF0r7iqSXFr_6aQm-wW7f6vU3KusWVhXEMVeVo58,64442
-pygeodesy/props.py,sha256=rPVqHSnowuDeQR95zFKGwmY0356X2WGW-yRsL2fODCo,21500
-pygeodesy/resections.py,sha256=nkfBxYrsEdyq2JqAbPrRWKplJBzFkIXLvEZGB4gPu_A,43550
-pygeodesy/simplify.py,sha256=FT3AzXiFjFfvwJ-X2q8iA9cQOUVdBT1vD_BIskM3gK8,25223
-pygeodesy/solveBase.py,sha256=cBe3QQWEaJlPWUlXoiYo1eFMh4z6GDZbQyt8ZiwMfos,16687
-pygeodesy/sphericalBase.py,sha256=sH2WwmY_RL0STyr1OhtCDKvGhO0Ks7o3V-MHLddpiHQ,31944
-pygeodesy/sphericalNvector.py,sha256=TBs_nid_DTcox7bBegh_Djv4zZRGRY4mH6dd1xIHGms,56963
-pygeodesy/sphericalTrigonometry.py,sha256=Q9qsqzIK43xBken2G8uP9snPXPuBoZ20pMHqbT_IjG0,64216
-pygeodesy/streprs.py,sha256=8t10NwrS3DmuX6Qig0TDIR7bEWRFmnQUwV1_ItL9zd0,23940
-pygeodesy/trf.py,sha256=4gVtF780EEZEqWwMBDe4x1AEkIz3hB8h4l0_0NXWM5U,118903
-pygeodesy/triaxials.py,sha256=nYFQcLimivcxpeXMj9a83iWuENDU1gI-2zNgCkZzL0U,61549
-pygeodesy/units.py,sha256=ofFTYc7mF9wOpfvpYHN83dGszMM18rTdsxfEXVzaIko,38705
-pygeodesy/unitsBase.py,sha256=xRZlNlO7S47Mwy0FGBg_cefvB4fEtWFM5dAE-Nlw-NE,13111
-pygeodesy/ups.py,sha256=07AG-Rb1D4EvmN3g-xk3ZxKzyaNYvOzztcyYbx7t8jc,23229
-pygeodesy/utily.py,sha256=jP82RmCPCVghxTQv4ZRuIS89afmsD-roz2iafHfyHXA,36128
-pygeodesy/utm.py,sha256=0qF5Kjw8Wf9zxGWOaCF-LSweibat-EkHvvmy7dFO_KE,30981
-pygeodesy/utmups.py,sha256=u2hlWSnmZKwR-ApgKw16R9p75sW_yaqQAmbcBUE8Zfg,13007
-pygeodesy/utmupsBase.py,sha256=KetB8R0uRYU6X8nLG3JkBHUr1OfNlChKa0isgvm8Yq8,18807
-pygeodesy/vector2d.py,sha256=pSvfpFoSa5R37o9tSmRma7KsjNnN9GwTDG9rhFOEmfA,35004
-pygeodesy/vector3d.py,sha256=6ZLYLhZJoOM6UVJlbV8segkVXcFt38HA-SywCdWsynM,44972
-pygeodesy/vector3dBase.py,sha256=wJpEcgHlJ5Qu0Us7CKuNDepZQzo6a-RvqZbA2-O4-ko,35583
-pygeodesy/webmercator.py,sha256=1IXiAHBXTm5kMCp5gEI67oBJeRXD7BiPVI7bcRRX1U4,14918
-pygeodesy/wgrs.py,sha256=AKUrYRCC67lOeJ6vUDAiGb_mY6R3ZwflXpOaP3wauOg,14774
-pygeodesy/auxilats/_CX_4.py,sha256=U41njj8Pu8cHMGuoUUVA20QIvRJAq-VGCnyoKJl0Ylo,8662
-pygeodesy/auxilats/_CX_6.py,sha256=x4hrHxunjqqkEsZbVW1dyn3R5mR8EWYOuX77RzDEyh4,14856
-pygeodesy/auxilats/_CX_8.py,sha256=t-OO48t4cCOsOgMi1FoyPw2DQqybVZFsgQMqAYP-jKY,25304
-pygeodesy/auxilats/__init__.py,sha256=yOa5RDYOOed9Z4dvcKlatH0JBgohAJ8ADXjU9mZGTfQ,2881
-pygeodesy/auxilats/__main__.py,sha256=TVN8evCKEzBKdANU5-Ucps8bZySqBTQmEGU4hy_U1cw,2980
-pygeodesy/auxilats/auxAngle.py,sha256=LEa1GVR1EOYnTxR-mBLUj4mGoLO6jRrpsyG4v7N8W_0,16727
-pygeodesy/auxilats/auxDLat.py,sha256=U3BHF6AkW5--nrwH9whL5wZVIZLH_keRLfUz6c6KBx4,10950
-pygeodesy/auxilats/auxDST.py,sha256=bdNEh3TdABWH7qW6ngZx5SnzDM3B5rtPLvYhvCnFsKc,10497
-pygeodesy/auxilats/auxLat.py,sha256=U6thEwMEoUm4OFb2_JviEtEn2-nqyVjNbII7oyMf0hM,31282
-pygeodesy/auxilats/auxily.py,sha256=ZiCFedYcr32O6TWQ_dcnwMrc9TgogyuhNSbR77WMDpg,8240
-pygeodesy/deprecated/__init__.py,sha256=ZRGqgwSdvtKSYZdw09-LPuGa_i0jMHWKIwrPG3r1hHs,2815
-pygeodesy/deprecated/bases.py,sha256=nxUtxscAg5cb7HEzTSmPJFafLc9Ad2SL5ovwkYaU5z8,1655
-pygeodesy/deprecated/classes.py,sha256=PXgss-2kEu3bzaxvSeVZJGdcRqsdi_6_aRqsESyUQKQ,11662
-pygeodesy/deprecated/consterns.py,sha256=W-rQiw443_zCFEUzjCGykGND-i5P_ghEIyJUSGg7-Nc,1908
-pygeodesy/deprecated/datum.py,sha256=KfuMA64LYGMj1voW2uai2RGcugtWdpvlOL6UHJvpTeQ,1875
-pygeodesy/deprecated/functions.py,sha256=-Ckor43KBiCDa7rbwY5kHvrs5xwuixTlw1TZpNSBgrU,13647
-pygeodesy/deprecated/nvector.py,sha256=_dZf84RdmPr7e7i8Yi683R-8Mqn0ipTqIsDhNl29hGo,2117
-pygeodesy/deprecated/rhumbBase.py,sha256=d7YKW--dnRpobB2CSvhFsntWF0B5-HYJqID2pv5lD5k,1375
-pygeodesy/deprecated/rhumbaux.py,sha256=n29xazYMbVG4MJkLjAGu8B88bbcFF5xnvuj9xSxjfIk,1428
-pygeodesy/deprecated/rhumbsolve.py,sha256=QprjRfo5T1_C4ovaa1cffAcmNczzkhGIfmybAup9a9w,1431
-pygeodesy/deprecated/rhumbx.py,sha256=OS0p_meaoVrpZe5UhK6qZljjlrGpL0pCHWw8gofw7ks,1425
-pygeodesy/geodesicx/_C4_24.py,sha256=kS4XMR9m7iBs01V8K0Oz9qTYmjN-icIQGpc_8iwVhig,90750
-pygeodesy/geodesicx/_C4_27.py,sha256=bPbj2Ckrn9WJglm3SNTXyMkULNwANM0tCQ-LKxP1L58,134258
-pygeodesy/geodesicx/_C4_30.py,sha256=QZO8p971ztJwDGLOaJYgIhklztz9GlqbtS-xRP_E7o4,201964
-pygeodesy/geodesicx/__init__.py,sha256=GmuEpkVmz5GagH10fSHCH0QWdh9y-xojuGRmWJ6TKAw,2446
-pygeodesy/geodesicx/__main__.py,sha256=xn4URUZ8Dois3gp6_JaCThTfhVmBJBPx70LvWyZhSIQ,3168
-pygeodesy/geodesicx/gx.py,sha256=E1WTVXsOC1jhc1xDmhCW-IEzqF0oOu74jAsIFt9YwRI,61304
-pygeodesy/geodesicx/gxarea.py,sha256=J-osK7YMZTMUQUtkf-sBMdGABOmLlxcnjTYkacFobkQ,19251
-pygeodesy/geodesicx/gxbases.py,sha256=vmqPnZGh_k7Fwev9oYoIzAZKdFFOydAXa372pHrzfMI,5279
-pygeodesy/geodesicx/gxline.py,sha256=gy0RT7DbcAvnSPqNl0FiqYpN00LBuJM-P9KcyasQvhU,27465
-pygeodesy/rhumb/__init__.py,sha256=MbwdmdduXd3fOWuS1mFdgyKBPBf7Ju1DzRf5D8w0Rok,2207
-pygeodesy/rhumb/aux_.py,sha256=W4HkgoHAQz_aWaysfsmOA5010nCGvBfUs2Q-bymnHYU,16660
-pygeodesy/rhumb/bases.py,sha256=kzU_Dgt4FNPMgTg5rqbw-HiNpflDPKpmq9jhPbQmR4U,53851
-pygeodesy/rhumb/ekx.py,sha256=lF3tZ-ZY9fPJV8y1kgHW-7EOZCyb3gJr-kR-jj5Fbf8,23871
-pygeodesy/rhumb/solve.py,sha256=NZfwx7xv5UriQs7A0c7ZhoxxVUeAT15UwXK_jtwEXQw,27802
-PyGeodesy-24.5.8.dist-info/METADATA,sha256=iiCbD7PToGDSIyOreeEG4YnJO2j2TZRnNvKeQdOVLQQ,19363
-PyGeodesy-24.5.8.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-PyGeodesy-24.5.8.dist-info/top_level.txt,sha256=cEQPatCXzKZqrivpULC5V5fuy9_V_bAwaP_gUGid7pQ,10
-PyGeodesy-24.5.8.dist-info/RECORD,,