pygeodesy 25.4.8__py2.py3-none-any.whl → 25.5.5__py2.py3-none-any.whl

pygeodesy/triaxials.py

@@ -17,20 +17,20 @@ see the U{GeographicLib<https://GeographicLib.SourceForge.io>} documentation.
 @var Triaxials.Amalthea: Triaxial(name='Amalthea', a=125000, b=73000, c=64000, e2ab=0.658944, e2bc=0.231375493, e2ac=0.737856, volume=2446253479595252, area=93239507787.490371704, area_p=93212299402.670425415)
 @var Triaxials.Ariel: Triaxial(name='Ariel', a=581100, b=577900, c=577700, e2ab=0.01098327, e2bc=0.000692042, e2ac=0.011667711, volume=812633172614203904, area=4211301462766.580078125, area_p=4211301574065.829589844)
 @var Triaxials.Earth: Triaxial(name='Earth', a=6378173.435, b=6378103.9, c=6356754.399999999, e2ab=0.000021804, e2bc=0.006683418, e2ac=0.006705077, volume=1083208241574987694080, area=510065911057441.0625, area_p=510065915922713.6875)
-@var Triaxials.Enceladus: Triaxial(name='Enceladus', a=256600, b=251400, c=248300, e2ab=0.040119337, e2bc=0.024509841, e2ac=0.06364586, volume=67094551514082248, area=798618496278.596679688, area_p=798619018175.109863281)
+@var Triaxials.Enceladus: Triaxial(name='Enceladus', a=256600, b=251400, c=248300, e2ab=0.040119337, e2bc=0.024509841, e2ac=0.06364586, volume=67094551514082248, area=798618496278.596679688, area_p=798619018175.109985352)
 @var Triaxials.Europa: Triaxial(name='Europa', a=1564130, b=1561230, c=1560930, e2ab=0.003704694, e2bc=0.000384275, e2ac=0.004087546, volume=15966575194402123776, area=30663773697323.51953125, area_p=30663773794562.45703125)
 @var Triaxials.Io: Triaxial(name='Io', a=1829400, b=1819300, c=1815700, e2ab=0.011011391, e2bc=0.003953651, e2ac=0.014921506, volume=25313121117889765376, area=41691875849096.7421875, area_p=41691877397441.2109375)
 @var Triaxials.Mars: Triaxial(name='Mars', a=3394600, b=3393300, c=3376300, e2ab=0.000765776, e2bc=0.009994646, e2ac=0.010752768, volume=162907283585817247744, area=144249140795107.4375, area_p=144249144150662.15625)
-@var Triaxials.Mimas: Triaxial(name='Mimas', a=207400, b=196800, c=190600, e2ab=0.09960581, e2bc=0.062015624, e2ac=0.155444317, volume=32587072869017956, area=493855762247.691894531, area_p=493857714107.9375)
-@var Triaxials.Miranda: Triaxial(name='Miranda', a=240400, b=234200, c=232900, e2ab=0.050915557, e2bc=0.011070811, e2ac=0.061422691, volume=54926187094835456, area=698880863325.756958008, area_p=698881306767.950317383)
-@var Triaxials.Moon: Triaxial(name='Moon', a=1735550, b=1735324, c=1734898, e2ab=0.000260419, e2bc=0.000490914, e2ac=0.000751206, volume=21886698675223740416, area=37838824729886.09375, area_p=37838824733332.2265625)
+@var Triaxials.Mimas: Triaxial(name='Mimas', a=207400, b=196800, c=190600, e2ab=0.09960581, e2bc=0.062015624, e2ac=0.155444317, volume=32587072869017956, area=493855762247.691833496, area_p=493857714107.9375)
+@var Triaxials.Miranda: Triaxial(name='Miranda', a=240400, b=234200, c=232900, e2ab=0.050915557, e2bc=0.011070811, e2ac=0.061422691, volume=54926187094835456, area=698880863325.757080078, area_p=698881306767.950317383)
+@var Triaxials.Moon: Triaxial(name='Moon', a=1735550, b=1735324, c=1734898, e2ab=0.000260419, e2bc=0.000490914, e2ac=0.000751206, volume=21886698675223740416, area=37838824729886.09375, area_p=37838824733332.21875)
 @var Triaxials.Tethys: Triaxial(name='Tethys', a=535600, b=528200, c=525800, e2ab=0.027441672, e2bc=0.009066821, e2ac=0.036259685, volume=623086233855821440, area=3528073490771.394042969, area_p=3528074261832.738769531)
 @var Triaxials.WGS84_35: Triaxial(name='WGS84_35', a=6378172, b=6378102, c=6356752.314245179, e2ab=0.00002195, e2bc=0.006683478, e2ac=0.006705281, volume=1083207319768789942272, area=510065621722018.125, area_p=510065626587483.3125)
 '''
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isLatLon, isscalar
+from pygeodesy.basics import _isin, isLatLon, isscalar
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INT0, PI2, PI_3, PI4, \
                                _EPS2e4, _SQRT2_2, float0_, isfinite, isnear1, _over, \
                                _0_0, _0_5, _1_0, _N_1_0, _64_0,  _4_0  # PYCHOK used!
@@ -40,10 +40,10 @@ from pygeodesy.datums import Datum, _spherical_datum, _WGS84,  Ellipsoid, _EWGS8
 from pygeodesy.errors import _AssertionError, _ValueError
 from pygeodesy.fmath import Fdot, fdot, fmean_, hypot, hypot_, norm2, sqrt0
 from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
-from pygeodesy.interns import NN, _a_, _b_, _beta_, _c_, _distant_, _finite_, \
-                             _height_, _inside_, _near_, _negative_, _not_, \
-                             _NOTEQUAL_, _null_, _opposite_, _outside_, _SPACE_, \
-                             _spherical_, _too_, _x_, _y_
+from pygeodesy.interns import NN, _a_, _b_, _beta_, _c_, _distant_, _DMAIN_, \
+                             _finite_, _height_, _inside_, _near_, _negative_, \
+                             _not_, _NOTEQUAL_, _null_, _opposite_, _outside_, \
+                             _SPACE_, _spherical_, _too_, _x_, _y_
 # from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS  # from .vector3d
 from pygeodesy.named import _lazyNamedEnumItem as _lazy, _name__, _NamedEnum, \
                                 _NamedEnumItem, _Pass
@@ -59,7 +59,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d,  _ALL_LAZY, _MODS
 from math import fabs, sqrt
 
 __all__ = _ALL_LAZY.triaxials
-__version__ = '24.11.24'
+__version__ = '25.04.14'
 
 _not_ordered_ = _not_('ordered')
 _omega_       = 'omega'
@@ -258,7 +258,7 @@ class Triaxial_(_NamedEnumItem):
 
     @Property_RO
     def _a2_b2(self):
-        '''(INTERNAL) Get C{(a/b)**2}.
+        '''(INTERNAL) Get C{(a / b)**2}.
         '''
         a, b, _ = self._abc3
         return (a / b)**2 if a != b else _1_0
@@ -321,7 +321,7 @@ class Triaxial_(_NamedEnumItem):
 
     @Property_RO
     def _c2_b2(self):
-        '''(INTERNAL) Get C{(c/b)**2}.
+        '''(INTERNAL) Get C{(c / b)**2}.
         '''
         _, b, c = self._abc3
         return (c / b)**2 if b != c else _1_0
@@ -422,7 +422,7 @@ class Triaxial_(_NamedEnumItem):
                 raise TriaxialError(x=x, y=y, z=z, cause=e)
             if h > 0 and self.sideOf(v, eps=EPS0) < 0:
                 h = -h  # inside
-        n = _name__(name, name__=self.height4)  # _DUNDER_nameof
+        n = _name__(name, name__=self.height4)  # typename
         return Vector4Tuple(x, y, z, h, iteration=i, name=n)
 
     @Property_RO
@@ -507,7 +507,7 @@ class Triaxial_(_NamedEnumItem):
                @return: 2-Tuple C{((a, b, c), ijk)} with C{a} >= C{b} >= C{c}
                         and C{ijk} a 3-tuple with the initial indices.
             '''
-            i, j, k = 0, 1, 2  # range(3)
+            i, j, k = range(3)
             if a < b:
                 a, b, i, j = b, a, j, i
             if a < c:
@@ -1245,9 +1245,9 @@ def hartzell4(pov, los=False, tri_biax=_WGS84, **name):
     '''Compute the intersection of a tri-/biaxial ellipsoid and a Line-Of-Sight from
        a Point-Of-View outside.
 
-       @arg pov: Point-Of-View outside the tri-/biaxial (C{Cartesian}, L{Ecef9Tuple}
+       @arg pov: Point-Of-View outside the tri-/biaxial (C{Cartesian}, L{Ecef9Tuple},
                  C{LatLon} or L{Vector3d}).
-       @kwarg los: Line-Of-Sight, I{direction} to the tri-/biaxial (L{Los}, L{Vector3d}),
+       @kwarg los: Line-Of-Sight, I{direction} to the tri-/biaxial (L{Los}, L{Vector3d})
                    or C{True} for the I{normal, perpendicular, plumb} to the surface of
                    the tri-/biaxial or C{False} or C{None} to point to its center.
        @kwarg tri_biax: A triaxial (L{Triaxial}, L{Triaxial_}, L{JacobiConformal} or
@@ -1275,13 +1275,13 @@ def hartzell4(pov, los=False, tri_biax=_WGS84, **name):
         T = tri_biax
     else:
         D = tri_biax if isinstance(tri_biax, Datum) else \
-                  _spherical_datum(tri_biax, name__=hartzell4)  # _DUNDER_nameof
+                  _spherical_datum(tri_biax, name__=hartzell4)  # typename
         T = D.ellipsoid._triaxial
     try:
         v, h, i = _hartzell3(pov, los, T)
     except Exception as x:
         raise TriaxialError(pov=pov, los=los, tri_biax=tri_biax, cause=x)
-    n = _name__(name, name__=hartzell4)  # _DUNDER_nameof
+    n = _name__(name, name__=hartzell4)  # typename
     return Vector4Tuple(v.x, v.y, v.z, h, iteration=i, name=n)
 
 
@@ -1478,19 +1478,18 @@ def _rootNd(r, s, u, v, w, g, eps=EPS0):
     '''
     u *=  r
     v *=  s  # 0 for 2-D root
-    t0 =  w + _N_1_0
-    t1 = _0_0 if g < 0 else (hypot_(u, w, v) + _N_1_0)
+    t0 =  w - _1_0
+    t1 = _0_0 if g < 0 else (hypot_(u, w, v) - _1_0)
     # assert t0 <= t1
-    _e = -eps
-    for i in range(1, _TRIPS):  # 47..65
+    for i in range(1, _TRIPS):  # 48..58
         t = (t1 + t0) * _0_5
         e =  t1 - t0
-        if _e < e < eps or t in (t0, t1):
+        if eps > e > -eps or _isin(t, t0, t1):
             break
         g = fsumf_(_N_1_0,  # ~= _hypot2_1
                    _over02(u, t +  r),
-                   _over02(w, t - _N_1_0),
-                   _over02(v, t +  s) if v else _0_0)
+                   _over02(w, t + _1_0), (
+                   _over02(v, t +  s) if v else _0_0))
         if g > 0:
             t0 = t
         elif g < 0:
