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

pygeodesy/dms.py

@@ -62,11 +62,11 @@ U{Vector-based geodesy<https://www.Movable-Type.co.UK/scripts/latlong-vectors.ht
 '''
 
 from pygeodesy.basics import copysign0, isLatLon, isodd, issequence, isstr, \
-                             neg as _neg  # in .ups
+                             neg as _neg,  typename  # in .ups
 from pygeodesy.constants import _umod_360, _0_0, _0_5, _60_0, _360_0, _3600_0
 from pygeodesy.errors import ParseError, RangeError, _TypeError, _ValueError, \
-                            _parseX, rangerrors, _xError, _xkwds,  _getPYGEODESY
-# from pygeodesy.internals import _getPYGEODESY  # from .errors
+                            _parseX, rangerrors, _xError, _xkwds,  _envPYGEODESY
+# from pygeodesy.internals import _envPYGEODESY, typename  # from .errors
 from pygeodesy.interns import NN, _COMMA_, _d_, _DASH_, _deg_, _degrees_, _DOT_, \
                              _0_, _e_, _E_, _EW_, _f_, _F_, _g_, _MINUS_, _N_, \
                              _NE_, _NS_, _NSEW_, _NW_, _PERCENTDOTSTAR_, _PLUS_, \
@@ -86,7 +86,7 @@ except ImportError:  # Python 3+
     from string import ascii_letters as _LETTERS
 
 __all__ = _ALL_LAZY.dms
-__version__ = '24.10.18'
+__version__ = '25.04.14'
 
 _beyond_      = 'beyond'
 _deg_min_     = 'deg+min'
@@ -100,7 +100,7 @@ F_D_,  F_DM_,  F_DMS_,  F_DEG_,  F_MIN_,  F_SEC_,  F_D60_,  F__E_,  F__F_,  F__G
 F_D__, F_DM__, F_DMS__, F_DEG__, F_MIN__, F_SEC__, F_D60__, F__E__, F__F__, F__G__, F_RAD__ = (NN(
  _PLUS_, _)  for _ in _F_s)
 del _F_s
-_F_DMS  = _getPYGEODESY('FMT_FORM') or F_DMS
+_F_DMS  = _envPYGEODESY('FMT_FORM') or F_DMS
 
 _F_case = {F_D:   F_D,   F_DEG: F_D,   _degrees_: F_D,  # unsigned _F_s
            F_DM:  F_DM,  F_MIN: F_DM,  _deg_min_: F_DM,
@@ -348,7 +348,7 @@ def compassPoint(bearing, prec=3):
         p = _MODS.units.Precision_(prec, low=1, high=4) \
              if prec != 3 else int(prec)
         m =  2 << p
-        w = 32 // m  # if m in (4, 8, 16, 32)
+        w = 32 // m  # if _isin(m, 4, 8, 16, 32)
         # not round(b), half-even rounding in Python 3+, but
         # round-away-from-zero as int(b + copysign0(_0_5, b))
         w *= int(b * m / _360_0 + _0_5) % m
@@ -483,7 +483,7 @@ def _latlonDMS_sep2(where, sep=None, **kwds):
         i = _MODS.inters
         k =  Fmt.EQUAL(sep=repr(sep))
         k = _SPACE_(i._keyword_, i._arg_, k, i._of_)
-        n =  where.__name__
+        n =  typename(where)
         t = _latlonDMS_sep2.__doc__ % (sep, n)
         _MODS.props._throwarning(k, n, t)
     return sep, kwds
@@ -670,7 +670,7 @@ def _DDDMMSS6(t, S):
         # check [D]DDMMSS form and compass point
         X = _EW_ if isodd(n) else _NS_
         if not (P in X or (S in X and (P.isdigit() or P == _DOT_))):
-            t =  parseDDDMMSS.__name__[5 if isodd(n) else 6:]
+            t =  typename(parseDDDMMSS)[(5 if isodd(n) else 6):]
             t = _SPACE_('form', t, 'applies', _DASH_.join(X))
             raise ParseError(t)
     else:

pygeodesy/ecef.py

@@ -57,8 +57,8 @@ for conversion between geodetic and I{local cartesian} coordinates in a I{local
 plane} as opposed to I{geocentric} (ECEF) ones.
 '''
 
-from pygeodesy.basics import copysign0, isscalar, issubclassof, neg, map1, \
-                            _xinstanceof, _xsubclassof  # _args_kwds_names
+from pygeodesy.basics import copysign0, _isin, isscalar, issubclassof, neg, map1, \
+                            _xinstanceof, _xsubclassof,  typename  # _args_kwds_names
 from pygeodesy.constants import EPS, EPS0, EPS02, EPS1, EPS2, EPS_2, INT0, PI, PI_2, \
                                _0_0, _0_0001, _0_01, _0_5, _1_0, _1_0_1T, _N_1_0, \
                                _2_0, _N_2_0, _3_0, _4_0, _6_0, _60_0, _90_0, _N_90_0, \
@@ -69,6 +69,7 @@ from pygeodesy.errors import _IndexError, LenError, _ValueError, _TypesError, \
                              _xattr, _xdatum, _xkwds, _xkwds_get
 from pygeodesy.fmath import cbrt, fdot, Fpowers, hypot, hypot1, hypot2_, sqrt0
 from pygeodesy.fsums import Fsum, fsumf_,  Fmt, unstr
+# from pygeodesy.internals import typename  # from .basics
 from pygeodesy.interns import NN, _a_, _C_, _datum_, _ellipsoid_, _f_, _height_, \
                              _lat_, _lon_, _M_, _name_, _singular_, _SPACE_, \
                              _x_, _xyz_, _y_, _z_
@@ -89,7 +90,7 @@ from pygeodesy.utily import atan1, atan1d, atan2, atan2d, degrees90, degrees180,
 from math import cos, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.ecef
-__version__ = '24.12.06'
+__version__ = '25.04.24'
 
 _Ecef_    = 'Ecef'
 _prolate_ = 'prolate'
@@ -138,7 +139,7 @@ class _EcefBase(_NamedBase):
             else:
                 raise ValueError()  # _invalid_
 
-            if E not in (_EWGS84, _WGS84):
+            if not _isin(E, _EWGS84, _WGS84):
                 d = _ellipsoidal_datum(E, **name)
                 E =  d.ellipsoid
                 if E.a < EPS or E.f > EPS1:
@@ -956,7 +957,7 @@ class EcefMatrix(_NamedTuple):
         # <https://GeographicLib.SourceForge.io/C++/doc/LocalCartesian_8cpp_source.html>
         # X = (fdot(self.column(r), *other.column(c)) for r in (0,1,2) for c in (0,1,2))
         X = (fdot(self[r::3], *other[c::3]) for r in range(3) for c in range(3))
-        return _xnamed(EcefMatrix(*X), EcefMatrix.multiply.__name__)
+        return _xnamed(EcefMatrix(*X), typename(EcefMatrix.multiply))
 
     def rotate(self, xyz, *xyz0):
         '''Forward rotation M{M0' ⋅ ([x, y, z] - [x0, y0, z0])'}.
@@ -1141,6 +1142,8 @@ class Ecef9Tuple(_NamedTuple, _NamedLocal):
         '''
         return PhiLam2Tuple(radians(self.lat), self.lamVermeille, name=self.name)
 
+    phiVermeille = phi
+
     def toCartesian(self, Cartesian=None, **Cartesian_kwds):
         '''Return the geocentric C{(x, y, z)} coordinates as an ellipsoidal or spherical
            C{Cartesian}.
@@ -1157,7 +1160,7 @@ class Ecef9Tuple(_NamedTuple, _NamedLocal):
 
            @raise TypeError: Invalid B{C{Cartesian}} or B{C{Cartesian_kwds}} item.
         '''
-        if Cartesian in (None, Vector4Tuple):
+        if _isin(Cartesian, None, Vector4Tuple):
             r = self.xyzh
         elif Cartesian is Vector3Tuple:
             r = self.xyz
@@ -1177,7 +1180,7 @@ class Ecef9Tuple(_NamedTuple, _NamedLocal):
            @raise TypeError: The B{C{datum2}} is not a L{Datum}.
         '''
         n = _name__(name, _or_nameof=self)
-        if self.datum in (None, datum2):  # PYCHOK _Names_
+        if _isin(self.datum, None, datum2):  # PYCHOK _Names_
             r = self.copy(name=n)
         else:
             c = self._CartesianBase(self, datum=self.datum, name=n)  # PYCHOK _Names_

pygeodesy/elevations.py

@@ -21,11 +21,12 @@ U{USGS10mElev.py<https://Gist.GitHub.com/pyRobShrk>}.
        C{"/Applications/Python\\ X.Y/Install\\ Certificates.command"}
 '''
 
-from pygeodesy.basics import clips, ub2str
+from pygeodesy.basics import clips, ub2str,  typename
 from pygeodesy.errors import ParseError, _xkwds_get
-from pygeodesy.interns import NN, _AMPERSAND_, _COLONSPACE_, \
-                             _elevation_, _height_, _LCURLY_, \
-                             _n_a_, _no_, _RCURLY_, _SPACE_
+# from pygeodesy.internals import typename  # from .basics
+from pygeodesy.interns import NN, _AMPERSAND_, _COLONSPACE_, _DMAIN_, \
+                             _elevation_, _height_, _LCURLY_, _n_a_, \
+                             _no_, _RCURLY_, _SPACE_
 from pygeodesy.lazily import _ALL_LAZY
 from pygeodesy.named import _NamedTuple
 from pygeodesy.streprs import fabs, Fmt, fstr, lrstrip
@@ -34,7 +35,7 @@ from pygeodesy.units import Lat, Lon, Meter, Scalar, Str
 # from math import fabs  # from .karney
 
 __all__ = _ALL_LAZY.elevations
-__version__ = '24.06.11'
+__version__ = '25.04.14'
 
 try:
     from urllib2 import urlopen  # quote, urlcleanup
@@ -91,7 +92,7 @@ except ImportError:
 def _error(fun, lat, lon, e):
     '''(INTERNAL) Format an error
     '''
-    return _COLONSPACE_(Fmt.PAREN(fun.__name__, fstr((lat, lon))), e)
+    return _COLONSPACE_(Fmt.PAREN(typename(fun), fstr((lat, lon))), e)
 
 
 def _qURL(url, timeout=2, **params):
@@ -243,14 +244,14 @@ def geoidHeight2(lat, lon, model=0, timeout=2.0):
     return GeoidHeight2Tuple(None, e)
 
 
-if __name__ == '__main__':
+if __name__ == _DMAIN_:
 
     from pygeodesy import printf
     # <https://WikiPedia.org/wiki/Mount_Diablo>
     for f in (elevation2,     # (1173.79, '3DEP 1/3 arc-second')
               geoidHeight2):  # (-31.699, u'GEOID12B')
         t = f(37.8816, -121.9142)
-        printf(_COLONSPACE_(f.__name__, t))
+        printf(_COLONSPACE_(typename(f), t))
 
 # **) MIT License
 #

pygeodesy/ellipsoidalBase.py

@@ -12,30 +12,41 @@ and published under the same MIT Licence**, see for example U{latlon-ellipsoidal
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-# from pygeodesy.basics import _xinstanceof  # from .datums
+# from pygeodesy.azimuthal import EquidistantExact, EquidistantKarney  # _MODS
+from pygeodesy.basics import _isin, _xinstanceof
 from pygeodesy.constants import EPS, EPS0, EPS1, _0_0, _0_5
 from pygeodesy.cartesianBase import CartesianBase  # PYCHOK used!
+# from pygeodesy.css import toCss  # _MODS
 from pygeodesy.datums import Datum, Datums, _earth_ellipsoid, _ellipsoidal_datum, \
-                             Transform, _WGS84,  _EWGS84, _xinstanceof  # _spherical_datum
+                             Transform, _WGS84,  _EWGS84  # _spherical_datum
+# from pygeodesy.dms import parse3llh  # _MODS
+# from pygeodesy.elevations import elevation2, geoidHeight2  # _MODS
+# from pygeodesy.ellipsoidalBaseDI import _intersect3, _intersections2, _nearestOn2  # _MODS
 # from pygeodesy.ellipsoids import _EWGS84  # from .datums
 from pygeodesy.errors import _IsnotError, RangeError, _TypeError, _xattr, _xellipsoidal, \
                              _xellipsoids, _xError, _xkwds, _xkwds_not
+# from pygeodesy.etm import etm, toEtm8  # _MODS
 # from pygeodesy.fmath import favg  # _MODS
 from pygeodesy.interns import NN, _COMMA_, _ellipsoidal_
 from pygeodesy.latlonBase import LatLonBase, _trilaterate5,  fabs, _Wrap
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
 # from pygeodesy.lcc import toLcc  # _MODS
 # from pygeodesy.namedTuples import Vector3Tuple  # _MODS
+# from pygeodesy.osgr import toOsgr  # _MODS
+# from pygeodesy.points import isenclosedBy  # _MODS
 from pygeodesy.props import deprecated_method, deprecated_property_RO, \
                             Property_RO, property_doc_, property_RO, _update_all
-# from pygeodesy.trf import _eT0Ds4  # _MODS
+# from pygeodesy.trf import RefFrame, _toRefFrame  # _MODS
 from pygeodesy.units import Epoch, _isDegrees, Radius_, _1mm as _TOL_M
+# from pygeodesy import ups, utm, utmups  # MODS
+# from pygeodesy.utmupsBase import _lowerleft  # MODS
 # from pygeodesy.utily import _Wrap  # from .latlonBase
+# from pygeodesy.vector3d import _intersects2  # _MODS
 
 # from math import fabs  # from .latlonBase
 
 __all__ = _ALL_LAZY.ellipsoidalBase
-__version__ = '24.12.04'
+__version__ = '25.04.14'
 
 
 class CartesianEllipsoidalBase(CartesianBase):
@@ -246,7 +257,7 @@ class LatLonEllipsoidalBase(LatLonBase):
            @raise UnitError: Invalid B{C{lat}}, B{C{lon}} or B{C{height}}.
         '''
         LatLonBase.__init__(self, latlonh, lon=lon, height=height, wrap=wrap, **name)
-        if datum not in (None, self._datum, _EWGS84):
+        if not _isin(datum, None, self._datum, _EWGS84):
             self.datum = _ellipsoidal_datum(datum, name=self.name)
         if reframe:
             self.reframe = reframe
@@ -738,7 +749,7 @@ class LatLonEllipsoidalBase(LatLonBase):
                 n = Datums.NAD83.ellipsoid.rocGauss(self.lat)
                 if n > EPS0:
                     # use ratio, datum and NAD83 units may differ
-                    E = self.ellipsoid() if datum in (None, self.datum) else \
+                    E = self.ellipsoid() if _isin(datum, None, self.datum) else \
                       _earth_ellipsoid(datum)
                     r = E.rocGauss(self.lat)
                     if r > EPS0 and fabs(r - n) > EPS:  # EPS1
@@ -1109,9 +1120,9 @@ class LatLonEllipsoidalBase(LatLonBase):
 def _lowerleft(utmups, center):
     '''(INTERNAL) Optionally I{un}-center C{utmups}.
     '''
-    if center in (False, 0, _0_0):
+    if _isin(center, False, 0, _0_0):
         u = utmups
-    elif center in (True,):
+    elif _isin(center, True):
         u = utmups._lowerleft
     else:
         u = _MODS.utmupsBase._lowerleft(utmups, center)

pygeodesy/ellipsoidalBaseDI.py

@@ -7,34 +7,36 @@ class C{LatLonEllipsoidalBaseDI} and functions.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import isLatLon, _xsubclassof
+# from pygeodesy.azimuthal import _Equidistants  # _MODS
+from pygeodesy.basics import isLatLon, _xsubclassof,  typename
 from pygeodesy.constants import EPS, MAX, PI, PI2, PI_4, isnear0, isnear1, \
                                _EPSqrt as _TOL, _0_0, _0_01, _1_0, _1_5, _3_0
 # from pygeodesy.dms import F_DMS  # _MODS
 from pygeodesy.ellipsoidalBase import LatLonEllipsoidalBase, _TOL_M,  property_RO
-from pygeodesy.errors import _AssertionError, IntersectionError, _IsnotError, \
-                             _or, _ValueError, _xellipsoidal, _xError, _xkwds_not
+from pygeodesy.errors import _AssertionError, IntersectionError, _IsnotError, _or, \
+                             _ValueError, _xellipsoidal, _xError, _xkwds_not
 from pygeodesy.fmath import favg, fmean_
 from pygeodesy.fsums import Fmt, fsumf_
 from pygeodesy.formy import _isequalTo, opposing, _radical2
-from pygeodesy.interns import _antipodal_, _concentric_, _ellipsoidal_, \
-                              _exceed_PI_radians_, _low_, _near_, \
-                              _SPACE_, _too_
+# from pygeodesy.geodesicw import _Intersecant2, _PlumbTo  # _MODS
+# from pygeodesy.internals import typename  # from .basics
+from pygeodesy.interns import _antipodal_, _concentric_, _ellipsoidal_, _low_, \
+                              _exceed_PI_radians_, _near_, _SPACE_, _too_
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS
-from pygeodesy.namedTuples import Bearing2Tuple, Destination2Tuple, \
-                                  Intersection3Tuple, NearestOn2Tuple, \
-                                  NearestOn8Tuple, _LL4Tuple
+from pygeodesy.namedTuples import Bearing2Tuple, Destination2Tuple, Intersection3Tuple, \
+                                  NearestOn2Tuple, NearestOn8Tuple, _LL4Tuple
 # from pygeodesy.props import property_RO  # from .ellipsoidalBase
+# from pygeodesy.sphericalNvector import _intersects2  # _MODS
+# from pygeodesy.sphericalTrigonometry import _intersect, LatLon  # _MODS
 # from pygeodesy.streprs import Fmt  # from .fsums
-from pygeodesy.units import _fi_j2, _isDegrees, _isHeight, _isRadius, \
-                             Radius_, Scalar
-from pygeodesy.utily import m2km, unroll180, _unrollon, _unrollon3, \
-                           _Wrap, wrap360
+from pygeodesy.units import _fi_j2, _isDegrees, _isHeight, _isRadius, Radius_, Scalar
+from pygeodesy.utily import m2km, unroll180, _unrollon, _unrollon3, _Wrap, wrap360
+# from pygeodesy.vector3d import _intersects2, _intersect3d3, _nearestOn2, Vector3d  # _MODS
 
 from math import degrees, radians
 
 __all__ = _ALL_LAZY.ellipsoidalBaseDI
-__version__ = '24.11.04'
+__version__ = '25.04.21'
 
 _polar__ = 'polar?'
 _TRIPS   =  33   # _intersect3, _intersects2, _nearestOn interations, 6..9 sufficient?
@@ -390,7 +392,7 @@ class LatLonEllipsoidalBaseDI(LatLonEllipsoidalBase):
 
         f, j = _fi_j2(f, len(Ps))  # like .vector3d.nearestOn6
 
-        n = self.nearestOn8.__name__  # _DUNDER_nameof
+        n = typename(self)
         c.rename(n)
         if s is not c:
             s = s.copy(name=n)

pygeodesy/ellipsoidalNvector.py

@@ -23,14 +23,17 @@ The Journal of Navigation (2010), vol 63, nr 3, pp 395-417.
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.basics import issubclassof, map2, _xinstanceof, _xsubclassof
+from pygeodesy.basics import _isin, issubclassof, map2, _xinstanceof, \
+                             _xsubclassof
 from pygeodesy.datums import _earth_ellipsoid, _ellipsoidal_datum, _WGS84
 # from pygeodesy.dms import F_D, toDMS  # _MODS
+# from pygeodesy.ecef import EcefVeness  # _MODS
 from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase, \
                                      _nearestOn, LatLonEllipsoidalBase, \
                                      _TOL_M,  _Wrap
 from pygeodesy.errors import _xkwds, _xkwds_pop2
 # from pygeodesy.fmath import fdot  # from .nvectorBase
+# from pygeodesy.formy import _isequalTo  # _MODS
 from pygeodesy.interns import _Nv00_, _COMMASPACE_,  _pole_  # PYCHOK used!
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
 # from pygeodesy.ltp import Ltp  # _MODS
@@ -48,7 +51,7 @@ from pygeodesy.units import Bearing, Distance, Height, Scalar
 # from math import fabs  # from .nvectorBase
 
 __all__ = _ALL_LAZY.ellipsoidalNvector
-__version__ = '24.10.19'
+__version__ = '25.04.21'
 
 
 class Ned(_Ned):
@@ -453,7 +456,7 @@ class Nvector(NvectorBase):
            @raise TypeError: If B{C{datum}} is not a L{Datum}.
         '''
         NvectorBase.__init__(self, x_xyz, y=y, z=z, h=h, ll=ll, **name)
-        if datum not in (None, self._datum):
+        if not _isin(datum, None, self._datum):
             self._datum = _ellipsoidal_datum(datum, **name)
 
     @Property_RO

pygeodesy/ellipsoidalVincenty.py

@@ -51,10 +51,13 @@ or by converting to anothor datum:
 from __future__ import division as _; del _  # PYCHOK semicolon
 
 from pygeodesy.constants import EPS, EPS0, _0_0, _1_0, _2_0, _3_0, _4_0, _6_0
+# from pygeodesy.ecef import EcefVeness  # _MODS
 from pygeodesy.ellipsoidalBase import CartesianEllipsoidalBase, _nearestOn
 from pygeodesy.ellipsoidalBaseDI import LatLonEllipsoidalBaseDI, \
                                        _intersection3, _intersections2, \
                                        _TOL_M, intersecant2
+# from pygeodesy.ellipsoidalExact import areaOf, perimeterOf  # _MODS
+# from pygeodesy.ellipsoidalKarney import areaOf, perimeterOf  # _MODS
 from pygeodesy.errors import _and, _ValueError, _xkwds
 from pygeodesy.fmath import Fpolynomial, hypot, hypot1
 from pygeodesy.interns import _ambiguous_, _antipodal_, _COLONSPACE_, \
@@ -73,7 +76,7 @@ from pygeodesy.utily import atan2, atan2b, atan2d, sincos2, sincos2d, \
 from math import cos, degrees, fabs, radians, tan as _tan
 
 __all__ = _ALL_LAZY.ellipsoidalVincenty
-__version__ = '24.11.26'
+__version__ = '25.04.21'
 
 _antipodal_to_ = _SPACE_(_antipodal_, _to_)