pygeodesy 25.7.25__py2.py3-none-any.whl → 25.9.9__py2.py3-none-any.whl

pygeodesy/ktm.py

@@ -62,11 +62,11 @@ from pygeodesy.props import property_doc_, Property, Property_RO, \
 from pygeodesy.units import Degrees, Scalar_, _1mm as _TOL_10  # PYCHOK used!
 from pygeodesy.utily import atan1d, atan2, _loneg, sincos2, sincos2d_
 
-from cmath import polar
+from cmath import polar as _polar
 from math import asinh, cos, cosh, degrees, fabs, sin, sinh, sqrt, tanh
 
 __all__ = _ALL_LAZY.ktm
-__version__ = '25.05.12'
+__version__ = '25.08.31'
 
 
 class KTMError(_ValueError):
@@ -476,7 +476,7 @@ def _Cyxgk4(E, xi_, eta_, C):
 
         # Gauss-Schreiber to Gauss-Krueger TM
         # C{cmath.polar} handles INF, NAN, etc.
-        k, g = polar(c)
+        k, g = _polar(c)
         g = degrees(g)
     else:  # E.isSpherical
         g, k = _0_0, _1_0

pygeodesy/latlonBase.py

@@ -33,7 +33,7 @@ from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name2__, _NamedBase,  Fmt
 from pygeodesy.namedTuples import Bounds2Tuple, LatLon2Tuple, PhiLam2Tuple, \
                                   Trilaterate5Tuple, Vector3Tuple
-# from pygeodesy.nvectorBase import _N_vector_  # _MODS
+# from pygeodesy.nvectorBase import _N_Vector  # _MODS
 from pygeodesy.props import deprecated_method, Property, Property_RO, \
                             property_RO, _update_all
 # from pygeodesy.streprs import Fmt, hstr  # from .named, _MODS
@@ -48,7 +48,7 @@ from contextlib import contextmanager
 from math import asin, cos, degrees, fabs, radians
 
 __all__ = _ALL_LAZY.latlonBase
-__version__ = '25.05.07'
+__version__ = '25.08.18'
 
 _formy = _MODS.into(formy=__name__)
 
@@ -971,9 +971,9 @@ class LatLonBase(_NamedBase, _EcefLocal):
 
     @property_RO
     def _N_vector(self):
