pygeodesy 25.1.9__py2.py3-none-any.whl → 25.4.25__py2.py3-none-any.whl

pygeodesy/auxilats/__main__.py

@@ -5,23 +5,22 @@ u'''Print L{auxilats} version, etc. using C{python -m pygeodesy.auxilats}.
 '''
 
 __all__ = ()
-__version__ = '24.09.04'
+__version__ = '25.04.14'
 
 
 def _main(**ALorder):  # PYCHOK no cover
 
     try:
-        from pygeodesy import auxilats
+        from pygeodesy import ADict, auxilats
         from pygeodesy.internals import _fper, _name_version, \
                                          printf, _versions
-        from pygeodesy.interns import _COMMASPACE_, _EQUAL_
+        from pygeodesy.interns import _COMMASPACE_
 
         A  = auxilats.AuxLat(**ALorder)
         Cx = A._CXcoeffs  # PropertyRO: Adict of _Rdicts
         b, n, u, z = Cx.bnuz4()
-        p = dict(ALorder=A.ALorder,CXb=b, CXb_z=_fper(b, z),
-                            CXn=n, CXu=u, CXu_n=_fper(u, n))
-        p = list(_EQUAL_(*t) for t in p.items())
+        p  = ADict(ALorder=A.ALorder, CXb=b, CXb_z=_fper(b, z),
+                               CXn=n, CXu=u, CXu_n=_fper(u, n))._toL()
         try:
             import geographiclib
             p.append(_name_version(geographiclib))
@@ -36,9 +35,12 @@ def _main(**ALorder):  # PYCHOK no cover
         print(_usage(__file__))
 
 
-from sys import argv  # .internals._isPyChecker
+from sys import argv  # .internals._isPyChOK
 _main(ALorder=int(argv[1])) if len(argv) == 2 and argv[1].isdigit() else _main()
 
+# % python3.13 -m pygeodesy.auxilats
+# pygeodesy.auxilats 25.04.14: ALorder=6, CXb=11099, CXb_z=64.1%, CXn=522, CXu=448, CXu_n=85.8%, geographiclib 2.0 (pygeodesy 25.4.24 Python 3.13.3 64bit arm64 macOS 15.4)
+
 # % python3.12 -m pygeodesy.auxilats 8
 # pygeodesy.auxilats 24.09.04: ALorder=8, CXb=20310, CXb_z=71.5%, CXn=888, CXu=780, CXu_n=87.8%, geographiclib 2.0 (pygeodesy 24.9.9 Python 3.12.5 64bit arm64 macOS 14.6.1)
 

pygeodesy/auxilats/auxAngle.py

@@ -32,7 +32,7 @@ from pygeodesy.utily import atan2, atan2d, sincos2, sincos2d
 from math import asinh, copysign, degrees, fabs, radians, sinh
 
 __all__ = ()
-__version__ = '24.11.24'
+__version__ = '25.04.14'
 
 _0_INF_NAN_NINF = (0, _0_0) + _INF_NAN_NINF
 _MAX_2          =  MAX * _0_5  # PYCHOK used!
@@ -207,7 +207,7 @@ class AuxAngle(_Named):
     def _copy_2(self, which):
         '''(INTERNAL) Copy for I{dyadic} operators.
         '''
