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

pygeodesy/named.py

@@ -14,25 +14,25 @@ standard Python C{namedtuple}s.
 '''
 
 from pygeodesy.basics import isclass, isidentifier, iskeyword, isstr, issubclassof, \
-                             itemsorted, len2, _sizeof, _xcopy, _xdup, _zip
+                             itemsorted, len2, _xcopy, _xdup, _zip
 from pygeodesy.errors import _AssertionError, _AttributeError, _incompatible, \
                              _IndexError, _IsnotError, _KeyError, LenError, \
                              _NameError, _NotImplementedError, _TypeError, \
                              _TypesError, UnitError, _ValueError, _xattr, _xkwds, \
                              _xkwds_get, _xkwds_item2, _xkwds_pop2
+from pygeodesy.internals import _caller3, _dunder_nameof, _isPyPy, _sizeof, _under
 from pygeodesy.interns import MISSING, NN, _AT_, _COLON_, _COLONSPACE_, _COMMA_, \
                              _COMMASPACE_, _doesn_t_exist_, _DOT_, _DUNDER_, _EQUAL_, \
-                             _exists_, _immutable_, _name_, _NL_, _NN_, _no_, _other_, \
-                             _s_, _SPACE_, _std_, _UNDER_, _valid_, _vs_, \
-                             _dunder_nameof, _isPyPy, _under
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _caller3, _getenv
+                             _exists_, _immutable_, _name_, _NL_, _NN_, _no_, \
+                             _other_, _s_, _SPACE_, _std_, _UNDER_, _valid_, _vs_
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
 from pygeodesy.props import _allPropertiesOf_n, deprecated_method, _hasProperty, \
                             _update_all, property_doc_, Property_RO, property_RO, \
                             _update_attrs
 from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 
 __all__ = _ALL_LAZY.named
-__version__ = '24.05.04'
+__version__ = '24.05.13'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
@@ -44,6 +44,7 @@ _name               = _under(_name_)
 _Names_             = '_Names_'
 _registered_        = 'registered'  # PYCHOK used!
 _std_NotImplemented = _getenv('PYGEODESY_NOTIMPLEMENTED', NN).lower() == _std_
+_such_              = 'such'
 _Units_             = '_Units_'
 _UP                 =  2
 
@@ -662,12 +663,13 @@ class _NamedEnum(_NamedDict):
         '''(INTERNAL) Check attribute name against given, registered name.
         '''
         pypy = _isPyPy()
+        _isa =  isinstance
         for n, v in kwds.items():
-            if isinstance(v, _LazyNamedEnumItem):  # property
+            if _isa(v, _LazyNamedEnumItem):  # property
                 assert (n == v.name) if pypy else (n is v.name)
                 # assert not hasattr(self.__class__, n)
                 setattr(self.__class__, n, v)
-            elif isinstance(v, self._item_Classes):  # PYCHOK no cover
+            elif _isa(v, self._item_Classes):  # PYCHOK no cover
                 assert self[n] is v and getattr(self, n) \
                                     and self.find(v) == n
             else:
@@ -710,8 +712,9 @@ class _NamedEnum(_NamedDict):
                            case-insensitive} order (C{bool}).
         '''
         if all:  # instantiate any remaining L{_LazyNamedEnumItem}
+            _isa = isinstance
             for n, p in tuple(self.__class__.__dict__.items()):
-                if isinstance(p, _LazyNamedEnumItem):
+                if _isa(p, _LazyNamedEnumItem):
                     _ = getattr(self, n)
         return itemsorted(self) if asorted else ADict.items(self)
 
@@ -778,7 +781,7 @@ class _NamedEnum(_NamedDict):
         else:
             name = self.find(name_or_item, dflt=MISSING)  # all=True?
             if name is MISSING:
-                t = _SPACE_(_no_, 'such', self.classname, _item_)
+                t = _SPACE_(_no_, _such_, self.classname, _item_)
                 raise _AttributeError(t, txt=repr(name_or_item))
         try:
             item = ADict.pop(self, name)

pygeodesy/nvectorBase.py

