pygeodesy 24.6.9__py2.py3-none-any.whl → 24.7.7__py2.py3-none-any.whl

pygeodesy/utmups.py

@@ -31,7 +31,7 @@ from pygeodesy.utmupsBase import Fmt, _to4lldn, _to3zBhp, _UPS_ZONE, \
                                 _UTMUPS_ZONE_MAX, _WGS84
 
 __all__ = _ALL_LAZY.utmups
-__version__ = '24.05.30'
+__version__ = '24.06.11'
 
 _MGRS_TILE = _100km  # in .mgrs.Mgrs.tile
 
@@ -111,32 +111,31 @@ def toUtmUps8(latlon, lon=None, datum=None, falsed=True, Utm=Utm, Ups=Ups,
 
        @arg latlon: Latitude (C{degrees}) or an (ellipsoidal)
                     geodetic C{LatLon} point.
-       @kwarg lon: Optional longitude (C{degrees}) or C{None}.
-       @kwarg datum: Optional datum to use this UTM coordinate,
-                     overriding B{C{latlon}}'s datum (C{Datum}).
-       @kwarg falsed: False both easting and northing (C{bool}).
-       @kwarg Utm: Optional class to return the UTM coordinate (L{Utm})
-                   or C{None}.
-       @kwarg Ups: Optional class to return the UPS coordinate (L{Ups})
-                   or C{None}.
-       @kwarg pole: Optional top/center of UPS (stereographic)
-                    projection (C{str}, C{'N[orth]'} or C{'S[outh]'}).
-       @kwarg name_cmoff: Optional B{C{Utm}} or B{C{Ups}} C{B{name}=NN}
-                   (C{str}) and DEPRECATED keyword argument C{B{cmoff}=True}
-                   to offset the longitude from the zone's central meridian
-                   (C{bool}), use B{C{falsed}} instead and I{for UTM only}.
-
-       @return: The UTM or UPS coordinate (B{C{Utm}} respectively B{C{Ups}})
-                or a L{UtmUps8Tuple}C{(zone, hemipole, easting, northing,
-                band, datum, gamma, scale)} if B{C{Utm}} respectively
-                B{C{Ups}} is C{None} or B{C{cmoff}} is C{False}.
-
-       @raise RangeError: If B{C{lat}} outside the valid UTM or UPS bands
-                          or if B{C{lat}} or B{C{lon}} outside the valid
-                          range and L{pygeodesy.rangerrors} set to C{True}.
-
-       @raise TypeError: If B{C{latlon}} is not ellipsoidal or B{C{lon}}
-                         value is missing of B{C{datum}} is invalid.
+       @kwarg lon: Longitude (C{degrees}), required if B{C{latlon}} is C{degrees},
+                   ignored otherwise.
+       @kwarg datum: Optional datum to use this UTM coordinate, overriding the
+                     B{C{latlon}}'s datum (C{Datum}).
+       @kwarg falsed: If C{True}, false both easting and northing (C{bool}).
+       @kwarg Utm: Optional class to return the UTM coordinate (L{Utm}) or C{None}.
+       @kwarg Ups: Optional class to return the UPS coordinate (L{Ups}) or C{None}.
+       @kwarg pole: Optional top/center of UPS (stereographic) projection (C{str},
+                    C{'N[orth]'} or C{'S[outh]'}).
+       @kwarg name_cmoff: Optional C{B{name}=NN} (C{str}) and DEPRECATED keyword
+                   argument C{B{cmoff}=True} to offset the longitude from the zone's
+                   central meridian (C{bool}), use B{C{falsed}} instead and I{for
+                   UTM only}.
+
+       @return: The UTM or UPS coordinate (B{C{Utm}} respectively B{C{Ups}}) or a
+                L{UtmUps8Tuple}C{(zone, hemipole, easting, northing, band, datum,
+                gamma, scale)} if B{C{Utm}} respectively C{B{Ups} is None} or if
+                C{B{falsed} is False}.
+
+       @raise RangeError: If B{C{lat}} outside the valid UTM or UPS bands or if
+                          B{C{lat}} or B{C{lon}} outside the valid range and
+                          L{rangerrors<pygeodesy.rangerrors>} is C{True}.
+
+       @raise TypeError: If B{C{latlon}} is not ellipsoidal or B{C{lon}} is missing
+                         or B{C{datum}} is invalid.
 
        @raise UTMUPSError: UTM or UPS validation failed.
 
@@ -154,21 +153,20 @@ def toUtmUps8(latlon, lon=None, datum=None, falsed=True, Utm=Utm, Ups=Ups,
     return u
 
 
-def UtmUps(zone, hemipole, easting, northing, band=NN, datum=_WGS84,
-                                              falsed=True, **name):
+def UtmUps(zone, hemipole, easting, northing, band=NN, datum=_WGS84, falsed=True, **name):
     '''Class-like function to create a UTM/UPS coordinate.
 
        @kwarg zone: The UTM zone with/-out I{longitudinal} Band or UPS zone C{0}
                     or C{"00"} with/-out I{polar} Band (C{str} or C{int}).
-       @kwarg hemipole: UTM hemisphere or UPS top/center of projection
-                        (C{str}, C{'N[orth]'} or C{'S[outh]'}).
+       @kwarg hemipole: UTM hemisphere or UPS top/center of projection (C{str},
+                        C{'N[orth]'} or C{'S[outh]'}).
        @arg easting: Easting, see B{C{falsed}} (C{meter}).
        @arg northing: Northing, see B{C{falsed}} (C{meter}).
        @kwarg band: Optional, UTM I{latitudinal} C{'C'|'D'|..|'W'|'X'} or UPS
                     I{polar} Band letter C{'A'|'B'|'Y'|'Z'} Band letter (C{str}).
        @kwarg datum: The coordinate's datum (L{Datum}).
-       @kwarg falsed: If C{True}, both B{C{easting}} and B{C{northing}} are
-                      falsed (C{bool}).
+       @kwarg falsed: If C{True}, both B{C{easting}} and B{C{northing}} are falsed
+                      (C{bool}).
        @kwarg name: Optional L{Utm} or L{Ups} C{B{name}=NN} (C{str}).
 
        @return: New UTM or UPS instance (L{Utm} or L{Ups}).
@@ -182,17 +180,16 @@ def UtmUps(zone, hemipole, easting, northing, band=NN, datum=_WGS84,
     '''
     z, B, hp = _to3zBhp(zone, band, hemipole=hemipole)
     U = Ups if z in (_UPS_ZONE, _UPS_ZONE_STR) else Utm
-    return U(z, hp, easting, northing, band=B, datum=datum,
-                                       falsed=falsed, **name)
+    return U(z, hp, easting, northing, band=B, datum=datum, falsed=falsed, **name)
 
 
 def utmupsValidate(coord, falsed=False, MGRS=False, Error=UTMUPSError):
     '''Check a UTM or UPS coordinate.
 
-       @arg coord: The UTM or UPS coordinate (L{Utm}, L{Etm}, L{Ups}
-                   or C{5+Tuple}).
-       @kwarg falsed: C{5+Tuple} easting and northing are falsed
-                      (C{bool}), ignored otherwise.
+       @arg coord: The UTM or UPS coordinate (L{Utm}, L{Etm}, L{Ups} or
+                   C{5+Tuple}).
+       @kwarg falsed: If C{True}, easting and northing are falsed in the
+                      C{B{coord} 5+Tuple} (C{bool}), ignored otherwise.
        @kwarg MGRS: Increase easting and northing ranges (C{bool}).
        @kwarg Error: Optional error to raise, overriding the default
                      (L{UTMUPSError}).
@@ -253,8 +250,8 @@ def utmupsValidateOK(coord, falsed=False, ok=True):
     '''Check a UTM or UPS coordinate.
 
        @arg coord: The UTM or UPS coordinate (L{Utm}, L{Ups} or C{5+Tuple}).
-       @kwarg falsed: Use C{B{falsed}=True} if the C{5+Tuple} easting and
-                      northing are falsed (C{bool}).
+       @kwarg falsed: If C{True}, easting and northing are falsed in the
+                      C{B{coord} 5+Tuple} (C{bool}), ignored otherwise.
        @kwarg ok: Result to return if validation passed (B{C{ok}}).
 
        @return: B{C{ok}} if validation passed, otherwise the L{UTMUPSError}.
@@ -263,9 +260,9 @@ def utmupsValidateOK(coord, falsed=False, ok=True):
     '''
     try:
         utmupsValidate(coord, falsed=falsed)
-        return ok
     except UTMUPSError as x:
         return x
+    return ok
 
 
 def utmupsZoneBand5(lat, lon, cmoff=False, **name):
@@ -280,11 +277,11 @@ def utmupsZoneBand5(lat, lon, cmoff=False, **name):
 
        @return: A L{UtmUpsLatLon5Tuple}C{(zone, band, hemipole, lat, lon)}
                 where C{hemipole} is C{'N'|'S'}, the UTM hemisphere or UPS
-                pole, the UPS projection top/center.
+                pole, projection top/center.
 
-       @raise RangeError: If B{C{lat}} outside the valid UTM or UPS bands
-                          or if B{C{lat}} or B{C{lon}} outside the valid
-                          range and L{pygeodesy.rangerrors} set to C{True}.
+       @raise RangeError: If B{C{lat}} outside the valid UTM or UPS bands or
+                          if B{C{lat}} or B{C{lon}} outside the valid range
+                          and L{rangerrors<pygeodesy.rangerrors>} is C{True}.
 
        @raise ValueError: Invalid B{C{lat}} or B{C{lon}}.
 

pygeodesy/utmupsBase.py

@@ -12,22 +12,22 @@ 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_not
+                             _xattrs, _xkwds, _xkwds_not
 # from pygeodesy.internals import _name__, _under  # from .named
 from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, \
                              _gamma_, _n_a_, _not_, _N_, _NS_, _PLUS_, \
                              _S_, _scale_, _SPACE_, _Y_, _Z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _NamedBase, _xnamed,  _name__, _under
+from pygeodesy.named import _name__, _NamedBase,  _under
 from pygeodesy.namedTuples import EasNor2Tuple, LatLonDatum5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, _update_all, \
                             deprecated_property_RO, Property_RO, property_RO
-from pygeodesy.streprs import Fmt, fstr, _fstrENH2, _xattrs, _xzipairs
+from pygeodesy.streprs import Fmt, fstr, _fstrENH2, _xzipairs
 from pygeodesy.units import Band, Easting, Northing, Scalar, Zone
 from pygeodesy.utily import _Wrap, wrap360
 
 __all__ = _ALL_LAZY.utmupsBase
-__version__ = '24.06.09'
+__version__ = '24.06.12'
 
 _UPS_BANDS = _A_, _B_, _Y_, _Z_  # UPS polar bands SE, SW, NE, NW
 # _UTM_BANDS = _MODS.utm._Bands
@@ -210,13 +210,12 @@ class UtmUpsBase(_NamedBase):
         ll = self._latlon
         if LatLon is None:
             r = LatLonDatum5Tuple(ll.lat, ll.lon, ll.datum,
-                                  ll.gamma, ll.scale)
+                                  ll.gamma, ll.scale, name=ll.name)
         else:
             _xsubclassof(_LLEB, LatLon=LatLon)
-            kwds = _xkwds(LatLon_kwds, datum=ll.datum)
-            r = _xattrs(LatLon(ll.lat, ll.lon, **kwds),
-                               ll, _under(_gamma_), _under(_scale_))
-        return _xnamed(r, ll.name)
+            r =  LatLon(ll.lat, ll.lon, **_xkwds(LatLon_kwds, datum=ll.datum, name=ll.name))
+            r = _xattrs(r, ll, _under(_gamma_), _under(_scale_))
+        return r
 
     def _latlon5args(self, ll, g, k, _toBand, unfalse, *other):
         '''(INTERNAL) See C{._toLLEB} methods, functions C{ups.toUps8} and C{utm._toXtm8}

pygeodesy/vector3d.py

@@ -31,7 +31,7 @@ from pygeodesy.vector3dBase import Vector3dBase
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector3d
-__version__ = '24.06.06'
+__version__ = '24.06.18'
 
 _vector2d = _MODS.into(vector2d=__name__)
 
@@ -475,7 +475,8 @@ def _intersect3d3(start1, end1, start2, end2, eps=EPS, useZ=False):  # MCCABE 16
     t  = cb.dot(ab)
     o1 = 0 if b1 else _outside(t, ab2, 1)
     v  = s1.plus(a.times(t / ab2))
-    o2 = 0 if b2 else _outside(v.minus(s2).dot(b), b.length2, 2)
+    t  = v.minus(s2).dot(b)
+    o2 = 0 if b2 else _outside(t, b.length2, 2)
     return v, o1, o2
 
 
@@ -541,16 +542,15 @@ def intersections2(center1, radius1, center2, radius2, sphere=True, **Vector_and
                                intersection points and optional, additional B{C{Vector}}
                                keyword arguments, otherwise B{C{center1}}'s (sub-)class.
 
-       @return: If B{C{sphere}} is C{True}, a 2-tuple of the C{center} and C{radius}
-                of the intersection of the I{spheres}.  The C{radius} is C{0.0} for
-                abutting spheres (and the C{center} is aka the I{radical center}).
+       @return: If C{B{sphere} is True}, a 2-tuple of the C{center} and C{radius} of the
+                intersection of the I{spheres}.  For abutting circles, C{radius} is C{0.0}
+                and C{center} is the I{radical center}.
 
-                If B{C{sphere}} is C{False}, a 2-tuple with the two intersection
-                points of the I{circles}.  For abutting circles, both points are
-                the same instance, aka the I{radical center}.
+                If C{B{sphere} is False}, a 2-tuple with the two intersection points of the
+                I{circles}.  For abutting circles, both points are the same instance, aka
+                the I{radical center}.
 
-       @raise IntersectionError: Concentric, invalid or non-intersecting spheres
-                                 or circles.
+       @raise IntersectionError: Concentric, invalid or non-intersecting spheres or circles.
 
        @raise TypeError: Invalid B{C{center1}} or B{C{center2}}.
 
@@ -637,8 +637,8 @@ def iscolinearWith(point, point1, point2, eps=EPS, useZ=True):
        @kwarg eps: Tolerance (C{scalar}), same units as C{x}, C{y} and C{z}.
        @kwarg useZ: If C{True}, use the Z components, otherwise force C{z=INT0} (C{bool}).
 
-       @return: C{True} if B{C{point}} is colinear B{C{point1}} and B{C{point2}},
-                        C{False} otherwise.
+       @return: C{True} if B{C{point}} is colinear B{C{point1}} and B{C{point2}}, C{False}
+                otherwise.
 
        @raise TypeError: Invalid B{C{point}}, B{C{point1}} or B{C{point2}}.
 
@@ -661,8 +661,8 @@ def nearestOn(point, point1, point2, within=True, useZ=True, Vector=None, **Vect
                       points, otherwise the closest point on the extended line
                       through both points (C{bool}).
        @kwarg useZ: If C{True}, use the Z components, otherwise force C{z=INT0} (C{bool}).
-       @kwarg Vector: Class to return closest point (C{Cartesian}, L{Vector3d}
-                      or C{Vector3Tuple}) or C{None}.
+       @kwarg Vector: Class to return closest point (C{Cartesian}, L{Vector3d} or
+                      C{Vector3Tuple}) or C{None}.
        @kwarg Vector_kwds: Optional, additional B{C{Vector}} keyword arguments,
                            ignored if C{B{Vector} is None}.
 
@@ -766,23 +766,22 @@ 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, Vector=None, **Vector_kwds_name):  # in .vector2d
+def _nVc(v, clas=None, Vector=None, **name_Vector_kwds):  # in .vector2d
     # return a named C{Vector} or C{clas} instance
-    name, Vector_kwds = _name2__(**Vector_kwds_name)
+    name, kwds = _name2__(**name_Vector_kwds)
     if Vector is not None:
-        v = Vector(v.x, v.y, v.z, **Vector_kwds)
+        v = Vector(v.x, v.y, v.z, **kwds)
     elif clas is not None:
         v = clas(v.x, v.y, v.z)  # ignore Vector_kwds
     return _xnamed(v, name) if name else v
 
 
-def _otherV3d(useZ=True, NN_OK=True, i=None, **name_v):
+def _otherV3d(useZ=True, NN_OK=True, i=None, **name_vector):
     # check named vector instance, return Vector3d
-    n, v = _xkwds_item2(name_v)
+    n, v = _xkwds_item2(name_vector)
+    n    =  Fmt.INDEX(n, i)
     if useZ and isinstance(v, Vector3dBase):
-        return v if NN_OK or v.name else v.copy(name=Fmt.INDEX(n, i))
-
-    n = Fmt.INDEX(n, i)
+        return v if NN_OK or v.name else v.copy(name=n)
     try:
         return Vector3d(v.x, v.y, (v.z if useZ else INT0), name=n)
     except AttributeError:  # no .x, .y or .z attr
@@ -799,7 +798,7 @@ def parse3d(str3d, sep=_COMMA_, Vector=Vector3d, **Vector_kwds):
        @kwarg Vector_kwds: Optional B{C{Vector}} keyword arguments,
                            ignored if C{B{Vector} is None}.
 
-       @return: A B{C{Vector}} instance or if B{C{Vector}} is C{None},
+       @return: A B{C{Vector}} instance or if C{B{Vector} is None},
                 a named L{Vector3Tuple}C{(x, y, z)}.
 
        @raise VectorError: Invalid B{C{str3d}}.
@@ -820,11 +819,11 @@ def sumOf(vectors, Vector=Vector3d, **Vector_kwds):
 
        @arg vectors: Vectors to be added (L{Vector3d}[]).
        @kwarg Vector: Optional class for the vectorial sum (L{Vector3d}).
-       @kwarg Vector_kwds: Optional B{C{Vector}} keyword arguments,
-                           ignored if C{B{Vector} is None}.
+       @kwarg Vector_kwds: Optional B{C{Vector}} keyword arguments, ignored
+                           if C{B{Vector} is None}.
 
-       @return: Vectorial sum as B{C{Vector}} or if B{C{Vector}} is
-                C{None}, a named L{Vector3Tuple}C{(x, y, z)}.
+       @return: Vectorial sum as B{C{Vector}} or if B{C{Vector} is None},
+                a named L{Vector3Tuple}C{(x, y, z)}.
 
        @raise VectorError: No B{C{vectors}}.
     '''

pygeodesy/vector3dBase.py

@@ -30,7 +30,7 @@ from pygeodesy.units import Float, Scalar
 from math import atan2, ceil, fabs, floor, trunc
 
 __all__ = _ALL_LAZY.vector3dBase
-__version__ = '24.06.07'
+__version__ = '24.06.11'
 
 
 class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
@@ -491,15 +491,14 @@ class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum
         '''Compute the cross product of this and an other vector.
 
            @arg other: The other vector (L{Vector3d}).
-           @kwarg raiser: Optional, L{CrossError} label if raised (C{str},
-                          non-L{NN}).
-           @kwarg eps0: Near-zero tolerance (C{scalar}), same units as
-                        C{x}, C{y}, and C{z}.
+           @kwarg raiser: Optional, L{CrossError} label if raised (C{str}, non-L{NN}).
+           @kwarg eps0: Near-zero tolerance (C{scalar}), same units as C{x}, C{y} and
+                        C{z}.
 
            @return: Cross product (L{Vector3d}).
 
-           @raise CrossError: Zero or near-zero cross product and both
-                              B{C{raiser}} and L{pygeodesy.crosserrors} set.
+           @raise CrossError: Zero or near-zero cross product and if B{C{raiser}} and
+                              L{crosserrors<pygeodesy.crosserrors>} are both C{True}.
 
            @raise TypeError: Incompatible B{C{other}} C{type}.
         '''

pygeodesy/webmercator.py

@@ -36,7 +36,7 @@ from pygeodesy.utily import degrees90, degrees180
 from math import atan, atanh, exp, radians, sin, tanh
 
 __all__ = _ALL_LAZY.webmercator
-__version__ = '24.05.31'
+__version__ = '24.06.11'
 
 # _FalseEasting  = 0   # false Easting (C{meter})
 # _FalseNorthing = 0   # false Northing (C{meter})
@@ -283,8 +283,8 @@ def parseWM(strWM, radius=R_MA, Wm=Wm, **name):
                   or C{None}.
        @kwarg name: Optional C{B{name}=NN} (C{str}).
 
-       @return: The WM coordinate (B{C{Wm}}) or if B{C{Wm}} is C{None}
-                an L{EasNorRadius3Tuple}C{(easting, northing, radius)}.
+       @return: The WM coordinate (B{C{Wm}}) or if C{B{Wm} is None}, an
+                L{EasNorRadius3Tuple}C{(easting, northing, radius)}.
 
        @raise WebMercatorError: Invalid B{C{strWM}}.
     '''
@@ -307,27 +307,25 @@ def parseWM(strWM, radius=R_MA, Wm=Wm, **name):
 def toWm(latlon, lon=None, earth=R_MA, Wm=Wm, **name_Wm_kwds_radius):
     '''Convert a lat-/longitude point to a WM coordinate.
 
-       @arg latlon: Latitude (C{degrees}) or an (ellipsoidal or
-                    spherical) geodetic C{LatLon} point.
+       @arg latlon: Latitude (C{degrees}) or an (ellipsoidal or spherical)
+                    geodetic C{LatLon} point.
        @kwarg lon: Optional longitude (C{degrees} or C{None}).
-       @kwarg earth: Earth radius (C{meter}), datum or ellipsoid
-                     (L{Datum}, L{a_f2Tuple}, L{Ellipsoid} or
-                     L{Ellipsoid2}), overridden by B{C{latlon}}'s
-                     datum if present.
-       @kwarg Wm: Optional class to return the WM coordinate (L{Wm})
-                  or C{None}.
-       @kwarg name_Wm_kwds_radius: Optional C{B{name}=NN} (C{str}),
-                   optional, additional B{C{Wm}} keyword arguments,
-                   ignored if C{B{Wm} is None} and DEPRECATED keyword
-                   argument C{B{radius}=earth}, use B{C{earth}}.
-
-       @return: The WM coordinate (B{C{Wm}}) or if B{C{Wm}} is C{None} an
+       @kwarg earth: Earth radius (C{meter}), datum or ellipsoid (L{Datum},
+                     L{a_f2Tuple}, L{Ellipsoid} or L{Ellipsoid2}), overridden
+                     by B{C{latlon}}'s datum if present.
+       @kwarg Wm: Optional class to return the WM coordinate (L{Wm}) or C{None}.
+       @kwarg name_Wm_kwds_radius: Optional C{B{name}=NN} (C{str}), optional,
+                   additional B{C{Wm}} keyword arguments, ignored if C{B{Wm} is
+                   None} and DEPRECATED keyword argument C{B{radius}=earth},
+                   use B{C{earth}}.
+
+       @return: The WM coordinate (B{C{Wm}}) or if C{B{Wm} is None}, an
                 L{EasNorRadius3Tuple}C{(easting, northing, radius)}.
 
-       @raise ValueError: If B{C{lon}} value is missing, if B{C{latlon}} is not
-                          scalar, if B{C{latlon}} is beyond the valid WM range
-                          and L{pygeodesy.rangerrors} is set to C{True} or if
-                          B{C{earth}} is invalid.
+       @raise ValueError: If B{C{earth}} is invalid, if B{C{lon}} value is missing,
+                          if B{C{latlon}} is not scalar, or if B{C{latlon}} is beyond
+                          the valid WM range and L{rangerrrors<pygeodesy.rangerrors>}
+                          is C{True}.
     '''
     name, kwds = _name2__(name_Wm_kwds_radius)
     R, kwds = _xkwds_pop2(kwds, radius=earth)

pygeodesy/wgrs.py

@@ -16,22 +16,22 @@ also U{World Geographic Reference System
 from pygeodesy.constants import INT0, _float, _off90, _0_001, \
                                _0_5, _1_0, _2_0, _60_0, _1000_0
 from pygeodesy.dms import parse3llh  # parseDMS2
-from pygeodesy.errors import _ValueError, _xattr, _xkwds
+from pygeodesy.errors import _ValueError, _xattr, _xStrError
 from pygeodesy.interns import NN, _0to9_, _AtoZnoIO_, _COMMA_, \
                              _height_, _radius_, _SPACE_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_OTHER
-from pygeodesy.named import nameof,  isstr, Property_RO
+from pygeodesy.named import _name2__, nameof,  isstr, Property_RO
 from pygeodesy.namedTuples import LatLon2Tuple, LatLonPrec3Tuple
 # from pygeodesy.props import Property_RO  # from .named
 from pygeodesy.streprs import Fmt, _0wd
 from pygeodesy.units import Height, Int, Lat, Lon, Precision_, \
-                            Radius, Scalar_, Str, _xStrError
+                            Radius, Scalar_, Str
 from pygeodesy.utily import ft2m, m2ft, m2NM
 
 from math import floor
 
 __all__ = _ALL_LAZY.wgrs
-__version__ = '23.06.12'
+__version__ = '24.06.15'
 
 _Base    =  10
 _BaseLen =  4
@@ -207,27 +207,25 @@ class Georef(Str):
         '''
         return self._decoded5.radius
 
-    def toLatLon(self, LatLon=None, height=None, **LatLon_kwds):
-        '''Return (the center of) this georef cell as an instance
-           of the supplied C{LatLon} class.
+    def toLatLon(self, LatLon=None, height=None, **name_LatLon_kwds):
+        '''Return (the center of) this georef cell as a C{LatLon}.
 
            @kwarg LatLon: Class to use (C{LatLon}) or C{None}.
-           @kwarg height: Optional height (C{meter}).
-           @kwarg LatLon_kwds: Optional, additional B{C{LatLon}} keyword
-                               arguments, ignored if C{B{LatLon} is None}.
+           @kwarg height: Optional height (C{meter}), overriding this height.
+           @kwarg name_LatLon_kwds: Optional C{B{name}=NN} (C{str}) and optional,
+                       additional B{C{LatLon}} keyword arguments, ignored if
+                       C{B{LatLon} is None}.
 
-           @return: This georef location (B{C{LatLon}}) or if B{C{LatLon}}
-                    is C{None}, a L{LatLon3Tuple}C{(lat, lon, height)}.
+           @return: This georef location (B{C{LatLon}}) or if C{B{LatLon} is None},
+                    a L{LatLon3Tuple}C{(lat, lon, height)}.
 
-           @raise TypeError: Invalid B{C{LatLon}} or B{C{LatLon_kwds}}.
+           @raise TypeError: Invalid B{C{LatLon}} or B{C{name_LatLon_kwds}}.
         '''
-        if LatLon is None:
-            r = self.latlonheight if height is None else \
-                self.latlon.to3Tuple(height)
-        else:
-            h = (self.height or INT0) if height is None else height
-            r =  LatLon(*self.latlon, height=h, **_xkwds(LatLon_kwds, name=self.name))
-        return r
+        n, kwds = _name2__(name_LatLon_kwds, _or_nameof=self)
+        h = (self.height or INT0) if height is None else height  # _heigHt
+        r =  self.latlon.to3Tuple(h) if LatLon is None else LatLon(
+            *self.latlon, height=h, **kwds)
+        return r.renamed(n) if n else r
 
 
 def decode3(georef, center=True):

PyGeodesy-24.6.9.dist-info/RECORD

@@ -1,116 +0,0 @@
-pygeodesy/LICENSE,sha256=YfgAiyxOwY6P9Kkb1_5XN81nueTLrpb3Ffkv3EuPgFU,1144
-pygeodesy/__init__.py,sha256=MliQ7bvn1U4dND9REeqtweBQF8d_LWeWIliPvZwBkeg,41046
-pygeodesy/__main__.py,sha256=UmTd6Qw20g_pgnQjdaHePm-xuOEBi1tUNRLO0eL0-rU,4593
-pygeodesy/albers.py,sha256=2t8EjmoFWmkdTb4DUHMlECkwTPDS1wpNf92WD_UWXds,31081
-pygeodesy/azimuthal.py,sha256=RQdZbHoLlHSamhnJ4GMrrRU6UrYmTpa1yK59nYB-A4o,50252
-pygeodesy/basics.py,sha256=Ez1tApjFnk6vNsYXeZzi28hYsa5AhUYobLS1Anna2g0,29381
-pygeodesy/booleans.py,sha256=_19jhaMqcPdaOfKdSElh50y2JQemXcu9Xcx0CqJ90ZE,73533
-pygeodesy/cartesianBase.py,sha256=-n3g68SO-3399cqyzgDXAolQnQfyOhzFYixhATpWZVI,47216
-pygeodesy/clipy.py,sha256=3ysIEWQ89HjvLnSlZm0nZAt9EN5AQxIs1sLLM8yF9zM,27675
-pygeodesy/constants.py,sha256=-weWOuHwE-qI6pYRLcTucI0KNcNJm6vPNzxwrJzACKs,19192
-pygeodesy/css.py,sha256=RXlLh76tVDFClVh7L1U3FFrLZvjBPFASDf3vq8dHecE,25778
-pygeodesy/datums.py,sha256=GYbtvPyzDChHYgnNleBqsM-MNwLNQqrO2_MMV4Z9kmI,34006
-pygeodesy/dms.py,sha256=VujWxk1L2Kp6OMfnu0XPI-j8bnyJ33sFmtB9_MbHqSU,44455
-pygeodesy/ecef.py,sha256=35lTlGfCM4t45IFpjfXHSUXJSyGUEjuqUK-YWRRplLs,59680
-pygeodesy/elevations.py,sha256=1qZM2w0rDF7jHunydpTEmdLwOwF81KUL9L6RALJC7K4,10807
-pygeodesy/ellipsoidalBase.py,sha256=ljWfrFENRFFWxhyvptfipEWM8xKeTs329F2OP4lZvKI,55297
-pygeodesy/ellipsoidalBaseDI.py,sha256=lPUPP5lVsCzI5RIukxmJ5MH6j2Mb7mdvftQ0tsvsW6g,38585
-pygeodesy/ellipsoidalExact.py,sha256=a_2C6S6hGRumavy5giRoC9QAhnjqpujiXyu92od6nKo,16951
-pygeodesy/ellipsoidalGeodSolve.py,sha256=nzT6KOubBOxXRHYafOo5ByQ90VOY1zvaS7byhnwaFqE,16830
-pygeodesy/ellipsoidalKarney.py,sha256=m07XlZKWvBnOzIKV6P7RNttk8G5s2JRBH2RVF_lg0_k,19243
-pygeodesy/ellipsoidalNvector.py,sha256=kRmWclV0NFnEJv3m3TxBNJMu7wyrZZO2iUrNrr-_m9g,30261
-pygeodesy/ellipsoidalVincenty.py,sha256=Uk93B8GFcMnWiwKUOA84TlLwbBlvzVnsAXAx0cU7cn4,26004
-pygeodesy/ellipsoids.py,sha256=_fbQy9k_k40Li6jAOlHcSlEPPUnliZsqjIR2be3h2QI,120238
-pygeodesy/elliptic.py,sha256=-80MbZvRPk-TeA_ggkfXhjuPv07MzsB4HxNF7gbdhB4,42501
-pygeodesy/epsg.py,sha256=oWHX_QVChE5roktAyXUmPmX49XHiryYmXTHxQzrAprE,8222
-pygeodesy/errors.py,sha256=3GPp5Axnbnch93VWO-E7uEAAfVnRzbByafNCtKR6g_I,28443
-pygeodesy/etm.py,sha256=DeX0mZQcHK0KbmOZodp2iv2TEFtRjYziSL9oUEV2YxU,44952
-pygeodesy/fmath.py,sha256=EOHD0uZ8VULZtXAk8tVeuPaSTozPDCN8GJcemCo-jqg,33709
-pygeodesy/formy.py,sha256=JKFqC7OlxBvB9sOH9OaWJX4bLkf0dMqW3LcVrwdnt7A,75121
-pygeodesy/frechet.py,sha256=GL4R26drObd1qFyg4hV-L9btdXaIj7xzrKjQUA-7JKc,34342
-pygeodesy/fstats.py,sha256=4eIhzSCMnn-2nVP3Q-5cCWCI-rvH0CE-zkk9hp3Pvn8,28642
-pygeodesy/fsums.py,sha256=35PAG1f5DO1KgnEWujH5TSbaas6a6eETAeeJxGcUW1A,80453
-pygeodesy/gars.py,sha256=gVnLQIEofyf_dA8dhpLrmhtIxGhBHZVRw8PbWgYUnnY,11400
-pygeodesy/geodesicw.py,sha256=PwUO5jCGExhMt6cKkQwVnPTHMMVadkTrd6pV4UWZYNY,27064
-pygeodesy/geodsolve.py,sha256=lC-81_56RUpgyJPDTXv0ih73tEuMNp3evDvyP4CDKSs,21974
-pygeodesy/geohash.py,sha256=hAgcl8p4DSswBdrNj-SzmWYMU2q6h5yczeLKtpRvmZA,32080
-pygeodesy/geoids.py,sha256=ztWLvRLpOPqC_52sxJVzVk7_g4o2REVxx5d3hh7jZ8g,80887
-pygeodesy/hausdorff.py,sha256=bhxy8_3dAoR1syc-X90AbANNrulMFdwRyvNxjYfcw6I,34713
-pygeodesy/heights.py,sha256=3-4ESUw7s7fggRRTXIR1YpV3K-Qk8x3nlt7BkNa54lw,43191
-pygeodesy/internals.py,sha256=0y4Wwx7bGife4-quIyAf7l6MR91Tmfjrie1FuqNSM5Y,19354
-pygeodesy/interns.py,sha256=njF6hxFJRhhWLsrfx21XX8V3ZvS59ujfzk2spWBGSBM,23258
-pygeodesy/iters.py,sha256=xPH0ytomvJeKHu717Fjzi3QbRrEikO6n7vqkY_IDz1k,20311
-pygeodesy/karney.py,sha256=iGoi32hDPdaMR39i6pypcbY2hqvHFVPFROYcjjA-Jrw,35121
-pygeodesy/ktm.py,sha256=itQElJegrfhpAuMujAWFTcyuMSeKIgSyw5qkkHFs7vE,27519
-pygeodesy/latlonBase.py,sha256=EK7hM0GrLrpfCrtYc0frdS_hF1UxSo8KkqP0Bg5nq24,79072
-pygeodesy/lazily.py,sha256=b6x3Dfob6HCoiwHaF8lhtnFQei3w2qW8yoMURPdr7tA,46519
-pygeodesy/lcc.py,sha256=H6HTbruMKwboVxAnM1EsieBJHKqWhdd47bCYDzTIioE,25746
-pygeodesy/ltp.py,sha256=oFuGZgWFKI7YjldlyTNhbLLOS7AVixLf5iemEhHhRbA,50857
-pygeodesy/ltpTuples.py,sha256=VFJWeGJ96NUPaxwc1JT82dMYgE3NpnUwzu0osaaHfVE,58414
-pygeodesy/mgrs.py,sha256=cKYnLKUorr_27Rca4V5I1-R6RPGnTlzrlYFuENnnjnI,29707
-pygeodesy/named.py,sha256=oZEqvA1rORBY44J8oi2I6XpBchCnyi_QgAvd-zlx25A,51885
-pygeodesy/namedTuples.py,sha256=UDmL4kCihvf8tIUVXzGzRLzL_1BLuyqm04pite6YUuk,28495
-pygeodesy/nvectorBase.py,sha256=jT_tmA7JW_C66h7zbgP4mKxcYnmLVVpv6j-ZTvZC3NI,28744
-pygeodesy/osgr.py,sha256=g-uCTy735aUNh5odTp27PY8CLDnTaquc1_oTs8Qv6zg,30827
-pygeodesy/points.py,sha256=whMm-9Nzlhr19nPNVkXB0nIg52iMvQ4q2Xg_Eor_Yz0,64415
-pygeodesy/props.py,sha256=8dGmTpdEABnLbBngmaOIpM0h4NYiBteMOHc_r4iNpAg,21988
-pygeodesy/resections.py,sha256=nkfBxYrsEdyq2JqAbPrRWKplJBzFkIXLvEZGB4gPu_A,43550
-pygeodesy/simplify.py,sha256=NybC-pfze0ObEm4ZCz6ZQrjJlQ-QyA83E6mSJqCuKq4,25223
-pygeodesy/solveBase.py,sha256=FGuvHvloiyBdE0H50o8rOxtD_n6gCx1Gp31Ckn-N7hk,16852
-pygeodesy/sphericalBase.py,sha256=eIvQz573LR9xPFZK4t5Z0TEVz4aPKI9MdMtgFDbm7Zo,32284
-pygeodesy/sphericalNvector.py,sha256=TBs_nid_DTcox7bBegh_Djv4zZRGRY4mH6dd1xIHGms,56963
-pygeodesy/sphericalTrigonometry.py,sha256=SqkFi2_Cy1LOzlZvvO4tpwxkS-AEBhdfRTgopXFTISw,64208
-pygeodesy/streprs.py,sha256=jZigK7DeHAFi2HTbvA5sXE1bJ8jeyJC1spBnzz7nTSs,24018
-pygeodesy/trf.py,sha256=CRFHmu0lFNtc41fddXavEkHmgnTFWEqR4RTFodcFKsw,119022
-pygeodesy/triaxials.py,sha256=klirzOo6yxTmd-eQM4PHMnszUo71JR0VKIUy9mYUam8,62860
-pygeodesy/units.py,sha256=gHmNw5HO78zeG3zUPfwf3wrV9LKQxBLOPPzbLivMiWA,38196
-pygeodesy/unitsBase.py,sha256=9WC7GgLJWc9MMKX1xFIlgXNKGpK9k0Do1lA6vAkLE8s,13539
-pygeodesy/ups.py,sha256=p9F49qQ9tGGf18fnFWJ5DdqQA-FdNe_BcuIGAi5tIoE,23419
-pygeodesy/utily.py,sha256=u5yGJvNKiNtafrokDaydHzBPe8vAGuy7WXrPP7yNSnk,36149
-pygeodesy/utm.py,sha256=ZxBvDcCkdnmTRzMOHyhADHdZJSUo0U0xBAsg0rEeTHk,31148
-pygeodesy/utmups.py,sha256=_GCrF3TljW4k5W9uKwilO1ivPLAbOArxlzi7jPJ4rbc,13226
-pygeodesy/utmupsBase.py,sha256=rRTSGgBbZiIp_C1v2elAjHKEIjYN1rt27lECXc55hH8,18764
-pygeodesy/vector2d.py,sha256=zJq5PB777_mFJpKD-rt_T0Vm4SNbVwF7pc3KxX8uCT8,34994
-pygeodesy/vector3d.py,sha256=t1MVIYCfnP-EdHiV3PAuVDcjLrDNZ3E48UOW-2rw5js,44953
-pygeodesy/vector3dBase.py,sha256=R6rQlqoO8pvzhfjz6jK1llL74c9SldafPXHbdBrPCIA,35732
-pygeodesy/webmercator.py,sha256=J89VAROczHNpD34AuIWD3vxfogk3ZKoYj1w0lXOCkYA,14968
-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=tj9fglSENe7whplLC9YCl--EQNyMNd1g26BPLT2JNr0,2881
-pygeodesy/auxilats/__main__.py,sha256=Vuj1YSp1LV0zejVzi6EYauka1Dv8kwOHI_aeHxQEVYk,2899
-pygeodesy/auxilats/auxAngle.py,sha256=rljkFpqLhCMZVMo9u0xNBmGZV0KxsmIbI41d5itcZ3E,16740
-pygeodesy/auxilats/auxDLat.py,sha256=U3BHF6AkW5--nrwH9whL5wZVIZLH_keRLfUz6c6KBx4,10950
-pygeodesy/auxilats/auxDST.py,sha256=bdNEh3TdABWH7qW6ngZx5SnzDM3B5rtPLvYhvCnFsKc,10497
-pygeodesy/auxilats/auxLat.py,sha256=GUpK5_rcL8IHjC209dhIibYYBJudFU0Yk7JD-KUApbc,32529
-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=nwYgLqw9Wy6ieDxQGZJ-dIeBaF4IvmNBFx9AcHwiBlE,13907
-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=0_wTYAkvfJ2xVTzw5Zo9qQlSQIT7Q_PUwC_IqFQkrWA,2446
-pygeodesy/geodesicx/__main__.py,sha256=JnKrYmg1q9J5wRRqUy-dQ9abj2-2jpWtrolMMaFfWiY,3176
-pygeodesy/geodesicx/gx.py,sha256=Luu-bmgX9WAJ7sVNkeLRuWUUj-ndp4FGafe71xC3H2k,61650
-pygeodesy/geodesicx/gxarea.py,sha256=-Kwe6spe2MSQbeLFDd6UN2NOi4JOjYhHAEzonOU3u4A,19409
-pygeodesy/geodesicx/gxbases.py,sha256=nSQpDPuRQFkkzvjOaalBTHOQCYT1fhSOb5uy-5NvvSA,5215
-pygeodesy/geodesicx/gxline.py,sha256=GP7BXfpsePLZy0SLLiIO6ytWKFpBLuPsOaL2Z_-45iU,27373
-pygeodesy/rhumb/__init__.py,sha256=70qKVuNKkddfqMSxZ9c0VCZM1w0_Ka_nBWwtpfxxh2o,2207
-pygeodesy/rhumb/aux_.py,sha256=UJEnoam_MLx2dBxgzjn_zU59f9wwDDNotdsV3ccWZFU,16652
-pygeodesy/rhumb/bases.py,sha256=J8fXg42CcAI1VR4Hz-MctOwUs029PWRTRIo6sSZYo8I,54089
-pygeodesy/rhumb/ekx.py,sha256=GZLJOqAEy_120q27rdt7kyEvkuoBPk6LOhOzjPOTOr8,24084
-pygeodesy/rhumb/solve.py,sha256=EDlLpbnw2FiNANOTau0emk29AEAaJpmckjK_cprvLNA,24035
-PyGeodesy-24.6.9.dist-info/METADATA,sha256=9j-xNRochKcXdPvnUAMAvuX3teuN-uBTTweCnqr7af0,19411
-PyGeodesy-24.6.9.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-PyGeodesy-24.6.9.dist-info/top_level.txt,sha256=cEQPatCXzKZqrivpULC5V5fuy9_V_bAwaP_gUGid7pQ,10
-PyGeodesy-24.6.9.dist-info/RECORD,,