-        return _Named.copy(self, deep=False, name=which.__name__)
+        return _Named.copy(self, deep=False, name__=which)
 
     def _copy_r2(self, other, which):
         '''(INTERNAL) Copy for I{reverse-dyadic} operators.

pygeodesy/auxilats/auxLat.py

@@ -9,8 +9,8 @@ Copyright (C) U{Charles Karney<mailto:Karney@Alum.MIT.edu>} (2022-2024) and lice
 under the MIT/X11 License.  For more information, see the U{GeographicLib
 <https://GeographicLib.SourceForge.io>} documentation.
 
-@see: U{Auxiliary latitudes<https:#GeographicLib.SourceForge.io/C++/doc/auxlat.html>}
-      U{On auxiliary latitudes<https:#ArXiv.org/abs/2212.05818>}.
+@see: U{Auxiliary latitudes<https://GeographicLib.SourceForge.io/C++/doc/auxlat.html>}
+      U{On auxiliary latitudes<https://ArXiv.org/abs/2212.05818>}.
 '''
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
@@ -18,8 +18,8 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 from pygeodesy.auxilats.auxAngle import AuxAngle, AuxBeta, AuxChi, _AuxClass, \
                                         AuxMu, AuxPhi, AuxTheta, AuxXi
 from pygeodesy.auxilats.auxily import Aux, _sc, _sn
-from pygeodesy.auxilats._CX_Rs import _Rdict, _Rtuple
-from pygeodesy.basics import _reverange, _xinstanceof,  _passarg
+from pygeodesy.auxilats._CX_Rs import _Rdict, _Rkey, _Rtuple
+from pygeodesy.basics import _isin, _reverange, _xinstanceof,  _passarg
 from pygeodesy.constants import INF, MAX_EXP, MIN_EXP, NAN, PI_2, PI_4, _EPSqrt, \
                                _0_0, _0_0s, _0_1, _0_5, _1_0, _2_0, _3_0, _360_0, \
                                _log2, _over, isfinite, isinf, isnan
@@ -48,7 +48,7 @@ except ImportError:  # Python 3.11-
         return pow(_2_0, x)
 
 __all__ = ()
-__version__ = '24.09.03'
+__version__ = '25.04.14'
 
 _TRIPS = 1024  # XXX 2 or 3?
 
@@ -90,7 +90,7 @@ class AuxLat(AuxAngle):
         else:
             name = NN
         try:
-            if a_earth not in (_EWGS84, _WGS84):
+            if not _isin(a_earth, _EWGS84, _WGS84):
                 n = _name__(name, name__=AuxLat)
                 if b is f is None:
                     E = _ellipsoidal_datum(a_earth, name=n).ellipsoid  # XXX raiser=_earth_
@@ -829,16 +829,16 @@ def _Newton(tphi, Zeta, _toZeta, **name):
 
 
 _AR2Coeffs = _Rdict(18,
-    _Rtuple(4, 4, '4/315,  4/105,  4/15,  -1/3'),
-    _Rtuple(6, 6, '4/1287, 4/693,  4/15,   4/105, 4/315, -1/3'),
-    _Rtuple(8, 8, '4/3315, 4/2145, 4/1287, 4/693, 4/315,  4/105, 4/15, -1/3'))
+    _Rtuple(_Rkey(4), 4, '4/315,  4/105,  4/15,  -1/3'),
+    _Rtuple(_Rkey(6), 6, '4/1287, 4/693,  4/15,   4/105, 4/315, -1/3'),
+    _Rtuple(_Rkey(8), 8, '4/3315, 4/2145, 4/1287, 4/693, 4/315,  4/105, 4/15, -1/3'))
 
 _RRCoeffs = _Rdict(9,
-    _Rtuple(4, 2,  '1/64,    1/4'),
-    _Rtuple(6, 3,  '1/256,   1/64,  1/4'),
-    _Rtuple(8, 4, '25/16384, 1/256, 1/64, 1/4'))  # PYCHOK used!
+    _Rtuple(_Rkey(4), 2,  '1/64,    1/4'),
+    _Rtuple(_Rkey(6), 3,  '1/256,   1/64,  1/4'),
+    _Rtuple(_Rkey(8), 4, '25/16384, 1/256, 1/64, 1/4'))  # PYCHOK used!
 
-del _Rdict, _Rtuple
+del _Rdict, _Rkey, _Rtuple
 # assert set(_AR2Coeffs.keys()) == set(_RRCoeffs.keys())
 
 # AuxLat._Lmax = max(_AR2Coeffs.keys())  # == max(ALorder)

