pygeodesy 24.9.29__py2.py3-none-any.whl → 24.10.24__py2.py3-none-any.whl

pygeodesy/geodesici.py

@@ -38,11 +38,10 @@ from pygeodesy.errors import GeodesicError, IntersectionError, _an, \
 # from pygeodesy.errors import exception_chaining  # _MODS
 from pygeodesy.fmath import euclid, fdot
 from pygeodesy.fsums import Fsum, fsum1_,  _ceil
-from pygeodesy.interns import NN, _A_, _B_, _c_, _COMMASPACE_, \
-                             _HASH_, _M_, _not_, _SPACE_, _too_
-from pygeodesy.karney import Caps, _diff182, GDict, _sincos2de
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
-                             _getenv, _PYGEODESY_INTERSECTTOOL_
+from pygeodesy.interns import NN, _A_, _B_, _c_, _COMMASPACE_, _HASH_, \
+                             _M_, _not_, _SPACE_, _too_
+from pygeodesy.karney import Caps, _diff182, GDict, _sincos2de, _Xables
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import ADict, _NamedBase, _NamedTuple, _Pass
 # from pygeodesy.namedTuples import _LL4Tuple  # _MODS
 from pygeodesy.props import deprecated_method, Property, \
@@ -57,7 +56,7 @@ from pygeodesy.utily import sincos2,  atan2, fabs, radians
 # from math import atan2, ceil as _ceil, fabs, radians  # .fsums, .utily
 
 __all__ = _ALL_LAZY.geodesici
-__version__ = '24.08.28'
+__version__ = '24.10.22'
 
 _0t     =  0,  # int
 _1_1t   = -1, +1
@@ -470,8 +469,8 @@ class Intersectool(_IntersectBase, _SolveCapsBase):
     _Names_ABs   = _latA_, _lonA_, 'latB', 'lonB', _sAB_  # -C to stderr
     _Names_XDict = 'sA', 'sB', _c_  # plus 'k' from -i or 'sX0' from -R
     _o_alt       = _o__,  # Offset latA lonA aziA  latB lonB aziB  x0 y0