@@ -1527,7 +1526,7 @@ def _validate(a, b, c, d, T, x, y, z, val):
                                 dot=e, eps=val)
 
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     from pygeodesy import printf
     from pygeodesy.interns import _COMMA_, _NL_, _NLATvar_
@@ -1540,6 +1539,10 @@ if __name__ == '__main__':
     t = [NN] + Triaxials.toRepr(all=True, asorted=True).split(_NL_)
     printf(_NLATvar_.join(i.strip(_COMMA_) for i in t))
 
+# % python3 -m pygeodesy.triaxials
+#
+# Bektas: height4(x=3909251.554667, y=3909165.750567, z=3170432.501602, h=999.999996)
+
 # **) MIT License
 #
 # Copyright (C) 2022-2025 -- mrJean1 at Gmail -- All Rights Reserved.

pygeodesy/units.py

@@ -6,11 +6,12 @@ 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 isscalar, issubclassof, signOf
+from pygeodesy.basics import isscalar, issubclassof, signOf,  typename
 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
 from pygeodesy.errors import _AssertionError, TRFError, UnitError, _xattr, _xcallable
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _azimuth_, _band_, _bearing_, _COMMASPACE_, \
                              _degrees_, _degrees2_, _distance_, _E_, _easting_, \
                              _epoch_, _EW_, _feet_, _height_, _lam_, _lat_, _LatLon_, \
