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

pygeodesy/internals.py

@@ -31,8 +31,14 @@ def _dunder_nameof(inst, *dflt):
     return dflt[0] if dflt else inst.__class__.__name__
 
 
+def _dunder_nameof_(*names__):  # in .errors._IsnotError
+    '''(INTERNAL) Yield the _dunder_nameof or name.
+    '''
+    return map(_dunder_nameof, names__, names__)
+
+
 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 +59,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 +213,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 +223,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 +366,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 +374,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 +394,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 +406,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 +550,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):
@@ -32,7 +32,7 @@ class _Int(int):
 class Str_(str):
     '''Extended, I{callable} C{str} class, not nameable.
 
-       @see: Nameable and callable class L{pygeodesy.Str}.
+       @see: Nameable and callable class L{Str<pygeodesy.unitsBase.Str>}.
     '''
     def join_(self, *args):
         '''Join all positional B{C{args}} like C{self.join(B{args})}.
@@ -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.14'
 
 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_))
 

pygeodesy/karney.py

@@ -160,7 +160,7 @@ from pygeodesy.utily import atan2d, sincos2d, tand, _unrollon,  fabs
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.karney
-__version__ = '24.05.31'
+__version__ = '24.06.27'
 
 _K_2_0      = _getenv('PYGEODESY_GEOGRAPHICLIB', _2_) == _2_
 _perimeter_ = 'perimeter'
@@ -213,7 +213,7 @@ class Caps(object):  # PYCHOK
     EMPTY          =  0        # formerly aka NONE
     _CAP_1         =  1 << 0   # for goedesicw only
     _CAP_1p        =  1 << 1   # for goedesicw only
-#   _CAP_2         =  1 << 2
+    _CAP_2         =  1 << 2
     _CAP_3         =  1 << 3   # for goedesicw only
 #   _CAP_4         =  1 << 4
 #   _CAP_ALL       =  0x1F
@@ -233,7 +233,9 @@ class Caps(object):  # PYCHOK
     _DIRECT3       =  AZIMUTH  | LATITUDE | LONGITUDE | _CAP_3   # for goedesicw only
     _INVERSE3      =  AZIMUTH  | DISTANCE | _CAP_1   # for goedesicw only
     _STD           =  STANDARD | _CAP_3   | _CAP_1   # for goedesicw only
-    _STD_LINE      = _STD      | _CAP_1p   # for goedesicw only
+    _STD_LINE      = _STD      | _CAP_2   | _CAP_1p  # for goedesici and -w
+
+    LINE_CAPS      = _STD_LINE | REDUCEDLENGTH | GEODESICSCALE  # .geodesici only
 
     LINE_OFF       =  1 << 15  # Line without updates from parent geodesic or rhumb
     LONG_UNROLL    =  1 << 16  # unroll C{lon2} in .Direct and .Position
@@ -308,6 +310,10 @@ and C{ALL} - all of the above.
 
 C{STANDARD} = C{AZIMUTH | DISTANCE | DISTANCE_IN | LATITUDE | LONGITUDE}'''
 
+_KEY2Caps = dict(m12=Caps.REDUCEDLENGTH,  # see GDict._unCaps
+                 M12=Caps.GEODESICSCALE,
+                 M21=Caps.GEODESICSCALE, S12=Caps.AREA)
+
 
 class _CapsBase(_NamedBase):  # in .auxilats, .geodesicx.gxbases
     '''(INTERNAL) Base class for C{[_]Geodesic*Exact}.
@@ -320,11 +326,13 @@ class _CapsBase(_NamedBase):  # in .auxilats, .geodesicx.gxbases
     EMPTY         = Caps.EMPTY  # aka NONE
     GEODESICSCALE = Caps.GEODESICSCALE
     LATITUDE      = Caps.LATITUDE
+    LINE_CAPS     = Caps.LINE_CAPS
     LINE_OFF      = Caps.LINE_OFF
     LONGITUDE     = Caps.LONGITUDE
     LONG_UNROLL   = Caps.LONG_UNROLL
     REDUCEDLENGTH = Caps.REDUCEDLENGTH
     STANDARD      = Caps.STANDARD
+    _STD_LINE     = Caps._STD_LINE  # for geodesici
 
     _caps         = 0  # None
     _debug        = 0  # or Caps._DEBUG_...
@@ -453,6 +461,14 @@ class GDict(ADict):  # XXX _NamedDict
         t  = tuple(_g(self, n, dflt) for n in nTuple._Names_)
         return nTuple(t, iteration=self._iteration)
 
+    def _unCaps(self, outmask):  # in .geodsolve
+        '''(INTERNAL) Remove superfluous items.
+        '''
+        for k, m in _KEY2Caps.items():
+            if k in self and not (outmask & m):
+                self.pop(k)  # delattr(self, k)
+        return self
+
 
 class Inverse10Tuple(_GTuple):
     '''10-Tuple C{(a12, s12, salp1, calp1, salp2, calp2, m12, M12, M21, S12)} with arc length