-        '''(INTERNAL) Get the C{Nvector} (C{nvectorBase._N_vector_})
+        '''(INTERNAL) Get the C{Nvector} (C{nvectorBase._N_Vector})
         '''
-        _N = _MODS.nvectorBase._N_vector_
+        _N = _MODS.nvectorBase._N_Vector
         return _N(*self._n_xyz3, h=self.height, name=self.name)
 
     @Property_RO

pygeodesy/lazily.py

@@ -29,15 +29,15 @@ and line number.
 
 from pygeodesy import internals as _internals, interns as _interns, \
                      _isfrozen  # DON'T _lazy_import2
-# from pygeodesy.errors import _error_init, _xkwds_item2  # _ALL_MODS
+# from pygeodesy.errors import _error_init, _ImmutableError, _xkwds_item2  # _ALL_MODS
 from pygeodesy.internals import _caller3, _envPYGEODESY, _headof, printf, _tailof, \
                                  typename, _versions  # _getenv, _PYGEODESY_ENV, \
 #                               _MODS_Base, _MODS.sys_version_info2
 from pygeodesy.interns import _attribute_, _by_, _COLONSPACE_, _COMMASPACE_, _DALL_, \
                               _DMAIN_, _doesn_t_exist_, _DOT_, _EQUALSPACED_, _from_, \
-                              _HASH_, _immutable_, _line_, _module_, NN, _no_, _not_, \
-                              _pygeodesy_, _pygeodesy_abspath_, _SPACE_, _SUB_PACKAGES, \
-                              _or_, _UNDER_, _version_,  _sys, _intern  # function, _1_
+                              _HASH_, _line_, _module_, NN, _no_, _not_, _pygeodesy_, \
+                              _pygeodesy_abspath_, _SPACE_, _SUB_PACKAGES, _or_, \
+                              _UNDER_, _version_,  _sys, _intern  # function, _1_
 try:
     from importlib import import_module
 except ImportError as x:  # Python 2.6-
@@ -125,8 +125,9 @@ class _NamedEnum_RO(dict):
             raise LazyAttributeError(t, txt=_doesn_t_exist_)
 
     def __setattr__(self, attr, value):  # PYCHOK no cover
-        t = _EQUALSPACED_(self._DOT_(attr), repr(value))
-        raise LazyAttributeError(_immutable_, txt=t)
+        e = _ALL_MODS.errors
+        raise e._ImmutableError(self, attr, value,
+                          Error=LazyAttributeError)
 
     def enums(self):
         # Yield all C{(mod_, tuple)} pairs
@@ -200,10 +201,10 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                                    'EasNorAziRk4Tuple', 'EasNorAziRkEqu6Tuple', 'LatLonAziRk4Tuple'),
                       constants=_a('DIG', 'EPS', 'EPS0', 'EPS02', 'EPS1', 'EPS2', 'EPS4', 'EPS_2',
                                    'INF', 'INT0', 'MANT_DIG', 'MAX', 'MAX_EXP', 'MIN', 'MIN_EXP', 'NAN', 'NEG0', 'NINF',
-                                   'PI', 'PI2', 'PI_2', 'PI3', 'PI_3', 'PI3_2', 'PI4', 'PI_4',
+                                   'PI', 'PI2', 'PI_2', 'PI3', 'PI_3', 'PI3_2', 'PI4', 'PI_4', 'PI_6',
                                    'R_FM', 'R_GM', 'R_KM', 'R_M', 'R_MA', 'R_MB', 'R_NM', 'R_QM', 'R_SM', 'R_VM',
                                    'float_', 'float0_', 'isclose', 'isfinite', 'isinf', 'isint0',
-                                   'isnan', 'isnear0', 'isnear1', 'isnear90', 'isneg0', 'isninf', 'isnon0',
+                                   'isnan', 'isnear0', 'isnear1', 'isnear90', 'isneg', 'isneg0', 'isninf', 'isnon0',
                                    'remainder'),
                          datums=_a('Datum', 'Datums', 'Transform', 'Transforms'),
 #                    deprecated=_a(),  # module only
@@ -214,8 +215,8 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                                    'bearingDMS', 'clipDegrees', 'clipRadians', 'compassDMS', 'compassPoint',
                                    'degDMS', 'latDMS', 'latlonDMS', 'latlonDMS_', 'lonDMS', 'normDMS',
                                    'parseDDDMMSS', 'parseDMS', 'parseDMS2', 'parse3llh', 'parseRad', 'precision', 'toDMS'),
-                           ecef=_a('EcefError', 'EcefFarrell21', 'EcefFarrell22', 'EcefKarney', 'EcefMatrix',
-                                   'EcefSudano', 'Ecef9Tuple', 'EcefVeness', 'EcefYou'),
+                           ecef=_a('EcefFarrell21', 'EcefFarrell22', 'EcefKarney', 'EcefSudano', 'EcefUPC', 'EcefVeness', 'EcefYou',
+                                   'EcefError', 'EcefMatrix', 'Ecef9Tuple'),
                      ecefLocals=_a(),  # module only
                      elevations=_a('Elevation2Tuple', 'GeoidHeight2Tuple',
                                    'elevation2', 'geoidHeight2'),
@@ -357,11 +358,11 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                                    'Radius_', 'Scalar', 'Scalar_', 'Zone'),
                       unitsBase=_a('Float', 'Int', 'Radius', 'Str'),
                             ups=_a('Ups', 'UPSError', 'parseUPS5', 'toUps8', 'upsZoneBand5'),
-                          utily=_a('acos1', 'acre2ha', 'acre2m2', 'asin1', 'atan1', 'atan1d', 'atan2', 'atan2b', 'atan2d',
+                          utily=_a('acos1', 'acre2ha', 'acre2m2', 'agdf', 'asin1', 'atan1', 'atan1d', 'atan2', 'atan2b', 'atan2d',
                                    'chain2m', 'circle4', 'cot', 'cot_', 'cotd', 'cotd_',
                                    'degrees', 'degrees90', 'degrees180', 'degrees360', 'degrees2grades', 'degrees2m',
                                    'fathom2m', 'ft2m', 'furlong2m',                  # 'degrees2grades as degrees2gons',
-                                   'grades', 'grades400', 'grades2degrees', 'grades2radians',
+                                   'gdf', 'grades', 'grades400', 'grades2degrees', 'grades2radians',
 #                                  'grades as gons', 'grades400 as gons400', 'grades2degrees as gons2degrees', 'grades2radians as gons2radians',
                                    'ha2acre', 'ha2m2', 'hav', 'km2m',
                                    'm2acre', 'm2chain', 'm2degrees', 'm2fathom', 'm2ft', 'm2furlong',
@@ -510,7 +511,7 @@ class _ALL_MODS(_internals._MODS_Base):
 _internals._MODS = _ALL_MODS = _ALL_MODS()  # PYCHOK singleton
 
 __all__ = _ALL_LAZY.lazily
-__version__ = '25.05.19'
+__version__ = '25.09.09'
 
 
 def _ALL_OTHER(*objs):

pygeodesy/lcc.py

@@ -24,10 +24,10 @@ and John P. Snyder U{'Map Projections - A Working Manual'<https://Pubs.USGS.gov/
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # noqa: E702 ;
 
-from pygeodesy.basics import copysign0, _isin, _xinstanceof, _xsubclassof, \
-                             typename
-from pygeodesy.constants import EPS, EPS02, PI_2, _float as _F, _0_0, _0_5, \
-                               _1_0, _2_0, _90_0
+from pygeodesy.basics import copysign0, _isin, typename, \
+                            _xinstanceof, _xsubclassof
+from pygeodesy.constants import EPS, EPS02, PI_2, _float as _F, \
+                               _0_0, _0_5, _1_0, _2_0, _90_0
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
 from pygeodesy.datums import Datums, _ellipsoidal_datum
 from pygeodesy.errors import _IsnotError, _ValueError
@@ -50,7 +50,7 @@ from pygeodesy.utily import atan1, degrees90, degrees180, sincos2, tanPI_2_2
 from math import atan, fabs, log, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.lcc
-__version__ = '25.05.26'
+__version__ = '25.08.31'
 
 _E0_   = 'E0'
 _N0_   = 'N0'

pygeodesy/named.py

@@ -16,17 +16,17 @@ standard Python C{namedtuple}s.
 from pygeodesy.basics import isbool, isidentifier, iskeyword, isstr, itemsorted, \
                              len2, _xcopy, _xdup, _xinstanceof, _xsubclassof, _zip
 # from pygeodesy.ecef import EcefKarney  # _MODS
-from pygeodesy.errors import _AssertionError, _AttributeError, _incompatible, \
-                             _IndexError, _KeyError, LenError, _NameError, \
-                             _NotImplementedError, _TypeError, _TypesError, \
-                             _UnexpectedError, UnitError, _ValueError, \
+from pygeodesy.errors import _AssertionError, _AttributeError, _ImmutableError, \
+                             _incompatible, _IndexError, _KeyError, LenError, \
+                             _NameError, _NotImplementedError, _TypeError, \
+                             _TypesError, _UnexpectedError, UnitError, _ValueError, \
                              _xattr, _xkwds, _xkwds_item2, _xkwds_pop2
 from pygeodesy.internals import _caller3, _envPYGEODESY, _isPyPy, _sizeof, \
                                  typename, _under
 from pygeodesy.interns import MISSING, NN, _AT_, _COLON_, _COLONSPACE_, _COMMA_, \
                              _COMMASPACE_, _DNAME_, _doesn_t_exist_, _DOT_, _DUNDER_, \
-                             _EQUAL_, _exists_, _immutable_, _name_, _NL_, _NN_, \
-                             _no_, _other_, _s_, _SPACE_, _std_, _UNDER_, _vs_
+                             _EQUAL_, _exists_, _name_, _NL_, _NN_, _no_, _other_, \
+                             _s_, _SPACE_, _std_, _UNDER_, _vs_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.props import _allPropertiesOf_n, deprecated_method, _hasProperty, \
                             _update_all, property_doc_, Property_RO, property_RO, \
@@ -35,11 +35,10 @@ from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 # from pygeodesy.units import _toUnit  # _MODS
 
 __all__ = _ALL_LAZY.named
-__version__ = '25.04.28'
+__version__ = '25.09.04'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
-_del_               = 'del'
 _item_              = 'item'
 _MRO_               = 'MRO'
 # __DUNDER gets mangled in class
@@ -111,7 +110,7 @@ class ADict(dict):
             self._iteration = iteration
         if items:
             dict.update(self, items)
-        return self  # in RhumbLineBase.Intersecant2, _PseudoRhumbLine.Position
+        return self  # in RhumbLineBase.Intersecant2, _PseudoRhumbLine.Position, ...
 
     def _toL(self):
         '''(INTERNAL) Get items as list.
