pygeodesy 24.5.6__py2.py3-none-any.whl → 24.5.15__py2.py3-none-any.whl

pygeodesy/geodesicw.py

@@ -20,8 +20,8 @@ from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
 from pygeodesy.errors import IntersectionError, GeodesicError, _xkwds_pop2
 from pygeodesy.fsums import Fsum,  Fmt, unstr
-from pygeodesy.interns import NN, _DOT_, _dunder_nameof, _SPACE_, \
-                             _to_, _too_,_under
+from pygeodesy.internals import _dunder_nameof, _under
+from pygeodesy.interns import NN, _DOT_, _SPACE_, _to_, _too_
 from pygeodesy.karney import _atan2d, Caps, Direct9Tuple, GDict, \
                              _kWrapped, Inverse10Tuple
 from pygeodesy.latlonBase import LatLonBase as _LLB,  F_D, Radius_
@@ -37,7 +37,7 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.04.07'
+__version__ = '24.05.14'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
@@ -353,17 +353,17 @@ class _gWrapped(_kWrapped):
                    @arg radius: Radius of the circle (C{meter}, conventionally).
                    @kwarg tol: Convergence tolerance (C{scalar}).
 
-                   @return: 2-Tuple C{(P, Q)} with both intersections (representing a
-                            geodesic chord), each a L{GDict} from method L{Position}
-                            extended to 14 items by C{lon0, lat0, azi0, a02, s02, at}
-                            with the circle center C{lat0}, C{lon0}, azimuth C{azi0} at,
-                            distance C{a02} in C{degrees} and C{s02} in C{meter} along
-                            the geodesic from the circle center to the intersection
-                            C{lat2}, C{lon2} and the angle C{at} between the geodesic
-                            and this line at the intersection.  The I{geodesic} azimuth
-                            at the intersection is C{(at + azi2)}.  If this line is
-                            tangential to the circle, both intersections are the same
-                            L{GDict} instance.
+                   @return: 2-Tuple C{(P, Q)} with both intersections points (representing
+                            a geodesic chord), each a L{GDict} from method L{Position} and
+                            extended to 14 items C{lat1, lon1, azi1, lat2, lon2, azi2, a12,
+                            s12, lat0, lon0, azi0, a02, s02, at} with the circle center
+                            C{lat0}, C{lon0}, azimuth C{azi0} at the intersection, distance
+                            C{a02} in C{degrees} and C{s02} in C{meter} along the geodesic
+                            from the circle center to the intersection C{lat2, lon2} and
+                            the angle C{at} between the geodesic and this line at the
+                            intersection.  The I{geodesic} azimuth at the intersection is
+                            C{(at + azi2)}.  If this line is tangential to the circle, both
+                            intersections are the same L{GDict} instance.
 
                    @raise IntersectionError: The circle and this geodesic line do not
                                              intersect.

pygeodesy/geodesicx/__main__.py

@@ -5,7 +5,7 @@ u'''Print L{geodesicx} version, etc. using C{python -m pygeodesy.geodesicx}.
 '''
 
 __all__ = ()
-__version__ = '23.06.19'
+__version__ = '24.05.13'
 
 
 def _C4stats(nC4=None):  # PYCHOK no cover
@@ -28,8 +28,8 @@ def _main():  # PYCHOK no cover
     try:
         from pygeodesy import geodesicx as _gx, GeodesicError, \
                               GeodesicSolve, printf, pygeodesy_abspath
-        from pygeodesy.interns import _COMMASPACE_, _DOT_, _pythonarchine, \
-                                      _SPACE_, _usage, _version_
+        from pygeodesy.internals import _Pythonarchine, _usage
+        from pygeodesy.interns import _COMMASPACE_, _DOT_, _SPACE_, _version_
         from pygeodesy.streprs import Fmt
 
         def _dot_attr(name, value):
@@ -41,7 +41,7 @@ def _main():  # PYCHOK no cover
         def _name_version(pkg):
             return _SPACE_(pkg.__name__, pkg.__version__)
 
-        v = _pythonarchine()
+        v = _Pythonarchine()
         try:
             import geographiclib
             v.append(_name_version(geographiclib))

pygeodesy/geodesicx/gxarea.py

@@ -27,10 +27,10 @@ from pygeodesy.named import ADict, callername, _NamedBase,  pairs
 from pygeodesy.props import Property, Property_RO, property_RO
 # from pygeodesy.streprs import pairs  # from .named
 
-from math import fmod
+from math import fmod as _fmod
 
 __all__ = ()
-__version__ = '24.03.24'
+__version__ = '24.05.10'
 
 
 class GeodesicAreaExact(_NamedBase):
@@ -198,8 +198,8 @@ class GeodesicAreaExact(_NamedBase):
             # Since we only need the parity of the result we
             # can use std::remquo but this is buggy with g++
             # 4.8.3 and requires C++11.  So instead we do:
-            lon1 = fmod(  lon1, _720_0)  # r.lon1
-            lon2 = fmod(r.lon2, _720_0)
+            lon1 = _fmod(  lon1, _720_0)  # r.lon1
+            lon2 = _fmod(r.lon2, _720_0)
             # int(True) == 1, int(False) == 0
             r.set_(xing=int(lon2 > 360 or -360 < lon2 <= 0) -
                         int(lon1 > 360 or -360 < lon1 <= 0))

pygeodesy/geodsolve.py

@@ -12,6 +12,7 @@ of the C{GeodSolve} executable.
 from pygeodesy.basics import _xinstanceof
 # from pygeodesy.errors import _xkwds  # from .karney
 # from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
+# from pygeodesy.internals import printf  # from .lazily
 from pygeodesy.interns import NN, _a12_, _azi1_, _azi2_, \
                              _lat1_, _lat2_, _lon1_, _lon2_, _m12_, \
                              _M12_, _M21_, _s12_, _S12_, _UNDER_
@@ -19,14 +20,14 @@ from pygeodesy.interns import _UNUSED_, _not_  # PYCHOK used!
 from pygeodesy.karney import _Azi, Caps, _Deg, GeodesicError, _GTuple, \
                              _Pass, _Lat, _Lon, _M, _M2, _sincos2d,  _xkwds
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
-                             _PYGEODESY_GEODSOLVE_, _getenv, printf
+                             _getenv, _PYGEODESY_GEODSOLVE_,  printf
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import Property, Property_RO
 from pygeodesy.solveBase import _SolveBase, _SolveLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 
 class GeodSolve12Tuple(_GTuple):

pygeodesy/geoids.py

@@ -92,12 +92,12 @@ from pygeodesy.fmath import favg, Fdot, fdot, Fhorner, frange
 # from pygoedesy.formy import heightOrthometric  # _MODS
 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_, _knots_, \
                              _lat_, _linear_, _lon_, _mean_, _N_, _n_a_, \
-                             _not_, _numpy_, _on_, _outside_, _S_, _s_, \
-                             _scipy_, _SPACE_, _stdev_, _supported_, _tbd_, \
-                             _W_, _width_, _version2
+                             _not_, _numpy_, _on_, _outside_, _S_, _s_, _scipy_, \
+                             _SPACE_, _stdev_, _supported_, _tbd_, _W_, _width_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _Named, _NamedTuple
 # from pygeodesy.namedTuples import LatLon3Tuple  # _MODS
@@ -118,7 +118,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 _assert_ = 'assert'
 _bHASH_  =  b'#'
@@ -1362,7 +1362,7 @@ class GeoidPGM(_GeoidBase):
         self._pgm = p = _PGM(g, pgm=egm_pgm, itemsize=self.u2B, sizeB=self.sizeB)
         if crop:
             g = p._cropped(g, abs(kind) + 1, *self._swne(crop))
-            if _version2(np.__version__) < (1, 9):
+            if _MODS.internals._version2(np.__version__) < (1, 9):
                 g = open(g.name, _rb_)  # reopen tempfile for numpy 1.8.0-
             self._cropped = True
         try:
@@ -1722,7 +1722,7 @@ __all__ += _ALL_DOCS(_GeoidBase)
 
 if __name__ == '__main__':
 
-    from pygeodesy.lazily import printf, _sys
+    from pygeodesy.internals import printf, _sys
 
     _crop     = ()
     _GeoidEGM = GeoidKarney

pygeodesy/heights.py

@@ -77,9 +77,9 @@ from pygeodesy.errors import _AssertionError, LenError, PointsError, \
 # from pygeodesy.formy import cosineAndoyerLambert, cosineForsytheAndoyerLambert, \
 #                             cosineLaw, equirectangular_, euclidean, flatLocal, \
 #                             flatPolar, haversine, thomas, vincentys  # _MODS
+# from pygeodesy.internals import _version2  # _MODS
 from pygeodesy.interns import NN, _COMMASPACE_, _cubic_, _insufficient_, _knots_, \
-                             _linear_, _NOTEQUAL_, _PLUS_, _scipy_, _SPACE_, \
-                             _STAR_, _version2
+                             _linear_, _NOTEQUAL_, _PLUS_, _scipy_, _SPACE_, _STAR_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _FOR_DOCS
 from pygeodesy.named import _Named
 from pygeodesy.points import _distanceTo, LatLon_,  Fmt, radians, _Wrap
@@ -91,7 +91,7 @@ from pygeodesy.units import _isDegrees, Float_, Int_
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.heights
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 _error_     = 'error'
 _llis_      = 'llis'
@@ -332,7 +332,7 @@ class _HeightsBase(_HeightBase):  # in .geoids
     def _scipy_version(self, **n):
         '''Get the C{scipy} version as 2- or 3-tuple C{(major, minor, micro)}.
         '''
-        return _version2(self.scipy.version.version, **n)
+        return _MODS.internals._version2(self.scipy.version.version, **n)
 
     def _xyhs3(self, knots, **wrap):
         # convert knot C{LatLon}s to tuples or C{NumPy} arrays and C{SciPy} sphericals