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

pygeodesy/geodesicw.py

@@ -8,8 +8,8 @@ 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.
 
-With env variable C{PYGEODESY_GEOGRAPHICLIB} left undefined or set to C{"2"}, this module,
-L{pygeodesy.geodesicx} and L{pygeodesy.karney} will use U{GeographicLib 2.0
+With env variable C{PYGEODESY_GEOGRAPHICLIB} left undefined or set to C{"2"}, this module and modules
+L{pygeodesy.geodesici}, L{pygeodesy.geodesicx} and L{pygeodesy.karney} will use U{GeographicLib 2.0
 <https://GeographicLib.SourceForge.io/C++/doc/>} transcoding, otherwise C{1.52} or older.
 '''
 
@@ -18,17 +18,19 @@ from pygeodesy.constants import EPS, NAN, _EPSqrt as _TOL, _0_5
 from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 # from pygeodesy.dms import F_D  # from .latlonBase
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
-from pygeodesy.errors import IntersectionError, GeodesicError
+from pygeodesy.errors import _AssertionError, GeodesicError, \
+                              IntersectionError
 from pygeodesy.fsums import Fsum,  Fmt, unstr
 from pygeodesy.internals import _dunder_nameof, _under
 from pygeodesy.interns import NN, _DOT_, _SPACE_, _to_, _too_
 from pygeodesy.karney import _atan2d, Caps, Direct9Tuple, GDict, \
-                              Inverse10Tuple, _kWrapped, _llz2line
+                              Inverse10Tuple, _kWrapped
 from pygeodesy.latlonBase import LatLonBase as _LLB,  F_D, Radius_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import callername, classname, _name1__, _name2__
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
-from pygeodesy.props import Property, Property_RO, property_RO
+from pygeodesy.props import Property, Property_RO, property_RO, \
+                            property_ROver
 # from pygeodesy.streprs import Fmt, unstr  # from .fsums
 # from pygeodesy.units import Radius_  # from .latlonBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360,  fabs  # PYCHOK used!
@@ -37,7 +39,7 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.07.09'
+__version__ = '24.07.12'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
@@ -48,14 +50,24 @@ class _gWrapped(_kWrapped):
         <https://PyPI.org/project/geographiclib>} classes.
     '''
 
-    @Property_RO  # MCCABE 24
+    @property_ROver  # MCCABE 24
     def Geodesic(self):
         '''Get the I{wrapped} C{geodesic.Geodesic} class from I{Karney}'s Python
            U{geographiclib<https://GitHub.com/geographiclib/geographiclib-python>},
            provided the latter is installed.
         '''
         _Geodesic = self.geographiclib.Geodesic
-        # assert Caps._STD == _Geodesic.STANDARD
+        if not (Caps.LATITUDE      == _Geodesic.LATITUDE and
+                Caps.LONGITUDE     == _Geodesic.LONGITUDE and
+                Caps.AZIMUTH       == _Geodesic.AZIMUTH and
+                Caps.DISTANCE      == _Geodesic.DISTANCE and
+                Caps.DISTANCE_IN   == _Geodesic.DISTANCE_IN and
+                Caps.REDUCEDLENGTH == _Geodesic.REDUCEDLENGTH and
+                Caps.GEODESICSCALE == _Geodesic.GEODESICSCALE and
+                Caps.AREA          == _Geodesic.AREA and
+                Caps.ALL           == _Geodesic.ALL):
+            raise _AssertionError(Caps=bin(Caps.ALL),
+                                  Geodesic=bin(_Geodesic.ALL))
 
         class Geodesic(_Geodesic):
             '''I{Wrapper} for I{Karney}'s Python U{geodesic.Geodesic
@@ -220,9 +232,7 @@ class _gWrapped(_kWrapped):
                 '''
                 with _wargs(self, lat1, lon1, lat2, lon2, caps, **name) as args:
                     t = _Geodesic.InverseLine(self, *args)
-                gl = self._Line13(t, **name)
-                p2 = gl.Position(gl.s13, outmask=Caps.AZIMUTH)
-                return _llz2line(gl, lat2=lat2, lon2=lon2, azi2=p2.azi2)
+                return self._Line13(t, **name)
 
             def Line(self, lat1, lon1, azi1, caps=Caps._STD_LINE, **name):
                 '''Set up a I{wrapped} C{GeodesicLine} to compute several points
@@ -247,14 +257,16 @@ class _gWrapped(_kWrapped):
 
 #           Polygon = _Geodesic.Polygon
 
+            WGS84 = None  # _EWGS84.geodesicw recusion
+
         # Geodesic.ArcDirect.__doc__   = _Geodesic.ArcDirect.__doc__
         # Geodesic.Direct.__doc__      = _Geodesic.Direct.__doc__
         # Geodesic.Inverse.__doc__     = _Geodesic.Inverse.__doc__
         # Geodesic.InverseLine.__doc__ = _Geodesic.InverseLinr.__doc__
         # Geodesic.Line.__doc__        = _Geodesic.Line.__doc__
-        return Geodesic
+        return Geodesic  # overwrite property_ROver
 
-    @Property_RO  # MCCABE 16
+    @property_ROver  # MCCABE 16
     def GeodesicLine(self):
         '''Get the I{wrapped} C{geodesicline.GeodesicLine} class from I{Karney}'s
            Python U{geographiclib<https://GitHub.com/geographiclib/geographiclib-python>},
@@ -418,48 +430,61 @@ class _gWrapped(_kWrapped):
 
         # GeodesicLine.ArcPosition.__doc__ = _GeodesicLine.ArcPosition.__doc__
         # GeodesicLine.Position.__doc__    = _GeodesicLine.Position.__doc__
-        return GeodesicLine
+        return GeodesicLine  # overwrite property_ROver
 
-    @Property_RO
+    @property_ROver
     def Geodesic_WGS84(self):
         '''Get the I{wrapped} C{Geodesic(WGS84)} singleton, provided the
            U{geographiclib<https://PyPI.org/project/geographiclib>} package
            is installed, otherwise an C{ImportError}.
         '''
-        return _EWGS84.geodesic
+        return _EWGS84.geodesicw  # overwrite property_ROver
 
 _wrapped = _gWrapped()  # PYCHOK singleton, .ellipsoids, .test/base.py
 
 
-def Geodesic(a_ellipsoid=_EWGS84, f=None, **name):
-    '''Return a I{wrapped} C{geodesic.Geodesic} instance from I{Karney}'s
-       Python U{geographiclib<https://PyPI.org/project/geographiclib>},
-       provide the latter is installed, otherwise an C{ImportError}.
-
-       @arg a_ellipsoid: An ellipsoid (L{Ellipsoid}) or datum (L{Datum})
-              or the equatorial radius I{a} of the ellipsoid (C{meter}).
-       @arg f: The flattening of the ellipsoid (C{scalar}), required if
-               B{C{a_ellipsoid}}) is C{meter}, ignored otherwise.
-       @kwarg name: Optional C{B{name}=NN} (C{str}), ignored like B{C{f}}.
+class Geodesic(_gWrapped):  # overwritten by 1st instance
+    '''I{Wrapper} around I{Karney}'s class U{geographiclib.geodesic.Geodesic
+       <https://geographiclib.sourceforge.io/Python/doc/code.html>}.
     '''
-    return _wrapped.Geodesic(a_ellipsoid, f=f, **name)
-
-
-def GeodesicLine(geodesic, lat1, lon1, azi1, caps=Caps._STD_LINE):
-    '''Return a I{wrapped} C{geodesicline.GeodesicLine} instance from I{Karney}'s
-       Python U{geographiclib<https://PyPI.org/project/geographiclib>}, provided
-       the latter is installed, otherwise an C{ImportError}.
-
-       @arg geodesic: A I{wrapped} L{Geodesic} instance.
-       @arg lat1: Latitude of the first points (C{degrees}).
-       @arg lon1: Longitude of the first points (C{degrees}).
-       @arg azi1: Azimuth at the first points (compass C{degrees360}).
-       @kwarg caps: Optional, bit-or'ed combination of L{Caps} values specifying
-                    the capabilities the C{GeodesicLine} instance should possess,
-                    i.e., which quantities can be returned by methods
-                    C{GeodesicLine.Position} and C{GeodesicLine.ArcPosition}.
+    def __new__(unused, a_ellipsoid=_EWGS84, f=None, **name):
+        '''Return a I{wrapped} C{geodesic.Geodesic} instance from I{Karney}'s
+           Python U{geographiclib<https://PyPI.org/project/geographiclib>},
+           provide the latter is installed, otherwise an C{ImportError}.
+
+           @arg a_ellipsoid: An ellipsoid (L{Ellipsoid}) or datum (L{Datum})
+                  or the equatorial radius I{a} of the ellipsoid (C{meter}).
+           @arg f: The flattening of the ellipsoid (C{scalar}), required if
+                   B{C{a_ellipsoid}}) is C{meter}, ignored otherwise.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
+        '''
+        g = _wrapped.Geodesic(a_ellipsoid, f=f, **name)
+        _MODS.geodesicw.Geodesic = g.__class__  # overwrite class
+        return g
+
+
+class GeodesicLine(_gWrapped):  # overwritten by 1st instance
+    '''I{Wrapper} around I{Karney}'s class U{geographiclib.geodesicline.GeodesicLine
+       <https://geographiclib.sourceforge.io/Python/doc/code.html>}.
     '''
-    return _wrapped.GeodesicLine(geodesic, lat1, lon1, azi1, caps=caps)
+    def __new__(unused, geodesic, lat1, lon1, azi1, caps=Caps._STD_LINE, **name):
+        '''Return a I{wrapped} C{geodesicline.GeodesicLine} instance from I{Karney}'s
+           Python U{geographiclib<https://PyPI.org/project/geographiclib>}, provided
+           the latter is installed, otherwise an C{ImportError}.
+
+           @arg geodesic: A I{wrapped} L{Geodesic} instance.
+           @arg lat1: Latitude of the first points (C{degrees}).
+           @arg lon1: Longitude of the first points (C{degrees}).
+           @arg azi1: Azimuth at the first points (compass C{degrees360}).
+           @kwarg caps: Optional, bit-or'ed combination of L{Caps} values specifying
+                        the capabilities the C{GeodesicLine} instance should possess,
+                        i.e., which quantities can be returned by methods
+                        C{GeodesicLine.Position} and C{GeodesicLine.ArcPosition}.
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
+        '''
+        gl = _wrapped.GeodesicLine(geodesic, lat1, lon1, azi1, caps=caps, **name)
+        _MODS.geodesicw.GeodesicLine = gl.__class__  # overwrite class
+        return gl
 
 
 def Geodesic_WGS84():
@@ -471,7 +496,7 @@ def Geodesic_WGS84():
 
 
 class _wargs(object):  # see also .formy._idllmn6, .latlonBase._toCartesian3, .vector2d._numpy
-    '''(INTERNAL) C{geographiclib} caller and exception mapper.
+    '''(INTERNAL) C{geographiclib} arguments and exception handler.
     '''
     @contextmanager  # <https://www.Python.org/dev/peps/pep-0343/> Examples
     def __call__(self, inst, *args, **kwds):
@@ -555,7 +580,7 @@ def _Intersecant2(gl, lat0, lon0, radius, tol=_TOL, form=F_D):  # MCCABE in LatL
 
 def _PlumbTo(gl, lat0, lon0, est=None, tol=_TOL):
     # (INTERNAL) Return the I{perpendicular} intersection of
-    # a geodesic from C{(lat0, lon0)} and a geodesic (line).
+    # a geodesic line C{gl} and geodesic from C{(lat0, lon0)}.
     pl = _MODS.rhumb.bases._PseudoRhumbLine(gl)
     return pl.PlumbTo(lat0, lon0, exact=gl.geodesic,
                                   est=est, tol=tol)

pygeodesy/geodesicx/gx.py

@@ -63,7 +63,7 @@ from pygeodesy.utily import atan2d as _atan2d_reverse, _unrollon, _Wrap, wrap360
 from math import atan2, copysign, cos, degrees, fabs, radians, sqrt
 
 __all__ = ()
-__version__ = '24.07.09'
+__version__ = '24.07.11'
 
 _MAXIT1 = 20
 _MAXIT2 = 10 + _MAXIT1 + MANT_DIG  # MANT_DIG == C++ digits
@@ -497,7 +497,7 @@ class GeodesicExact(_GeodesicBase):
         Cs = Caps
         if self._debug:  # PYCHOK no cover
             outmask |= Cs._DEBUG_INVERSE & self._debug
-        outmask &= Cs._OUT_MASK  # incl. _S_CALPs_ and _DEBUG_
+        outmask &= Cs._OUT_MASK  # incl. _SALP_CALPs_ and _DEBUG_
         # compute longitude difference carefully (with _diff182):
         # result is in [-180, +180] but -180 is only for west-going
         # geodesics, +180 is for east-going and meridional geodesics
@@ -674,7 +674,7 @@ class GeodesicExact(_GeodesicBase):
                 S12 = -S12
             r.set_(S12=unsigned0(S12))
 
-        if (outmask & (Cs.AZIMUTH | Cs._S_CALPs_)):
+        if (outmask & (Cs.AZIMUTH | Cs._SALP_CALPs_)):
             if swap_:
                 salp1, salp2 = salp2, salp1
                 calp1, calp2 = calp2, calp1
@@ -686,7 +686,7 @@ class GeodesicExact(_GeodesicBase):
             if (outmask & Cs.AZIMUTH):
                 r.set_(azi1=_atan2d(salp1, calp1),
                        azi2=_atan2d_reverse(salp2, calp2, reverse=outmask & Cs.REVERSE2))
-            if (outmask & Cs._S_CALPs_):
+            if (outmask & Cs._SALP_CALPs_):
                 r.set_(salp1=salp1, calp1=calp1,
                        salp2=salp2, calp2=calp2)
 
@@ -716,7 +716,7 @@ class GeodesicExact(_GeodesicBase):
            @return: L{Inverse10Tuple}C{(a12, s12, salp1, calp1, salp2, calp2,
                                              m12,   M12,   M21,   S12)}.
         '''
-        r = self._GDictInverse(lat1, lon1, lat2, lon2, outmask | Caps._S_CALPs_)
+        r = self._GDictInverse(lat1, lon1, lat2, lon2, outmask | Caps._SALP_CALPs_)
         return r.toInverse10Tuple()
 
     def _Inverse(self, ll1, ll2, wrap, **outmask):
@@ -761,7 +761,7 @@ class GeodesicExact(_GeodesicBase):
         # and .HeightIDWkarney._distances
         if wrap:
             _, lat2, lon2 = _Wrap.latlon3(lat1, lat2, lon2, True)  # _Geodesic.LONG_UNROLL
-        return fabs(self._GDictInverse(lat1, lon1, lat2, lon2, Caps._ANGLE_ONLY).a12)
+        return fabs(self._GDictInverse(lat1, lon1, lat2, lon2, Caps.EMPTY).a12)  # a12 always
 
     def Inverse3(self, lat1, lon1, lat2, lon2):  # PYCHOK outmask
         '''Return the distance in C{meter} and the forward and
@@ -806,9 +806,9 @@ class GeodesicExact(_GeodesicBase):
                  Python U{Geodesic.InverseLine<https://GeographicLib.SourceForge.io/Python/doc/code.html>}.
         '''
         Cs = Caps
-        r  = self._GDictInverse(lat1, lon1, lat2, lon2, Cs.AZIMUTH | Cs.DISTANCE | Cs._S_CALPs_)
+        r  = self._GDictInverse(lat1, lon1, lat2, lon2, caps | Cs._SALP_CALPs_)
         return GeodesicLineExact(self, lat1, lon1, None, caps=caps, _s_calp1=(r.salp1, r.calp1),
-                               **name)._GenSet(self._debug, lat2=lat2, lon2=lon2, **r)
+                                                            **name)._GenSet(self._debug, **r)
 
     def _InverseArea(self, _meridian, salp1, calp1,  # PYCHOK 9 args
                                       salp2, calp2,

pygeodesy/geodesicx/gxline.py

@@ -47,7 +47,7 @@ from pygeodesy.geodesicx.gxbases import _cosSeries, _GeodesicBase, \
 # from pygeodesy.geodesicw import _Intersecant2  # _MODS
 from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS
 from pygeodesy.karney import _around, _atan2d, Caps, GDict, _fix90, \
-                             _K_2_0, _llz2line, _norm2, _norm180, \
+                             _K_2_0, _llz2gl, _norm2, _norm180, \
                              _sincos2, _sincos2d
 from pygeodesy.named import Property_RO, _update_all
 # from pygeodesy.props import Property_RO, _update_all  # from .named
@@ -56,7 +56,7 @@ from pygeodesy.utily import atan2d as _atan2d_reverse, sincos2
 from math import atan2, cos, degrees, fabs, floor, radians, sin
 
 __all__ = ()
-__version__ = '24.07.09'
+__version__ = '24.07.12'
 
 _glXs = []  # instances of C{[_]GeodesicLineExact} to be updated
 
@@ -113,7 +113,7 @@ class _GeodesicLineExact(_GeodesicBase):
         self._salp1 = salp1
         self._calp1 = calp1
         # allow lat, azimuth and unrolling of lon
-        self._caps  = caps | Caps._LINE
+        self._caps  = caps | Caps._AZIMUTH_LATITUDE_LONG_UNROLL
 
         sbet1, cbet1 = _sinf1cos2d(_around(lat1), gX.f1)
         self._dn1 = gX._dn(sbet1, cbet1)
@@ -140,7 +140,7 @@ class _GeodesicLineExact(_GeodesicBase):
         # _norm2(schi1?, cchi1)  # no need to normalize!
         if not (caps & Caps.LINE_OFF):
             _glXs.append(self)
-        # no need to pre-compute other attrs based on _Caps.X.  All are
+        # no need to pre-compute other attrs for (caps & Caps.X).  All are
         # Property_RO's, computed once and cached/memoized until reset when
         # arc, distance, C4order is changed or Elliptic function is reset.
 
@@ -473,7 +473,7 @@ class _GeodesicLineExact(_GeodesicBase):
         self._a13   = a12
         self._caps |= Cs.DISTANCE | Cs.DISTANCE_IN
         # _update_all(self)  # new, from GeodesicExact.*Line
-        return _llz2line(self, **llz2)
+        return _llz2gl(self, **llz2)
 
     @Property_RO
     def geodesic(self):

pygeodesy/geodsolve.py

@@ -14,7 +14,7 @@ from pygeodesy.basics import _xinstanceof
 # from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
 from pygeodesy.interns import NN, _UNDER_
 from pygeodesy.karney import Caps, GeodesicError, GeodSolve12Tuple, \
-                            _llz2line, _sincos2d,  _0_0, NAN
+                            _sincos2d,  _0_0, NAN
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
                              _getenv, _PYGEODESY_GEODSOLVE_
 from pygeodesy.named import _name1__
@@ -24,7 +24,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.07.09'
+__version__ = '24.07.11'
 
 
 class _GeodesicSolveBase(_SolveGDictBase):
@@ -182,6 +182,15 @@ class GeodesicSolve(_GeodesicSolveBase):
             ll2 = _unrollon(ll1, _Wrap.point(ll2))
         return self.InverseLine(ll1.lat, ll1.lon, ll2.lat, ll2.lon, **caps_name)
 
+#   def _InverseLine2(self, lat1, lon1, lat2, lon2, **caps_name):  # in .geodesici
+#       '''(INTERNAL) Helper for L{InverseLine} and L{_InverseLine}.
+#       '''
+#       r  = self.Inverse(lat1, lon1, lat2, lon2)
+#       gl = GeodesicLineSolve(self, lat1, lon1, r.azi1, **_name1__(caps_name, _or_nameof=self))
+#       gl._a13 = r.a12  # gl.SetArc(r.a12)
+#       gl._s13 = r.s12  # gl.SetDistance(r.s12)
+#       return gl, r
+
     def InverseLine(self, lat1, lon1, lat2, lon2, **caps_name):  # PYCHOK no cover
         '''Set up a L{GeodesicLineSolve} to compute several points
            on a single geodesic.
@@ -207,7 +216,7 @@ class GeodesicSolve(_GeodesicSolveBase):
         gl = GeodesicLineSolve(self, lat1, lon1, r.azi1, **_name1__(caps_name, _or_nameof=self))
         gl._a13 = r.a12  # gl.SetArc(r.a12)
         gl._s13 = r.s12  # gl.SetDistance(r.s12)
-        return _llz2line(gl, lat2=lat2, lon2=lon2, azi2=r.azi2)
+        return gl
 
 
 class GeodesicLineSolve(_GeodesicSolveBase, _SolveGDictLineBase):

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.12'
 
 _assert_ = 'assert'
 _bHASH_  =  b'#'
@@ -473,12 +472,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)