@@ -977,8 +976,7 @@ class _NamedTuple(tuple, _Named):
            @note: Items can not be deleted.
         '''
         if name in self._Names_:
-            t = _SPACE_(_del_, self._DOT_(name))
-            raise _TypeError(t, txt=_immutable_)
+            raise _ImmutableError(self, name)  # _del_
         elif name in (_name_, _name):
             _Named.__setattr__(self, name, NN)  # XXX _Named.name.fset(self, NN)
         else:
@@ -1011,8 +1009,7 @@ class _NamedTuple(tuple, _Named):
         '''Set attribute or item B{C{name}} to B{C{value}}.
         '''
         if name in self._Names_:
-            t = Fmt.EQUALSPACED(self._DOT_(name), repr(value))
-            raise _TypeError(t, txt=_immutable_)
+            raise _ImmutableError(self, name, value)
         elif name in (_name_, _name):
             _Named.__setattr__(self, name, value)  # XXX _Named.name.fset(self, value)
         else:  # e.g. _iteration

pygeodesy/nvectorBase.py

@@ -38,7 +38,7 @@ from pygeodesy.vector3d import Vector3d, _xyzhdlln4
 from math import degrees, fabs, sqrt
 
 __all__ = _ALL_LAZY.nvectorBase
-__version__ = '25.05.12'
+__version__ = '25.08.18'
 
 
 class NvectorBase(Vector3d):  # XXX kept private
@@ -355,7 +355,7 @@ class NvectorBase(Vector3d):  # XXX kept private
         return self.xyz.to4Tuple(self.h)
 
 
-class _N_vector_(NvectorBase):
+class _N_Vector(NvectorBase):
     '''(INTERNAL) Minimal, low-overhead C{n-vector}.
     '''
     def __init__(self, x, y, z, h=0, **name):
@@ -366,8 +366,8 @@ class _N_vector_(NvectorBase):
             self.name = name
 
 
-NorthPole = _N_vector_(0, 0, +1, name='NorthPole')  # North pole
-SouthPole = _N_vector_(0, 0, -1, name='SouthPole')  # South pole
+NorthPole = _N_Vector(0, 0, +1, name='NorthPole')  # North pole
+SouthPole = _N_Vector(0, 0, -1, name='SouthPole')  # South pole
 
 
 class LatLonNvectorBase(LatLonBase):

pygeodesy/rhumb/__init__.py

@@ -9,7 +9,7 @@ u'''Package of lazily imported C{rhumb} modules L{rhumb.aux_}, L{rhumb.ekx} and
 from pygeodesy.lazily import _ALL_LAZY, _ALL_OTHER, _lazy_import_as, _unLazy0
 
 __all__ = _ALL_LAZY.rhumb