pygeodesy/auxilats/auxily.py

@@ -15,10 +15,13 @@ under the MIT/X11 License.  For more information, see the U{GeographicLib
 from __future__ import division as _; del _  # PYCHOK semicolon
 
 # from pygeodesy import auxilats  # _MODS
+from pygeodesy.auxilats._CX_Rs import _Rkey
+from pygeodesy.basics import _isin,  typename
 from pygeodesy.constants import INF, NAN, isinf, isnan, _0_0, _0_5, _1_0, \
                                _copysign_1_0, _over, _1_over
 from pygeodesy.errors import AuxError
 from pygeodesy.fmath import hypot1 as _sc, hypot2_
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN,  _DOT_, _UNDER_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS,  _ALL_MODS as _MODS  # PYCHOK used!
 from pygeodesy.utily import atan1
@@ -26,19 +29,19 @@ from pygeodesy.utily import atan1
 from math import asinh, copysign
 
 __all__ = ()
-__version__ = '24.09.03'
+__version__ = '25.04.14'
 
 
 class Aux(object):
     '''Enum-style Aux names.
     '''
     _coeffs    = {}
-    GEOGRAPHIC = PHI   = GEODETIC = 0
-    PARAMETRIC = BETA  = REDUCED  = 1
-    GEOCENTRIC = THETA = 2  # all ...
-    RECTIFYING = MU    = 3  # use n^2
-    CONFORMAL  = CHI   = 4  # use n
-    AUTHALIC   = XI    = 5  # use n
+    GEOGRAPHIC = PHI   =  GEODETIC = _Rkey(0)
+    PARAMETRIC = BETA  =  REDUCED  = _Rkey(1)
+    GEOCENTRIC = THETA = _Rkey(2)  # all ...
+    RECTIFYING = MU    = _Rkey(3)  # use n^2
+    CONFORMAL  = CHI   = _Rkey(4)  # use n
+    AUTHALIC   = XI    = _Rkey(5)  # use n
     N  = 6
     N2 = 36
 
@@ -57,7 +60,7 @@ class Aux(object):
             _coeffs = Aux._coeffs[aL]
         except KeyError:
             try:  # from pygeodesy.auxilats._CX_x import _coeffs_x as _coeffs
-                _CX_x   = _DOT_(_MODS.auxilats.__name__, _UNDER_('_CX', aL))
+                _CX_x   = _DOT_(typename(_MODS.auxilats), _UNDER_('_CX', aL))
                 _coeffs = _MODS.getattr(_CX_x, _UNDER_('_coeffs', aL))
             except (AttributeError, ImportError, KeyError, TypeError) as x:
                 raise AuxError(ALorder=aL, cause=x)
@@ -91,7 +94,7 @@ class Aux(object):
         return (auxout - auxin) if max(auxin, auxout) < Aux.MU else None
 
     def use_n2(self, aux):
-        return aux not in (Aux.CHI, Aux.XI)
+        return not _isin(aux, Aux.CHI, Aux.XI)
 
 Aux = Aux()  # PYCHOK singleton
 
@@ -228,6 +231,7 @@ def _sn(tx):
 
 
 __all__ += _ALL_DOCS(Aux.__class__)
+del _Rkey
 
 # **) MIT License
 #

pygeodesy/azimuthal.py

@@ -42,19 +42,20 @@ altitude in Earth radii<https://WikiPedia.org/wiki/Azimuthal_equidistant_project
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-# from pygeodesy.basics import _xinstanceof  # from .ellipsoidalBase
+# from pygeodesy.basics import _isin, _xinstanceof  # from .ellipsoidalBase
 from pygeodesy.constants import EPS, EPS0, EPS1, NAN, isnon0, _umod_360, \
                                _EPStol, _0_0, _0_1, _0_5, _1_0, _N_1_0, _2_0
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB, \
-                              _xinstanceof
+                                     _isin, _xinstanceof
 from pygeodesy.datums import _spherical_datum, _WGS84
 from pygeodesy.errors import _ValueError, _xdatum, _xkwds
 from pygeodesy.fmath import euclid, fdot_, hypot as _hypot,  Fsum
 # from pygeodesy.fsums import Fsum  # from .fmath
 # from pygeodesy.formy import antipode  # _MODS
+# from pygeodesy.internals import typename  # from .karney
 from pygeodesy.interns import _azimuth_, _datum_, _lat_, _lon_, _scale_, \
                               _SPACE_, _x_, _y_
-from pygeodesy.karney import _norm180
+from pygeodesy.karney import _norm180,  typename
 from pygeodesy.latlonBase import _MODS, LatLonBase as _LLB
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _FOR_DOCS  # ALL_MODS
 from pygeodesy.named import _name__, _name2__, _NamedBase, _NamedTuple, _Pass
@@ -70,7 +71,7 @@ from pygeodesy.utily import asin1, atan1, atan2, atan2b, atan2d, \
 from math import acos, degrees, fabs, sin, sqrt
 
 __all__ = _ALL_LAZY.azimuthal
-__version__ = '24.11.24'
+__version__ = '25.04.14'
 
 _EPS_K         = _EPStol * _0_1  # Karney's eps_ or _EPSmin * _0_1?
 _over_horizon_ = 'over horizon'
@@ -112,7 +113,7 @@ class _AzimuthalBase(_NamedBase):
 
            @raise TypeError: Invalid B{C{datum}}.
        '''
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _spherical_datum(datum, **name)
         if name:
             self.name = name
@@ -1088,7 +1089,7 @@ class Stereographic(_AzimuthalBase):
     def k0(self, factor):
         '''Set the central scale factor (C{scalar}).
         '''
-        n = Stereographic.k0.fget.__name__  # 'k0', name__=Stereographic.k0.fget
+        n = typename(Stereographic.k0.fget)  # 'k0', name__=Stereographic.k0.fget
         self._k0  = Scalar_(factor, name=n, low=EPS, high=2)  # XXX high=1, 2, other?
         self._k02 = self._k0 * _2_0
 

pygeodesy/basics.py

@@ -20,8 +20,8 @@ from pygeodesy.errors import _AttributeError, _ImportError, _NotImplementedError
                              _TypeError, _TypesError, _ValueError, _xAssertionError, \
                              _xkwds_get1
 # from pygeodesy.fsums import _isFsum_2Tuple  # _MODS
-from pygeodesy.internals import _0_0, _enquote, _getenv, _passarg, _PYGEODESY, \
-                                _version_info
+from pygeodesy.internals import _0_0, _enquote, _envPYGEODESY, _getenv, _passarg, \
+                                _PYGEODESY_ENV, typename, _version_info
 from pygeodesy.interns import MISSING, NN, _1_, _by_, _COMMA_, _DOT_, _DEPRECATED_, \
                              _ELLIPSIS4_, _EQUAL_, _in_, _invalid_, _N_A_, _not_, \
                              _not_scalar_, _odd_, _SPACE_, _UNDER_, _version_
@@ -37,7 +37,7 @@ from math import copysign as _copysign
 # import inspect as _inspect  # _MODS
 
 __all__ = _ALL_LAZY.basics
-__version__ = '24.12.31'
+__version__ = '25.04.14'
 
 _below_           = 'below'
 _list_tuple_types = (list, tuple)
@@ -207,6 +207,22 @@ def _enumereverse(iterable):
         yield j, iterable[j]
 
 
+try:
+    from math import gcd as _gcd
+except ImportError:  # 3.4-
+
+    def _gcd(a, b):  # PYCHOK redef
+        # <https://WikiPedia.org/wiki/Greatest_common_divisor>
+        a, b = int(a), int(b)
+        if b > a:
+            a, b = b, a
+#       if b <= 0:
+#           return 1
+        while b:
+            a, b = b, (a % b)
+        return a
+
+
 def halfs2(str2):
     '''Split a string in 2 halfs.
 
@@ -222,6 +238,15 @@ def halfs2(str2):
     return str2[:h], str2[h:]
 
 
+def _integer_ratio2(x):  # PYCHOK no cover
+    '''(INTERNAL) Return C{B{x}.as_interger_ratio()}.
+    '''
+    try:  # int.as_integer_ratio in 3.8+
+        return  x.as_integer_ratio()
+    except (AttributeError, OverflowError, TypeError, ValueError):
+        return (x if isint(x) else float(x)), 1
+
+
 def int1s(x):  # PYCHOK no cover
     '''Count the number of 1-bits in an C{int}, I{unsigned}.
 
@@ -287,17 +312,23 @@ def iscomplex(obj, both=False):
         return False
 
 
-def isDEPRECATED(obj):
-    '''Is B{C{obj}}ect a C{DEPRECATED} class, method or function?
+def isDEPRECATED(obj, outer=1):
+    '''Is B{C{obj}}ect or its outer C{type} a C{DEPRECATED}
+       class, constant, method or function?
 
        @return: C{True} if C{DEPRECATED}, {False} if not or
                 C{None} if undetermined.
     '''
-    try:  # XXX inspect.getdoc(obj) or obj.__doc__
-        doc = obj.__doc__.lstrip()
-        return bool(doc and doc.startswith(_DEPRECATED_))
-    except AttributeError:
-        return None
+    r = None
+    for _ in range(max(0, outer) + 1):
+        try:  # inspect.getdoc(obj)
+            if _DEPRECATED_ in obj.__doc__:
+                return True
+            r = False
+        except AttributeError:
+            pass
+        obj = type(obj)
+    return r
 
 
 def isfloat(obj, both=False):
@@ -327,6 +358,13 @@ except AttributeError:  # Python 2-
                         and not obj[:1].isdigit())
 
 
