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

pygeodesy/geohash.py

@@ -30,7 +30,7 @@ from pygeodesy.named import _name__, _NamedDict, _NamedTuple, nameof, _xnamed
 from pygeodesy.namedTuples import Bounds2Tuple, Bounds4Tuple, LatLon2Tuple, \
                                   PhiLam2Tuple
 from pygeodesy.props import deprecated_function, deprecated_method, \
-                            deprecated_property_RO, Property_RO, property_RO
+                            deprecated_property_RO, Property_RO
 from pygeodesy.streprs import fstr
 from pygeodesy.units import Degrees_, Int, Lat, Lon, Precision_, Str, \
                            _xStrError
@@ -38,7 +38,9 @@ from pygeodesy.units import Degrees_, Int, Lat, Lon, Precision_, Str, \
 from math import fabs, ldexp, log10, radians
 
 __all__ = _ALL_LAZY.geohash
-__version__ = '24.05.23'
+__version__ = '24.06.10'
+
+_formy = _MODS.into(formy=__name__)
 
 
 class _GH(object):
@@ -317,9 +319,8 @@ class Geohash(Str):
         '''
         lls  =  self.latlon + _2Geohash(other).latlon
         kwds = _xkwds(adjust_limit_wrap, adjust=False, limit=None, wrap=False)
-        m    =  self._formy
-        return m.equirectangular( *lls, radius=radius, **kwds) if radius else \
-               m.equirectangular4(*lls, **kwds).distance2
+        return _formy.equirectangular( *lls, radius=radius, **kwds) if radius else \
+               _formy.equirectangular4(*lls, **kwds).distance2
 
     def euclideanTo(self, other, **radius_adjust_wrap):
         '''Approximate the distance between this and an other geohash using
@@ -335,14 +336,7 @@ class Geohash(Str):
            @raise TypeError: The B{C{other}} is not a L{Geohash}, C{LatLon}
                              or C{str} or invalid B{C{radius}}.
         '''
-        return self._distanceTo(self._formy.euclidean, other, **radius_adjust_wrap)
-
-    @property_RO
-    def _formy(self):
-        '''(INTERNAL) Get the C{.formy} module, I{once}.
-        '''
-        Geohash._formy = f = _MODS.formy  # overwrite property_RO
-        return f
+        return self._distanceTo(_formy.euclidean, other, **radius_adjust_wrap)
 
     def haversineTo(self, other, **radius_wrap):
         '''Compute the distance between this and an other geohash using
@@ -358,7 +352,7 @@ class Geohash(Str):
            @raise TypeError: The B{C{other}} is not a L{Geohash}, C{LatLon}
                              or C{str} or invalid B{C{radius}}.
         '''
-        return self._distanceTo(self._formy.haversine, other, **radius_wrap)
+        return self._distanceTo(_formy.haversine, other, **radius_wrap)
 
     @Property_RO
     def latlon(self):
@@ -431,7 +425,7 @@ class Geohash(Str):
            @raise TypeError: The B{C{other}} is not a L{Geohash}, C{LatLon}
                              or C{str} or invalid B{C{radius}}.
         '''
-        return self._distanceTo(self._formy.vincentys, other, **radius_wrap)
+        return self._distanceTo(_formy.vincentys, other, **radius_wrap)
 
     @Property_RO
     def N(self):