-    _Xable_name  = 'IntersectTool'
-    _Xable_path  = _getenv(_PYGEODESY_INTERSECTTOOL_, _PYGEODESY_INTERSECTTOOL_)
+    _Xable_name  = _Xables.IntersectTool.__name__
+    _Xable_path  = _Xables.IntersectTool()
 
     def __init__(self, a_geodesic=None, f=None, **name):
         '''New L{IntersectTool}.
@@ -1547,7 +1546,7 @@ if __name__ == '__main__':  # MCCABE 14
             ll4 += ll4.replace(_A_, _B_)
             llz  = _SPACE_(NN, _latA_, _lonA_, 'aziA')
             llz2 =  llz + llz.replace(_A_, _B_)
-            return dict(opts='-Verbose|V--version|v--help|h--Tool|T--Check|C-R meter-',
+            return dict(opts='-Verbose|V--version|v--help|h--Tool|T--Check|C-R <meter>-',
                         alts=((_c_ + llz2),
                               (_i_ + ll4),
                               (_m_ + ll4),
@@ -1587,8 +1586,8 @@ if __name__ == '__main__':  # MCCABE 14
                 I = Intersectool()  # PYCHOK I
                 if _V:
                     I.verbose = True
-                if I.IntersectTool in (_PYGEODESY_INTERSECTTOOL_, None):  # not set
-                    I.IntersectTool = '/opt/local/bin/IntersectTool'  # '/opt/local/Cellar/geographiclib/2.3/bin/IntersectTool'  # HomeBrew
+                if not _Xables.X_OK(I.IntersectTool):
+                    I.IntersectTool = _Xables.IntersectTool(_Xables.bin_)
                 elif _V:
                     _ = I.version
                 M, _T = None, True
@@ -1640,38 +1639,42 @@ if __name__ == '__main__':  # MCCABE 14
                 for i, X in enumerate(X):
                     printf(_COLONSPACE_(Fmt.INDEX(m, i), repr(X)))
 
+    def _examples():
+
+        from pygeodesy.internals import _usage_argv
+
+        s = _SPACE_(*_usage_argv(__file__))
+        for t in ('-h', '-h -n',
+                  '-c 0 0 45  40 10 135',
+                  '-C -c 0 0 45  40 10 135',
+                  '-T -R 2.6e7 -c 0 0 45  40 10 135',
+                  '-c 50 -4 -147.7  0 0 90',
+                  '-C -c 50 -4 -147.7  0 0 90',
+                  '# % echo 0 0  10 10  50 -4  50S 4W | IntersectTool -i  -p 0  -C',
+                  '# -631414 5988887 0 -3',
+                  '# -4.05187 -4.00000 -4.05187 -4.00000 0',
+                  '-m 0 0  10 10  50 -4  50S 4W',
+                  '-C -m 0 0  10 10  50 -4  50S 4W',
+                  '-i 0 0  10 10  50 -4  50S 4W',
+                  '-T -i 0 0  10 10  50 -4  50S 4W',
+                  '-C -i 0 0  10 10  50 -4  50S 4W',
+                  '-T -C -i 0 0  10 10  50 -4  50S 4W',
+                  '-V -T -i 0 0  10 10  50 -4  -50 -4',
+                  '-C -R 4e7 -c 50 -4 -147.7  0 0 90',
+                  '-T -C -R 4e7 -c 50 -4 -147.7  0 0 90',
+                  '-R 4e7 -i 0 0  10 10  50 -4  -50 -4',
+                  '-T -R 4e7 -i 0 0  10 10  50 -4  -50 -4'):
+            if t.startswith(_HASH_):
+                printf(t, nl=int(t[2] == '%'))
+            else:
+                printf(_SPACE_(_HASH_, s, t), nl=1)
+                argv[1:] = t = t.split()
+                _main(t)
+
     from sys import argv, stderr
     try:
         if len(argv) == 2 and argv[1] == __help_:
-            from pygeodesy.internals import _usage_argv
-
-            s = _SPACE_(*_usage_argv(__file__))
-            for t in ('-h', '-h -n',
-                      '-c 0 0 45  40 10 135',
-                      '-C -c 0 0 45  40 10 135',
-                      '-T -R 2.6e7 -c 0 0 45  40 10 135',
-                      '-c 50 -4 -147.7  0 0 90',
-                      '-C -c 50 -4 -147.7  0 0 90',
-                      '# % echo 0 0  10 10  50 -4  50S 4W | IntersectTool -i  -p 0  -C',
-                      '# -631414 5988887 0 -3',
-                      '# -4.05187 -4.00000 -4.05187 -4.00000 0',
-                      '-m 0 0  10 10  50 -4  50S 4W',
-                      '-C -m 0 0  10 10  50 -4  50S 4W',
-                      '-i 0 0  10 10  50 -4  50S 4W',
-                      '-T -i 0 0  10 10  50 -4  50S 4W',
-                      '-C -i 0 0  10 10  50 -4  50S 4W',
-                      '-T -C -i 0 0  10 10  50 -4  50S 4W',
-                      '-V -T -i 0 0  10 10  50 -4  -50 -4',
-                      '-C -R 4e7 -c 50 -4 -147.7  0 0 90',
-                      '-T -C -R 4e7 -c 50 -4 -147.7  0 0 90',
-                      '-R 4e7 -i 0 0  10 10  50 -4  -50 -4',
-                      '-T -R 4e7 -i 0 0  10 10  50 -4  -50 -4'):
-                if t.startswith(_HASH_):
-                    printf(t, nl=int(t[2] == '%'))
-                else:
-                    printf(_SPACE_(_HASH_, s, t), nl=1)
-                    argv[1:] = t = t.split()
-                    _main(t)
+            _examples()
         else:
             _main(argv[1:])
 

pygeodesy/geodesicw.py

@@ -21,7 +21,7 @@ from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 from pygeodesy.errors import _AssertionError, GeodesicError, \
                               IntersectionError
 from pygeodesy.fsums import Fsum,  Fmt, unstr
-from pygeodesy.internals import _dunder_nameof, _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, \
                               Inverse10Tuple, _kWrapped
@@ -39,7 +39,7 @@ from contextlib import contextmanager
 # from math import fabs  # from .utily
 
 __all__ = _ALL_LAZY.geodesicw
-__version__ = '24.07.12'
+__version__ = '24.10.14'
 
 _plumb_ = 'plumb'
 _TRIPS  =  65
@@ -516,7 +516,7 @@ def _Intersecant2(gl, lat0, lon0, radius, tol=_TOL, form=F_D):  # MCCABE in LatL
     # (INTERNAL) Return the intersections of a circle at C{lat0, lon0}
     # and a geodesic line as a 2-Tuple C{(P, Q)}, each a C{GDict}.
     r  =  Radius_(radius)
-    n  = _dunder_nameof(_Intersecant2)[1:]
+    n  = _DUNDER_nameof(_Intersecant2)[1:]
     _P =  gl.Position
     _I =  gl.geodesic.Inverse
     _a =  fabs

pygeodesy/geodesicx/gxarea.py

@@ -19,10 +19,11 @@ from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.basics import isodd, unsigned0
 from pygeodesy.constants import NAN, _0_0, _0_5, _720_0
+from pygeodesy.internals import printf
 # from pygeodesy.interns import _COMMASPACE_  # from .lazily
 from pygeodesy.karney import Area3Tuple, _diff182, GeodesicError, \
                             _norm180, _remainder, _sum3
-from pygeodesy.lazily import _ALL_DOCS, printf,  _COMMASPACE_
+from pygeodesy.lazily import _ALL_DOCS,  _COMMASPACE_
 from pygeodesy.named import ADict, callername, _NamedBase,  pairs
 from pygeodesy.props import Property, Property_RO, property_RO
 # from pygeodesy.streprs import pairs  # from .named
@@ -30,7 +31,7 @@ from pygeodesy.props import Property, Property_RO, property_RO
 from math import fmod as _fmod
 
 __all__ = ()
-__version__ = '24.09.04'
+__version__ = '24.10.14'
 
 
 class GeodesicAreaExact(_NamedBase):

pygeodesy/geodsolve.py

@@ -14,9 +14,8 @@ from pygeodesy.basics import _xinstanceof
 # from pygeodesy.geodesicx import GeodesicAreaExact  # _MODS
 from pygeodesy.interns import NN, _UNDER_
 from pygeodesy.karney import Caps, GeodesicError, GeodSolve12Tuple, \
-                            _sincos2d,  _0_0, NAN
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, \
-                             _getenv, _PYGEODESY_GEODSOLVE_
+                            _sincos2d, _Xables,  _0_0, NAN
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name1__
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import Property, Property_RO, property_RO
@@ -24,7 +23,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.geodsolve
-__version__ = '24.08.13'
+__version__ = '24.10.14'
 
 
 class _GeodesicSolveBase(_SolveGDictBase):
@@ -33,8 +32,8 @@ class _GeodesicSolveBase(_SolveGDictBase):
     _Error         =  GeodesicError
     _Names_Direct  = \
     _Names_Inverse =  GeodSolve12Tuple._Names_
-    _Xable_name    = 'GeodSolve'
-    _Xable_path    = _getenv(_PYGEODESY_GEODSOLVE_, _PYGEODESY_GEODSOLVE_)
+    _Xable_name    = _Xables.GeodSolve.__name__
+    _Xable_path    = _Xables.GeodSolve()
 
     @Property_RO
     def _b_option(self):
@@ -396,30 +395,32 @@ __all__ += _ALL_DOCS(_GeodesicSolveBase)
 
 if __name__ == '__main__':
 
-    from pygeodesy import printf
-    from sys import argv
+    def _main():
+        from pygeodesy import printf
+        from sys import argv
 
-    gS = GeodesicSolve(name='Test')
-    gS.verbose = '--verbose' in argv  # or '-v' in argv
+        gS = GeodesicSolve(name='Test')
+        gS.verbose = '--verbose' in argv  # or '-v' in argv
 
-    if gS.GeodSolve in (_PYGEODESY_GEODSOLVE_, None):  # not set
-        gS.GeodSolve = '/opt/local/bin/GeodSolve'  # '/opt/local/Cellar/geographiclib/2.3/bin/GeodSolve'  # HomeBrew
-    printf('version: %s', gS.version)
+        if not _Xables.X_OK(gS.GeodSolve):  # not set
+            gS.GeodSolve = _Xables.GeodSolve(_Xables.bin_)
+        printf('version: %s', gS.version)
 
-    r = gS.Direct(40.6, -73.8, 51, 5.5e6)
-    printf('Direct: %r', r, nl=1)
-    printf('Direct3: %r', gS.Direct3(40.6, -73.8, 51, 5.5e6))
+        r = gS.Direct(40.6, -73.8, 51, 5.5e6)
+        printf('Direct: %r', r, nl=1)
+        printf('Direct3: %r', gS.Direct3(40.6, -73.8, 51, 5.5e6))
 
-    printf('Inverse: %r',  gS.Inverse( 40.6, -73.8, 51.6, -0.5), nl=1)
-    printf('Inverse1: %r', gS.Inverse1(40.6, -73.8, 51.6, -0.5))
-    printf('Inverse3: %r', gS.Inverse3(40.6, -73.8, 51.6, -0.5))
+        printf('Inverse: %r',  gS.Inverse( 40.6, -73.8, 51.6, -0.5), nl=1)
+        printf('Inverse1: %r', gS.Inverse1(40.6, -73.8, 51.6, -0.5))
+        printf('Inverse3: %r', gS.Inverse3(40.6, -73.8, 51.6, -0.5))
 
-    glS = GeodesicLineSolve(gS, 40.6, -73.8, 51, name='LineTest')
-    p = glS.Position(5.5e6)
-    printf('Position:    %s  %r', p == r, p, nl=1)
-    p = glS.ArcPosition(49.475527)
-    printf('ArcPosition: %s %r', p == r, p)
+        glS = GeodesicLineSolve(gS, 40.6, -73.8, 51, name='LineTest')
+        p = glS.Position(5.5e6)
+        printf('Position:    %5s %r', p == r, p, nl=1)
+        p = glS.ArcPosition(49.475527)
+        printf('ArcPosition: %5s %r', p == r, p)
 
+    _main()
 
 # % python3 -m pygeodesy.geodsolve
 
@@ -436,6 +437,21 @@ if __name__ == '__main__':
 # ArcPosition: False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141174, m12=4844148.669561, M12=0.650911, M21=0.651229, s12=5499999.948497, S12=39735074737272.734375)
 
 
+# % python3 -m pygeodesy.geodsolve
+
+# version: /opt/local/bin/GeodSolve: GeographicLib version 2.3
+
+# Direct: GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141173, m12=4844148.703101, M12=0.650911, M21=0.651229, s12=5500000.0, S12=39735075134877.078125)
+# Direct3: Destination3Tuple(lat=51.884565, lon=-1.141173, final=107.189397)
+
+# Inverse: GDict(a12=49.94131, azi1=51.198883, azi2=107.821777, lat1=40.6, lat2=51.6, lon1=-73.8, lon2=-0.5, m12=4877684.602706, M12=0.64473, M21=0.645046, s12=5551759.400319, S12=40041368848742.53125)
+# Inverse1: 49.94131021789904
+# Inverse3: Distance3Tuple(distance=5551759.400319, initial=51.198883, final=107.821777)
+
+# Position:    False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141173, s12=5500000.0)
+# ArcPosition: False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141174, s12=5499999.948497)
+
+
 # % python3 -m pygeodesy.geodsolve --verbose
 
 # GeodesicSolve 'Test' 1: /opt/local/bin/GeodSolve --version (invoke)
@@ -462,6 +478,39 @@ if __name__ == '__main__':
 # Position:    True  GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141173, m12=4844148.703101, M12=0.650911, M21=0.651229, s12=5500000.0, S12=39735075134877.09375)
 # ArcPosition: False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141174, m12=4844148.669561, M12=0.650911, M21=0.651229, s12=5499999.948497, S12=39735074737272.734375)
 
+
+# % python3 -m pygeodesy.geodsolve --verbose
+
+# GeodesicSolve 'Test'@1: /opt/local/bin/GeodSolve --version (invoke)
+# GeodesicSolve 'Test'@1: '/opt/local/bin/GeodSolve: GeographicLib version 2.3' (0, stdout/-err)
+# GeodesicSolve 'Test'@1: /opt/local/bin/GeodSolve: GeographicLib version 2.3 (0)
+# version: /opt/local/bin/GeodSolve: GeographicLib version 2.3
+# GeodesicSolve 'Test'@2: /opt/local/bin/GeodSolve -f -E -p 10 \ 40.600000000000001 -73.799999999999997 51.0 5500000.0 (Direct)
+# GeodesicSolve 'Test'@2: '40.600000000000001 -73.799999999999997 51.000000000000000 51.884564505606761 -1.141172861200843 107.189397162605871 5500000.0000000000 49.475527463251460 4844148.7031014860 0.65091056699808614 0.65122865892196569 39735075134877.078' (0, stdout/-err)
+# GeodesicSolve 'Test'@2: lat1=40.600000000000001, lon1=-73.799999999999997, azi1=51.0, lat2=51.884564505606761, lon2=-1.141172861200843, azi2=107.189397162605871, s12=5500000.0, a12=49.47552746325146, m12=4844148.703101486, M12=0.65091056699808614, M21=0.65122865892196569, S12=39735075134877.078 (0)
+
+# Direct: GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141173, m12=4844148.703101, M12=0.650911, M21=0.651229, s12=5500000.0, S12=39735075134877.078125)
+# GeodesicSolve 'Test'@3: /opt/local/bin/GeodSolve -f -E -p 10 \ 40.600000000000001 -73.799999999999997 51.0 5500000.0 (Direct3)
+# GeodesicSolve 'Test'@3: '40.600000000000001 -73.799999999999997 51.000000000000000 51.884564505606761 -1.141172861200843 107.189397162605871 5500000.0000000000 49.475527463251460 4844148.7031014860 0.65091056699808614 0.65122865892196569 39735075134877.078' (0, stdout/-err)
+# GeodesicSolve 'Test'@3: lat1=40.600000000000001, lon1=-73.799999999999997, azi1=51.0, lat2=51.884564505606761, lon2=-1.141172861200843, azi2=107.189397162605871, s12=5500000.0, a12=49.47552746325146, m12=4844148.703101486, M12=0.65091056699808614, M21=0.65122865892196569, S12=39735075134877.078 (0)
+# Direct3: Destination3Tuple(lat=51.884565, lon=-1.141173, final=107.189397)
+# GeodesicSolve 'Test'@4: /opt/local/bin/GeodSolve -f -E -p 10 -i \ 40.600000000000001 -73.799999999999997 51.600000000000001 -0.5 (Inverse)
+# GeodesicSolve 'Test'@4: '40.600000000000001 -73.799999999999997 51.198882845579824 51.600000000000001 -0.500000000000000 107.821776735514248 5551759.4003186813 49.941310217899037 4877684.6027061967 0.64472969205948238 0.64504567852134398 40041368848742.531' (0, stdout/-err)
+# GeodesicSolve 'Test'@4: lat1=40.600000000000001, lon1=-73.799999999999997, azi1=51.198882845579824, lat2=51.600000000000001, lon2=-0.5, azi2=107.821776735514248, s12=5551759.4003186813, a12=49.941310217899037, m12=4877684.6027061967, M12=0.64472969205948238, M21=0.64504567852134398, S12=40041368848742.531 (0)
+
+# Inverse: GDict(a12=49.94131, azi1=51.198883, azi2=107.821777, lat1=40.6, lat2=51.6, lon1=-73.8, lon2=-0.5, m12=4877684.602706, M12=0.64473, M21=0.645046, s12=5551759.400319, S12=40041368848742.53125)
+# GeodesicSolve 'Test'@5: /opt/local/bin/GeodSolve -f -E -p 10 -i \ 40.600000000000001 -73.799999999999997 51.600000000000001 -0.5 (Inverse1)
+# GeodesicSolve 'Test'@5: '40.600000000000001 -73.799999999999997 51.198882845579824 51.600000000000001 -0.500000000000000 107.821776735514248 5551759.4003186813 49.941310217899037 4877684.6027061967 0.64472969205948238 0.64504567852134398 40041368848742.531' (0, stdout/-err)
+# GeodesicSolve 'Test'@5: lat1=40.600000000000001, lon1=-73.799999999999997, azi1=51.198882845579824, lat2=51.600000000000001, lon2=-0.5, azi2=107.821776735514248, s12=5551759.4003186813, a12=49.941310217899037, m12=4877684.6027061967, M12=0.64472969205948238, M21=0.64504567852134398, S12=40041368848742.531 (0)
+# Inverse1: 49.94131021789904
+# GeodesicSolve 'Test'@6: /opt/local/bin/GeodSolve -f -E -p 10 -i \ 40.600000000000001 -73.799999999999997 51.600000000000001 -0.5 (Inverse3)
+# GeodesicSolve 'Test'@6: '40.600000000000001 -73.799999999999997 51.198882845579824 51.600000000000001 -0.500000000000000 107.821776735514248 5551759.4003186813 49.941310217899037 4877684.6027061967 0.64472969205948238 0.64504567852134398 40041368848742.531' (0, stdout/-err)
+# GeodesicSolve 'Test'@6: lat1=40.600000000000001, lon1=-73.799999999999997, azi1=51.198882845579824, lat2=51.600000000000001, lon2=-0.5, azi2=107.821776735514248, s12=5551759.4003186813, a12=49.941310217899037, m12=4877684.6027061967, M12=0.64472969205948238, M21=0.64504567852134398, S12=40041368848742.531 (0)
+# Inverse3: Distance3Tuple(distance=5551759.400319, initial=51.198883, final=107.821777)
+
+# Position:    False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141173, s12=5500000.0)
+# ArcPosition: False GDict(a12=49.475527, azi1=51.0, azi2=107.189397, lat1=40.6, lat2=51.884565, lon1=-73.8, lon2=-1.141174, s12=5499999.948497)
+
 # **) MIT License
 #
 # Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.

pygeodesy/geohash.py

@@ -7,7 +7,7 @@ Class L{Geohash} and several functions to encode, decode and inspect
 C{geohashes} and optional L{Geohashed} caches.
 
 Originally transcoded from JavaScript originals by I{(C) Chris Veness
-2011-2015} and published under the same MIT Licence**, see
+2011-2024} and published under the same MIT Licence**, see
 U{Geohashes<https://www.Movable-Type.co.UK/scripts/geohash.html>}.
 
 @see: U{Geohash<https://WikiPedia.org/wiki/Geohash>}, I{Karney}'s C++
@@ -38,7 +38,7 @@ from pygeodesy.units import Degrees_, Int, Lat_, Lon_, Meter, Precision_, Str
 from math import fabs, ldexp, log10, radians
 
 __all__ = _ALL_LAZY.geohash
-__version__ = '24.08.05'
+__version__ = '24.10.12'
 
 _formy   = _MODS.into(formy=__name__)
 _MASK5   =  16, 8, 4, 2, 1  # PYCHOK used!

pygeodesy/geoids.py

@@ -106,9 +106,9 @@ from pygeodesy.streprs import attrs, Fmt, fstr, pairs
 from pygeodesy.units import Height, Int_, Lat, Lon
 # from pygeodesy.utily import _Wrap  # from .heights
 
-from math import floor
-import os.path as _os_path
-from os import SEEK_CUR as _SEEK_CUR, SEEK_SET as _SEEK_SET
+from math import floor as _floor
+# from os import SEEK_CUR, SEEK_SET  # _MODS
+# import os.path  # _MODS
 from struct import calcsize as _calcsize, unpack as _unpack
 try:
     from StringIO import StringIO as _BytesIO  # reads bytes
@@ -118,7 +118,7 @@ except ImportError:  # Python 3+
     from io import BytesIO as _BytesIO  # PYCHOK expected
 
 __all__ = _ALL_LAZY.geoids
-__version__ = '24.08.24'
+__version__ = '24.10.11'
 
 _assert_         = 'assert'
 _bHASH_          = b'#'
@@ -463,7 +463,7 @@ class _GeoidBase(_HeightBase):
 
     def _load(self, g, dtype, n, offset=0):
         # numpy.fromfile, like .frombuffer
-        g.seek(offset, _SEEK_SET)
+        g.seek(offset, _MODS.os.SEEK_SET)
         return self.numpy.fromfile(g, dtype, n)
 
     @Property_RO
@@ -545,8 +545,8 @@ class _GeoidBase(_HeightBase):
     def _open(self, geoid, datum, kind, name, smooth):
         # open the geoid file
         try:
-            self._geoid = _os_path.basename(geoid)
-            self._sizeB = _os_path.getsize(geoid)
+            self._geoid = _MODS.os.path.basename(geoid)
+            self._sizeB = _MODS.os.path.getsize(geoid)
             g = open(geoid, _rb_)
         except (IOError, OSError) as x:
             raise GeoidError(geoid=geoid, cause=x)
@@ -988,21 +988,21 @@ class GeoidKarney(_GeoidBase):
         p = self._pgm
         if 0 < x < (p.nlon - 2) and 0 < y < (p.nlat - 2):
             # read 4x4 ushorts, drop the 4 corners
-            g = self._egm
-            e = self._4endian
-            n = self._4u2B
-            R = self._Ru2B
-
-            b = self._seek(y - 1, x - 1)
+            S = _MODS.os.SEEK_SET
+            e =  self._4endian
+            g =  self._egm
+            n =  self._4u2B
+            R =  self._Ru2B
+            b =  self._seek(y - 1, x - 1)
             v = _unpack(e, g.read(n))[1:3]
             b += R
-            g.seek(b, _SEEK_SET)
+            g.seek(b, S)
             v += _unpack(e, g.read(n))
             b += R
-            g.seek(b, _SEEK_SET)
+            g.seek(b, S)
             v += _unpack(e, g.read(n))
             b += R
-            g.seek(b, _SEEK_SET)
+            g.seek(b, S)
             v += _unpack(e, g.read(n))[1:3]
             j = 1
 
@@ -1021,7 +1021,7 @@ class GeoidKarney(_GeoidBase):
     def _ev(self, lat, lon):  # PYCHOK expected
         # interpolate the geoid height at grid (lat, lon)
         fy, fx = self._g2yx2(lat, lon)
-        y, x = int(floor(fy)), int(floor(fx))
+        y, x = int(_floor(fy)), int(_floor(fx))
         fy -= y
         fx -= x
         H  = self._ev2d(fy, fx, y, x)  # PYCHOK ._ev2k or ._ev3k
@@ -1223,7 +1223,7 @@ class GeoidKarney(_GeoidBase):
         p, g = self._pgm, self._egm
         if g:
             b = p.skip + (y * p.nlon + x) * self._u2B
-            g.seek(b, _SEEK_SET)
+            g.seek(b, _MODS.os.SEEK_SET)
             return b  # position
         raise GeoidError('closed file', txt=repr(p.egm))  # IOError
 
@@ -1551,11 +1551,11 @@ class _PGM(_Gpars):
         t, c = 0, self._tmpfile()
         # reading (s - n) rows, forward
         for y in range(n, s):  # PYCHOK y unused
-            g.seek(z, _SEEK_SET)
+            g.seek(z, _MODS.os.SEEK_SET)
             # Python 2 tmpfile.write returns None
             t += c.write(g.read(r)) or r
             if p:  # wrap around to start of row
-                g.seek(-q, _SEEK_CUR)
+                g.seek(-q, _MODS.os.SEEK_CUR)
                 # assert(g.tell() == (z - w * self.u2B))
                 # Python 2 tmpfile.write returns None
                 t += c.write(g.read(p)) or p
@@ -1582,7 +1582,7 @@ class _PGM(_Gpars):
         self.knots = k
         self.skip  = 0  # no header lines in c
 
-        c.seek(0, _SEEK_SET)
+        c.seek(0, _MODS.os.SEEK_SET)
         # c = open(c.name, _rb_)  # reopen for numpy 1.8.0-
         return c
 
@@ -1606,10 +1606,11 @@ class _PGM(_Gpars):
         try:
             from tempfile import NamedTemporaryFile as tmpfile
         except ImportError:  # Python 2.7.16-
-            from os import tmpfile
-        t = _os_path.splitext(_os_path.basename(self.pgm))[0]
-        f = tmpfile(mode='w+b', prefix=t or 'egm')
-        f.seek(0, _SEEK_SET)  # force overwrite
+            from _MODS.os import tmpfile
+        t = _MODS.os.path.basename(self.pgm)
+        t = _MODS.os.path.splitext(t)[0]
+        f =  tmpfile(mode='w+b', prefix=t or 'egm')
+        f.seek(0, _MODS.os.SEEK_SET)  # force overwrite
         return f
 
     @Property_RO
@@ -1649,7 +1650,7 @@ def egmGeoidHeights(GeoidHeights_dat):
         dat = _BytesIO(dat)
 
     try:
-        dat.seek(0, _SEEK_SET)  # reset
+        dat.seek(0, _MODS.os.SEEK_SET)  # reset
     except AttributeError as x:
         raise GeoidError(GeoidHeights_dat=type(dat), cause=x)
 
@@ -1666,7 +1667,7 @@ __all__ += _ALL_DOCS(_GeoidBase)
 
 if __name__ == '__main__':  # MCCABE 14
 
-    from pygeodesy.internals import printf, _secs2str, _sys, _versions
+    from pygeodesy.internals import printf, _secs2str, _versions,  _sys
     from time import time
 
     _crop     = ()