@@ -27,7 +28,7 @@ from pygeodesy.unitsBase import Float, Int, _NamedUnit, Radius, Str,  Fmt, fstr
 from math import degrees, isnan, radians
 
 __all__ = _ALL_LAZY.units
-__version__ = '24.11.14'
+__version__ = '25.04.14'
 
 
 class Float_(Float):
@@ -860,8 +861,8 @@ def _std_repr(*Classes):
     '''
     from pygeodesy.internals import _getenv
     for C in Classes:
-        if hasattr(C, _std_repr.__name__):  # PYCHOK del _std_repr
-            env = 'PYGEODESY_%s_STD_REPR' % (C.__name__.upper(),)
+        if hasattr(C, typename(_std_repr)):  # PYCHOK del _std_repr
+            env = 'PYGEODESY_%s_STD_REPR' % (typename(C).upper(),)
             if _getenv(env, _std_).lower() != _std_:
                 C._std_repr = False
 

pygeodesy/unitsBase.py

@@ -4,8 +4,9 @@
 u'''Basic C{Float}, C{Int} and C{Str}ing units classes.
 '''
 
-from pygeodesy.basics import isstr, issubclassof, _xsubclassof
+from pygeodesy.basics import _isin, isstr, issubclassof, _xsubclassof,  typename
 from pygeodesy.errors import _IsnotError, _UnexpectedError, UnitError, _XError
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _degrees_, _degrees2_, _invalid_, _meter_, \
                              _radians_, _radians2_, _radius_, _UNDER_, _units_, \
                              _std_  # PYCHOK used!
@@ -15,7 +16,7 @@ from pygeodesy.named import modulename, _Named,  property_doc_
 from pygeodesy.streprs import Fmt, fstr
 
 __all__ = _ALL_LAZY.unitsBase
-__version__ = '24.08.13'
+__version__ = '25.04.14'
 
 
 class _NamedUnit(_Named):
@@ -49,7 +50,7 @@ class _NamedUnit(_Named):
         elif name:
             pass
         elif name__ is not None:
-            name = name__.__name__
+            name = typename(name__)
         return name, arg
 
     @staticmethod  # PYCHOK unused suffix
@@ -84,7 +85,7 @@ class _NamedUnit(_Named):
     def std_repr(self, std):
         '''Set the representation (C{True} or C{"std"} for standard).
         '''
-        self._std_repr = std in (True, _std_)
+        self._std_repr = _isin(std, True, _std_)
 
     def _toRepr(self, value):
         '''(INTERNAL) Representation "<name> (<value>)" or "<classname>(<value>)".