@@ -19,13 +19,14 @@ from pygeodesy.fmath import fdot, fidw, hypot_  # PYCHOK fdot shared
 from pygeodesy.fsums import Fsum, fsumf_
 from pygeodesy.formy import _isequalTo, n_xyz2latlon, n_xyz2philam, \
                             _spherical_datum
+# from pygeodesy.internals import _under  # from .named
 from pygeodesy.interns import NN, _1_, _2_, _3_, _bearing_, _coincident_, \
                              _COMMASPACE_, _distance_, _h_, _insufficient_, \
                              _intersection_, _no_, _NorthPole_, _point_, \
-                             _pole_, _SPACE_, _SouthPole_, _under
+                             _pole_, _SPACE_, _SouthPole_
 from pygeodesy.latlonBase import LatLonBase,  _ALL_DOCS, _ALL_LAZY, _MODS
 # from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS  # from .latlonBase
-from pygeodesy.named import _xother3
+from pygeodesy.named import _xother3,  _under
 from pygeodesy.namedTuples import Trilaterate5Tuple, Vector3Tuple, \
                                   Vector4Tuple,  map1
 from pygeodesy.props import deprecated_method, Property_RO, property_doc_, \
@@ -38,7 +39,7 @@ from pygeodesy.vector3d import Vector3d, _xyzhdn3
 from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.nvectorBase
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 
 class NvectorBase(Vector3d):  # XXX kept private

pygeodesy/osgr.py

@@ -53,7 +53,7 @@ from pygeodesy.utily import degrees90, degrees180, sincostan3, truncate
 from math import cos, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.osgr
-__version__ = '23.12.03'
+__version__ = '24.05.13'
 
 _equivalent_ = 'equivalent'
 _OSGR_       = 'OSGR'
@@ -324,17 +324,19 @@ class Osgr(_NamedBase):
             r = NG.reverse(self)
 
         elif self._latlon is None:
+            _F = _Fsumf_
             e0 =     self.easting  - NG.eas0
             n0 = m = self.northing - NG.nor0
 
-            _M =  NG.Mabcd0
             a0 =  NG.a0
+            _M =  NG.Mabcd0
             a  =  NG.phi0
-            _A = _Fsumf_(a).fsum_
+            _a =  fabs
+            _A = _F(a).fsum_
             for self._iteration in range(1, _TRIPS):
                 a = _A(m / a0)
                 m = n0 - _M(a)  # meridional arc
-                if fabs(m) < eps:
+                if _a(m) < eps:
                     break
             else:  # PYCHOK no cover
                 t =  str(self)
@@ -354,14 +356,14 @@ class Osgr(_NamedBase):
             d2  = d**2
 
             a = (d2 * ta * (-1 +  # Horner-like
-                 d2 / 12 * (_Fsumf_( 5,  3 * ta2, -9 * ta2 * n2, n2) -
-                 d2 / 30 *  _Fsumf_(61, 90 * ta2, 45 * ta4)))).fsum_(a)
+                 d2 / 12 * (_F( 5,  3 * ta2, -9 * ta2 * n2, n2) -
+                 d2 / 30 *  _F(61, 90 * ta2, 45 * ta4)))).fsum_(a)
 
             b = (d  / ca * ( 1 -  # Horner-like
-                 d2 /  6 * (_Fsumf_(v_r,  2 * ta2) -
-                 d2 / 20 * (_Fsumf_( 5,  28 * ta2,   24 * ta4) +
-                 d2 / 42 *  _Fsumf_(61, 662 * ta2, 1320 * ta4,
-                                        720 * ta2 * ta4))))).fsum_(NG.lam0)
+                 d2 /  6 * (_F(v_r,  2 * ta2) -
+                 d2 / 20 * (_F( 5,  28 * ta2,   24 * ta4) +
+                 d2 / 42 *  _F(61, 662 * ta2, 1320 * ta4,
+                                   720 * ta2 * ta4))))).fsum_(NG.lam0)
 
             r = _LLEB(degrees90(a), degrees180(b), datum=self.datum, name=self.name)
             r._iteration = self._iteration  # only ellipsoidal LatLon
@@ -541,7 +543,7 @@ def parseOSGR(strOSGR, Osgr=Osgr, name=NN, **Osgr_kwds):
         if not p:
             raise ValueError
         g = s[0]