@@ -803,18 +797,11 @@ def precision(res1, res2=None):
              <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1Geohash.html>}.
     '''
     r = Degrees_(res1=res1, low=_0_0, Error=GeohashError)
-    if res2 is None:
-        t = r, r
-        for p in range(1, _MaxPrec):
-            if resolution2(p, None) <= t:
-                return p
-
-    else:
-        t = r, Degrees_(res2=res2, low=_0_0, Error=GeohashError)
-        for p in range(1, _MaxPrec):
-            if resolution2(p, p) <= t:
-                return p
-
+    N = res2 is None
+    t = r, (r if N else Degrees_(res2=res2, low=_0_0, Error=GeohashError))
+    for p in range(1, _MaxPrec):
+        if resolution2(p, (None if N else p)) <= t:
+            return p
     return _MaxPrec
 
 

pygeodesy/geoids.py

@@ -118,7 +118,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '24.05.23'
+__version__ = '24.06.03'
 
 _assert_ = 'assert'
 _bHASH_  =  b'#'

pygeodesy/hausdorff.py

@@ -86,7 +86,7 @@ from pygeodesy.unitsBase import _Str_degrees, _Str_degrees2, _Str_meter, _Str_NN
 from random import Random
 
 __all__ = _ALL_LAZY.hausdorff
-__version__ = '24.05.26'
+__version__ = '24.06.08'
 
 
 class HausdorffError(PointsError):
@@ -819,14 +819,13 @@ class Hausdorff6Tuple(_NamedTuple):
     _Names_ = ('hd', _i_,     _j_,     'mn',     'md',  _units_)
     _Units_ = (_Pass, Number_, Number_, Number_, _Pass, _Pass)
 
-    def toUnits(self, **Error):  # PYCHOK expected
+    def toUnits(self, **Error_name):  # PYCHOK expected
         '''Overloaded C{_NamedTuple.toUnits} for C{hd} and C{md} units.
         '''
-        U = _xUnit(self.units, Float)  # PYCHOK expected
-        M = _Pass if self.md is None else U  # PYCHOK expected
-        self._Units_ = (U,) + Hausdorff6Tuple._Units_[1:4] \
-                     + (M,) + Hausdorff6Tuple._Units_[5:]
-        return _NamedTuple.toUnits(self, **Error)
+        u    = list(Hausdorff6Tuple._Units_)
+        u[0] = U = _xUnit(self.units, Float)  # PYCHOK expected
+        u[4] =     _Pass if self.md is None else U  # PYCHOK expected
+        return _NamedTuple.toUnits(self.reUnit(*u), **Error_name)  # PYCHOK self
 
 
 def randomrangenerator(seed):

pygeodesy/heights.py

@@ -76,7 +76,7 @@ from pygeodesy.errors import _AssertionError, LenError, PointsError, \
 # from pygeodesy.fmath import fidw  # _MODS
 # from pygeodesy.formy import cosineAndoyerLambert, cosineForsytheAndoyerLambert, \
 #                             cosineLaw, equirectangular4, euclidean, flatLocal, \
-#                             flatPolar, haversine, thomas, vincentys  # _MODS
+#                             flatPolar, haversine, thomas, vincentys  # _MODS.into
 # from pygeodesy.internals import _version2  # _MODS
 from pygeodesy.interns import NN, _COMMASPACE_, _cubic_, _insufficient_, _linear_, \
                              _NOTEQUAL_, _PLUS_, _scipy_, _SPACE_, _STAR_
@@ -91,9 +91,10 @@ from pygeodesy.units import _isDegrees, Float_, Int_
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.heights
-__version__ = '24.05.25'
+__version__ = '24.06.03'
 
 _error_     = 'error'
+_formy      = _MODS.into(formy=__name__)
 _llis_      = 'llis'
 _smoothing_ = 'smoothing'
 
@@ -693,20 +694,6 @@ class _HeightIDW(_HeightBase):
             i = Fmt.INDEX(knots=i)
             raise HeightError(i, k, cause=e)
 
-    @property_RO
-    def _fmath(self):
-        '''(INTERNAL) Get module C{fmath}, I{once}.
-        '''
-        _HeightIDW._fmath = f = _MODS.fmath  # overwrite property_RO
-        return f
-
-    @property_RO
-    def _formy(self):
-        '''(INTERNAL) Get module C{formy}, I{once}.
-        '''
-        _HeightIDW._formy = f = _MODS.formy  # overwrite property_RO
-        return f
-
     def height(self, lats, lons, **wrap):
         '''Interpolate the height for one or several lat-/longitudes.
 
