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

pygeodesy/units.py

@@ -6,32 +6,30 @@ C{Str} from basic C{float}, C{int} respectively C{str} to
 named units as L{Degrees}, L{Feet}, L{Meter}, L{Radians}, etc.
 '''
 
-from pygeodesy.basics import isinstanceof, isscalar, isstr, issubclassof, \
-                             signOf
-from pygeodesy.constants import EPS, EPS1, PI, PI2, PI_2, \
-                               _umod_360, _0_0, _0_001, \
-                               _0_5, INT0  # PYCHOK for .mgrs, .namedTuples
-from pygeodesy.dms import F__F, F__F_, parseDMS, parseRad, \
-                          S_NUL, S_SEP, _toDMS, toDMS
-from pygeodesy.errors import _AssertionError, _IsnotError, TRFError, \
-                              UnitError, _xkwds, _xkwds_item2
+from pygeodesy.basics import isinstanceof, isscalar, isstr, issubclassof, signOf
+from pygeodesy.constants import EPS, EPS1, PI, PI2, PI_2, _umod_360, _0_0, \
+                               _0_001,  _0_5, INT0  # PYCHOK for .mgrs, .namedTuples
+from pygeodesy.dms import F__F, F__F_, S_NUL, S_SEP, parseDMS, parseRad, \
+                         _toDMS, toDMS
+from pygeodesy.errors import _AssertionError, _IsnotError, TRFError, UnitError, \
+                             _xkwds
 from pygeodesy.interns import NN, _band_, _bearing_, _degrees_, _degrees2_, \
-                             _distance_, _E_, _easting_, _epoch_, _EW_, \
-                             _feet_, _height_, _lam_, _lat_, \
-                             _LatLon_, _lon_, _meter_, _meter2_, _N_, \
-                             _northing_, _NS_, _NSEW_, _number_, _PERCENT_, \
-                             _phi_, _precision_, _radians_, _radians2_, \
-                             _radius_, _S_, _scalar_, _units_, \
-                             _W_, _zone_,  _std_  # PYCHOK used!
+                             _distance_, _E_, _easting_, _epoch_, _EW_, _feet_, \
+                             _height_, _lam_, _lat_, _LatLon_, _lon_, _meter_, \
+                             _meter2_, _N_, _northing_, _NS_, _NSEW_, _number_, \
+                             _PERCENT_, _phi_, _precision_, _radians_, _radians2_, \
+                             _radius_, _S_, _scalar_, _units_, _W_, _zone_, \
+                             _std_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
 from pygeodesy.props import Property_RO
 # from pygeodesy.streprs import Fmt, fstr  # from .unitsBase
-from pygeodesy.unitsBase import _Error, Float, Fmt, fstr, Int, _NamedUnit, \
-                                 Radius, Str  # PYCHOK shared .namedTuples
+from pygeodesy.unitsBase import _Error, Float, Fmt, fstr, Int, _arg_name_arg2, \
+                                _NamedUnit, Radius, Str  # PYCHOK shared .namedTuples
+
 from math import degrees, radians
 
 __all__ = _ALL_LAZY.units
-__version__ = '24.02.20'
+__version__ = '24.05.20'
 
 _negative_falsed_ = 'negative, falsed'
 
@@ -48,15 +46,15 @@ class Float_(Float):
            @kwarg Error: Optional error to raise, overriding the default L{UnitError}.
            @kwarg low: Optional lower B{C{arg}} limit (C{float} or C{None}).
            @kwarg high: Optional upper B{C{arg}} limit (C{float} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Float_} instance.
 
            @raise Error: Invalid B{C{arg}} or B{C{arg}} below B{C{low}} or above B{C{high}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Float.__new__(cls, arg=arg, name=name, Error=Error)
         if (low is not None) and self < low:
             txt = Fmt.limit(below=Fmt.g(low, prec=6, ints=isinstance(self, Epoch)))
@@ -79,15 +77,15 @@ class Int_(Int):
            @kwarg Error: Optional error to raise, overriding the default C{UnitError}.
            @kwarg low: Optional lower B{C{arg}} limit (C{int} or C{None}).
            @kwarg high: Optional upper B{C{arg}} limit (C{int} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: An L{Int_} instance.
 
            @raise Error: Invalid B{C{arg}} or B{C{arg}} below B{C{low}} or above B{C{high}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Int.__new__(cls, arg=arg, name=name, Error=Error)
         if (low is not None) and self < low:
             txt = Fmt.limit(below=low)
@@ -120,7 +118,7 @@ class Bool(Int, _NamedUnit):
            @raise Error: Invalid B{C{arg}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             b = bool(arg)
         except Exception as x:  # XXX not ... as x:
@@ -195,7 +193,7 @@ class Degrees(Float):
                          range and L{pygeodesy.rangerrors} set to C{True}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             d = Float.__new__(cls, parseDMS(arg, suffix=suffix, clip=clip),
                                                   Error=Error,  name=name)
@@ -255,15 +253,15 @@ class Degrees_(Degrees):
            @kwarg suffix: Optional, valid compass direction suffixes (C{NSEW}).
            @kwarg low: Optional lower B{C{arg}} limit (C{float} or C{None}).
            @kwarg high: Optional upper B{C{arg}} limit (C{float} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Degrees} instance.
 
            @raise Error: Invalid B{C{arg}} or B{C{arg}} below B{C{low}} or above B{C{high}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Degrees.__new__(cls, arg=arg, name=name, Error=Error, suffix=suffix, clip=0)
         if (low is not None) and self < low:
             txt = Fmt.limit(below=low)
@@ -297,8 +295,8 @@ class Radians(Float):
            @kwarg suffix: Optional, valid compass direction suffixes (C{NSEW}).
            @kwarg clip: Optional B{C{arg}} range B{C{-clip..+clip}} (C{radians} or C{0}
                         or C{None} for unclipped).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Radians} instance.
 
@@ -306,7 +304,7 @@ class Radians(Float):
                          range and L{pygeodesy.rangerrors} set to C{True}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             return Float.__new__(cls, parseRad(arg, suffix=suffix, clip=clip),
                                                      Error=Error,  name=name)
@@ -326,8 +324,8 @@ class Radians(Float):
     def toRepr(self, std=False, **prec_fmt_ints):  # PYCHOK prec=8, ...
         '''Return a representation of this C{Radians}.
 