pygeodesy/ups.py

@@ -28,7 +28,7 @@ from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, _neg, parseDMS2
 from pygeodesy.errors import RangeError, _ValueError, _xkwds_pop2
 from pygeodesy.fmath import hypot, hypot1, sqrt0
-from pygeodesy.internals import _getPYGEODESY, _under
+from pygeodesy.internals import _envPYGEODESY, _under
 from pygeodesy.interns import NN, _COMMASPACE_, _inside_, _N_, \
                              _pole_, _range_, _S_, _scale0_, \
                              _SPACE_, _std_, _to_, _UTM_
@@ -49,9 +49,9 @@ from pygeodesy.utmupsBase import Fmt, _LLEB, _hemi, _parseUTMUPS5, _to4lldn, \
 from math import fabs, radians, tan  # as _tan
 
 __all__ = _ALL_LAZY.ups
-__version__ = '24.11.26'
+__version__ = '25.04.14'
 
-_BZ_UPS  = _getPYGEODESY('UPS_POLES', _std_) == _std_
+_BZ_UPS  = _envPYGEODESY('UPS_POLES', _std_) == _std_
 _Falsing =  Meter(2000e3)  # false easting and northing (C{meter})
 _K0_UPS  =  Float(_K0_UPS= 0.994)  # scale factor at central meridian
 _K1_UPS  =  Float(_K1_UPS=_1_0)    # rescale point scale factor

pygeodesy/utily.py

@@ -18,7 +18,7 @@ from pygeodesy.constants import EPS, EPS0, INF, NAN, PI, PI2, PI_2, R_M, \
                                _copysign_0_0, _float, _isfinite, isnan, isnear0, \
                                _over, _umod_360, _umod_PI2
 from pygeodesy.errors import _ValueError, _xkwds,  _ALL_LAZY, _MODS
-from pygeodesy.internals import _passargs
+from pygeodesy.internals import _passargs, typename
 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, Lamd, \
@@ -28,7 +28,7 @@ from math import acos, asin, atan2 as _atan2, cos, degrees, fabs, radians, \
                  sin, tan as _tan  # pow
 
 __all__ = _ALL_LAZY.utily
-__version__ = '25.01.05'
+__version__ = '25.04.14'
 
 _G_DEG     = _float(  400.0 / _360_0)  # grades per degree
 _G_RAD     = _float(  400.0 /  PI2)    # grades per radian
@@ -1109,7 +1109,7 @@ def unrollPI(rad1, rad2, wrap=True):
 def _valueError(where, x, raiser=True, **kwds):
     '''(INTERNAL) Return a C{_ValueError} or C{None}.
     '''
-    t = _MODS.streprs.Fmt.PAREN(where.__name__, x)
+    t = _MODS.streprs.Fmt.PAREN(typename(where), x)
     return _ValueError(t, **kwds) if raiser else None
 
 
@@ -1193,7 +1193,7 @@ class _Wrap(object):
             lat, lon = ll.latlon
             if fabs(lon) > _180_0 or fabs(lat) > _90_0:
                 _n = self.latlon
-                ll = ll.copy(name=_n.__name__)
+                ll = ll.copy(name=typename(_n))
                 ll.latlon = _n(lat, lon)
         return ll
 

pygeodesy/utmups.py