@@ -882,7 +898,7 @@ def _unroll2(lon1, lon2, wrap=False):  # see .ellipsoidalBaseDI._intersects2
     '''Unroll B{C{lon2 - lon1}} like C{geodesic.Geodesic.Inverse}.
 
        @return: 2-Tuple C{(B{lon2} - B{lon1}, B{lon2})} with B{C{lon2}}
-                unrolled if B{C{wrap}} is C{True}, normalized otherwise.
+                unrolled if C{B{wrap} is True}, normalized otherwise.
     '''
     if wrap:
         d, t = _diff182(lon1, lon2)

pygeodesy/ktm.py

@@ -67,7 +67,7 @@ from cmath import polar
 from math import atan2, asinh, cos, cosh, degrees, fabs, sin, sinh, sqrt, tanh
 
 __all__ = _ALL_LAZY.ktm
-__version__ = '24.05.24'
+__version__ = '24.06.11'
 
 
 class KTMError(_ValueError):
@@ -119,18 +119,16 @@ class KTransverseMercator(_NamedBase):
                                    raiser=False, **TMorder_name):
         '''New L{KTransverseMercator}.
 
-           @kwarg a_earth: This rhumb's earth (L{Ellipsoid}, L{Ellipsoid2},
-                           L{a_f2Tuple}, L{Datum}, 2-tuple (C{a, f})) or the
-                           equatorial radius (C{scalar}, C{meter}).
-           @kwarg f: The ellipsoid's flattening (C{scalar}), iff B{C{a_earth}}
-                     is a C{scalar}, ignored otherwise.
+           @kwarg a_earth: This rhumb's earth (L{Ellipsoid}, L{Ellipsoid2}, L{a_f2Tuple},
+                           L{Datum}, 2-tuple (C{a, f})) or the equatorial radius (C{meter}).
+           @kwarg f: The ellipsoid's flattening (C{scalar}), required if B{C{a_earth}} is
+                     is C{meter}, ignored otherwise.
            @kwarg lon0: The central meridian (C{degrees180}).
            @kwarg k0: Central scale factor (C{scalar}).
-           @kwarg raiser: If C{True}, throw a L{KTMError} for C{forward}
-                          singularities (C{bool}).
-           @kwarg TMorder_name: Optional C{B{name}=NN} (C{str}) and optional
-                          keyword argument C{B{TMorder}=6} for the order of
-                          this L{KTransverseMercator}, see property C{TMorder}.
+           @kwarg raiser: If C{True}, throw a L{KTMError} for C{forward} singularities (C{bool}).
+           @kwarg TMorder_name: Optional C{B{name}=NN} (C{str}) and optional keyword argument
+                          C{B{TMorder}=6} for the order of this L{KTransverseMercator}, see
+                          property C{TMorder}.
 
            @raise KTMError: Invalid B{C{a_earth}}, B{C{f}} or B{C{TMorder}}.
         '''
@@ -229,14 +227,13 @@ class KTransverseMercator(_NamedBase):
            @arg lon0: Central meridian of the projection (C{degrees180}).
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
-           @return: L{Forward4Tuple}C{(easting, northing, gamma, scale)}
-                    with C{easting} and C{northing} in C{meter}, unfalsed, the
+           @return: L{Forward4Tuple}C{(easting, northing, gamma, scale)} with
+                    C{easting} and C{northing} in C{meter}, unfalsed, the
                     meridian convergence C{gamma} at point in C{degrees180}
                     and the C{scale} of projection at point C{scalar}.  Any
                     value may be C{NAN}, C{NINF} or C{INF} for singularities.
 
-           @raise KTMError: For singularities, iff property C{raiser} is
-                            C{True}.
+           @raise KTMError: For singularities, iff property C{raiser} is C{True}.
         '''
         lat, _lat = _unsigned2(_fix90(lat - self._lat0))
         lon, _    = _diff182((self.lon0 if lon0 is None else lon0), lon)
@@ -343,7 +340,7 @@ class KTransverseMercator(_NamedBase):
            @arg lat0: Latitude of the central parallel (C{degrees90}).
            @arg lon0: Longitude of the central parallel (C{degrees180}).
 
-           @return: 2-Tuple C{(lat0, lon0)} of the previous central
+           @return: 2-Tuple C{(lat0, lon0)} with the previous central
                     parallel and meridian.
 
            @raise KTMError: Invalid B{C{lat0}} or B{C{lon0}}.