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

pygeodesy/karney.py

@@ -4,14 +4,12 @@
 u'''Wrapper around several C{geomath.Math} functions from I{Karney}'s Python package U{geographiclib
 <https://PyPI.org/project/geographiclib>}, provided that package is installed.
 
-The I{wrapped} class methods return a L{GDict} instance offering access to the C{dict} items
-either by C{key} or by C{attribute} name.
-All methods of the I{wrapped} L{Geodesic<geodesicw.Geodesic>} and L{GeodesicLine<geodesicw.GeodesicLine>}
+Methods of the I{wrapped} L{Geodesic<geodesicw.Geodesic>} and L{GeodesicLine<geodesicw.GeodesicLine>}
 classes return a L{GDict} instance offering access to the C{dict} items either by C{key} or by
 C{attribute} name.
 
-With env variable C{PYGEODESY_GEOGRAPHICLIB} left undefined or set to C{"2"}, modules L{geodesicx},
-L{geodesicw} and this module will use U{GeographicLib 2.0<https://GeographicLib.SourceForge.io/C++/doc/>}
+With env variable C{PYGEODESY_GEOGRAPHICLIB} left undefined or set to C{"2"}, modules L{geodesicw},
+L{geodesicx} and this module will use U{GeographicLib 2.0+<https://GeographicLib.SourceForge.io/C++/doc/>}
 and newer transcoding, otherwise C{1.52} or older.
 
 Karney-based functionality
@@ -60,8 +58,11 @@ Karney-based functionality
   - L{GnomonicExact}, L{GnomonicGeodSolve}, L{GnomonicKarney} -- U{Gnomonic
     <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1Gnomonic.html>}
 
+  - L{Intersector} -- U{Intersect
+    <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1Intersect.html>} from I{GeographicLib 2.3+}
+
   - L{JacobiConformal} -- U{JacobiConformal
-    <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1JacobiConformal.html#details>}
+    <https://geographiclib.sourceforge.io/C++/doc/classGeographicLib_1_1experimental_1_1JacobiConformal.html>}
 
   - L{KTransverseMercator} - U{TransverseMercator
     <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1TransverseMercator.html>}
@@ -94,13 +95,14 @@ are I{transcoded} from C++ classes in I{Karney}'s U{GeographicLib<https://Geogra
 
 2. These C{pygeodesy} modules and classes
 
-  - L{ellipsoidalGeodSolve}, L{ellipsoidalKarney}, L{geodsolve}, L{karney}, L{rhumb.solve}
+  - L{ellipsoidalGeodSolve}, L{ellipsoidalKarney}, L{geodesici}, L{geodsolve}, L{karney}, L{rhumb.solve}
   - L{EquidistantKarney}, L{FrechetKarney}, L{GeodesicSolve}, L{GeodesicLineSolve}, L{GnomonicGeodSolve},
-    L{GnomonicKarney}, L{HeightIDWkarney}
+    L{GnomonicKarney}, L{HeightIDWkarney}, L{Intersectool}
 
-are or use I{wrappers} around I{Karney}'s Python U{geographiclib<https://PyPI.org/project/geographiclib>}
-C{geodesic}, C++ utility U{GeodSolve<https://GeographicLib.SourceForge.io/C++/doc/GeodSolve.1.html>} or
-C++ utility U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/RhumbSolve.1.html>}.
+are or use I{wrappers} around I{Karney}'s Python U{geographiclib<https://PyPI.org/project/geographiclib>} or
+C++ utility U{GeodSolve<https://GeographicLib.SourceForge.io/C++/doc/GeodSolve.1.html>},
+U{IntersectTool<https://GeographicLib.SourceForge.io/C++/doc/IntersectTool.1.html>} or
+U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/RhumbSolve.1.html>}.
 
 3. All C{pygeodesy} functions and methods to compute I{ellipsoidal} intersections, nearest points and trilaterations
 
@@ -139,20 +141,20 @@ in C{pygeodesy} are based on I{Karney}'s post U{Area of a spherical polygon
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import _copysign, int1s, isint, itemsorted, neg, unsigned0, \
-                             _xgeographiclib, _zip,  _version_info
+from pygeodesy.basics import _copysign, isint, neg, unsigned0, _xgeographiclib, \
+                             _zip,  _version_info
 from pygeodesy.constants import NAN, _isfinite as _math_isfinite, _0_0, \
                                _1_16th, _1_0, _2_0, _180_0, _N_180_0, _360_0
 from pygeodesy.errors import GeodesicError, _ValueError, _xkwds, _xkwds_get1
 from pygeodesy.fmath import cbrt, fremainder, norm2
 # from pygeodesy.internals import _version_info  # from .basics
-from pygeodesy.interns import _2_, _a12_, _area_, _azi2_, _azi12_, _composite_, \
-                              _lat1_, _lat2_, _lon1_, _lon2_, _m12_, _M12_, \
-                              _M21_, _number_, _s12_, _S12_, _UNDER_, \
-                              _BAR_, NN  # PYCHOK used!
+from pygeodesy.interns import NN, _2_, _a12_, _area_, _azi1_, _azi2_, _azi12_, \
+                             _composite_, _lat1_, _lat2_, _lon1_, _lon2_, \
+                             _m12_, _M12_, _M21_, _number_, _s12_, _S12_, \
+                             _UNDER_, _X_,  _BAR_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
 from pygeodesy.named import ADict, _NamedBase, _NamedTuple, notImplemented, _Pass
-from pygeodesy.props import deprecated_method, Property_RO
+from pygeodesy.props import deprecated_method, Property_RO, property_ROnce
 from pygeodesy.units import Bearing as _Azi, Degrees as _Deg, Lat, Lon, \
                             Meter as _M, Meter2 as _M2, Number_
 from pygeodesy.utily import atan2d, sincos2d, tand, _unrollon,  fabs
@@ -160,7 +162,7 @@ from pygeodesy.utily import atan2d, sincos2d, tand, _unrollon,  fabs
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.karney
-__version__ = '24.06.27'
+__version__ = '24.07.16'
 
 _K_2_0      = _getenv('PYGEODESY_GEOGRAPHICLIB', _2_) == _2_
 _perimeter_ = 'perimeter'
@@ -207,39 +209,39 @@ class Area3Tuple(_NamedTuple):  # in .geodesicx.gxarea
     _Units_ = ( Number_, _M,          _M2)
 
 
-class Caps(object):  # PYCHOK
+class Caps(object):
     '''(INTERNAL) Overriden by C{Caps} below.
     '''
-    EMPTY          =  0        # formerly aka NONE
-    _CAP_1         =  1 << 0   # for goedesicw only
-    _CAP_1p        =  1 << 1   # for goedesicw only
-    _CAP_2         =  1 << 2
-    _CAP_3         =  1 << 3   # for goedesicw only
-#   _CAP_4         =  1 << 4
-#   _CAP_ALL       =  0x1F
-#   _CAP_MASK      = _CAP_ALL
-    LATITUDE       =  1 << 7   # compute latitude C{lat2}
-    LONGITUDE      =  1 << 8   # compute longitude C{lon2}  _CAP_3
-    AZIMUTH        =  1 << 9   # azimuths C{azi1} and C{azi2}
-    DISTANCE       =  1 << 10  # compute distance C{s12}  _CAP_1
-    DISTANCE_IN    =  1 << 11  # allow distance C{s12} in Direct  _CAP_1 | _CAP_1p
-    REDUCEDLENGTH  =  1 << 12  # compute reduced length C{m12}    _CAP_1 | _CAP_2
-    GEODESICSCALE  =  1 << 13  # compute geodesic scales C{M12} and C{M21}  _CAP_1 | _CAP_2
-    AREA           =  1 << 14  # compute area C{S12}  _CAP_4
-
-    STANDARD       =  AZIMUTH | DISTANCE | DISTANCE_IN | LATITUDE | LONGITUDE
-    ALL            =  0x7F80   # without LONG_UNROLL, LINE_OFF, REVERSE2 and _DEBUG_*
-
-    _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_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
-    REVERSE2       =  1 << 17  # reverse C{azi2}
+    EMPTY         =  0        # formerly aka NONE
+    _CAP_1        =  1 << 0   # for goedesici/-w
+    _CAP_1p       =  1 << 1   # for goedesici/-w
+    _CAP_2        =  1 << 2
+    _CAP_3        =  1 << 3   # for goedesici/-w
+    _CAP_4        =  1 << 4   # for goedesicw
+    _CAP_ALL      =  0x1F
+#   _CAP_MASK     = _CAP_ALL
+    LATITUDE      =  1 << 7   # compute latitude C{lat2}
+    LONGITUDE     =  1 << 8  | _CAP_3  # compute longitude C{lon2}
+    AZIMUTH       =  1 << 9   # azimuths C{azi1} and C{azi2}
+    DISTANCE      =  1 << 10 | _CAP_1  # compute distance C{s12}
+    DISTANCE_IN   =  1 << 11 | _CAP_1 | _CAP_1p  # allow distance C{s12} in Direct
+    REDUCEDLENGTH =  1 << 12 | _CAP_1 | _CAP_2  # compute reduced length C{m12}
+    GEODESICSCALE =  1 << 13 | _CAP_1 | _CAP_2  # compute geodesic scales C{M12} and C{M21}
+    AREA          =  1 << 14 | _CAP_4  # compute area C{S12}
+
+    STANDARD      =  AZIMUTH | DISTANCE | LATITUDE | LONGITUDE
+
+    _DIRECT3      =  AZIMUTH  | LATITUDE | LONGITUDE  # for goedesicw only
+    _INVERSE3     =  AZIMUTH  | DISTANCE  # for goedesicw only
+    _STD          =  STANDARD  # for goedesicw only
+    _STD_LINE     = _STD      | DISTANCE_IN  # for goedesici/-w
+
+    LINE_CAPS     = _STD_LINE | REDUCEDLENGTH | GEODESICSCALE  # .geodesici only
+    LONG_UNROLL   =  1 << 15  # unroll C{lon2} in .Direct and .Position
+#                 =  1 << 16  # unused
+    LINE_OFF      =  1 << 17  # Line without updates from parent geodesic or rhumb
+    REVERSE2      =  1 << 18  # reverse C{azi2}
+    ALL           =  0x7F80 | _CAP_ALL  # without LONG_UNROLL, LINE_OFF, REVERSE2 and _DEBUG_*
 
     LATITUDE_LONGITUDE         = LATITUDE | LONGITUDE
     LATITUDE_LONGITUDE_AREA    = LATITUDE | LONGITUDE | AREA
@@ -247,35 +249,38 @@ class Caps(object):  # PYCHOK
     AZIMUTH_DISTANCE           = AZIMUTH | DISTANCE
     AZIMUTH_DISTANCE_AREA      = AZIMUTH | DISTANCE | AREA
 
-    _ANGLE_ONLY    =  1 << 18  # angular distance C{a12} only
-    _SALPs_CALPs   =  1 << 19  # (INTERNAL) GeodesicExact._GenInverse
+    _SALP_CALPs_   =  1 << 19  # (INTERNAL) GeodesicExact._GenInverse
 
     _DEBUG_AREA    =  1 << 20  # (INTERNAL) include Line details
     _DEBUG_DIRECT  =  1 << 21  # (INTERNAL) include Direct details
     _DEBUG_INVERSE =  1 << 22  # (INTERNAL) include Inverse details
     _DEBUG_LINE    =  1 << 23  # (INTERNAL) include Line details
     _DEBUG_ALL     = _DEBUG_AREA | _DEBUG_DIRECT | _DEBUG_INVERSE | \
-                     _DEBUG_LINE | _ANGLE_ONLY | _SALPs_CALPs
+                     _DEBUG_LINE | _SALP_CALPs_
 
-    _OUT_ALL       =  ALL
+    _OUT_ALL       =  ALL  # see geographiclib.geodesiccapabilities.py
     _OUT_MASK      =  ALL | LONG_UNROLL | REVERSE2 | _DEBUG_ALL
 
     _AZIMUTH_LATITUDE_LONGITUDE           =  AZIMUTH | LATITUDE | LONGITUDE
+    _AZIMUTH_LATITUDE_LONG_UNROLL         =  AZIMUTH | LATITUDE | LONG_UNROLL
     _DEBUG_DIRECT_LINE                    = _DEBUG_DIRECT | _DEBUG_LINE
 #   _DISTANCE_IN_OUT                      =  DISTANCE_IN & _OUT_MASK  # == DISTANCE_IN in .gx, .gxline
-    _LINE                                 =  AZIMUTH | LATITUDE | LONG_UNROLL
     _REDUCEDLENGTH_GEODESICSCALE          =  REDUCEDLENGTH | GEODESICSCALE
 #   _REDUCEDLENGTH_GEODESICSCALE_DISTANCE =  REDUCEDLENGTH | GEODESICSCALE | DISTANCE
 
-    def toStr(self, Csk, sep=_BAR_):
-        '''Return a C{Caps} or C{outmask} as C{str} or tuple of C{str}s.
+    def items(self):
+        '''Yield all I{public} C{Caps} as 2-tuple C{(NAME, mask)}.
+        '''
+        for n, C in Caps.__class__.__dict__.items():
+            if isint(C) and not n.startswith(_UNDER_) \
+                        and n.replace(_UNDER_, NN).isupper():
+                yield n, C
+
+    def toStr(self, Cask, sep=_BAR_):
+        '''Return C{Caps} or an C{outmask} as C{str} or tuple of C{str}s.
         '''