-__version__ = '25.04.14'
+__version__ = '25.08.28'
 
 if _unLazy0:  # or _isfrozen
     from pygeodesy.rhumb.aux_ import RhumbAux, RhumbLineAux

pygeodesy/rhumb/aux_.py

@@ -48,7 +48,7 @@ from pygeodesy.rhumb.bases import RhumbBase, RhumbLineBase, \
 from math import ceil as _ceil, fabs, radians
 
 __all__ = _ALL_LAZY.rhumb_aux_
-__version__ = '25.05.12'
+__version__ = '25.08.31'
 
 # DIGITS = (sizeof(real) * 8) bits
 #        = (ctypes.sizeof(ctypes.c_double(1.0)) * 8) bits

pygeodesy/rhumb/bases.py

@@ -732,8 +732,7 @@ class RhumbLineBase(_CapsBase):
                    azi02=other.azi12, a02=t.a12, s02=t.s12,
                    at=other.azi12 - self.azi12, iteration=i)
         except Exception as x:
-            raise IntersectionError(self, other, tol=tol,
-                                          eps=eps, cause=x)
+            raise IntersectionError(self, other, tol=tol, cause=x, **eps)
         return P
 
     def Inverse(self, lat2, lon2, wrap=False, **outmask):
@@ -870,19 +869,19 @@ class RhumbLineBase(_CapsBase):
             P  =  self.Intersection(rl, tol=tol, eps=eps)
 
         else:  # C{rhumb-intercept}
