pygeodesy 24.4.24__py2.py3-none-any.whl → 24.5.6__py2.py3-none-any.whl

pygeodesy/interns.py

@@ -151,7 +151,6 @@ _antipodal_           = 'antipodal'          # PYCHOK OK
 _areaOf_              = 'areaOf'             # PYCHOK OK
 _arg_                 = 'arg'                # PYCHOK OK
 # _ASTERISK_          = _STAR_               # PYCHOK OK
-_at_                  = 'at'                 # PYCHOK OK
 _AT_             = Str_('@')                 # PYCHOK OK
 _AtoZnoIO_    = _Slicer('ABCDEFGHJKLMNPQRSTUVWXYZ')  # PYCHOK in .gars, .mgrs and .wgrs
 _attribute_           = 'attribute'          # PYCHOK OK
@@ -247,7 +246,6 @@ _HASH_                = '#'                  # PYCHOK OK
 _height_              = 'height'             # PYCHOK OK
 _hemipole_            = 'hemipole'           # PYCHOK OK
 _i_                   = 'i'                  # PYCHOK OK
-_iadd_op_             = '+='                 # PYCHOK OK
 _immutable_           = 'immutable'          # PYCHOK OK
 _in_                  = 'in'                 # PYCHOK OK
 _incompatible_        = 'incompatible'       # PYCHOK OK
@@ -463,11 +461,14 @@ def _dunder_nameof(inst, *dflt):
     return dflt[0] if dflt else inst.__class__.__name__
 
 
-def _enquote(strs, quote=_QUOTE2_):  # in .basics, .solveBase
-    '''(INTERNAL) Enquote a string containing whitespace.
+def _enquote(strs, quote=_QUOTE2_, white=NN):  # in .basics, .solveBase
+    '''(INTERNAL) Enquote a string containing whitespace or replace
+       whitespace by C{white} if specified.
     '''
-    if len(strs.split()) > 1:
-        strs = NN(quote, strs, quote)
+    if strs:
+        t = strs.split()
+        if len(t) > 1:
+            strs = white.join(t if white else (quote, strs, quote))
     return strs
 
 
@@ -646,7 +647,7 @@ def _version_ints(vs):
 __all__ = (_NN_,  # not MISSING!
             Str_.__name__,  # classes
             machine.__name__)  # in .lazily
-__version__ = '24.03.20'
+__version__ = '24.05.06'
 
 if __name__ == '__main__':
 

pygeodesy/named.py

@@ -20,7 +20,7 @@ from pygeodesy.errors import _AssertionError, _AttributeError, _incompatible, \
                              _NameError, _NotImplementedError, _TypeError, \
                              _TypesError, UnitError, _ValueError, _xattr, _xkwds, \
                              _xkwds_get, _xkwds_item2, _xkwds_pop2
-from pygeodesy.interns import MISSING, NN, _at_, _AT_, _COLON_, _COLONSPACE_, _COMMA_, \
+from pygeodesy.interns import MISSING, NN, _AT_, _COLON_, _COLONSPACE_, _COMMA_, \
                              _COMMASPACE_, _doesn_t_exist_, _DOT_, _DUNDER_, _EQUAL_, \
                              _exists_, _immutable_, _name_, _NL_, _NN_, _no_, _other_, \
                              _s_, _SPACE_, _std_, _UNDER_, _valid_, _vs_, \
@@ -32,7 +32,7 @@ from pygeodesy.props import _allPropertiesOf_n, deprecated_method, _hasProperty,
 from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 
 __all__ = _ALL_LAZY.named
-__version__ = '24.04.07'
+__version__ = '24.05.04'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
@@ -48,10 +48,16 @@ _Units_             = '_Units_'
 _UP                 =  2
 
 
-def _xjoined_(prefix, name):
+def _xjoined_(prefix, name, enquote=True):
     '''(INTERNAL) Join C{pref} and non-empty C{name}.
     '''
-    return _SPACE_(prefix, repr(name)) if name and prefix else (prefix or name)
+    if name and prefix:
+        if enquote:
+            name = repr(name)
+        n = _SPACE_(prefix, name)
+    else:
+        n =  prefix or name
+    return n
 
 
 def _xnamed(inst, name, force=False):
@@ -192,7 +198,7 @@ class _Named(object):
     def __repr__(self):
         '''Default C{repr(self)}.
         '''
-        return Fmt.ANGLE(_SPACE_(self, _at_, hex(id(self))))
+        return Fmt.repr_at(self)
 
     def __rmatmul__(self, other):  # PYCHOK no cover
         '''Not implemented.'''
@@ -360,9 +366,15 @@ class _Named(object):
         '''
         return self.name or self.classname
 