+def _isin(obj, *objs):
+    '''(INTERNAL) Return C{bool(obj in objs)} with C{True} and C{False} matching.
+    '''
+    return any(o is obj for o in objs) or \
+           any(o == obj for o in objs if not isbool(o))
+
+
 def isinstanceof(obj, *Classes):
     '''Is B{C{obj}}ect an instance of one of the C{Classes}?
 
@@ -371,7 +409,7 @@ def isiterable(obj, strict=False):
        @return: C{True} if C{iterable}, C{False} otherwise.
     '''
     # <https://PyPI.org/project/isiterable/>
-    return isiterabletype(obj) if strict else hasattr(obj, '__iter__')  # map, range, set
+    return bool(isiterabletype(obj)) if strict else hasattr(obj, '__iter__')  # map, range, set
 
 
 def isiterablen(obj, strict=False):
@@ -383,7 +421,7 @@ def isiterablen(obj, strict=False):
        @return: C{True} if C{iterable} with C{len}gth, C{False} otherwise.
     '''
     _has = isiterabletype if strict else hasattr
-    return _has(obj, '__len__') and _has(obj, '__getitem__')
+    return bool(_has(obj, '__len__') and _has(obj, '__getitem__'))
 
 
 def isiterabletype(obj, method='__iter__'):
@@ -763,9 +801,13 @@ def _splituple(strs, *sep_splits):  # in .mgrs, ...
     '''(INTERNAL) Split a C{comma}- or C{whitespace}-separated
        string into a C{tuple} of stripped C{str}ings.
     '''
-    t = (strs.split(*sep_splits) if sep_splits else
-         strs.replace(_COMMA_, _SPACE_).split()) if strs else ()
-    return tuple(s.strip() for s in t if s)
+    if sep_splits:
+        t = (t.strip() for t in strs.split(*sep_splits))
+    else:
+        t = strs.strip()
+        if t:
+            t = t.replace(_COMMA_, _SPACE_).split()
+    return tuple(t) if t else ()
 
 
 def unsigned0(x):
@@ -876,8 +918,8 @@ def _xiterablen(obj):
 def _xiterror(obj, _xwhich):
     '''(INTERNAL) Helper for C{_xinterable} and C{_xiterablen}.
     '''
-    t = _not_(_xwhich.__name__[2:])  # _DUNDER_nameof
-    raise _TypeError(repr(obj), txt=t)
+    t = typename(_xwhich)[2:]  # less '_x'
+    raise _TypeError(repr(obj), txt=_not_(t))
 
 
 def _xnumpy(where, *required):
@@ -899,13 +941,13 @@ def _xor(x, *xs):
     return x
 
 
-def _xpackages(_xpkgf):
+def _xpackages(_xhich):
     '''(INTERNAL) Check dependency to be excluded.
     '''
     if _XPACKAGES:  # PYCHOK no cover
-        n = _xpkgf.__name__[2:]  # _DUNDER_nameof, less '_x'
+        n = typename(_xhich)[2:]  # less '_x'
         if n.lower() in _XPACKAGES:
-            E = _PYGEODESY(_xpackages)
+            E = _PYGEODESY_ENV(_xpackages_)
             x = _SPACE_(n, _in_, E)
             e = _enquote(_getenv(E, NN))
             raise ImportError(_EQUAL_(x, e))
@@ -955,7 +997,7 @@ def _xversion(package, where, *required, **name):
     if required:
         t = _version_info(package)
         if t[:len(required)] < required:
-            t = _SPACE_(package.__name__,  # _DUNDER_nameof
+            t = _SPACE_(typename(package),
                        _version_, _DOT_(*t),
                        _below_, _DOT_(*required),
                        _req_d_by(where, **name))
@@ -982,7 +1024,8 @@ else:  # Python 3.10+
     def _zip(*args):
         return zip(*args, strict=True)
 
-_XPACKAGES = _splituple(_getenv(_PYGEODESY(_xpackages), NN).lower())  # test/bases._X_OK
+_xpackages_ =  typename(_xpackages).lstrip(_UNDER_)
+_XPACKAGES  = _splituple(_envPYGEODESY(_xpackages_).lower())  # test/bases._X_OK
 
 # **) MIT License
 #

pygeodesy/booleans.py

@@ -17,12 +17,14 @@ C{reverse-difference}, C{sum} and C{union}.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isodd, issubclassof, map2, _xscalar
+from pygeodesy.basics import _isin, isodd, issubclassof, map2, \
+                             _xscalar,  typename
 from pygeodesy.constants import EPS, EPS2, INT0, _0_0, _0_5, _1_0
 from pygeodesy.errors import ClipError, _IsnotError, _TypeError, \
                             _ValueError, _xattr, _xkwds_get, _xkwds_pop2
 from pygeodesy.fmath import favg, fdot_, hypot, hypot2
 # from pygeodesy.fsums import fsum1  # _MODS
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _BANG_, _clipid_, _COMMASPACE_, \
                              _composite_, _DOT_, _duplicate_, _e_, \
                              _ELLIPSIS_, _few_, _height_, _lat_, _LatLon_, \
@@ -43,7 +45,7 @@ from pygeodesy.utily import fabs, _unrollon, _Wrap
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.booleans
-__version__ = '24.11.07'
+__version__ = '25.04.14'
 
 _0EPS  =  EPS  # near-zero, positive
 _EPS0  = -EPS  # near-zero, negative
@@ -352,11 +354,11 @@ class LatLonFHP(_LatLonBool):
     def _isduplicate(self):
         # Is this point a I{duplicate} intersection?
         p = self._dupof
-        return bool(p and self._linked
-                      and p is not self
-                      and p == self
-#                     and p._alpha in (None, self._alpha)
-                      and self._alpha in (_0_0, p._alpha))
+        return bool(p and  self._linked
+                      and  p is not self
+                      and  p == self
+#                     and _isin(p._alpha, None, self._alpha)
+                      and _isin(self._alpha, _0_0, p._alpha))
 
 #   @property_RO
 #   def _isduplicated(self):
@@ -940,7 +942,7 @@ class _CompositeBase(_Named):
         c = Fmt.SQUARE(c) if c > 1 else NN
         n = Fmt.SQUARE(len(self))
         t = Fmt.PAREN(self)  # XXX not unstr
-        return NN(self.__class__.__name__, c, n, t)
+        return NN(self.typename, c, n, t)
 
     def __str__(self):
         '''String C{str} of this composite.