-        s = []
-        for c, C in itemsorted(self.__class__.__dict__):
-            if isint(C) and (Csk & C) and int1s(C) == 1 \
-                        and (C in (Caps.REVERSE2, Caps._SALPs_CALPs)
-                               or c.replace(_UNDER_, NN).isupper()):
-                s.append(c)
+        s = (n for n, C in sorted(Caps.items())
+                        if C and (Cask & C) == C)  # and int1s(C) <= 3
         return sep.join(s) if sep else tuple(s)
 
 Caps = Caps()  # PYCHOK singleton
@@ -286,7 +291,7 @@ C{AREA} - compute area C{S12},
 
 C{AZIMUTH} - include azimuths C{azi1} and C{azi2},
 
-C{DISTANCE} - compute distance C{s12},
+C{DISTANCE} - compute distance C{s12} and angular distance C{a12},
 
 C{DISTANCE_IN} - allow distance C{s12} in C{.Direct},
 
@@ -310,13 +315,19 @@ 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)
+_key2Caps = dict(a12 =Caps.DISTANCE,  # in GDict._unCaps
+                 azi2=Caps.AZIMUTH,
+                 lat2=Caps.LATITUDE,
+                 lon2=Caps.LONGITUDE,
+                 m12 =Caps.REDUCEDLENGTH,
+                 M12 =Caps.GEODESICSCALE,
+                 M21 =Caps.GEODESICSCALE,
+                 s12 =Caps.DISTANCE,
+                 S12 =Caps.AREA)
 
 
 class _CapsBase(_NamedBase):  # in .auxilats, .geodesicx.gxbases