-           @kwarg std: If C{True} return the standard C{repr},
-                       otherwise the named representation (C{bool}).
+           @kwarg std: If C{True} return the standard C{repr}, otherwise
+                       the named representation (C{bool}).
 
            @see: Methods L{Radians.toStr}, L{Float.toRepr} and function
                  L{pygeodesy.toDMS} for more documentation.
@@ -356,15 +354,15 @@ class Radians_(Radians):
            @kwarg suffix: Optional, valid compass direction suffixes (C{NSEW}).
            @kwarg low: Optional lower B{C{arg}} limit (C{float} or C{None}).
            @kwarg high: Optional upper B{C{arg}} limit (C{float} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Radians_} instance.
 
            @raise Error: Invalid B{C{arg}} or B{C{arg}} below B{C{low}} or above B{C{high}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Radians.__new__(cls, arg=arg, name=name, Error=Error, suffix=suffix, clip=0)
         if (low is not None) and self < low:
             txt = Fmt.limit(below=low)
@@ -394,7 +392,7 @@ class Bearing(Degrees):
         '''New L{Bearing} instance, see L{Degrees}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         d =  Degrees.__new__(cls, arg=arg, name=name, Error=Error, suffix=_N_, clip=clip)
         b = _umod_360(d)  # 0 <= b < 360
         return d if b == d else Degrees.__new__(cls, arg=b, name=name, Error=Error)
@@ -440,15 +438,15 @@ class Easting(Float):
            @kwarg Error: Optional error to raise, overriding the default L{UnitError}.
            @kwarg falsed: The B{C{arg}} value includes false origin (C{bool}).
            @kwarg high: Optional upper B{C{arg}} easting limit (C{scalar} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: An C{Easting} instance.
 
            @raise Error: Invalid B{C{arg}}, above B{C{high}} or negative, falsed B{C{arg}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Float.__new__(cls, arg=arg, name=name, Error=Error)
         if high and (self < 0 or self > high):  # like Veness
             raise _Error(cls, arg, name, Error)
@@ -467,7 +465,7 @@ class Epoch(Float_):  # in .ellipsoidalBase, .trf
         '''New L{Epoch} instance, see L{Float_}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         return arg if isinstance(arg, Epoch) else Float_.__new__(cls,
                arg=arg, name=name, Error=Error, low=low, high=high)
 
@@ -515,8 +513,8 @@ class FIx(Float_):
            @arg fi: The fractional index (C{float} or C{int}).
            @kwarg fin: Optional C{len}, the number of C{points}, the index
                        C{[n]} wrapped to C{[0]} (C{int} or C{None}).
-           @kwarg name_Error: Optional keyword argument C{B{name}=NN}
-                              and C{B{Error}=UnitError}.
+           @kwarg name_Error: Optional C{B{name}=NN} (C{str}) and keyword
+                       argument C{B{Error}=UnitError}.
 
            @return: The B{C{fi}} (named L{FIx}).
 
@@ -631,7 +629,7 @@ class Lam_(Lam):
         '''New L{Lam_} instance, see L{Lam} and L{Radians}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         d = Lam.__new__(cls, arg=arg, name=name, Error=Error, clip=clip)
         return Radians.__new__(cls, radians(d), name=name, Error=Error)
 
@@ -752,15 +750,15 @@ class Northing(Float):
            @kwarg Error: Optional error to raise, overriding the default L{UnitError}.
            @kwarg falsed: The B{C{arg}} value includes false origin (C{bool}).
            @kwarg high: Optional upper B{C{arg}} northing limit (C{scalar} or C{None}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of B{C{name}}
-                            and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu of separate
+                            B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Northing} instance.
 
            @raise Error: Invalid B{C{arg}}, above B{C{high}} or negative, falsed B{C{arg}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         self = Float.__new__(cls, arg=arg, name=name, Error=Error)
         if high and (self < 0 or self > high):
             raise _Error(cls, arg, name, Error)
@@ -794,7 +792,7 @@ class Phi_(Phi):
         '''New L{Phi_} instance, see L{Phi} and L{Radians}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         d = Phi.__new__(cls, arg=arg, name=name, Error=Error, clip=clip)
         return Radians.__new__(cls, arg=radians(d), name=name, Error=Error)
 

pygeodesy/unitsBase.py

@@ -4,9 +4,9 @@
 u'''Basic C{Float}, C{Int} and C{Str}ing units classes.
 '''
 
-from pygeodesy.errors import UnitError, _XError, _xkwds_item2
+from pygeodesy.errors import _UnexpectedError, UnitError, _XError
 from pygeodesy.interns import NN, _degrees_, _degrees2_, _invalid_, \
-                             _meter_, _radians_, _radians2_, \
+                             _meter_, MISSING, _radians_, _radians2_, \
                              _radius_, _UNDER_,  _std_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY
 from pygeodesy.named import modulename, _Named, property_doc_
@@ -14,7 +14,7 @@ from pygeodesy.named import modulename, _Named, property_doc_
 from pygeodesy.streprs import Fmt, fstr
 
 __all__ = _ALL_LAZY.unitsBase
-__version__ = '24.02.20'
+__version__ = '24.05.20'
 
 
 class _NamedUnit(_Named):
@@ -69,14 +69,14 @@ class Float(float, _NamedUnit):
            @kwarg Error: Optional error to raise, overriding the default
                          L{UnitError}.
            @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu
-                            of B{C{name}} and B{C{arg}}.
+                            of separate B{C{arg}} and B{C{name}} ones.
 
            @returns: A C{Float} instance.
 
            @raise Error: Invalid B{C{arg}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             self = float.__new__(cls, arg)
             if name:
@@ -146,15 +146,15 @@ class Int(int, _NamedUnit):
            @kwarg name: Optional instance name (C{str}).
            @kwarg Error: Optional error to raise, overriding the
                          default L{UnitError}.
-           @kwarg name_arg: Optional C{name=arg} keyword argument,
-                            inlieu of B{C{name}} and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu
+                            of separate B{C{arg}} and B{C{name}} ones.
 
            @returns: An C{Int} instance.
 
            @raise Error: Invalid B{C{arg}}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             self = int.__new__(cls, arg)
             if name:
@@ -223,8 +223,8 @@ class Str(str, _NamedUnit):
            @kwarg name: Optional instance name (C{str}).
            @kwarg Error: Optional error to raise, overriding the
                          default (C{ValueError}).
-           @kwarg name_arg: Optional C{name=arg} keyword argument,
-                            inlieu of B{C{name}} and B{C{arg}}.
+           @kwarg name_arg: Optional C{name=arg} keyword argument, inlieu
+                            of separate B{C{arg}} and B{C{name}} ones.
 
            @returns: A L{Str} instance.
 
@@ -233,7 +233,7 @@ class Str(str, _NamedUnit):
            @see: Callable, not-nameable class L{pygeodesy.Str_}.
         '''
         if name_arg:
-            name, arg = _xkwds_item2(name_arg)
+            name, arg = _arg_name_arg2(arg, **name_arg)
         try:
             self = str.__new__(cls, arg)
             if name:
@@ -324,6 +324,19 @@ def _Error(clas, arg, name, Error, txt=_invalid_, x=None):
     return _XError(Error, n, arg, txt=txt, cause=x)
 
 
+def _arg_name_arg2(arg, name__=None, **name_arg):  # in .units
+    '''(INTERNAL) Get the 2-tuple C{(name, arg)}.
+    '''
+    if name__ is None:
+        t =  name_arg.popitem() if len(name_arg) == 1 else \
+            (MISSING, arg)
+    else:
+        t =  name__.__name__, arg
+    if name_arg:
+        raise _UnexpectedError(**name_arg)
+    return t
+
+
 __all__ += _ALL_DOCS(_NamedUnit)
 
 # **) MIT License

pygeodesy/ups.py

@@ -28,11 +28,12 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, _neg, parseDMS2
 from pygeodesy.errors import RangeError, _ValueError
 from pygeodesy.fmath import hypot, hypot1, sqrt0
-from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, _pole_, \
-                             _range_, _S_, _scale0_, _SPACE_, _std_, \
-                             _to_, _UTM_, _under
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv
-from pygeodesy.named import nameof, _xnamed
+# from pygeodesy.internals import _under  # from .named
+from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, \
+                             _pole_, _range_, _S_, _scale0_, \
+                             _SPACE_, _std_, _to_, _UTM_
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _getenv
+from pygeodesy.named import nameof, _xnamed,  _under
 from pygeodesy.namedTuples import EasNor2Tuple, UtmUps5Tuple, \
                                   UtmUps8Tuple, UtmUpsLatLon5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, \
@@ -48,7 +49,7 @@ from pygeodesy.utmupsBase import Fmt, _LLEB, _hemi, _parseUTMUPS5, _to4lldn, \
 from math import atan2, fabs, radians, tan
 
 __all__ = _ALL_LAZY.ups
-__version__ = '23.09.29'
+__version__ = '25.05.13'
 
 _BZ_UPS  = _getenv('PYGEODESY_UPS_POLES', _std_) == _std_
 _Falsing =  Meter(2000e3)  # false easting and northing (C{meter})

pygeodesy/utily.py

@@ -10,8 +10,7 @@ U{Vector-based geodesy<https://www.Movable-Type.co.UK/scripts/latlong-vectors.ht
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import _copysign, isinstanceof, isint, isstr, neg, \
-                             _passargs
+from pygeodesy.basics import _copysign, isinstanceof, isint, isstr, neg
 from pygeodesy.constants import EPS, EPS0, INF, NAN, PI, PI2, PI_2, R_M, \
                                _M_KM, _M_NM, _M_SM, _0_0, _1__90, _0_5, _1_0, \
                                _N_1_0, _2__PI, _10_0, _90_0, _N_90_0, _180_0, \
@@ -19,6 +18,7 @@ from pygeodesy.constants import EPS, EPS0, INF, NAN, PI, PI2, PI_2, R_M, \
                                _float as _F, _isfinite, isnan, isnear0, \
                                _over, _umod_360, _umod_PI2
 from pygeodesy.errors import _ValueError, _xkwds, _xkwds_get,  _ALL_LAZY, _MODS
+from pygeodesy.internals import _passargs  # , _MODS?
 from pygeodesy.interns import _edge_, _radians_, _semi_circular_, _SPACE_
 # from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS  # from .errors
 from pygeodesy.units import Degrees, Degrees_, Feet, Float, Lam, Lam_, \
@@ -27,7 +27,7 @@ from pygeodesy.units import Degrees, Degrees_, Feet, Float, Lam, Lam_, \
 from math import acos, asin, atan2, cos, degrees, fabs, radians, sin, tan  # pow
 
 __all__ = _ALL_LAZY.utily
-__version__ = '24.04.04'
+__version__ = '24.05.14'
 
 # read constant name "_M_Unit" as "meter per Unit"
 _M_CHAIN     = _F(  20.1168)     # yard2m(1) * 22
@@ -907,7 +907,7 @@ def truncate(x, ndigits=None):
     '''
     if isint(ndigits):
         p = _10_0**ndigits
-        x = int(x * p) / p
+        x =  int(x * p) / p
     return x