-        if p == 2 and isfloat(g):  # "easting,northing"
+        if p == 2 and isfloat(g, both=True):  # "easting,northing"
             e, n, m = _enstr2m3(*s, wide=_EN_WIDE + 1)
 
         else:
@@ -681,7 +683,7 @@ def toOsgr(latlon, lon=None, kTM=False, datum=_WGS84, Osgr=Osgr, name=NN,  # MCC
 
 if __name__ == '__main__':
 
-    from pygeodesy.lazily import printf
+    from pygeodesy import printf
     from random import random, seed
     from time import localtime
 

pygeodesy/points.py

@@ -26,8 +26,8 @@ C{ilon} longitude index in each 2+tuple.
 '''
 
 from pygeodesy.basics import isclass, isint, isscalar, issequence, \
-                             issubclassof, _Sequence, _xcopy, _xdup, \
-                             _xinstanceof
+                            _xdup, issubclassof, _Sequence, _xcopy, \
+                            _xinstanceof
 from pygeodesy.constants import EPS, EPS1, PI_2, R_M, isnear0, isnear1, \
                                _umod_360, _0_0, _0_5, _1_0, _2_0, _6_0, \
                                _90_0, _N_90_0, _180_0, _360_0
@@ -59,10 +59,10 @@ from pygeodesy.units import Number_, Radius, Scalar, Scalar_
 from pygeodesy.utily import atan2b, degrees90, degrees180, degrees2m, \
                             unroll180, _unrollon, unrollPI, _Wrap, wrap180
 
-from math import cos, fabs, fmod, radians, sin
+from math import cos, fabs, fmod as _fmod, radians, sin
 
 __all__ = _ALL_LAZY.points
-__version__ = '24.04.07'
+__version__ = '24.05.10'
 
 _ilat_  = 'ilat'
 _ilon_  = 'ilon'
@@ -1353,7 +1353,7 @@ def isenclosedBy(point, points, wrap=False):  # MCCABE 15
             return dx, x2, y2
 
     else:
-        x0 = fmod(x0, _360_0)  # not x0 % 360!
+        x0 = _fmod(x0, _360_0)  # not x0 % 360!
         x0_180_ = x0 - _180_0
         x0_180  = x0 + _180_0
 

pygeodesy/props.py

@@ -25,7 +25,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, \
 from functools import wraps as _wraps
 
 __all__ = _ALL_LAZY.props
-__version__ = '24.05.03'
+__version__ = '24.05.12'
 
 _class_       = 'class'
 _dont_use_    = _DEPRECATED_ + ", don't use."
@@ -48,11 +48,11 @@ def _allPropertiesOf(Clas_or_inst, *Bases, **excls):
         except AttributeError:
             raise
             S = ()  # not an inst
-    B   = Bases or _PropertyBase
-    _is = isinstance
+    B    = Bases or _PropertyBase
+    _isa = isinstance
     for C in S:
         for n, p in C.__dict__.items():
-            if _is(p, B) and p.name == n and n not in excls:
+            if _isa(p, B) and p.name == n and n not in excls:
                 yield p
 
 
@@ -252,9 +252,9 @@ class Property_RO(_PropertyBase):
                  <https://Docs.Python.org/3/library/functools.html#functools.cache>}
                  to I{cache} or I{memoize} the property value.
 
-           @see: Luciano Ramalho, "Fluent Python", page 636, O'Reilly, Example
-                 19-24, 2016 p. 636 or Example 22-28, 2022 p. 869+ and U{class
-                 Property<https://docs.Python.org/3/howto/descriptor.html>}.
+           @see: Luciano Ramalho, "Fluent Python", O'Reilly, Example 19-24, 2016
+                 p. 636 or Example 22-28, 2022 p. 870 and U{class Property
+                 <https://docs.Python.org/3/howto/descriptor.html>}.
         '''
         _fget = method if _FOR_DOCS else self._fget  # XXX force method.__doc__ to epydoc
         _PropertyBase.__init__(self, method, _fget, self._fset_error)

pygeodesy/rhumb/bases.py

@@ -33,8 +33,9 @@ from pygeodesy.errors import IntersectionError, RhumbError, _xdatum, \
 from pygeodesy.fmath import euclid, favg, sqrt_a,  Fsum
 # from pygeodesy.formy import opposing  # _MODS
 # from pygeodesy.fsums import Fsum  # from .fmath
+from pygeodesy.internals import _dunder_nameof, _under
 from pygeodesy.interns import NN, _coincident_, _COMMASPACE_, _Dash, \
-                             _dunder_nameof, _parallel_, _too_, _under
+                             _parallel_, _too_
 from pygeodesy.karney import _atan2d, Caps, _CapsBase, _diff182, _fix90, \
                              _norm180, GDict
 # from pygeodesy.ktm import KTransverseMercator, _AlpCoeffs  # _MODS
@@ -51,7 +52,7 @@ from pygeodesy.vector3d import _intersect3d3, Vector3d  # in .Intersection below
 from math import cos, fabs
 
 __all__ = ()
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 _anti_ = _Dash('anti')
 _rls   = []  # instances of C{RbumbLine...} to be updated

pygeodesy/rhumb/solve.py

@@ -21,7 +21,7 @@ from pygeodesy.solveBase import _SolveBase, _SolveLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.rhumb_solve
-__version__ = '24.02.21'
+__version__ = '24.04.13'
 
 
 class _RhumbSolveBase(_SolveBase):
@@ -356,7 +356,7 @@ __all__ += _ALL_DOCS(_RhumbSolveBase)
 
 if __name__ == '__main__':
 
-    from pygeodesy.lazily import printf
+    from pygeodesy import printf
     from sys import argv
 
     def rhumb_intercept(rS, lat1, lon1, lat2, lon2, azi2, s23):

pygeodesy/solveBase.py

@@ -9,10 +9,11 @@ from pygeodesy.constants import DIG
 from pygeodesy.datums import _earth_datum, _WGS84,  _EWGS84
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
 from pygeodesy.errors import _AssertionError, _xkwds_get, _xkwds_item2
-from pygeodesy.interns import NN, _0_, _BACKSLASH_, _COMMASPACE_, _enquote, \
+from pygeodesy.internals import _enquote, printf
+from pygeodesy.interns import NN, _0_, _BACKSLASH_, _COMMASPACE_, \
                              _EQUAL_, _Error_, _not_, _SPACE_, _UNUSED_
 from pygeodesy.karney import Caps, _CapsBase, GDict
-from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, printf, _unlazy
+from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _unlazy
 from pygeodesy.named import callername, notOverloaded
 from pygeodesy.props import Property, Property_RO, property_RO, _update_all
 from pygeodesy.streprs import Fmt, fstr, fstrzs, pairs, strs

pygeodesy/streprs.py

@@ -5,23 +5,24 @@ u'''Floating point and other formatting utilities.
 '''
 
 from pygeodesy.basics import isint, islistuple, isscalar, isstr, itemsorted, \
-                            _zip,  _0_0
+                            _zip, _0_0
 # from pygeodesy.constants import _0_0
 from pygeodesy.errors import _or, _AttributeError, _IsnotError, _TypeError, \
                              _ValueError, _xkwds_get, _xkwds_item2, _xkwds_pop2
+# from pygeodesy.internals import _dunder_nameof  # from .lazily
 from pygeodesy.interns import NN, _0_, _0to9_, MISSING, _BAR_, _COMMASPACE_, \
                              _DOT_, _E_, _ELLIPSIS_, _EQUAL_, _H_, _LR_PAIRS, \
                              _N_, _name_, _not_, _not_scalar_, _PERCENT_, \
-                             _SPACE_, _STAR_, _UNDER_,  _dunder_nameof
+                             _SPACE_, _STAR_, _UNDER_
 from pygeodesy.interns import _convergence_, _distant_, _e_, _eps_, _exceeds_, \
                               _EQUALSPACED_, _f_, _F_, _g_, _limit_, _no_, \
                               _tolerance_  # PYCHOK used!
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _dunder_nameof
 
 from math import fabs, log10 as _log10
 
 __all__ = _ALL_LAZY.streprs
-__version__ = '24.05.04'
+__version__ = '24.05.13'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer

pygeodesy/trf.py

@@ -69,7 +69,7 @@ en/how-to-deal-with-etrs89-datum-and-time-dependent-transformation-parameters-45
 @var RefFrames.WGS84g1762: RefFrame(name='WGS84g1762', epoch=2005, datum=Datums.GRS80) .Xforms=(0, 0)
 '''
 
-from pygeodesy.basics import map1, neg, isidentifier, isstr, _xinstanceof, _xisscalar
+from pygeodesy.basics import map1, neg, isidentifier, isstr, _xinstanceof, _xscalar
 from pygeodesy.constants import _float as _F, _0_0s, _0_0, _0_001, _0_5, _1_0
 from pygeodesy.datums import Datums, _earth_datum, _equall, _GDA2020_, _Names7, \
                             _negastr, Transform, _WGS84,  _EWGS84, _operator
@@ -91,7 +91,7 @@ from math import ceil as _ceil, fabs
 # import operator as _operator  # from .datums
 
 __all__ = _ALL_LAZY.trf
-__version__ = '24.03.12'
+__version__ = '24.05.13'
 
 _EP0CH    =  Epoch(0, low=0)
 _Es       = {_EP0CH: _EP0CH}  # L{Epoch}s, deleted below
@@ -568,7 +568,7 @@ class TRFXform7Tuple(_NamedTuple):
         return _NamedTuple.__hash__(self)
 
     def __mul__(self, factor):
-        _xisscalar(factor=factor)
+        _xscalar(factor=factor)
         return type(self)((x * factor for x in self), name=_STAR_)  # .fsums._mul_op
 
     def __neg__(self):
@@ -1733,7 +1733,7 @@ if __name__ == '__main__':
     def _main():
         from pygeodesy.basics import _args_kwds_names
         from pygeodesy.interns import _COLONSPACE_,_COMMA_, _NL_, _NLATvar_, _vs_
-        from pygeodesy.lazily import printf
+        from pygeodesy import printf
         from time import localtime
 
         D = date2epoch.__name__

pygeodesy/units.py

@@ -6,32 +6,30 @@ C{Str} from basic C{float}, C{int} respectively C{str} to
 named units as L{Degrees}, L{Feet}, L{Meter}, L{Radians}, etc.
 '''
 
-from pygeodesy.basics import isinstanceof, isscalar, isstr, issubclassof, \
-                             signOf
-from pygeodesy.constants import EPS, EPS1, PI, PI2, PI_2, \
-                               _umod_360, _0_0, _0_001, \
-                               _0_5, INT0  # PYCHOK for .mgrs, .namedTuples
-from pygeodesy.dms import F__F, F__F_, parseDMS, parseRad, \
-                          S_NUL, S_SEP, _toDMS, toDMS
-from pygeodesy.errors import _AssertionError, _IsnotError, TRFError, \
-                              UnitError, _xkwds, _xkwds_item2
+from pygeodesy.basics import isinstanceof, isscalar, isstr, issubclassof, signOf
+from pygeodesy.constants import EPS, EPS1, PI, PI2, PI_2, _umod_360, _0_0, \
+                               _0_001,  _0_5, INT0  # PYCHOK for .mgrs, .namedTuples
+from pygeodesy.dms import F__F, F__F_, S_NUL, S_SEP, parseDMS, parseRad, \
+                         _toDMS, toDMS
+from pygeodesy.errors import _AssertionError, _IsnotError, TRFError, UnitError, \
+                             _xkwds, _xkwds_item2
 from pygeodesy.interns import NN, _band_, _bearing_, _degrees_, _degrees2_, \
-                             _distance_, _E_, _easting_, _epoch_, _EW_, \
-                             _feet_, _height_, _lam_, _lat_, \
-                             _LatLon_, _lon_, _meter_, _meter2_, _N_, \
-                             _northing_, _NS_, _NSEW_, _number_, _PERCENT_, \
-                             _phi_, _precision_, _radians_, _radians2_, \
-                             _radius_, _S_, _scalar_, _units_, \
-                             _W_, _zone_,  _std_  # PYCHOK used!
+                             _distance_, _E_, _easting_, _epoch_, _EW_, _feet_, \
+                             _height_, _lam_, _lat_, _LatLon_, _lon_, _meter_, \
+                             _meter2_, _N_, _northing_, _NS_, _NSEW_, _number_, \
+                             _PERCENT_, _phi_, _precision_, _radians_, _radians2_, \
+                             _radius_, _S_, _scalar_, _units_, _W_, _zone_, \
+                             _std_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv
 from pygeodesy.props import Property_RO
 # from pygeodesy.streprs import Fmt, fstr  # from .unitsBase
 from pygeodesy.unitsBase import _Error, Float, Fmt, fstr, Int, _NamedUnit, \
                                  Radius, Str  # PYCHOK shared .namedTuples
+
 from math import degrees, radians
 
 __all__ = _ALL_LAZY.units
-__version__ = '24.02.20'
+__version__ = '24.05.10'
 
 _negative_falsed_ = 'negative, falsed'
 

pygeodesy/ups.py

@@ -28,11 +28,12 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, _neg, parseDMS2
 from pygeodesy.errors import RangeError, _ValueError
 from pygeodesy.fmath import hypot, hypot1, sqrt0
-from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, _pole_, \
-                             _range_, _S_, _scale0_, _SPACE_, _std_, \
-                             _to_, _UTM_, _under
-from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _getenv
-from pygeodesy.named import nameof, _xnamed
+# from pygeodesy.internals import _under  # from .named
+from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, \
+                             _pole_, _range_, _S_, _scale0_, \
+                             _SPACE_, _std_, _to_, _UTM_
+from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS,  _getenv
+from pygeodesy.named import nameof, _xnamed,  _under
 from pygeodesy.namedTuples import EasNor2Tuple, UtmUps5Tuple, \
                                   UtmUps8Tuple, UtmUpsLatLon5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, \
@@ -48,7 +49,7 @@ from pygeodesy.utmupsBase import Fmt, _LLEB, _hemi, _parseUTMUPS5, _to4lldn, \
 from math import atan2, fabs, radians, tan
 
 __all__ = _ALL_LAZY.ups
-__version__ = '23.09.29'
+__version__ = '25.05.13'
 
 _BZ_UPS  = _getenv('PYGEODESY_UPS_POLES', _std_) == _std_
 _Falsing =  Meter(2000e3)  # false easting and northing (C{meter})

pygeodesy/utily.py

@@ -10,8 +10,7 @@ U{Vector-based geodesy<https://www.Movable-Type.co.UK/scripts/latlong-vectors.ht
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import _copysign, isinstanceof, isint, isstr, neg, \
-                             _passargs
+from pygeodesy.basics import _copysign, isinstanceof, isint, isstr, neg
 from pygeodesy.constants import EPS, EPS0, INF, NAN, PI, PI2, PI_2, R_M, \
                                _M_KM, _M_NM, _M_SM, _0_0, _1__90, _0_5, _1_0, \
                                _N_1_0, _2__PI, _10_0, _90_0, _N_90_0, _180_0, \
@@ -19,6 +18,7 @@ from pygeodesy.constants import EPS, EPS0, INF, NAN, PI, PI2, PI_2, R_M, \
                                _float as _F, _isfinite, isnan, isnear0, \
                                _over, _umod_360, _umod_PI2
 from pygeodesy.errors import _ValueError, _xkwds, _xkwds_get,  _ALL_LAZY, _MODS
+from pygeodesy.internals import _passargs  # , _MODS?
 from pygeodesy.interns import _edge_, _radians_, _semi_circular_, _SPACE_
 # from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS  # from .errors
 from pygeodesy.units import Degrees, Degrees_, Feet, Float, Lam, Lam_, \
@@ -27,7 +27,7 @@ from pygeodesy.units import Degrees, Degrees_, Feet, Float, Lam, Lam_, \
 from math import acos, asin, atan2, cos, degrees, fabs, radians, sin, tan  # pow
 
 __all__ = _ALL_LAZY.utily
-__version__ = '24.04.04'
+__version__ = '24.05.14'
 
 # read constant name "_M_Unit" as "meter per Unit"
 _M_CHAIN     = _F(  20.1168)     # yard2m(1) * 22
@@ -907,7 +907,7 @@ def truncate(x, ndigits=None):
     '''
     if isint(ndigits):
         p = _10_0**ndigits
-        x = int(x * p) / p
+        x =  int(x * p) / p
     return x
 
 

pygeodesy/utm.py

@@ -40,9 +40,10 @@ from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.errors import MGRSError, RangeError, _ValueError, \
                             _xkwds_get
 from pygeodesy.fmath import fdot3, hypot, hypot1,  _operator
+# from pygeodesy.internals import _under  # from .utmupsBase
 from pygeodesy.interns import MISSING, NN, _by_, _COMMASPACE_, _N_, \
                              _NS_, _outside_, _range_, _S_, _scale0_, \
-                             _SPACE_, _UTM_, _V_, _X_, _zone_, _under
+                             _SPACE_, _UTM_, _V_, _X_, _zone_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 # from pygeodesy.named import _xnamed  # from .utmupsBase
 from pygeodesy.namedTuples import EasNor2Tuple, UtmUps5Tuple, \
@@ -54,9 +55,9 @@ from pygeodesy.units import Band, Int, Lat, Lon, Meter, Zone
 from pygeodesy.utily import atan1, degrees90, degrees180, sincos2
 from pygeodesy.utmupsBase import _hemi, _LLEB, _parseUTMUPS5, _to4lldn, \
                                  _to3zBhp, _to3zll, _UPS_LATS, _UPS_ZONE, \
-                                 _UTM_LAT_MAX, _UTM_ZONE_MAX, \
-                                 _UTM_LAT_MIN, _UTM_ZONE_MIN, \
-                                 _UTM_ZONE_OFF_MAX, UtmUpsBase, _xnamed
+                                 _UTM_LAT_MAX, _UTM_ZONE_MAX,  _under, \
+                                 _UTM_LAT_MIN, _UTM_ZONE_MIN,  _xnamed, \
+                                 _UTM_ZONE_OFF_MAX, UtmUpsBase
 
 from math import asinh, atanh, atan2, cos, cosh, degrees, fabs, \
                  radians, sin, sinh, tan, tanh

pygeodesy/utmupsBase.py

@@ -13,11 +13,12 @@ from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
 from pygeodesy.errors import _or, ParseError, _parseX, _ValueError, \
                              _xkwds, _xkwds_get, _xkwds_not
+# from pygeodesy.internals import _under  # from .named
 from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, \
                              _gamma_, _n_a_, _not_, _N_, _NS_, _PLUS_, \
-                             _scale_, _SPACE_, _Y_, _Z_, _under
+                             _scale_, _SPACE_, _Y_, _Z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.named import _NamedBase, nameof, _xnamed
+from pygeodesy.named import _NamedBase, nameof, _xnamed,  _under
 from pygeodesy.namedTuples import EasNor2Tuple, LatLonDatum5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, _update_all, \
                             deprecated_property_RO, Property_RO, property_RO
@@ -26,7 +27,7 @@ from pygeodesy.units import Band, Easting, Northing, Scalar, Zone
 from pygeodesy.utily import _Wrap, wrap360
 
 __all__ = _ALL_LAZY.utmupsBase
-__version__ = '24.04.07'
+__version__ = '24.05.13'
 
 _UPS_BANDS = _A_, _B_, _Y_, _Z_  # UPS polar bands SE, SW, NE, NW
 # _UTM_BANDS = _MODS.utm._Bands

pygeodesy/vector3dBase.py

@@ -27,10 +27,11 @@ from pygeodesy.streprs import Fmt, strs, unstr
 from pygeodesy.units import Float, Scalar
 # from pygeodesy.utily import sincos2  # _MODS
 
+# from builtints import hash, int, isinstance, map, max, round, type, zip
 from math import atan2, ceil, fabs, floor, trunc
 
 __all__ = _ALL_LAZY.vector3dBase
-__version__ = '24.03.24'
+__version__ = '24.05.10'
 
 
 class Vector3dBase(_NamedBase):  # sync __methods__ with .fsums.Fsum