-    '''(INTERNAL) Base class for C{[_]Geodesic*Exact}.
+    '''(INTERNAL) Base class for C{Geodesic*}, C{Geodesic*Exact}, C{Intersectool} and C{Rhumb*Base}.
     '''
     ALL           = Caps.ALL
     AREA          = Caps.AREA
@@ -426,6 +437,12 @@ class GDict(ADict):  # XXX _NamedDict
         '''
         return self._toTuple(Inverse10Tuple, dflt)
 
+    def _toNAN(self, outmask):  # .GeodesicLineExact._GenPosition
+        '''(INTERNAL) Convert this C{GDict} to all C{NAN}s.
+        '''
+        d = dict((n, NAN) for n in GeodSolve12Tuple._Names_)
+        return self.set_(**d)._unCaps(outmask)
+
     @deprecated_method
     def toRhumb7Tuple(self, dflt=NAN):  # PYCHOK no cover
         '''DEPRECATED on 23.12.07, use method C{toRhumb8Tuple}.
@@ -461,15 +478,40 @@ class GDict(ADict):  # XXX _NamedDict
         t  = tuple(_g(self, n, dflt) for n in nTuple._Names_)
         return nTuple(t, iteration=self._iteration)
 
+    def _2X(self, gl, _2X=_X_):  # .Intersectool, .Intersector
+        '''(INTERNAL) Rename C{-2} attr to C{-X} or C{-M}.
+        '''
+        X = GDict(self)
+        for n in (_lat2_, _lon2_, _azi2_, _s12_, _a12_):
+            if n in X:  # X._X = X._2
+                X[n[:-1] + _2X] = X.pop(n)
+            v = getattr(gl, n, X)
+            if v is not X:  # X._2 = gl._2
+                X[n] = v
+        return X
+
     def _unCaps(self, outmask):  # in .geodsolve
         '''(INTERNAL) Remove superfluous items.
         '''
-        for k, m in _KEY2Caps.items():
-            if k in self and not (outmask & m):
+        for k, C in _key2Caps.items():
+            if k in self and (outmask & C) != C:
                 self.pop(k)  # delattr(self, k)
         return self
 
 
+class GeodSolve12Tuple(_GTuple):
+    '''12-Tuple C{(lat1, lon1, azi1, lat2, lon2, azi2, s12, a12, m12, M12, M21, S12)} with
+       angles C{lat1}, C{lon1}, C{azi1}, C{lat2}, C{lon2} and C{azi2} and arc C{a12} all in
+       C{degrees}, initial C{azi1} and final C{azi2} forward azimuths, distance C{s12} and
+       reduced length C{m12} in C{meter}, area C{S12} in C{meter} I{squared} and geodesic
+       scale factors C{M12} and C{M21}, both C{scalar}, see U{GeodSolve
+       <https://GeographicLib.SourceForge.io/C++/doc/GeodSolve.1.html>}.
+    '''
+    # from GeodSolve --help option -f ... lat1 lon1 azi1 lat2 lon2 azi2 s12 a12 m12 M12 M21 S12
+    _Names_ = (_lat1_, _lon1_, _azi1_, _lat2_, _lon2_, _azi2_, _s12_, _a12_, _m12_, _M12_, _M21_, _S12_)
+    _Units_ = (_Lat,   _Lon,   _Azi,   _Lat,   _Lon,   _Azi,   _M,    _Deg,  _Pass, _Pass, _Pass, _M2)
+
+
 class Inverse10Tuple(_GTuple):
     '''10-Tuple C{(a12, s12, salp1, calp1, salp2, calp2, m12, M12, M21, S12)} with arc length
        C{a12} in C{degrees}, distance C{s12} and reduced length C{m12} in C{meter}, area
@@ -494,13 +536,13 @@ class _kWrapped(object):  # in .geodesicw
         <https://PyPI.org/project/geographiclib>} classes.
     '''
 
-    @Property_RO
+    @property_ROnce
     def geographiclib(self):
         '''Lazily import C{geographiclib}, provided the U{geographiclib
            <https://PyPI.org/project/geographiclib>} package is installed,
            otherwise raise a C{LazyImportError}.
         '''
-        g = _xgeographiclib(self.__class__, 1, 49)
+        g = _xgeographiclib(self.__class__.__module__, 1, 49)
         from geographiclib.geodesic import Geodesic
         g.Geodesic = Geodesic
         from geographiclib.geodesicline import GeodesicLine
@@ -509,7 +551,7 @@ class _kWrapped(object):  # in .geodesicw
         g.Math = Math
         return g
 
-    @Property_RO
+    @property_ROnce
     def Math(self):
         '''Wrap the C{geomath.Math} class, provided the U{geographiclib
            <https://PyPI.org/project/geographiclib>} package is installed,
@@ -562,7 +604,7 @@ class Rhumb8Tuple(_GTuple):
 
            @kwarg dflt: Default value for missing items (C{any}).
            @kwarg a12_m12_M12_M21_salp1_calp1_salp2_calp2: Optional keyword
-                     arguments to specify or override L{Inverse10Tuple} items.
+                      arguments to specify or override L{Inverse10Tuple} items.
 
            @return: L{Inverse10Tuple}C{(a12, s12, salp1, calp1, salp2, calp2,
                     m12, M12, M21, S12)}.
@@ -687,6 +729,17 @@ def _isfinite(x):  # mimick geomath.Math.isfinite
         return _math_isfinite(x)  # and fabs(x) <= _MAX
 
 
+def _llz2gl(gl, **llz2):  # see .geodesici._llz2G
+    '''(INTERNAL) Set C{gl.lat2, .lon2, .azi2} from C{llz2}.
+    '''
+    if llz2:
+        for n in (_lat2_, _lon2_, _azi2_):  # _lat1_, _lon1_, _azi1_
+            v = llz2.get(n, None)
+            if v is not None:
+                setattr(gl, n, v)
+    return gl
+
+
 def _norm2(x, y):  # mimick geomath.Math.norm
     '''Normalize C{B{x}} and C{B{y}}.
 

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.06.11'
+__version__ = '24.07.16'
 
 
 class KTMError(_ValueError):
@@ -433,10 +433,7 @@ def _cma(a, b0, b1, Cn):
        @see: CPython function U{_Py_c_prod<https://GitHub.com/python/
              cpython/blob/main/Objects/complexobject.c>}.
 
-       @note: Python function C{cmath.fsum} is no longer available,
-              but stil mentioned in Note 4 of the comments before
-              CPython function U{math_fsum<https://GitHub.com/python/
-              cpython/blob/main/Modules/mathmodule.c>}
+       @note: Python function C{cmath.fsum} is no longer available.
     '''
     r = fsum1f_(a.real * b0.real, -a.imag * b0.imag, -b1.real, Cn)
     j = fsum1f_(a.real * b0.imag,  a.imag * b0.real, -b1.imag)

pygeodesy/latlonBase.py

@@ -41,7 +41,7 @@ from pygeodesy.namedTuples import Bounds2Tuple, LatLon2Tuple, PhiLam2Tuple, \
                                   Trilaterate5Tuple
 # from pygeodesy.nvectorBase import _N_vector_  # _MODS
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
-                            property_RO, _update_all
+                            property_RO, property_ROnce, _update_all
 # from pygeodesy.streprs import Fmt, hstr  # from .named, _MODS
 from pygeodesy.units import _isDegrees, _isRadius, Distance_, Lat, Lon, \
                              Height, Radius, Radius_, Scalar, Scalar_
@@ -54,7 +54,7 @@ from contextlib import contextmanager
 from math import asin, cos, degrees, fabs, radians
 
 __all__ = _ALL_LAZY.latlonBase
-__version__ = '24.06.11'
+__version__ = '24.07.12'
 
 _formy = _MODS.into(formy=__name__)
 
@@ -475,12 +475,11 @@ class LatLonBase(_NamedBase):
         r = func_(phi2, self.phi, lam21, datum=D)
         return r * (D.ellipsoid.a if radius is None else radius)
 
-    @property_RO
+    @property_ROnce
     def Ecef(self):
         '''Get the ECEF I{class} (L{EcefKarney}), I{once}.
         '''
-        LatLonBase.Ecef = E = _MODS.ecef.EcefKarney  # overwrite property_RO
-        return E
+        return _MODS.ecef.EcefKarney
 
     @Property_RO
     def _Ecef_forward(self):

pygeodesy/lazily.py

@@ -48,26 +48,27 @@ except ImportError as x:  # Python 2.6-
 from os import getenv as _getenv
 # import sys as _sys  # from .interns
 
-__as__                  = ' as '
-_dunder_all_            = '__all__'  # in .__main__
-_enabled_               = 'enabled'
-_FOR_DOCS               = _getenv('PYGEODESY_FOR_DOCS', NN)  # for epydoc ...
-_i0                     = ()  # PYCHOK empty tuple
-_init__all__            = _FOR_DOCS or _getenv('PYGEODESY_INIT__ALL__', _dunder_all_) == _dunder_all_  # PYCHOK exported
-_lazily_                = 'lazily'
-_lazily_imported_       = _SPACE_(_HASH_, _lazily_, 'imported')
-_PYGEODESY_GEOCONVERT_  = 'PYGEODESY_GEOCONVERT'  # PYCHOK .mgrs, test.bases
-_PYGEODESY_GEODSOLVE_   = 'PYGEODESY_GEODSOLVE'   # PYCHOK .geodsolve, test.bases
-_PYGEODESY_LAZY_IMPORT_ = 'PYGEODESY_LAZY_IMPORT'
-_PYGEODESY_RHUMBSOLVE_  = 'PYGEODESY_RHUMBSOLVE'  # PYCHOK .rhumb.solve, test.bases
-_PYTHON_X_DEV           =  getattr(_sys, '_xoptions', {}).get('dev',  # Python 3.2+
+__as__                    = ' as '
+_dunder_all_              = '__all__'  # in .__main__
+_enabled_                 = 'enabled'
+_FOR_DOCS                 = _getenv('PYGEODESY_FOR_DOCS', NN)  # for epydoc ...
+_i0                       = ()  # PYCHOK empty tuple
+_init__all__              = _FOR_DOCS or _getenv('PYGEODESY_INIT__ALL__', _dunder_all_) == _dunder_all_  # PYCHOK exported
+_lazily_                  = 'lazily'
+_lazily_imported_         = _SPACE_(_HASH_, _lazily_, 'imported')
+_PYGEODESY_GEOCONVERT_    = 'PYGEODESY_GEOCONVERT'  # PYCHOK .mgrs, test.bases
+_PYGEODESY_GEODSOLVE_     = 'PYGEODESY_GEODSOLVE'   # PYCHOK .geodsolve, test.bases
+_PYGEODESY_INTERSECTTOOL_ = 'PYGEODESY_INTERSECTTOOL'  # PYCHOK .intersectool, test.bases
+_PYGEODESY_LAZY_IMPORT_   = 'PYGEODESY_LAZY_IMPORT'
+_PYGEODESY_RHUMBSOLVE_    = 'PYGEODESY_RHUMBSOLVE'  # PYCHOK .rhumb.solve, test.bases
+_PYTHON_X_DEV             =  getattr(_sys, '_xoptions', {}).get('dev',  # Python 3.2+
                           _getenv('PYTHONDEVMODE', NN))  # PYCHOK exported
-_sys_version_info2      = _sys.version_info[:2]  # in .basics, .fmath, ...
-_unlazy = _unLazy0      = _isfrozen or _sys_version_info2 < (3, 7)  # PYCHOK mod.__getattr__ 3.7+
-_WARNINGS_X_DEV         = _getenv('PYGEODESY_WARNINGS', NN) and (
-                          _PYTHON_X_DEV or bool(_sys.warnoptions))  # PYCHOK .props
+_sys_version_info2        = _sys.version_info[:2]  # in .basics, .fmath, ...
+_unlazy = _unLazy0        = _isfrozen or _sys_version_info2 < (3, 7)  # PYCHOK mod.__getattr__ 3.7+
+_WARNINGS_X_DEV           = _getenv('PYGEODESY_WARNINGS', NN) and (
+                            _PYTHON_X_DEV or bool(_sys.warnoptions))  # PYCHOK .props
 # @module_property[_RO?] <https://GitHub.com/jtushman/proxy_tools/>
-isLazy                  =  None  # see @var isLazy in .__init__
+isLazy                    =  None  # see @var isLazy in .__init__
 
 
 class LazyAttributeError(AttributeError):
@@ -283,7 +284,8 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                           fsums=_i('Fsum', 'DivMod2Tuple', 'Fsum2Tuple', 'ResidualError',
                                    'fsum', 'fsum_', 'fsumf_', 'fsum1', 'fsum1_', 'fsum1f_'),
                            gars=_i('Garef', 'GARSError'),
-                      geodesici=_i('Intersector', 'Intersector5Tuple', 'XDist'),
+                      geodesici=_i('Intersectool', 'Intersectool5Tuple', 'Intersect7Tuple',
+                                   'Intersector',  'Intersector5Tuple',  'Middle5Tuple', 'XDict'),
                       geodesicw=_i('Geodesic', 'GeodesicLine', 'Geodesic_WGS84'),
                       geodesicx=_i('gx', 'gxarea', 'gxbases', 'gxline',  # modules
                                    'GeodesicAreaExact', 'GeodesicExact', 'GeodesicLineExact', 'PolygonArea'),
@@ -341,7 +343,8 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                                    'areaOf', 'boundsOf', 'centroidOf', 'fractional',
                                    'isclockwise', 'isconvex', 'isconvex_', 'isenclosedBy', 'ispolar',
                                    'luneOf', 'nearestOn5', 'perimeterOf', 'quadOf'),
-                          props=_i('Property', 'Property_RO', 'property_RO', 'property_doc_',
+                          props=_i('Property', 'Property_RO', 'property_doc_',
+                                   'property_RO', 'property_ROnce', 'property_ROver',
                                    'deprecated_class', 'deprecated_function', 'deprecated_method',
                                    'deprecated_Property_RO', 'deprecated_property_RO', 'DeprecationWarnings'),
                      resections=_i('Collins5Tuple', 'ResectionError', 'Survey3Tuple', 'Tienstra7Tuple',
@@ -409,7 +412,7 @@ _ALL_DEPRECATED = _NamedEnum_RO(_name='_ALL_DEPRECATED',
                                          'HeightIDW', 'HeightIDW2', 'HeightIDW3', 'Helmert7Tuple',
                                          'Lam_', 'LatLonExact4Tuple', 'NearestOn4Tuple', 'Ned3Tuple',
                                          'Phi_', 'RefFrameError', 'Rhumb7Tuple', 'RhumbOrder2Tuple',
-                                         'Transform7Tuple', 'TriAngle4Tuple', 'UtmUps4Tuple'),
+                                         'Transform7Tuple', 'TriAngle4Tuple', 'UtmUps4Tuple', 'XDist'),
                  deprecated_consterns=_i('EPS1_2', 'MANTIS', 'OK'),
                      deprecated_datum=_i('Curvature2Tuple', 'Datum',  'Ellipsoid',  'Transform',  # assert
                                                             'Datums', 'Ellipsoids', 'Transforms',
@@ -519,7 +522,7 @@ class _ALL_MODS(_internals._MODS_Base):
 _internals._MODS = _ALL_MODS = _ALL_MODS()  # PYCHOK singleton
 
 __all__ = _ALL_LAZY.lazily
-__version__ = '24.06.19'
+__version__ = '24.07.18'
 
 
 def _ALL_OTHER(*objs):

pygeodesy/ltp.py

@@ -33,8 +33,8 @@ from pygeodesy.ltpTuples import Attitude4Tuple, ChLVEN2Tuple, ChLV9Tuple, \
                                 ChLVyx2Tuple, _XyzLocals4, _XyzLocals5, Xyz4Tuple
 from pygeodesy.named import _name__, _name2__, _NamedBase, notOverloaded
 from pygeodesy.namedTuples import LatLon3Tuple, LatLon4Tuple, Vector3Tuple
-from pygeodesy.props import Property, Property_RO, property_doc_, property_RO, \
-                           _update_all
+from pygeodesy.props import Property, Property_RO, property_doc_, \
+                            property_ROver, _update_all
 from pygeodesy.streprs import Fmt, strs, unstr
 from pygeodesy.units import Bearing, Degrees, _isHeight, Meter
 from pygeodesy.utily import cotd, _loneg, sincos2d, sincos2d_, tand, tand_, \
@@ -44,7 +44,7 @@ from pygeodesy.vector3d import _ALL_LAZY, Vector3d
 # from math import fabs, floor as _floor  # from .fmath, .fsums
 
 __all__ = _ALL_LAZY.ltp
-__version__ = '24.06.11'
+__version__ = '24.07.12'
 
 _height0_ = _height_ + _0_
 _narrow_  = 'narrow'
@@ -722,15 +722,15 @@ class _ChLV(object):
         t = Y_X_h_lat_lon_h + (self, self._t0, None)  # PYCHOK _t0
         return ChLV9Tuple(t, name=name)
 
-    @property_RO
+    @property_ROver
     def _enh_n_h(self):
         '''(INTERNAL) Get C{ChLV*.reverse} args[1:4] names, I{once}.
         '''
-        _ChLV._enh_n_h = t = _args_kwds_names(_ChLV.reverse)[1:4]  # overwrite property_RO
+        t = _args_kwds_names(_ChLV.reverse)[1:4]
         # assert _args_kwds_names( ChLV.reverse)[1:4] == t
         # assert _args_kwds_names(ChLVa.reverse)[1:4] == t
         # assert _args_kwds_names(ChLVe.reverse)[1:4] == t
-        return t
+        return t  # overwrite propertyROver
 
     def forward(self, latlonh, lon=None, height=0, M=None, **name):  # PYCHOK no cover
         '''Convert WGS84 geodetic to I{Swiss} projection coordinates.  I{Must be overloaded}.

pygeodesy/ltpTuples.py

@@ -36,7 +36,7 @@ from pygeodesy.vector3d import Vector3d
 # from math import cos, radians  # from .utily
 
 __all__ = _ALL_LAZY.ltpTuples
-__version__ = '24.06.15'
+__version__ = '24.06.28'
 
 _aer_        = 'aer'
 _alt_        = 'alt'
@@ -349,7 +349,7 @@ class Aer(_AbcBase):
                                 number of (decimal) digits, unstripped
                                 (C{int}), C{B{fmt}='[]'} the enclosing
                                 backets format (C{str}) and separator
-                                C{B{sep}=', '} to join (C{str}).
+                                C{B{sep}=", "} to join (C{str}).
 
            @return: This AER as "[degrees360, degrees90, meter]" (C{str}).
         '''
@@ -572,7 +572,7 @@ class Ned(_AbcBase):
                                 number of (decimal) digits, unstripped
                                 (C{int}), C{B{fmt}='[]'} the enclosing
                                 backets format (C{str}) and separator
-                                C{B{sep}=', '} to join (C{str}).
+                                C{B{sep}=", "} to join (C{str}).
 
            @return: This NED as "[meter, meter, meter]" (C{str}).
         '''
@@ -659,7 +659,7 @@ class _Vector3d(Vector3d):
                                 number of (decimal) digits, unstripped
                                 (C{int}), C{B{fmt}='[]'} the enclosing
                                 backets format (C{str}) and separator
-                                C{B{sep}=', '} to join (C{str}).
+                                C{B{sep}=", "} to join (C{str}).
 
            @return: This XYZ as "[meter, meter, meter]" (C{str}).
         '''

pygeodesy/named.py

@@ -34,7 +34,7 @@ from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 # from pygeodesy.units import _toUnit  # _MODS
 
 __all__ = _ALL_LAZY.named
-__version__ = '24.06.24'
+__version__ = '24.07.12'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
@@ -1231,9 +1231,9 @@ def modulename(clas, prefixed=None):  # in .basics._xversion
        @return: The B{C{class}}'s C{[module.]class} name (C{str}).
     '''
     try:
-        n =  clas.__name__
+        n = clas.__name__
     except AttributeError:
-        n = _dunder_name_
+        n = clas if isstr(clas) else _dunder_name_
     if prefixed or (classnaming() if prefixed is None else False):
         try:
             m =  clas.__module__.rsplit(_DOT_, 1)

pygeodesy/nvectorBase.py

@@ -29,7 +29,7 @@ from pygeodesy.named import _xother3,  _under
 from pygeodesy.namedTuples import Trilaterate5Tuple, Vector3Tuple, \
                                   Vector4Tuple,  map1
 from pygeodesy.props import deprecated_method, Property_RO, property_doc_, \
-                            property_RO, _update_all
+                            property_RO, property_ROnce, _update_all
 from pygeodesy.streprs import Fmt, hstr, unstr
 from pygeodesy.units import Bearing, Height, Radius_, Scalar
 from pygeodesy.utily import sincos2d, _unrollon, _unrollon3
@@ -38,7 +38,7 @@ from pygeodesy.vector3d import Vector3d, _xyzhdlln4
 from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.nvectorBase
-__version__ = '24.06.12'
+__version__ = '24.07.12'
 
 
 class NvectorBase(Vector3d):  # XXX kept private
@@ -78,12 +78,11 @@ class NvectorBase(Vector3d):  # XXX kept private
         '''
         return self._datum
 
-    @property_RO
+    @property_ROnce
     def Ecef(self):
         '''Get the ECEF I{class} (L{EcefKarney}), I{once}.
         '''
-        NvectorBase.Ecef = E = _MODS.ecef.EcefKarney  # overwrite property_RO
-        return E
+        return _MODS.ecef.EcefKarney
 
     @property_RO
     def ellipsoidalNvector(self):