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

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__ = '25.01.17'
+__version__ = '25.04.14'
 
 _below_           = 'below'
 _list_tuple_types = (list, tuple)
@@ -312,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):
@@ -352,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}?
 
@@ -905,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):
@@ -928,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))
@@ -984,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))
@@ -1011,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

pygeodesy/clipy.py

@@ -12,11 +12,12 @@ I{Greiner-Hormann} and L{clipSH} and L{clipSH3} I{Sutherland-Hodgeman}.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-# from pygeodesy.basics import len2  # from .fmath
+from pygeodesy.basics import len2,  typename
 from pygeodesy.constants import EPS, _0_0, _1_0
 from pygeodesy.errors import _AssertionError, ClipError, PointsError
-from pygeodesy.fmath import fabs, len2,  Fsum
+from pygeodesy.fmath import fabs,  Fsum
 # from pygeodesy.fsums import Fsum  # from .fmath
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _clipid_, _convex_, _DOT_, _end_, _few_, \
                              _fi_, _height_, _i_, _invalid_, _j_, _lat_, \
                              _lon_, _near_, _not_, _points_, _start_, _too_
@@ -30,7 +31,7 @@ from pygeodesy.units import Bool, FIx, HeightX, Lat, Lon, Number_
 # from math import fabs  # from .fmath
 
 __all__ = _ALL_LAZY.clipy
-__version__ = '23.09.20'
+__version__ = '25.04.14'
 
 _fj_       = 'fj'
 _original_ = 'original'
@@ -126,7 +127,7 @@ class _CS(_Named):
 #       elif c & _CS._XR:
 #           return self.lat4(p, self._xr)
 #       # should never get here
-#       raise _AssertionError(self._DOT_(self.clip4.__name__))
+#       raise _AssertionError(self._DOT_(typename(self.clip4)))
 
     def code4(self, p):  # compute code for point p
         if p.lat < self._yb:
@@ -168,7 +169,7 @@ class _CS(_Named):
 
     def nop4(self, b, p):  # PYCHOK no cover
         if p:  # should never get here
-            raise _AssertionError(self._DOT_(self.nop4.__name__))
+            raise _AssertionError(self._DOT_(typename(self.nop4)))
         return _CS._IN, self.nop4, b, p
 
 
@@ -202,7 +203,7 @@ def clipCS4(points, lowerleft, upperight, closed=False, inull=False):
        @raise PointsError: Insufficient number of B{C{points}}.
     '''
     T4 =  ClipCS4Tuple
-    cs = _CS(lowerleft, upperight, name=clipCS4.__name__)
+    cs = _CS(lowerleft, upperight, name=typename(clipCS4))
     n, pts = _pts2(points, closed, inull)
 
     i, m = _imdex2(closed, n)
@@ -398,7 +399,7 @@ def clipLB6(points, lowerleft, upperight, closed=False, inull=False):
              U{Liang-Barsky algorithm<https://WikiPedia.org/wiki/Liang-Barsky_algorithm>}.
     '''
     xl, yb, \
-    xr, yt = _box4(lowerleft, upperight, clipLB6.__name__)
+    xr, yt = _box4(lowerleft, upperight, typename(clipLB6))
     n, pts = _pts2(points, closed, inull)
 
     T6  =  ClipLB6Tuple
@@ -578,7 +579,7 @@ class _SH(_Named):
         fx = float(p2.lon - x)
         d  = fy * dx - fx * dy  # fdot((fx, fy), dx, -dy)
         if fabs(d) < EPS:  # PYCHOK no cover
-            raise _AssertionError(self._DOT_(self.intersect.__name__))
+            raise _AssertionError(self._DOT_(typename(self.intersect)))
         d  = Fsum(self._xy, -y * dx, x * dy).fover(d)
         y += d * fy
         x += d * fx
@@ -644,7 +645,7 @@ def clipSH(points, corners, closed=False, inull=False):
 
        @raise PointsError: Insufficient number of B{C{points}}.
     '''
-    sh = _SH(corners, name=clipSH.__name__)
+    sh = _SH(corners, name=typename(clipSH))
     n, pts = sh.clip2(points, closed, inull)
     for i in range(n):
         p, _ = sh.clipped2(pts[i])
@@ -671,7 +672,7 @@ def clipSH3(points, corners, closed=False, inull=False):
 
        @raise PointsError: Insufficient number of B{C{points}} or B{C{corners}}.
     '''