@@ -735,7 +722,7 @@ class _HeightIDW(_HeightBase):
         '''
         ds, hs = self._distances(x, y), self._heights
         try:
-            return self._fmath.fidw(hs, ds, beta=self.beta)
+            return _MODS.fmath.fidw(hs, ds, beta=self.beta)
         except (TypeError, ValueError) as e:
             raise HeightError(x=x, y=y, cause=e)
 
@@ -798,7 +785,7 @@ class HeightIDWcosineAndoyerLambert(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__datum_wrap)
-        self._func = self._formy.cosineAndoyerLambert
+        self._func = _formy.cosineAndoyerLambert
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -821,7 +808,7 @@ class HeightIDWcosineForsytheAndoyerLambert(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__datum_wrap)
-        self._func = self._formy.cosineForsytheAndoyerLambert
+        self._func = _formy.cosineForsytheAndoyerLambert
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -845,7 +832,7 @@ class HeightIDWcosineLaw(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__radius_wrap)
-        self._func = self._formy.cosineLaw
+        self._func = _formy.cosineLaw
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -914,7 +901,7 @@ class HeightIDWequirectangular(_HeightIDW):
     def _distances(self, x, y):
         '''(INTERNAL) Yield distances to C{(x, y)}.
         '''
-        _f, kwds = self._formy.equirectangular4, self._kwds
+        _f, kwds = _formy.equirectangular4, self._kwds
         try:
             for i, k in enumerate(self._knots):
                 yield _f(y, x, k.lat, k.lon, **kwds).distance2
@@ -942,7 +929,7 @@ class HeightIDWeuclidean(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__adjust_radius_wrap)
-        self._func = self._formy.euclidean
+        self._func = _formy.euclidean
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -995,7 +982,7 @@ class HeightIDWflatLocal(_HeightIDW):
         '''
         _HeightIDW.__init__(self, knots, beta=beta,
                                        **name__datum_hypot_scaled_wrap)
-        self._func = self._formy.flatLocal
+        self._func = _formy.flatLocal
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -1018,7 +1005,7 @@ class HeightIDWflatPolar(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__radius_wrap)
-        self._func = self._formy.flatPolar
+        self._func = _formy.flatPolar
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -1042,7 +1029,7 @@ class HeightIDWhaversine(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__radius_wrap)
-        self._func = self._formy.haversine
+        self._func = _formy.haversine
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -1106,7 +1093,7 @@ class HeightIDWthomas(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__datum_wrap)
-        self._func = self._formy.thomas
+        self._func = _formy.thomas
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__
@@ -1130,7 +1117,7 @@ class HeightIDWvincentys(_HeightIDW):
            @see: L{Here<_HeightIDW.__init__>} for further details.
         '''
         _HeightIDW.__init__(self, knots, beta=beta, **name__radius_wrap)
-        self._func = self._formy.vincentys
+        self._func = _formy.vincentys
 
     if _FOR_DOCS:
         __call__ = _HeightIDW.__call__

pygeodesy/internals.py

@@ -32,7 +32,7 @@ def _dunder_nameof(inst, *dflt):
 
 
 def _Property_RO(method):
-    '''(INTERNAL) Can't Irecursively import L{props.property_RO}.
+    '''(INTERNAL) Can't I{recursively} import L{props.property_RO}.
     '''
     name = _dunder_nameof(method)
 
@@ -53,7 +53,7 @@ def _Property_RO(method):
     return property(_get, _set, _del)
 
 
-class _ALL_MODS_Base(object):
+class _MODS_Base(object):
     '''(INTERNAL) Base-class for C{lazily._ALL_MODS}.
     '''
     def __delattr__(self, attr):  # PYCHOK no cover
@@ -207,7 +207,7 @@ class _ALL_MODS_Base(object):
         from pygeodesy import streprs  # DON'T _lazy_import2
         return streprs
 
-_MODS = _ALL_MODS_Base()  # PYCHOK overwritten by .lazily
+_MODS = _MODS_Base()  # PYCHOK overwritten by .lazily
 
 
 def _caller3(up):  # in .lazily, .named
@@ -217,8 +217,9 @@ def _caller3(up):  # in .lazily, .named
     # sys._getframe(1) ... 'importlib._bootstrap' line 1032,
     # may throw a ValueError('call stack not deep enough')
     f = _sys._getframe(up + 1)