@@ -1051,7 +1053,7 @@ class _CompositeBase(_Named):
     def _kwds(self, op, **more):
         # Get all keyword arguments as C{dict}.
         kwds = dict(raiser=self.raiser, eps=self.eps,
-                      name=self.name or op.__name__)
+                      name=self.name or typename(op))
         kwds.update(more)
         return kwds
 
@@ -1105,7 +1107,7 @@ class _CompositeBase(_Named):
     def _sum(self, other, op):
         # Combine this and an C{other} composite
         LL = self._LL
-        sp = self.copy(name=self.name or op.__name__)
+        sp = self.copy(name=self.name or typename(op))
         sp._clips, sid = (), INT0  # new clips
         for cp in (self, other):
             for c in cp._clips:

pygeodesy/cartesianBase.py

@@ -10,17 +10,18 @@ U{https://www.Movable-Type.co.UK/scripts/latlong-vectors.html} and
 U{https://www.Movable-Type.co.UK/scripts/geodesy/docs/latlon-ellipsoidal.js.html}.
 '''
 
-# from pygeodesy.basics import _xinstanceof  # from .datums
+from pygeodesy.basics import _isin, _xinstanceof,  typename
 from pygeodesy.constants import EPS, EPS0, INT0, PI2, _isfinite, isnear0, \
                                _0_0, _1_0, _N_1_0, _2_0, _4_0, _6_0
 from pygeodesy.datums import Datum, _earth_ellipsoid, _spherical_datum, \
-                             Transform, _WGS84,  _xinstanceof
+                             Transform, _WGS84
 # from pygeodesy.ecef import EcefKarney  # _MODS
 from pygeodesy.errors import _IsnotError, _TypeError, _ValueError, _xattr, \
                              _xdatum, _xkwds, _xkwds_get, _xkwds_pop2
 from pygeodesy.fmath import cbrt, hypot, hypot_, hypot2,  fabs, sqrt  # hypot
 # from pygeodesy.formy import _hartzell  # _MODS
 from pygeodesy.fsums import fsumf_,  Fmt
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import _COMMASPACE_, _datum_, _no_, _phi_
 from pygeodesy.interns import _ellipsoidal_, _spherical_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
@@ -30,8 +31,7 @@ from pygeodesy.namedTuples import LatLon4Tuple, _NamedTupleTo , Vector3Tuple, \
 # from pygeodesy.nvectorBase import _N_vector  # _MODS
 from pygeodesy.props import deprecated_method, Property, Property_RO, property_doc_, \
                             property_RO, _update_all
-# from pygeodesy,resections import cassini, collins5, pierlot, pierlotx, \
-#                                  tienstra7  # _MODS
+# from pygeodesy import resections as _resections  # _MODS.into
 # from pygeodesy.streprs import Fmt  # from .fsums
 # from pygeodesy.triaxials import Triaxial_  # _MODS
 from pygeodesy.units import Degrees, Height, _heigHt, _isMeter, Meter, Radians
@@ -43,10 +43,11 @@ from pygeodesy.vector3d import Vector3d, _xyzhdlln4
 # from math import degrees, fabs, radians, sqrt  # from .fmath, .utily
 
 __all__ = _ALL_LAZY.cartesianBase
-__version__ = '24.12.04'
+__version__ = '25.04.21'
 
-_r_     = 'r'
-_theta_ = 'theta'
+_r_         = 'r'
+_resections = _MODS.into(resections=__name__)
+_theta_     = 'theta'
 
 
 class CartesianBase(Vector3d, _NamedLocal):
@@ -112,8 +113,8 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Function L{pygeodesy.cassini} for references and more details.
         '''
-        return _MODS.resections.cassini(self, pointB, pointC, alpha, beta,
-                                              useZ=useZ, datum=self.datum)
+        return _resections.cassini(self, pointB, pointC, alpha, beta,
+                                         useZ=useZ, datum=self.datum)
 
     @deprecated_method
     def collins(self, pointB, pointC, alpha, beta, useZ=False):
@@ -148,8 +149,8 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Function L{pygeodesy.collins5} for references and more details.
         '''
-        return _MODS.resections.collins5(self, pointB, pointC, alpha, beta,
-                                               useZ=useZ, datum=self.datum)
+        return _resections.collins5(self, pointB, pointC, alpha, beta,
+                                          useZ=useZ, datum=self.datum)
 
     @deprecated_method
     def convertDatum(self, datum2, **datum):
@@ -304,7 +305,7 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @raise TypeError: Invalid or undefined B{C{earth}} or C{datum}.
         '''
-        n = self.height3.__name__
+        n = typename(self.height3)
         d = self.datum if earth is None else _spherical_datum(earth, name=n)
         c, h = self, _heigHt(self, height)
         if h and d:
@@ -357,7 +358,7 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Methods L{Ellipsoid.height4} and L{Triaxial_.height4} for more information.
         '''
-        n = self.height4.__name__
+        n = typename(self.height4)
         d = self.datum if earth is None else earth
         if normal and d is self.datum:
             r = self._height4
@@ -504,8 +505,8 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Function L{pygeodesy.pierlot} for references and more details.
         '''
-        return _MODS.resections.pierlot(self, point2, point3, alpha12, alpha23,
-                                              useZ=useZ, eps=eps, datum=self.datum)
+        return _resections.pierlot(self, point2, point3, alpha12, alpha23,
+                                         useZ=useZ, eps=eps, datum=self.datum)
 
     def pierlotx(self, point2, point3, alpha1, alpha2, alpha3, useZ=False):
         '''3-Point resection between this and two other points using U{Pierlot
@@ -531,8 +532,8 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Function L{pygeodesy.pierlotx} for references and more details.
         '''
-        return _MODS.resections.pierlotx(self, point2, point3, alpha1, alpha2, alpha3,
-                                               useZ=useZ, datum=self.datum)
+        return _resections.pierlotx(self, point2, point3, alpha1, alpha2, alpha3,
+                                          useZ=useZ, datum=self.datum)
 
     def Roc2(self, earth=None):
         '''Compute this cartesian's I{normal} and I{pseudo, z-based} radius of curvature.
@@ -605,8 +606,8 @@ class CartesianBase(Vector3d, _NamedLocal):
 
            @see: Function L{pygeodesy.tienstra7} for references and more details.
         '''
-        return _MODS.resections.tienstra7(self, pointB, pointC, alpha, beta, gamma,
-                                                useZ=useZ, datum=self.datum)
+        return _resections.tienstra7(self, pointB, pointC, alpha, beta, gamma,
+                                           useZ=useZ, datum=self.datum)
 
     @deprecated_method
     def to2ab(self):  # PYCHOK no cover
@@ -659,7 +660,7 @@ class CartesianBase(Vector3d, _NamedLocal):
         '''
         _xinstanceof(Datum, datum2=datum2)
 
-        c = self if datum in (None, self.datum) else \
+        c = self if _isin(datum, None, self.datum) else \
             self.toDatum(datum)
 
         i, d = False, c.datum