-    sh = _SH(corners, name=clipSH3.__name__)
+    sh = _SH(corners, name=typename(clipSH3))
     n, pts = sh.clip2(points, closed, inull)
     if n > 1:
         T3 = ClipSH3Tuple

pygeodesy/constants.py

@@ -13,8 +13,8 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 from pygeodesy.basics import _copysign, isbool, iscomplex, isint
 from pygeodesy.errors import _xError, _xError2, _xkwds_get1, _xkwds_item2
 # from pygeodesy.fsums import _isFsum_2Tuple  # _MODS
-from pygeodesy.internals import _0_0, _100_0
-from pygeodesy.interns import _INF_, _NAN_, _UNDER_
+from pygeodesy.internals import _0_0, _100_0, typename
+from pygeodesy.interns import _DMAIN_, _INF_, _NAN_
 from pygeodesy.lazily import _ALL_MODS as _MODS, _ALL_LAZY
 # from pygeodesy.streprs import Fmt  # from .unitsBase
 from pygeodesy.unitsBase import Float, Int, Radius,  Fmt
@@ -26,7 +26,7 @@ except ImportError:  # Python 2-
     _inf, _nan = float(_INF_), float(_NAN_)
 
 __all__ = _ALL_LAZY.constants
-__version__ = '24.12.22'
+__version__ = '25.04.14'
 
 
 def _copysign_0_0(y):
@@ -360,7 +360,7 @@ def isfinite(obj):
             return _iscfinite(obj)
         if _MODS.fsums._isFsum_2Tuple(obj):  # OverflowError
             return obj.is_finite()
-        raise _xError(x, Fmt.PAREN(isfinite.__name__, obj))
+        raise _xError(x, Fmt.PAREN(typename(isfinite), obj))
 
 
 def isint0(obj, both=False):
@@ -493,13 +493,14 @@ def _umod_PI2(rad):
     return (rad % PI2) or _0_0
 
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
-    def _main():
+    def _main(locals):
         from pygeodesy import itemsorted, printf
+        from pygeodesy.interns import _DALL_, _UNDER_
 
         t = n = v = []
-        for n, v in itemsorted(locals()):
+        for n, v in itemsorted(locals):
             if isinstance(v, (Float, Int, Radius)):
                 printf('%9s: %r', n, v.toRepr(std=False))
                 if v.name != n:
@@ -508,10 +509,10 @@ if __name__ == '__main__':
                     raise AssertionError('%r is not %r' % (n, v))
                 if not n.startswith(_UNDER_):
                     t.append(n)
-        t.append(float_.__name__)
-        printf('__all__ = %r', tuple(t))
+        t.append(typename(float_))
+        printf('%s = %r', _DALL_, tuple(t))
 
-    _main()
+    _main(locals())
 
 # **) MIT License
 #

pygeodesy/css.py

@@ -3,12 +3,13 @@
 
 u'''Cassini-Soldner (CSS) projection.
 
-Classes L{CassiniSoldner}, L{Css} and L{CSSError} requiring I{Charles Karney}'s
-U{geographiclib <https://PyPI.org/project/geographiclib>} Python package to be
-installed.
+Classes L{CassiniSoldner}, L{Css} and L{CSSError} use I{Charles Karney}'s
+U{geographiclib <https://PyPI.org/project/geographiclib>} Python package
+if installed, see property L{CassiniSoldner.geodesic}.
 '''
 
-from pygeodesy.basics import islistuple, neg, _xinstanceof, _xsubclassof
+from pygeodesy.basics import _isin, islistuple, neg, _xinstanceof, \
+                             _xsubclassof
 from pygeodesy.constants import _umod_360, _0_0, _0_5, _90_0
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
@@ -33,7 +34,7 @@ from pygeodesy.units import Azimuth, Degrees, Easting, Height, _heigHt, \
 # from math import fabs  # from .karney
 
 __all__ = _ALL_LAZY.css