-            E   = self.ellipsoid
-            _gI = E.geodesic_(exact=exact).Inverse
-            gm  = Cs.STANDARD | Cs._REDUCEDLENGTH_GEODESICSCALE  # ^ Cs.DISTANCE_IN
+            E   =  self.ellipsoid
+            _gI =  E.geodesic_(exact=exact).Inverse
+            gm  =  Cs.STANDARD | Cs._REDUCEDLENGTH_GEODESICSCALE  # ^ Cs.DISTANCE_IN
+            _d2 = _diff182
             if est is None:  # get an estimate from the "perpendicular" geodesic
                 r = _gI(self.lat1, self.lon1, lat0, lon0, outmask=Cs.AZIMUTH_DISTANCE)
-                d, _ = _diff182(r.azi2, self.azi12, K_2_0=True)
+                d, _ = _d2(r.azi2, self.azi12, K_2_0=True)
                 _, s12 = sincos2d(d)
                 s12 *=  r.s12  # signed
             else:
                 s12  =  Meter(est=est)
             try:
                 _abs =  fabs
-                _d2  = _diff182
                 _ErT =  E.rocPrimeVertical  # aka rocTransverse
                 _ovr = _over
                 _S12 =  Fsum(s12).fsum2f_
@@ -894,7 +893,7 @@ class RhumbLineBase(_CapsBase):
                     s, c, s2, c2 = _scd(d, r.lat2)
                     c2 *= _ErT(r.lat2)
                     s  *= _ovr(s2 * self._salp, c2) - _ovr(s * r.M21, r.m12)