-    return (f.f_code.co_name,  # caller name
-           _os_path.basename(f.f_code.co_filename),  # file name
+    c =  f.f_code
+    return (c.co_name,  # caller name
+           _os_path.basename(c.co_filename),  # file name .py
             f.f_lineno)  # line number
 
 
@@ -359,7 +360,7 @@ def _plural(noun, n):
     return NN(noun, _s_) if n > 1 else (noun if n else NN)
 
 
-def print_(*args, **nl_nt_prec_prefix__end_file_flush_sep_kwds):  # PYCHOK no cover
+def print_(*args, **nl_nt_prec_prefix__end_file_flush_sep__kwds):  # PYCHOK no cover
     '''Python 3+ C{print}-like formatting and printing.
 
        @arg args: Values to be converted to C{str} and joined by B{C{sep}},
@@ -367,16 +368,16 @@ def print_(*args, **nl_nt_prec_prefix__end_file_flush_sep_kwds):  # PYCHOK no co
 
        @see: Function L{printf} for further details.
     '''
-    return printf(NN, *args, **nl_nt_prec_prefix__end_file_flush_sep_kwds)
+    return printf(NN, *args, **nl_nt_prec_prefix__end_file_flush_sep__kwds)
 
 
-def printf(fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep_kwds):
+def printf(fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep__kwds):
     '''C{Printf-style} and Python 3+ C{print}-like formatting and printing.
 
        @arg fmt: U{Printf-style<https://Docs.Python.org/3/library/stdtypes.html#
                  printf-style-string-formatting>} format specification (C{str}).
        @arg args: Arguments to be formatted (any C{type}, all positional).
-       @kwarg nl_nt_prec_prefix__end_file_flush_sep_kwds: Optional keyword arguments
+       @kwarg nl_nt_prec_prefix__end_file_flush_sep__kwds: Optional keyword arguments
                  C{B{nl}=0} for the number of leading blank lines (C{int}), C{B{nt}=0}
                  the number of trailing blank lines (C{int}), C{B{prefix}=NN} to be
                  inserted before the formatted text (C{str}) and Python 3+ C{print}
@@ -387,7 +388,7 @@ def printf(fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep_kwds):
 
        @return: Number of bytes written.
     '''
-    b, e, f, fl, p, s, kwds = _print7(**nl_nt_prec_prefix__end_file_flush_sep_kwds)
+    b, e, f, fl, p, s, kwds = _print7(**nl_nt_prec_prefix__end_file_flush_sep__kwds)
     try:
         if args:
             t = (fmt % args) if fmt else s.join(map(str, args))
@@ -399,7 +400,7 @@ def printf(fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep_kwds):
     except Exception as x:
         _E, s = _MODS.errors._xError2(x)
         unstr = _MODS.streprs.unstr
-        t = unstr(printf, fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep_kwds)
+        t = unstr(printf, fmt, *args, **nl_nt_prec_prefix__end_file_flush_sep__kwds)
         raise _E(s, txt=t, cause=x)
     try:
         n = f.write(NN(b, t, e))
@@ -543,7 +544,7 @@ def _version_ints(vs):
 
 
 __all__ = tuple(map(_dunder_nameof, (machine, print_, printf)))
-__version__ = '24.05.25'
+__version__ = '24.06.05'
 
 if _dunder_ismain(__name__):  # PYCHOK no cover
 

pygeodesy/interns.py

@@ -10,8 +10,8 @@ except NameError:  # Python 3+
     _intern = _sys.intern
 
 _COMMASPACE_  = ', '  # overriden below
-_sub_packages = 'auxilats', 'deprecated', 'geodesicx', 'rhumb'  # PYCHOK in .lazily,
-# ... make._dist, MANIFEST, setup.setup, test.bases, test.testModules
+_SUB_PACKAGES = 'auxilats', 'deprecated', 'geodesicx', 'rhumb'  # PYCHOK in ...
+# ... .lazily, make._dist, MANIFEST, setup.setup, test.bases, .testModules
 
 
 class _Dash(str):
@@ -145,7 +145,6 @@ _and_                 = 'and'                # PYCHOK OK
 # _AND_               = _AMPERSAND_          # PYCHOK OK
 _angle_               = 'angle'              # PYCHOK OK
 _antipodal_           = 'antipodal'          # PYCHOK OK
-_areaOf_              = 'areaOf'             # PYCHOK OK
 _arg_                 = 'arg'                # PYCHOK OK
 # _ASTERISK_          = _STAR_               # PYCHOK OK
 _AT_             = Str_('@')                 # PYCHOK OK
@@ -214,7 +213,6 @@ _ELLIPSIS4_      = Str_('....')              # PYCHOK OK
 # _ELLIPSISPACED_ = Str_(' ... ')            # PYCHOK <https://www.ThePunctuationGuide.com/ellipses.html>
 _ellipsoid_           = 'ellipsoid'          # PYCHOK OK
 _ellipsoidal_         = 'ellipsoidal'        # PYCHOK OK
-_enabled_             = 'enabled'            # PYCHOK OK
 _encode_              = 'encode'             # PYCHOK OK
 _end_                 = 'end'                # PYCHOK OK
 _epoch_               = 'epoch'              # PYCHOK OK
@@ -254,8 +252,6 @@ _intersection_        = 'intersection'       # PYCHOK OK
 _Intl1924_            = 'Intl1924'           # PYCHOK OK
 _invalid_             = 'invalid'            # PYCHOK OK
 _invokation_          = 'invokation'         # PYCHOK OK
-_isclockwise_         = 'isclockwise'        # PYCHOK OK
-_ispolar_             = 'ispolar'            # PYCHOK OK
 _j_                   = 'j'                  # PYCHOK OK
 _k0_                  = 'k0'                 # PYCHOK OK
 _keyword_             = 'keyword'            # PYCHOK OK
@@ -317,7 +313,6 @@ _NLHASH_         = Str_(_NL_ + '# ')         # PYCHOK OK
 _NN_                  = 'NN'                 # PYCHOK OK
 _no_          = _Prefix('no')                # PYCHOK OK
 _northing_            = 'northing'           # PYCHOK OK
-_NorthPole_           = 'NorthPole'          # PYCHOK OK
 _not_         = _Prefix('not')               # PYCHOK OK
 _NOTEQUAL_            = _BANG_ + _EQUAL_     # PYCHOK OK
 _not_finite_          = 'not finite'         # PYCHOK _not_(_finite_), _infinite_
@@ -385,7 +380,6 @@ _SLASH_          = Str_('/')                 # PYCHOK OK
 _small_               = 'small'              # PYCHOK OK
 _Sphere_              = 'Sphere'             # PYCHOK OK
 _spherical_           = 'spherical'          # PYCHOK OK
-_SouthPole_           = 'SouthPole'          # PYCHOK OK
 _SPACE_          = Str_(' ')                 # PYCHOK OK
 _specified_           = 'specified'          # PYCHOK OK
 _STAR_           = Str_('*')                 # PYCHOK OK
@@ -447,7 +441,7 @@ _LR_PAIRS  = {_LANGLE_:  _RANGLE_,
 
 __all__ = (_NN_,  # NOT MISSING!
             Str_.__name__)  # classes
-__version__ = '24.05.21'
+__version__ = '24.06.05'
 
 if __name__ == '__main__':
 

pygeodesy/iters.py

@@ -26,7 +26,7 @@ from pygeodesy.units import Int, Radius
 from pygeodesy.utily import degrees2m, _Wrap,  _1_0
 
 __all__ = _ALL_LAZY.iters
-__version__ = '24.05.23'
+__version__ = '24.06.09'
 
 _items_        = 'items'
 _iterNumpy2len =  1  # adjustable for testing purposes
@@ -83,7 +83,7 @@ class _BaseIter(_Named):
             try:
                 self._loop = tuple(self.next for _ in range(loop))
                 if self.loop != loop:
-                    raise RuntimeError  # force Error
+                    raise RuntimeError()  # force Error
             except (RuntimeError, StopIteration):
                 raise self._Error(self.name, self.loop, txt=_too_(_few_))