-__version__ = '24.11.06'
+__version__ = '25.04.14'
 
 
 def _CS0(cs0):
@@ -76,7 +77,7 @@ class CassiniSoldner(_NamedBase):
 
            @raise CSSError: Invalid B{C{lat}} or B{C{lon}}.
         '''
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _xellipsoidal(datum=_ellipsoidal_datum(datum, **name))
         if name:
             self.name = name
@@ -217,9 +218,10 @@ class CassiniSoldner(_NamedBase):
     @Property
     def geodesic(self):
         '''Get this projection's I{wrapped} U{geodesic.Geodesic
-           <https://GeographicLib.SourceForge.io/Python/doc/code.html>}, provided
+           <https://GeographicLib.SourceForge.io/Python/doc/code.html>} from
            I{Karney}'s U{geographiclib<https://PyPI.org/project/geographiclib>}
-           package is installed, otherwise an I{exact} L{GeodesicExact} instance.
+           package if installed, otherwise an I{exact} L{GeodesicExact
+           <pygeodesy.geodesicx.GeodesicExact>} instance.
         '''
         g = self._geodesic
         if g is None:
@@ -247,7 +249,8 @@ class CassiniSoldner(_NamedBase):
 
     @Property_RO
     def isExact(self):
-        '''Return C{True} if this projection's geodesic is L{GeodesicExact}.
+        '''Return C{True} if this projection's geodesic is L{GeodesicExact
+           <pygeodesy.geodesicx.GeodesicExact>}.
         '''
         return isinstance(self.geodesic, _MODS.geodesicx.GeodesicExact)
 
@@ -306,8 +309,8 @@ class CassiniSoldner(_NamedBase):
 
         g = self.geodesic
         self._meridian = m = g.Line(Lat_(lat0=lat0, Error=CSSError),
-                                    Lon_(lon0=lon0, Error=CSSError), _0_0,
-                                    g.STANDARD | g.DISTANCE_IN | g.LINE_OFF)
+                                    Lon_(lon0=lon0, Error=CSSError),
+                                   _0_0, caps=g.STANDARD_LINE | g.LINE_OFF)
         self._latlon0 = LatLon2Tuple(m.lat1, m.lon1)
         s, c = _sincos2d(m.lat1)  # == self.lat0 == self.LatitudeOrigin()
         self._sb0, self._cb0 = _norm2(s * g.f1, c)

pygeodesy/datums.py