+#   @Property_RO
+#   def named_(self):
+#       '''Get the C{class} name I{and/or} the str(name) or C{""} (C{str}).
+#       '''
+#       return _xjoined_(self.classname, self.name, enquote=False)
+
     @Property_RO
     def named2(self):
-        '''Get the C{class} name I{and/or} the name or C{""} (C{str}).
+        '''Get the C{class} name I{and/or} the repr(name) or C{""} (C{str}).
         '''
         return _xjoined_(self.classname, self.name)
 

pygeodesy/props.py

@@ -25,7 +25,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, \
 from functools import wraps as _wraps
 
 __all__ = _ALL_LAZY.props
-__version__ = '24.03.06'
+__version__ = '24.05.03'
 
 _class_       = 'class'
 _dont_use_    = _DEPRECATED_ + ", don't use."
@@ -36,9 +36,9 @@ _method_      = 'method'
 _not_an_inst_ = _not_(_an_, 'instance')
 
 
-def _allPropertiesOf(Clas_or_inst, *Bases):
+def _allPropertiesOf(Clas_or_inst, *Bases, **excls):
     '''(INTERNAL) Yield all C{R/property/_RO}s at C{Clas_or_inst}
-       as specified in the C{Bases} arguments.
+       as specified in the C{Bases} arguments, except C{excls}.
     '''
     if _isclass(Clas_or_inst):
         S = Clas_or_inst,  # just this Clas
@@ -48,17 +48,18 @@ def _allPropertiesOf(Clas_or_inst, *Bases):
         except AttributeError:
             raise
             S = ()  # not an inst
-    B = Bases or _PropertyBase
+    B   = Bases or _PropertyBase
+    _is = isinstance
     for C in S:
         for n, p in C.__dict__.items():
-            if isinstance(p, B) and p.name == n:
+            if _is(p, B) and p.name == n and n not in excls:
                 yield p
 
 
-def _allPropertiesOf_n(n, Clas_or_inst, *Bases):
+def _allPropertiesOf_n(n, Clas_or_inst, *Bases, **excls):
     '''(INTERNAL) Assert the number of C{R/property/_RO}s at C{Clas_or_inst}.
     '''
-    t = tuple(p.name for p in _allPropertiesOf(Clas_or_inst, *Bases))
+    t = tuple(p.name for p in _allPropertiesOf(Clas_or_inst, *Bases, **excls))
     if len(t) != n:
         raise _AssertionError(_COMMASPACE_.join(t), Clas_or_inst,
                           txt=_COMMASPACE_(len(t), _not_(n)))

pygeodesy/streprs.py

@@ -21,12 +21,14 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from math import fabs, log10 as _log10
 
 __all__ = _ALL_LAZY.streprs
-__version__ = '24.03.20'
+__version__ = '24.05.04'
 
+_at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
 _EN_WIDE    =  5           # number of MGRS/OSGR units, log10(_100km)
 _OKd_       = '._-'        # acceptable name characters
 _PAREN_g    = '(%g)'       # PYCHOK used!
+_RESIDUAL_  = 'RESIDUAL'   # PYCHOK used!
 _threshold_ = 'threshold'  # PYCHOK used!
 
 
@@ -42,8 +44,8 @@ class _Fmt(str):
         for n, v in name_value.items():
             break
         else:
-            n, v = name_value_[:2] if len(name_value_) > 1 else (NN,
-                  (name_value_[0]  if name_value_ else MISSING))
+            n, v = name_value_[:2] if len(name_value_) > 1 else \
+                  (NN, (name_value_ or MISSING))
         t = str.__mod__(self, v)
         return NN(n, t) if n else t
 
@@ -123,6 +125,7 @@ class Fmt(object):
     EQUALSPACED   = _Fmt(_EQUALSPACED_(NN, '%s'))
     exceeds_eps   = _Fmt(_exceeds_(_eps_, _PAREN_g))
     exceeds_limit = _Fmt(_exceeds_(_limit_, _PAREN_g))
+    exceeds_R     = _Fmt(_exceeds_(_RESIDUAL_, _PAREN_g))
     f             =  Fstr(_f_)
     F             =  Fstr(_F_)
     g             =  Fstr(_g_)
@@ -173,6 +176,11 @@ class Fmt(object):
                 t = t.replace(_tolerance_, _threshold_)
         return _no_(t)
 
+    def repr_at(self, inst, text=NN):
+        '''Return a C{repr} string C{"<B{text} at B{hex_id}>"}.
+        '''
+        return self.ANGLE(_SPACE_((text or inst), _at_, hex(id(inst))))
+
 Fmt          = Fmt()  # PYCHOK singleton
 Fmt.__name__ = Fmt.__class__.__name__
 
@@ -286,7 +294,7 @@ def _enstr2m3(estr, nstr, wide=_EN_WIDE):  # in .mgrs, .osgr
     return e, n, m
 
 
-def fstr(floats, prec=6, fmt=Fmt.F, ints=False, sep=_COMMASPACE_, strepr=None):
+def fstr(floats, prec=6, fmt=Fmt.F, ints=False, sep=_COMMASPACE_, strepr=None, force=True):
     '''Convert one or more floats to string, optionally stripped of trailing zero decimals.
 
        @arg floats: Single or a list, sequence, tuple, etc. (C{scalar}s).