-                    s12, t = _S12(c / s)  # XXX _ovr?
+                    s12, t = _S12(c / s) if s else (s12, s)  # XXX _ovr?
                     if _abs(t) < tol:  # or _abs(c) < EPS
                         break
                 P.set_(azi0=r.azi1, a02=r.a12, s02=r.s12,  # azi2=r.azi2,

pygeodesy/rhumb/ekx.py

@@ -22,9 +22,9 @@ License.  For more information, see the U{GeographicLib<https://GeographicLib.So
 # make sure int/int division yields float quotient
 from __future__ import division as _; del _  # noqa: E702 ;
 
-from pygeodesy.basics import copysign0, neg
-from pygeodesy.constants import PI_2, _0_0s, _0_0, _0_5, _1_0, \
-                               _2_0, _4_0, _720_0, _over, _1_over
+# from pygeodesy.basics import copysign0, neg  # _MODS
+from pygeodesy.constants import PI_2, _over, _1_over, _0_0s, \
+                               _0_0, _0_5, _1_0, _2_0, _4_0, _720_0
 # from pygeodesy.datums import _WGS84  # from .rhumb.bases
 # from pygeodesy.deprecated import RhumbOrder2Tuple  # _MODS
 from pygeodesy.errors import RhumbError, _xkwds_pop2, _Xorder
@@ -42,7 +42,7 @@ from pygeodesy.utily import atan1, sincos2_
 from math import asinh, atan, cos, cosh, radians, sin, sinh, sqrt, tan  # as _tan
 
 __all__ = _ALL_LAZY.rhumb_ekx
-__version__ = '25.05.12'
+__version__ = '25.08.31'
 
 
 class Rhumb(RhumbBase):
@@ -159,9 +159,9 @@ class Rhumb(RhumbBase):
         if (outmask & Cs.DISTANCE):
             a = s = hypot(lon12, psi12)
             if a:
-                a *= self._DIsometric2Rectifyingd(psi2, psi1)
-                s  = self._mpd * a  # == E._Lpd
-                a  = copysign0(a, s)
+                a *=  self._DIsometric2Rectifyingd(psi2, psi1)
+                s  =  self._mpd * a  # == E._Lpd
+                a  = _MODS.basics.copysign0(a, s)
             r.set_(a12=a, s12=s)
 
         if ((outmask | self._debug) & Cs._DEBUG_INVERSE):  # PYCHOK no cover
@@ -306,7 +306,7 @@ class RhumbLine(RhumbLineBase):
 
     @Property_RO
     def _psi1(self):
-        '''(INTERNAL) Get the I{isometric auxiliary} latitude C{psi} (C{degrees}).
+        '''(INTERNAL) Get the I{isometric auxiliary} latitude (C{degrees}).
         '''
         return self.ellipsoid.auxIsometric(self.lat1)
 
@@ -465,7 +465,7 @@ def _sincosSeries(sinp, x, y, C, n):
     #   SC = sinp ? sin : cos
     #   CS = sinp ? cos : sin
     # ...
-    d, _neg = (x - y), neg
+    d, _neg = (x - y), _MODS.basics.neg
     sp, cp, sd, cd = sincos2_(x + y, d)
     sd = (sd / d) if d else _1_0
     s  = _neg(sp * sd)  # negative

pygeodesy/solveBase.py

@@ -23,7 +23,7 @@ from pygeodesy.units import Precision_
 from pygeodesy.utily import unroll180
 
 __all__ = _ALL_LAZY.solveBase
-__version__ = '25.05.12'
+__version__ = '25.09.02'
 
 _ERROR_ = 'ERROR'
 
@@ -63,10 +63,16 @@ class _SolveCapsBase(_CapsBase):
 
     @Property_RO
     def a(self):
-        '''Get the I{equatorial} radius, semi-axis (C{meter}).
+        '''Get the ellipsoid's I{equatorial} radius, semi-axis (C{meter}).
         '''
         return self.ellipsoid.a
 
+    @Property_RO
+    def b(self):
+        '''Get the ellipsoid's I{polar} radius, semi-axis (C{meter}).
+        '''
+        return self.ellipsoid.b
+
     @property_RO
     def _cmdBasic(self):  # PYCHOK no covers        '''(INTERNAL) I{Must be overloaded}.'''
         notOverloaded(self, underOK=True)
@@ -381,6 +387,11 @@ class _SolveGDictBase(_SolveBase):
         if path:
             self._setXable(path)
 
+    def ArcDirect(self, lat1, lon1, azi1, a12, outmask=_UNUSED_):  # PYCHOK unused
+        '''Return the C{Direct} result at C{a12} degrees.
+        '''
+        return self._GDictDirect(lat1, lon1, azi1, True, a12)
+
     @Property_RO
     def _cmdDirect(self):
         '''(INTERNAL) Get the C{Solve} I{Direct} cmd (C{tuple}).
@@ -394,7 +405,7 @@ class _SolveGDictBase(_SolveBase):
         return self._cmdBasic + ('-i',)
 
     def Direct(self, lat1, lon1, azi1, s12, outmask=_UNUSED_):  # PYCHOK unused
-        '''Return the C{Direct} result.
+        '''Return the C{Direct} result at distance C{s12}.
         '''
         return self._GDictDirect(lat1, lon1, azi1, False, s12)
 

pygeodesy/sphericalTrigonometry.py

@@ -17,9 +17,9 @@ U{Latitude/Longitude<https://www.Movable-Type.co.UK/scripts/latlong.html>}.
 from __future__ import division as _; del _  # noqa: E702 ;
 
 from pygeodesy.basics import copysign0, _isin, map1, signOf,  typename
-from pygeodesy.constants import EPS, EPS1, EPS4, PI, PI2, PI_2, PI_4, R_M, \
-                                isnear0, isnear1, isnon0, _0_0, _0_5, \
-                                _1_0, _2_0, _90_0
+from pygeodesy.constants import EPS, EPS1, EPS4, PI, PI2, PI_2, PI_4, \
+                                R_M, _0_0, _0_5, _1_0, _2_0, _90_0, \
+                                isnear0, isnear1, isnon0
 from pygeodesy.datums import _ellipsoidal_datum, _mean_radius
 from pygeodesy.errors import _AssertionError, CrossError, crosserrors, \
                              _TypeError, _ValueError, IntersectionError, \
@@ -36,7 +36,7 @@ from pygeodesy.interns import _1_, _2_, _coincident_, _composite_, _colinear_, \
                               _point_, _SPACE_, _too_
 from pygeodesy.latlonBase import _trilaterate5
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
-# from pygeodesy.nvectorBase import NvectorBase, sumOf  # _MODS
+# from pygeodesy.nvectorBase import _N_Vector, NvectorBase,  sumOf  # _MODS
 from pygeodesy.namedTuples import LatLon2Tuple, LatLon3Tuple, NearestOn3Tuple, \
                                   Triangle7Tuple, Triangle8Tuple
 from pygeodesy.points import ispolar, nearestOn5 as _nearestOn5, \
@@ -57,7 +57,7 @@ from pygeodesy.vector3d import sumOf, Vector3d
 from math import asin, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '25.05.28'
+__version__ = '25.08.31'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -968,10 +968,10 @@ def _intersect(start1, end1, start2, end2, height=None, wrap=False,  # in.ellips
             a, b = antipode_(a, b)  # PYCHOK PhiLam2Tuple
 
     else:  # end point(s) or bearing(s)
-        _N_vector_ = _MODS.nvectorBase._N_vector_
+        _N = _MODS.nvectorBase._N_Vector
 
-        x1, d1 = _int3d2(s1, end1, wrap, _1_, _N_vector_, hs)
-        x2, d2 = _int3d2(s2, end2, wrap, _2_, _N_vector_, hs)
+        x1, d1 = _int3d2(s1, end1, wrap, _1_, _N, hs)
+        x2, d2 = _int3d2(s2, end2, wrap, _2_, _N, hs)
         x = x1.cross(x2)
         if x.length < EPS:  # [nearly] colinear or parallel lines
             raise IntersectionError(_colinear_)