@@ -67,7 +67,7 @@ datum, q.v. U{"A Guide to Coordinate Systems in Great Britain", Section 6
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import islistuple, map2, neg, _xinstanceof, _zip
+from pygeodesy.basics import _isin, islistuple, map2, neg, _xinstanceof, _zip
 from pygeodesy.constants import R_M, _float as _F, _0_0, _1_0, _2_0, _8_0, _3600_0
 # from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase as _CEB, \
 #                                          LatLonEllipsoidalBase as _LLEB  # MODS
@@ -77,10 +77,10 @@ from pygeodesy.errors import _IsnotError, _TypeError, _xellipsoidall, _xkwds, _x
 from pygeodesy.fmath import fdot, fmean,  Fmt, _operator
 from pygeodesy.internals import _passarg, _under
 from pygeodesy.interns import NN, _a_, _Airy1830_, _AiryModified_, _BAR_, _Bessel1841_, \
-                             _Clarke1866_, _Clarke1880IGN_, _COMMASPACE_, _DOT_, _earth_, \
-                             _ellipsoid_, _ellipsoidal_, _GRS80_, _Intl1924_, _MINUS_, \
-                             _Krassovski1940_, _Krassowsky1940_, _NAD27_, _NAD83_, _s_, \
-                             _PLUS_, _Sphere_, _spherical_, _transform_, _UNDER_, \
+                             _Clarke1866_, _Clarke1880IGN_, _COMMASPACE_, _DMAIN_,_DOT_, \
+                             _earth_, _ellipsoid_, _ellipsoidal_, _GRS80_, _Intl1924_, \
+                             _MINUS_, _Krassovski1940_, _Krassowsky1940_, _NAD27_, _NAD83_, \
+                             _s_, _PLUS_, _Sphere_, _spherical_, _transform_, _UNDER_, \
                              _WGS72_, _WGS84_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _lazyNamedEnumItem as _lazy, _name__, _name2__, _NamedEnum, \
@@ -94,7 +94,7 @@ from pygeodesy.units import _isRadius, Radius_,  radians
 # import operator as _operator  # from .fmath
 
 __all__ = _ALL_LAZY.datums
-__version__ = '24.10.12'
+__version__ = '25.04.14'
 
 _a_ellipsoid_ = _UNDER_(_a_, _ellipsoid_)
 _BD72_        = 'BD72'
@@ -510,7 +510,7 @@ def _earth_datum(inst, a_earth, f=None, raiser=_a_ellipsoid_, **name):  # in .ka
         E, n, D = _EnD3((a_earth, f), name)
         if raiser and not E:
             raise _TypeError(f=f, **{raiser: a_earth})
-    elif a_earth in (_EWGS84, _WGS84, None) and inst._datum is _WGS84:
+    elif _isin(a_earth, None, _EWGS84, _WGS84) and inst._datum is _WGS84:
         return
     elif isinstance(a_earth, Datum):
         E, n, D =  None, NN, a_earth
@@ -721,7 +721,7 @@ _WGS84 = Datums.WGS84
 assert _WGS84.ellipsoid is _EWGS84
 # assert _WGS84.transform.isunity
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     from pygeodesy.interns import _COMMA_, _NL_, _NLATvar_
     from pygeodesy import printf

pygeodesy/deprecated/bases.py

@@ -9,11 +9,11 @@ from pygeodesy.latlonBase import LatLonBase as _LatLonBase
 from pygeodesy.lazily import _ALL_DEPRECATED
 
 __all__ = _ALL_DEPRECATED.deprecated_bases
-__version__ = '23.11.25'
+__version__ = '25.04.09'
 
 
 class LatLonHeightBase(_LatLonBase):  # PYCHOK no cover
-    ''''DEPRECATED on 2021.02.10, use (INTERNAL) class L{pygeodesy.latlonBase.LatLonBase}.'''
+    '''DEPRECATED on 2021.02.10, use (INTERNAL) class L{pygeodesy.latlonBase.LatLonBase}.'''
     pass
 
 

pygeodesy/deprecated/classes.py

@@ -22,7 +22,7 @@ from pygeodesy.trf import TRFXform7Tuple as _TRFXform7Tuple
 from pygeodesy.units import Bearing, Int, Lamd, Lat, Lon, Meter, Phid
 
 __all__ = _ALL_DEPRECATED.deprecated_classes
-__version__ = '24.12.31'
+__version__ = '25.04.11'
 
 
 class _Deprecated_NamedTuple(_NamedTuple):
@@ -349,7 +349,7 @@ class UtmUps4Tuple(_Deprecated_NamedTuple):  # PYCHOK no cover
 
 
 class XDist(ADict):
-    '''DEPRECATED on 2024.07.02, use class L{XDict}.'''
+    '''DEPRECATED on 2024.07.02, use class L{ADict}.'''
     def __init__(self, *args, **kwds):  # PYCHOK no cover
         deprecated_class(self.__class__)
         ADict.__init__(self, *args, **kwds)

pygeodesy/deprecated/consterns.py

@@ -9,21 +9,21 @@ from pygeodesy.lazily import _ALL_DEPRECATED
 from pygeodesy.units import Float, Int, Str
 
 __all__ = _ALL_DEPRECATED.deprecated_consterns
-__version__ = '23.11.24'
+__version__ = '25.04.09'
 
 
 class _Deprecated_Float(Float):
-    '''DEPRECATED on 2023.09.12, don't use.'''
+    '''DEPRECATED on 2023.09.12, I{don't use}.'''
     pass
 
 
 class _Deprecated_Int(Int):
-    '''DEPRECATED on 2023.09.12, don't use.'''
+    '''DEPRECATED on 2023.09.12, I{don't use}.'''
     pass
 
 
 class _Deprecated_Str(Str):
-    '''DEPRECATED on 2023.09.12, don't use.'''
+    '''DEPRECATED on 2023.09.12, I{don't use}.'''
     pass