@@ -300,15 +308,18 @@ def fstr(floats, prec=6, fmt=Fmt.F, ints=False, sep=_COMMASPACE_, strepr=None):
        @kwarg ints: Optionally, remove the decimal dot for C{int} values (C{bool}).
        @kwarg sep: Separator joining the B{C{floats}} (C{str}).
        @kwarg strepr: Optional callable to format non-C{floats} (typically
-                      C{repr}, C{str}) or C{None} to raise a TypeError.
+                      C{repr}, C{str}) or C{None} to raise a TypeError and used
+                      only if C{B{force} is not True}.
+       @kwarg force: If C{True} format all B{C{floats}} using B{C{fmt}},
+                     otherwise use B{C{strepr}} for non-C{floats}.
 
        @return: The C{sep.join(strs(floats, ...)} joined (C{str}) or single
                 C{strs((floats,), ...)} (C{str}) if B{C{floats}} is C{scalar}.
     '''
     if isscalar(floats):  # see Fstr.__call__ above
-        return next(_streprs(prec, (floats,), fmt, ints, True, strepr))
+        return next(_streprs(prec, (floats,), fmt, ints, force, strepr))
     else:
-        return sep.join(_streprs(prec, floats, fmt, ints, True, strepr))
+        return sep.join(_streprs(prec, floats, fmt, ints, force, strepr))
 
 
 def _fstrENH2(inst, prec, m, fmt=Fmt.F):  # in .css, .lcc, .utmupsBase

pygeodesy/triaxials.py

@@ -30,7 +30,7 @@ see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isLatLon, isscalar, map2, _zip,  _ValueError
+from pygeodesy.basics import isLatLon, isscalar, _zip,  _ValueError
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INT0, PI2, PI_3, PI4, \
                                _EPS2e4, float0_, isfinite, isnear1, _0_0, _0_5, \
                                _1_0, _N_1_0, _N_2_0,  _4_0  # PYCHOK used!
@@ -59,7 +59,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 from math import atan2, fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '24.04.14'
+__version__ = '24.04.30'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -1127,7 +1127,7 @@ Triaxials = Triaxials(Triaxial, Triaxial_)  # PYCHOK singleton
 # <https://ArxIV.org/pdf/1909.06452.pdf> Table 1 Semi-axes in Km
 # <https://www.JPS.NASA.gov/education/images/pdf/ss-moons.pdf>
 # <https://link.Springer.com/article/10.1007/s00190-022-01650-9>
-_EWGS84_35 = _EWGS84.a + 35, _EWGS84.a - 35, _EWGS84.b
+_abc84_35 = (_EWGS84.a + 35), (_EWGS84.a - 35), _EWGS84.b
 Triaxials._assert(                 # a (Km)       b (Km)     c (Km)     planet
     Amalthea  = _lazy('Amalthea',  125.0,        73.0,      64),      # Jupiter
     Ariel     = _lazy('Ariel',     581.1,       577.9,     577.7),    # Uranus
@@ -1140,8 +1140,8 @@ Triaxials._assert(                 # a (Km)       b (Km)     c (Km)     planet
     Miranda   = _lazy('Miranda',   240.4,       234.2,     232.9),    # Uranus
     Moon      = _lazy('Moon',     1735.55,     1735.324,  1734.898),  # Earth
     Tethys    = _lazy('Tethys',    535.6,       528.2,     525.8),    # Saturn
-    WGS84_35  = _lazy('WGS84_35', *map2(m2km, _EWGS84_35)))
-del _EWGS84_35
+    WGS84_35  = _lazy('WGS84_35', *map(m2km, _abc84_35)))
+del _abc84_35, _EWGS84
 
 
 def _getitems(items, *indices):

pygeodesy/vector2d.py

@@ -30,7 +30,7 @@ from contextlib import contextmanager
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector2d
-__version__ = '24.04.18'
+__version__ = '24.05.04'
 
 _cA_        = 'cA'
 _cB_        = 'cB'
@@ -663,7 +663,7 @@ def _trilaterate2d2(x1, y1, radius1, x2, y2, radius2, x3, y3, radius3,
     return t
 
 
-def _trilaterate3d2(c1, r1, c2, r2, c3, r3, eps=EPS, coin=False,
+def _trilaterate3d2(c1, r1, c2, r2, c3, r3, eps=EPS4, coin=False,
                                           **clas_Vector_and_kwds):
     # (INTERNAL) Intersect three spheres or circles, see function
     # L{pygeodesy.trilaterate3d2}, separated to allow callers to

pygeodesy/vector3d.py

@@ -301,7 +301,7 @@ class Vector3d(Vector3dBase):
         '''
         return _MODS.vector2d.soddy4(self, point2, point3, eps=eps, useZ=True)
 
-    def trilaterate2d2(self, radius, center2, radius2, center3, radius3, eps=EPS, z=INT0):
+    def trilaterate2d2(self, radius, center2, radius2, center3, radius3, eps=EPS4, z=INT0):
         '''Trilaterate this and two other circles, each given as a (2-D) center
            and a radius.
 
@@ -344,7 +344,7 @@ class Vector3d(Vector3dBase):
                              center2=center2, radius2=radius2,
                              center3=center3, radius3=radius3)
 
-    def trilaterate3d2(self, radius, center2, radius2, center3, radius3, eps=EPS):
+    def trilaterate3d2(self, radius, center2, radius2, center3, radius3, eps=EPS4):
         '''Trilaterate this and two other spheres, each given as a (3-D) center
            and a radius.