@@ -14,14 +14,14 @@ A pure Python implementation, partially transcoded from C++ class U{UTMUPS
 <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1UTMUPS.html>}
 by I{Charles Karney}.
 '''
-# from pygeodesy.basics import map1  # from .namedTuples
+from pygeodesy.basics import _isin, map1
 # from pygeodesy.datums import _WGS84  # from .utmupsBase
 from pygeodesy.errors import _IsnotError, RangeError, _ValueError, _xkwds_pop2
 from pygeodesy.interns import NN, _easting_, _MGRS_, _northing_, _NS_, \
                              _outside_, _range_, _SPACE_, _UPS_, _UTM_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import modulename
-from pygeodesy.namedTuples import UtmUps5Tuple, UtmUps8Tuple,  map1
+from pygeodesy.namedTuples import UtmUps5Tuple, UtmUps8Tuple
 # from pygeodesy.streprs import Fmt  # from .utmupsBase
 from pygeodesy.units import Northing, _100km
 from pygeodesy.ups import parseUPS5, toUps8, Ups, UPSError, upsZoneBand5
@@ -31,7 +31,7 @@ from pygeodesy.utmupsBase import Fmt, _to4lldn, _to3zBhp, _UPS_ZONE, \
                                 _UTMUPS_ZONE_MAX, _WGS84
 
 __all__ = _ALL_LAZY.utmups
-__version__ = '24.06.11'
+__version__ = '25.04.14'
 
 _MGRS_TILE = _100km  # in .mgrs.Mgrs.tile
 
@@ -179,7 +179,7 @@ def UtmUps(zone, hemipole, easting, northing, band=NN, datum=_WGS84, falsed=True
              <https://GeographicLib.SourceForge.io/C++/doc/classGeographicLib_1_1UTMUPS.html>}.
     '''
     z, B, hp = _to3zBhp(zone, band, hemipole=hemipole)
-    U = Ups if z in (_UPS_ZONE, _UPS_ZONE_STR) else Utm
+    U = Ups if _isin(z, _UPS_ZONE, _UPS_ZONE_STR) else Utm
     return U(z, hp, easting, northing, band=B, datum=datum, falsed=falsed, **name)
 
 

pygeodesy/utmupsBase.py

@@ -4,39 +4,44 @@
 u'''(INTERNAL) Private class C{UtmUpsBase}, functions and constants
 for modules L{epsg}, L{etm}, L{mgrs}, L{ups} and L{utm}.
 '''
+# make sure int/int division yields float quotient, see .basics
+from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isint, isscalar, isstr, neg_, \
-                            _xinstanceof, _xsubclassof
+from pygeodesy.basics import _copysign, _isin, isint, isscalar, isstr, \
+                              neg_, _xinstanceof, _xsubclassof
 from pygeodesy.constants import _float, _0_0, _0_5, _N_90_0, _180_0
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84
 from pygeodesy.dms import degDMS, parseDMS2
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase as _LLEB
 from pygeodesy.errors import _or, ParseError, _parseX, _ValueError, \
                              _xattrs, _xkwds, _xkwds_not
+# from pygeodesy.fsums import Fsum  # _MODS
 # from pygeodesy.internals import _name__, _under  # from .named
-from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, \
-                             _gamma_, _n_a_, _not_, _N_, _NS_, _PLUS_, \
-                             _S_, _scale_, _SPACE_, _Y_, _Z_
+from pygeodesy.interns import NN, _A_, _B_, _COMMA_, _Error_, _gamma_, \
+                             _n_a_, _not_, _N_, _NS_, _PLUS_, _scale_, \
+                             _S_, _SPACE_, _Y_, _Z_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 from pygeodesy.named import _name__, _NamedBase,  _under
 from pygeodesy.namedTuples import EasNor2Tuple, LatLonDatum5Tuple
 from pygeodesy.props import deprecated_method, property_doc_, _update_all, \
                             deprecated_property_RO, Property_RO, property_RO
 from pygeodesy.streprs import Fmt, fstr, _fstrENH2, _xzipairs
-from pygeodesy.units import Band, Easting, Northing, Scalar, Zone
-from pygeodesy.utily import _Wrap, wrap360
+from pygeodesy.units import Band, Easting, Lat, Northing, Phi, Scalar, Zone
+from pygeodesy.utily import atan1, _Wrap, wrap360
+
+from math import cos, degrees, fabs, sin, tan  # copysign as _copysign
 
 __all__ = _ALL_LAZY.utmupsBase
-__version__ = '24.08.13'
+__version__ = '25.04.26'
 
 _UPS_BANDS = _A_, _B_, _Y_, _Z_  # UPS polar bands SE, SW, NE, NW
 # _UTM_BANDS = _MODS.utm._Bands
 
-_UTM_LAT_MAX  = _float( 84)          # PYCHOK for export (C{degrees})
-_UTM_LAT_MIN  = _float(-80)          # PYCHOK for export (C{degrees})
+_UTM_LAT_MAX = _float( 84)          # PYCHOK for export (C{degrees})
+_UTM_LAT_MIN = _float(-80)          # PYCHOK for export (C{degrees})
 
