pygeodesy 24.7.7__py2.py3-none-any.whl → 24.8.4__py2.py3-none-any.whl

pygeodesy/geoids.py

@@ -93,15 +93,14 @@ from pygeodesy.fmath import favg, Fdot, fdot, Fhorner, frange
 from pygeodesy.heights import _as_llis2, _ascalar, _height_called, HeightError, \
                               _HeightsBase,  _ellipsoidal_datum, _Wrap
 # from pygeodesy.internals import _version2  # _MODS
-from pygeodesy.interns import MISSING, NN, _4_, _COLONSPACE_, _COMMASPACE_, \
-                             _cubic_, _E_, _height_, _in_, _kind_, _lat_, \
-                             _linear_, _lon_, _mean_, _N_, _n_a_, _numpy_, \
-                             _on_, _outside_, _S_, _s_, _scipy_, _SPACE_, \
-                             _stdev_, _tbd_, _W_, _width_
+from pygeodesy.interns import MISSING, NN, _4_, _COLONSPACE_, _COMMASPACE_, _cubic_, \
+                             _E_, _height_, _in_, _kind_, _lat_, _linear_, _lon_, \
+                             _mean_, _N_, _n_a_, _numpy_, _on_, _outside_, _S_, _s_, \
+                             _scipy_, _SPACE_, _stdev_, _tbd_, _W_, _width_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _name__, _Named, _NamedTuple
 # from pygeodesy.namedTuples import LatLon3Tuple  # _MODS
-from pygeodesy.props import deprecated_method, Property_RO, property_RO
+from pygeodesy.props import deprecated_method, Property_RO, property_RO, property_ROver
 from pygeodesy.streprs import attrs, Fmt, fstr, pairs
 from pygeodesy.units import Height, Int_, Lat, Lon
 # from pygeodesy.utily import _Wrap  # from .heights
@@ -118,7 +117,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '24.06.11'
+__version__ = '24.07.25'
 
 _assert_ = 'assert'
 _bHASH_  =  b'#'
@@ -288,7 +287,7 @@ class _GeoidBase(_HeightsBase):
 
     def _called(self, llis, scipy, wrap=False, H=False):
         # handle __call__
-        _H = _MODS.formy.heightOrthometric if H else None
+        _H = self._heightOrthometric if H else None
         _as, llis = _as_llis2(llis, Error=GeoidError)
         hs, _w    =  [], _Wrap._latlonop(wrap)
         _a, _h    =  hs.append, self._hGeoid
@@ -417,6 +416,10 @@ class _GeoidBase(_HeightsBase):
         '''
         return _height_called(self, lats, lons, Error=GeoidError, **wrap)
 
+    @property_ROver
+    def _heightOrthometric(self):
+        return _MODS.formy.heightOrthometric  # overwrite property_ROver
+
     def _hGeoid(self, lat, lon):
         out = self.outside(lat, lon)
         if out:
@@ -473,12 +476,11 @@ class _GeoidBase(_HeightsBase):
         '''(INTERNAL) I{Must be overloaded}.'''
         self._notOverloaded(lat, lon)
 
-    @property_RO
+    @property_ROver
     def _LL3T(self):
         '''(INTERNAL) Get L{LatLon3Tuple}, I{once}.
         '''
-        _GeoidBase._LL3T = T = _MODS.namedTuples.LatLon3Tuple  # overwrite poperty_RO
-        return T
+        return _MODS.namedTuples.LatLon3Tuple  # overwrite property_ROver
 
     def _llh3(self, lat, lon):
         return self._LL3T(lat, lon, self._hGeoid(lat, lon), name=self.name)

pygeodesy/heights.py

@@ -69,7 +69,7 @@ C{>>> hs = hinterpolator.height(lats, lons)}
 from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import isscalar, len2, map1, map2, _xnumpy, _xscipy
-from pygeodesy.constants import EPS, PI, PI2, _0_0, _90_0, _180_0
+from pygeodesy.constants import EPS, PI, PI_2, PI2, _0_0, _90_0, _180_0
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.errors import _AssertionError, LenError, PointsError, \
                              _SciPyIssue, _xattr, _xkwds, _xkwds_get, _xkwds_item2
@@ -83,7 +83,7 @@ from pygeodesy.interns import NN, _COMMASPACE_, _cubic_, _insufficient_, _linear
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _name2__, _Named
 from pygeodesy.points import _distanceTo, LatLon_,  Fmt, radians, _Wrap
-from pygeodesy.props import Property_RO, property_RO
+from pygeodesy.props import Property_RO, property_RO, property_ROver
 # from pygeodesy.streprs import Fmt  # from .points
 from pygeodesy.units import _isDegrees, Float_, Int_
 # from pygeodesy.utily import _Wrap  # from .points
@@ -91,7 +91,7 @@ from pygeodesy.units import _isDegrees, Float_, Int_
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.heights
-__version__ = '24.06.22'
+__version__ = '24.07.25'
 
 _error_     = 'error'
 _formy      = _MODS.into(formy=__name__)
@@ -169,14 +169,13 @@ def _insufficientError(need, Error=HeightError, **name_value):  # PYCHOK no cove
     return Error(txt=t, **name_value)
 
 
-def _ordedup(ts, lo=EPS, hi=PI2-EPS):
+def _orderedup(ts, lo=EPS, hi=PI2-EPS):
     # clip, order and remove duplicates
-    # p, ks = 0, []
+    # p = 0
     # for k in sorted(max(lo, min(hi, t)) for t in ts):
     #     if k > p:
-    #         ks.append(k)
+    #         yield k
     #         p = k
-    # return ks
     return sorted(set(max(lo, min(hi, t)) for t in ts))  # list
 
 
@@ -227,8 +226,6 @@ class _HeightBase(_Named):  # in .geoids
 class _HeightsBase(_HeightBase):  # in .geoids
     '''(INTERNAL) Interpolator base class.
     '''
-    _np_sp = None  # (numpy, scipy)
-
     def __call__(self, *llis, **wrap):  # PYCHOK no cover
         '''Interpolate the height for one or several locations.  I{Must be overloaded}.
 
@@ -290,46 +287,37 @@ class _HeightsBase(_HeightBase):  # in .geoids
         '''
         self._notOverloaded(lats, lons, **wrap)
 
-    def _np_sp2(self, throwarnings=False):
+    def _np_sp2(self, throwarnings=False):  # PYCHOK no cover
         '''(INTERNAL) Import C{numpy} and C{scipy}, once.
         '''
-        t = _HeightsBase._np_sp
-        if not t:
-            # raise SciPyWarnings, but not if
-            # scipy has already been imported
-            if throwarnings:  # PYCHOK no cover
-                import sys
-                if _scipy_ not in sys.modules:
-                    import warnings
-                    warnings.filterwarnings(_error_)
-
-            sp = _xscipy(self.__class__, 1, 2)
-            np = _xnumpy(self.__class__, 1, 9)
-
-            _HeightsBase._np_sp = t = np, sp
-        return t
-
-    @Property_RO
+        # raise SciPyWarnings, but not if
+        # scipy has already been imported
+        if throwarnings:  # PYCHOK no cover
+            import sys
+            if _scipy_ not in sys.modules:
+                import warnings
+                warnings.filterwarnings(_error_)
+        return self.numpy, self.scipy
+
+    @property_ROver
     def numpy(self):
         '''Get the C{numpy} module or C{None}.
         '''
-        np, _ = self._np_sp2()
-        return np
+        return _xnumpy(self.__class__, 1, 9)  # overwrite property_ROver
 
-    @Property_RO
+    @property_ROver
     def scipy(self):
         '''Get the C{scipy} module or C{None}.
         '''
-        _, sp = self._np_sp2()
-        return sp
+        return _xscipy(self.__class__, 1, 2)  # overwrite property_ROver
 
-    @Property_RO
+    @property_ROver
     def scipy_interpolate(self):
         '''Get the C{scipy.interpolate} module or C{None}.
         '''
         _ = self.scipy
         import scipy.interpolate as spi  # scipy 1.2.2
-        return spi
+        return spi  # overwrite property_ROver
 
     def _scipy_version(self, **n):
         '''Get the C{scipy} version as 2- or 3-tuple C{(major, minor, micro)}.
@@ -441,19 +429,20 @@ class HeightLSQBiSpline(_HeightsBase):
     '''
     _kmin = 16  # k = 3, always
 
-    def __init__(self, knots, weight=None, **name_wrap):
+    def __init__(self, knots, weight=None, low=1e-4, **name_wrap):
         '''New L{HeightLSQBiSpline} interpolator.
 
            @arg knots: The points with known height (C{LatLon}s).
            @kwarg weight: Optional weight or weights for each B{C{knot}}
                           (C{scalar} or C{scalar}s).
+           @kwarg low: Optional lower bound for I{ordered knots} (C{radians}).
            @kwarg name_wrap: Optional C{B{name}=NN} for this height interpolator
                        (C{str}) and keyword argument C{b{wrap}=False} to wrap or
                        I{normalize} all B{C{knots}} and B{C{llis}} locations iff
                        C{True} (C{bool}).
 
-           @raise HeightError: Insufficient number of B{C{knots}} or
-                               an invalid B{C{knot}} or B{C{weight}}.
+           @raise HeightError: Insufficient number of B{C{knots}} or an invalid
+                               B{C{knot}},  B{C{weight}} or B{C{eps}}.
 
            @raise LenError: Unequal number of B{C{knots}} and B{C{weight}}s.
 
@@ -487,9 +476,10 @@ class HeightLSQBiSpline(_HeightsBase):
                 w = Fmt.INDEX(weight=w.index(m))
                 raise HeightError(w, m)
         try:
-            T = 1.0e-4  # like SciPy example
-            ps = np.array(_ordedup(xs, T, PI2 - T))
-            ts = np.array(_ordedup(ys, T, PI  - T))
+            if not EPS < low < (PI_2 - EPS):  # 1e-4 like SciPy example
+                raise HeightError(low=low)
+            ps = np.array(_orderedup(xs, low, PI2 - low))
+            ts = np.array(_orderedup(ys, low, PI  - low))
             self._ev = spi.LSQSphereBivariateSpline(ys, xs, hs,
                                                     ts, ps, eps=EPS, w=w).ev
         except Exception as x:

pygeodesy/internals.py

@@ -213,6 +213,13 @@ class _MODS_Base(object):
         from pygeodesy import streprs  # DON'T _lazy_import2
         return streprs
 
+    @_Property_RO
+    def version(self):
+        '''Get pygeodesy version, I{once}.
+        '''
+        from pygeodesy import version
+        return version
+
 _MODS = _MODS_Base()  # PYCHOK overwritten by .lazily
 
 
@@ -430,7 +437,7 @@ def _print7(nl=0, nt=0, prec=6, prefix=NN, sep=_SPACE_, file=_sys.stdout,
 
 
 def _Pythonarchine(sep=NN):  # in .lazily, test/bases.py versions
-    '''(INTERNAL) Get PyPy and Python versions, bit and machine as C{3- or 4-list} or C{str}.
+    '''(INTERNAL) Get PyPy and Python versions, bits and machine as C{3- or 4-list} or C{str}.
     '''
     l3 = _MODS.Pythonarchine
     return sep.join(l3) if sep else l3  # 3- or 4-list
@@ -576,16 +583,22 @@ def _version_ints(vs):
     return tuple(_ints(vs))
 
 
+def _versions(sep=_SPACE_):
+    '''(INTERNAL) Get pygeodesy, PyPy and Python versions, bits, machine and OS as C{7- or 8-list} or C{str}.
+    '''
+    l7 = [_pygeodesy_, _MODS.version] + _Pythonarchine() + _osversion2()
+    return sep.join(l7) if sep else l7  # 5- or 6-list
+
+
 __all__ = tuple(map(_dunder_nameof, (machine, print_, printf)))
-__version__ = '24.07.04'
+__version__ = '24.08.01'
 
 if _dunder_ismain(__name__):  # PYCHOK no cover
 
-    from pygeodesy import _isfrozen, isLazy, version as vs
+    from pygeodesy import _isfrozen, isLazy
 
-    print_(_pygeodesy_, vs, *(_Pythonarchine() + _osversion2()
-                                               + ['_isfrozen', _isfrozen,
-                                                  'isLazy',     isLazy]))
+    print_(*(_versions(sep=NN) + ['_isfrozen', _isfrozen,
+                                  'isLazy',     isLazy]))
 
 # **) MIT License
 #

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,12 +141,11 @@ 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, \
-                            _xkwds_kwds, _xkwds_not
+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 NN, _2_, _a12_, _area_, _azi1_, _azi2_, _azi12_, \
@@ -153,15 +154,15 @@ from pygeodesy.interns import NN, _2_, _a12_, _area_, _azi1_, _azi2_, _azi12_, \
                              _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.units import Bearing as _Azi, Degrees as _Deg, Lat, Lon, \
+from pygeodesy.props import deprecated_method, Property_RO, property_ROnce
+from pygeodesy.units import Azimuth as _Azi, Degrees as _Deg, Lat, Lon, \
                             Meter as _M, Meter2 as _M2, Number_
 from pygeodesy.utily import atan2d, sincos2d, tand, _unrollon,  fabs
 
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.karney
-__version__ = '24.07.09'
+__version__ = '24.07.25'
 
 _K_2_0      = _getenv('PYGEODESY_GEOGRAPHICLIB', _2_) == _2_
 _perimeter_ = 'perimeter'
@@ -208,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 goedesici/-w
-    _CAP_1p        =  1 << 1   # for goedesici/-w
-    _CAP_2         =  1 << 2
-    _CAP_3         =  1 << 3   # for goedesici/-w
-#   _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/-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
@@ -248,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
-    _S_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 | _S_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._S_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
@@ -287,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},
 
@@ -311,7 +315,8 @@ and C{ALL} - all of the above.
 
 C{STANDARD} = C{AZIMUTH | DISTANCE | DISTANCE_IN | LATITUDE | LONGITUDE}'''
 
-_KEY2Caps = dict(azi2=Caps.AZIMUTH,  # see GDict._unCaps
+_key2Caps = dict(a12 =Caps.DISTANCE,  # in GDict._unCaps
+                 azi2=Caps.AZIMUTH,
                  lat2=Caps.LATITUDE,
                  lon2=Caps.LONGITUDE,
                  m12 =Caps.REDUCEDLENGTH,
@@ -322,7 +327,7 @@ _KEY2Caps = dict(azi2=Caps.AZIMUTH,  # see GDict._unCaps
 
 
 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
@@ -473,8 +478,8 @@ 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_):  # .Intesectool, .Intersector
-        '''(INTERNAL) Rename attr tail from C{-2} to C{-X} or C{-M}.
+    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_):
@@ -488,8 +493,8 @@ class GDict(ADict):  # XXX _NamedDict
     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
 
@@ -531,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
@@ -546,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,
@@ -599,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)}.
@@ -724,14 +729,15 @@ def _isfinite(x):  # mimick geomath.Math.isfinite
         return _math_isfinite(x)  # and fabs(x) <= _MAX
 
 
-def _llz2line(line, **llz2):
-    '''(INTERNAL) Set C{line.lat2, .lon2, .azi2} from C{llz2}.
+def _llz2gl(gl, **llz2):  # see .geodesici._llz2G
+    '''(INTERNAL) Set C{gl.lat2, .lon2, .azi2} from C{llz2}.
     '''
     if llz2:
-        llz2 = _xkwds_not(None, **_xkwds_kwds(llz2, lat2=None, lon2=None, azi2=None))
-        if llz2:
-            line.__dict__.update(llz2)
-    return line
+        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

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.29'
 
 _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):
@@ -1535,7 +1534,7 @@ class LatLonBase(_NamedBase):
 
            @kwarg form: The lat-/longitude C{B{form}at} to use (C{str}), see
                         functions L{pygeodesy.latDMS} or L{pygeodesy.lonDMS}.
-           @kwarg joined: Separator to join the lat-, longitude and heigth
+           @kwarg joined: Separator to join the lat-, longitude and height
                           strings (C{str} or C{None} or C{NN} for non-joined).
            @kwarg m: Optional unit of the height (C{str}), use C{None} to
                      exclude height from the returned string.