-_UPS_LAT_MAX  = _UTM_LAT_MAX - _0_5  # PYCHOK includes 30' UTM overlap
-_UPS_LAT_MIN  = _UTM_LAT_MIN + _0_5  # PYCHOK includes 30' UTM overlap
+_UPS_LAT_MAX = _UTM_LAT_MAX - _0_5  # PYCHOK includes 30' UTM overlap
+_UPS_LAT_MIN = _UTM_LAT_MIN + _0_5  # PYCHOK includes 30' UTM overlap
 
 _UPS_LATS = {_A_: _N_90_0, _Y_: _UTM_LAT_MAX,  # UPS band bottom latitudes,
              _B_: _N_90_0, _Z_: _UTM_LAT_MAX}  # PYCHOK see .Mgrs.bandLatitude
@@ -91,7 +96,7 @@ class UtmUpsBase(_NamedBase):
         if band:
             self._band1(band)
 
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _ellipsoidal_datum(datum)  # raiser=_datum_, name=band
 
         if not falsed:
@@ -189,6 +194,67 @@ class UtmUpsBase(_NamedBase):
         '''I{Must be overloaded}.'''
         self._notOverloaded(self)
 
+    def _footpoint(self, y, lat0, makris):
+        '''(INTERNAL) Return the foot-point latitude in C{radians}.
+        '''
+        F = _MODS.fsums.Fsum
+        E = self.datum.ellipsoid
+        if y is None:
+            _, y = self.eastingnorthing2(falsed=False)
+        B = F(E.Llat(lat0), y)
+        if E.isSpherical:
+            r = B.fover(E.a)  # == E.b
+
+        elif makris:
+            b = B.fover(E.b)
+            r = fabs(b)
+            if r:
+                e2 = E.e22  # E.e22abs?
+                e4 = E.e4
+
+                e1  = F(-1, e2 /  4, -11 /  64 * e4).as_iscalar
+                e2  = F(    e2 /  8, -13 / 128 * e4).as_iscalar
+                e4 *= cos(r)**2 / 8
+
+                s =  sin(r * 2)
+                r = -r
+                U =  F(e1 * r, e2 * s, e4 * r, e4 / 8 * 5 * s**2)
+                r = _copysign(atan1(E.a * tan(float(U)) / E.b), b)
+
+#       elif clins:  # APRIL-ZJU/clins/include/utils/gps_convert_utils.h
+#           n  = E.n
+#           n2 = n**2
+#           n3 = n**3
+#           n4 = n**4
+#           n5 = n**5
+#           A  = F(1, n2 / 4, n4 / 64).fmul((E.a + E.b) / 2)
+#           r  = B.fover(A)
+#           R  = F(r)
+#           if clins:  # FootpointLatitude, GPS-Theory-Practice, 1994
+#               R += F(3 / 2 * n, -27 / 32 * n3,  269 / 512 * n5).fmul(sin(r * 2))
+#               R += F(            21 / 16 * n2,  -55 /  32 * n4).fmul(sin(r * 4))
+#               R += F(           151 / 96 * n3, -417 / 128 * n5).fmul(sin(r * 6))
+#               R +=                            (1097 / 512 * n4)    * sin(r * 8)
+#           else:  # GPS-Theory-Practice, 1992, page 234-235
+#               R += F(-3 / 2 * n, 9 / 16 * n3,  -3 /  32 * n5).fmul(sin(r * 2))
+#               R += F(           15 / 16 * n2, -15 /  32 * n4).fmul(sin(r * 4))
+#               R += F(          -35 / 48 * n3, 105 / 256 * n4).fmul(sin(r * 6))  # n5?
+#           r = float(R)
+
+        else:  # PyGeodetics/src/geodetics/footpoint_latitude.py
+            f  = E.f
+            f2 = f**2
+            f3 = f**3
+            B0 = F(1, -f / 2, f2 / 16, f3 / 32).fmul(E.a)
+            r  = B.fover(B0)
+            R  = F(r)
+            R += F(3 / 4 * f, 3 /  8 * f2, 21 / 256 * f3).fmul(sin(r * 2))
+            R += F(          21 / 64 * f2, 21 /  64 * f3).fmul(sin(r * 4))
+            R +=                         (151 / 768 * f3)    * sin(r * 6)
+            r  = float(R)
+
+        return r
+
     @Property_RO
     def gamma(self):
         '''Get the meridian convergence (C{degrees}) or C{None}
@@ -204,6 +270,23 @@ class UtmUpsBase(_NamedBase):
             self._toLLEB()
         return self._hemisphere
 
+    def latFootPoint(self, northing=None, lat0=0, makris=False):
+        '''Compute the foot-point latitude in C{degrees}.
+
+           @arg northing: Northing (C{meter}, same units this ellipsoid's axes),
+                          overriding this northing, I{unfalsed}.
+           @kwarg lat0: Geodetic latitude of the meridian's origin (C{degrees}).
+           @kwarg makris: If C{True}, use C{Makris}' formula, otherwise C{PyGeodetics}'.
+
+           @return: Foot-point latitude (C{degrees}).
+
+           @see: U{PyGeodetics<https://GitHub.com/paarnes/pygeodetics>}, U{FootpointLatitude
+                 <https://GitHub.com/APRIL-ZJU/clins/blob/master/include/utils/gps_convert_utils.h#L143>},
+                 U{Makris<https://www.TandFonline.com/doi/abs/10.1179/sre.1982.26.205.345>} and
+                 U{Geomatics' Mercator, page 60<https://Geomatics.CC/legacy-files/mercator.pdf>}.
+        '''
+        return Lat(FootPoint=degrees(self._footpoint(northing, lat0, makris)))
+
     def _latlon5(self, LatLon, **LatLon_kwds):
         '''(INTERNAL) Get cached C{._toLLEB} as B{C{LatLon}} instance.
         '''
@@ -255,6 +338,15 @@ class UtmUpsBase(_NamedBase):
         '''
         return self._northing
 
+    def phiFootPoint(self, northing=None, lat0=0, makris=False):
+        '''Compute the foot-point latitude in C{radians}.
+
+           @return: Foot-point latitude (C{radians}).
+
+           @see: Method L{latFootPoint<UtmUpsBase.latFootPoint>} for further details.
+        '''
+        return Phi(FootPoint=self._footpoint(northing, lat0, makris))
+
     @Property_RO
     def scale(self):
         '''Get the grid scale (C{float}) or C{None}.
@@ -302,9 +394,9 @@ class UtmUpsBase(_NamedBase):
            @note: If not specified, the I{latitudinal} C{band} is computed from
                   the (geodetic) latitude and the C{datum}.
         '''
-        return self._mgrs if center in (False, 0, _0_0) else (
-               self._mgrs_lowerleft if center in (True,) else
-              _toMgrs(_lowerleft(self, center)))  # PYCHOK indent
+        return self._mgrs_lowerleft if center is True else (
+              _toMgrs(_lowerleft(self, center)) if center else
+               self._mgrs)  # PYCHOK indent
 
     def _toRepr(self, fmt, B, cs, prec, sep):  # PYCHOK expected
         '''(INTERNAL) Return a representation for this ETM/UTM/UPS coordinate.
@@ -349,8 +441,8 @@ def _lowerleft(utmups, center):  # in .ellipsoidalBase._lowerleft
             t = c * 2
             e = int(utmups.easting  % t)
             n = int(utmups.northing % t)
-            if (e == c and n in (c, c - 1)) or \
-               (n == c and e in (c, c - 1)):
+            if (e == c and _isin(n, c, c - 1)) or \
+               (n == c and _isin(e, c, c - 1)):
                 break
         else:
             return utmups  # unchanged

pygeodesy/vector2d.py

@@ -2,18 +2,23 @@
 # -*- coding: utf-8 -*-
 
 u'''2- or 3-D vectorial functions L{circin6}, L{circum3}, L{circum4_},
-L{iscolinearWith}, L{meeus2}, L{nearestOn}, L{radii11}, L{soddy4} and
-L{trilaterate2d2}.
+L{iscolinearWith}, L{meeus2}, L{nearestOn}, L{radii11}, L{soddy4},
+L{triaxum5} and L{trilaterate2d2}.
+
+@note: Functions L{circin6}, L{circum3}, L{circum4_}, L{soddy4} and
+       L{triaxum5} require U{numpyhttps://PyPI.org/project/numpy>}
+       version 1.10 or newer to be installed.
 '''
 
-from pygeodesy.basics import len2, map2, _xnumpy
+from pygeodesy.basics import len2, map2, _xnumpy,  typename
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS4, INF, INT0, \
                                _EPS4e8, isnear0, _0_0, _0_25, _0_5, _N_0_5, \
                                _1_0, _1_0_1T, _N_1_0, _2_0, _N_2_0, _4_0
 from pygeodesy.errors import _and, _AssertionError, IntersectionError, NumPyError, \
                               PointsError, TriangleError, _xError, _xkwds
-from pygeodesy.fmath import fabs, fdot, fdot_, hypot, hypot2_, sqrt
+from pygeodesy.fmath import fabs, fdot, Fdot_, fdot_, hypot, hypot2_, sqrt
 from pygeodesy.fsums import _Fsumf_, fsumf_, fsum1f_
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _a_, _and_, _b_, _c_, _center_, _coincident_, \
                              _colinear_, _COMMASPACE_, _concentric_, _few_, \
                              _intersection_, _invalid_, _near_, _no_, _of_, \
@@ -31,7 +36,7 @@ from contextlib import contextmanager
 # from math import fabs, sqrt  # from .fmath
 
 __all__ = _ALL_LAZY.vector2d
-__version__ = '24.11.21'
+__version__ = '25.04.30'
 
 _cA_        = 'cA'
 _cB_        = 'cB'
@@ -184,7 +189,7 @@ def _circin6(point1, point2, point3, eps=EPS4, useZ=True, dLL3=False, **Vector_k
 
     r    =  t.rIn
     c, d = _tricenter3d2(c1, r, c2, r, c3, r, eps=eps, useZ=useZ, dLL3=dLL3,
-                       **_xkwds(Vector_kwds, Vector=V, name=circin6.__name__))
+                       **_xkwds(Vector_kwds, Vector=V, name=typename(circin6)))
     return Circin6Tuple(r, c, d, cA, cB, cC)
 
 
@@ -236,7 +241,7 @@ def _circum3(p1, point2, point3, circum=True, eps=EPS4, useZ=True, dLL3=False,
     r, d, p2, p3 = _meeus4(p1, point2, point3, circum=circum, useZ=useZ,
                                                clas=clas, **clas_kwds)
     if d is None:  # Meeus' Type II or circum=True
-        kwds = _xkwds(clas_kwds, eps=eps, Vector=clas, name=circum3.__name__)
+        kwds = _xkwds(clas_kwds, eps=eps, Vector=clas, name=typename(circum3))
         c, d = _tricenter3d2(p1, r, p2, r, p3, r, useZ=useZ, dLL3=dLL3, **kwds)
     else:  # Meeus' Type I
         c, d = d, None
@@ -386,7 +391,7 @@ def _meeus4(A, point2, point3, circum=False, useZ=True, clas=None, **clas_kwds):
         r = sqrt(a * _0_25) if a > EPS02 else INT0
         t = B.plus(C).times(_0_5)  # Meeus' Type I
         if clas is not None:
-            t = clas(t.x, t.y, t.z, **_xkwds(clas_kwds, name=meeus2.__name__))
+            t = clas(t.x, t.y, t.z, **_xkwds(clas_kwds, name=typename(meeus2)))
     return r, t, p2, p3
 
 
@@ -410,6 +415,8 @@ class _numpy(object):  # see also .formy._idllmn6, .geodesicw._wargs, .latlonBas
 
     @Property_RO
     def array(self):
+        '''Get U{numpy.array<https://NumPy.org/doc/2.2/reference/generated/numpy.array.html#numpy.array>}.
+        '''
         return self.np.array
 
     def least_squares3(self, A, b):
@@ -595,7 +602,7 @@ def soddy4(point1, point2, point3, eps=EPS4, useZ=True):
     c, d = _tricenter3d2(p1, t.rA + r,
                          p2, t.rB + r,
                          p3, t.rC + r, eps=eps, useZ=useZ,
-                                       Vector=point1.classof, name=soddy4.__name__)
+                                       Vector=point1.classof, name=typename(soddy4))
     return Soddy4Tuple(r, c, d, t.roS)
 
 
@@ -748,8 +755,8 @@ def _trilaterate2d2(x1, y1, radius1, x2, y2, radius2, x3, y3, radius3,
         raise IntersectionError(_and(_astr(x1=x1, y1=y1, radius1=r1),
                                      _astr(x2=x2, y2=y2, radius2=r2),
                                      _astr(x3=x3, y3=y3, radius3=r3)), txt=t)
-    t = Vector2Tuple(fdot_(c, e, -b, f) / q,
-                     fdot_(a, f, -c, d) / q, name=trilaterate2d2.__name__)
+    t = Vector2Tuple(Fdot_(c, e, -b, f).fover(q),
+                     Fdot_(a, f, -c, d).fover(q), name=typename(trilaterate2d2))
 
     if eps and eps > 0:  # check distances to center vs radius
         for x, y, r in ((x1, y1, r1), (x2, y2, r2), (x3, y3, r3)):
@@ -784,7 +791,7 @@ def _trilaterate3d2(c1, r1, c2, r2, c3, r3, eps=EPS4, coin=False,  # MCCABE 13
     def _N3(t01, x, z):
         # compute x, y and z and return as B{C{clas}} or B{C{Vector}}
         v = x.plus(z.times(t01))
-        n = trilaterate3d2.__name__
+        n = typename(trilaterate3d2)
         return _nVc(v, **_xkwds(clas_Vector_and_kwds, name=n))
 
     c2 = _otherV3d(center2=c2, NN_OK=False)
@@ -828,7 +835,7 @@ def _trilaterate3d2(c1, r1, c2, r2, c3, r3, eps=EPS4, coin=False,  # MCCABE 13
             r =  repr(r1) if r1 == r2 == r3 else _reprs(r1, r2, r3)
             t = _SPACE_(t, _of_, _reprs(c1, c2, c3), _with_, _radius_, r)
         elif Z is None:
-            t = _COMMASPACE_(t, _no_(_numpy.null_space2.__name__))
+            t = _COMMASPACE_(t, _no_(typename(_numpy.null_space2)))
         return t
 
     # coincident, concentric, colinear, too distant, no intersection: