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

pygeodesy/sphericalTrigonometry.py

@@ -30,9 +30,9 @@ from pygeodesy.formy import antipode_, bearing_, _bearingTo2, excessAbc_, \
                             excessGirard_, excessLHuilier_, opposing_, _radical2, \
                             vincentys_
 from pygeodesy.interns import _1_, _2_, _coincident_, _composite_, _colinear_, \
-                              _concentric_, _convex_, _end_, _infinite_, _invalid_,\
-                              _line_, _near_, _not_, _null_, _parallel_, _point_, \
-                              _SPACE_, _too_
+                              _concentric_, _convex_, _end_, _infinite_, \
+                              _invalid_, _line_, _near_, _null_, _parallel_, \
+                              _point_, _SPACE_, _too_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, _ALL_OTHER
 # from pygeodesy.nvectorBase import NvectorBase, sumOf  # _MODE
 from pygeodesy.namedTuples import LatLon2Tuple, LatLon3Tuple, NearestOn3Tuple, \
@@ -54,7 +54,7 @@ from pygeodesy.vector3d import sumOf, Vector3d
 from math import asin, atan2, cos, degrees, fabs, radians, sin
 
 __all__ = _ALL_LAZY.sphericalTrigonometry
-__version__ = '24.04.07'
+__version__ = '24.05.25'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -494,7 +494,7 @@ class LatLon(LatLonSphericalBase):
                     s0 = s
                 else:
                     t = _Fmt.SQUARE(points=i)
-                    raise _ValueError(t, p2, wrap=wrap, txt=_not_(_convex_))
+                    raise _ValueError(t, p2, wrap=wrap, txt_not_=_convex_)
             gc1, v1 = gc, v2
 
         return True  # inside
@@ -538,7 +538,7 @@ class LatLon(LatLonSphericalBase):
     def nearestOn(self, point1, point2, radius=R_M, **wrap_adjust_limit):
         '''Locate the point between two points closest to this point.
 
-           Distances are approximated by function L{pygeodesy.equirectangular_},
+           Distances are approximated by function L{pygeodesy.equirectangular4},
            subject to the supplied B{C{options}}.
 
            @arg point1: Start point (L{LatLon}).
@@ -546,12 +546,12 @@ class LatLon(LatLonSphericalBase):
            @kwarg radius: Mean earth radius (C{meter}).
            @kwarg wrap_adjust_limit: Optional keyword arguments for functions
                               L{sphericalTrigonometry.nearestOn3} and
-                              L{pygeodesy.equirectangular_},
+                              L{pygeodesy.equirectangular4},
 
            @return: Closest point on the great circle line (L{LatLon}).
 
            @raise LimitError: Lat- and/or longitudinal delta exceeds B{C{limit}},
-                              see function L{pygeodesy.equirectangular_}.
+                              see function L{pygeodesy.equirectangular4}.
 
            @raise NotImplementedError: Keyword argument C{B{within}=False}
                                        is not (yet) supported.
@@ -560,7 +560,7 @@ class LatLon(LatLonSphericalBase):
 
            @raise ValueError: Invalid B{C{radius}} or B{C{options}}.
 
-           @see: Functions L{pygeodesy.equirectangular_} and L{pygeodesy.nearestOn5}
+           @see: Functions L{pygeodesy.equirectangular4} and L{pygeodesy.nearestOn5}
                  and method L{sphericalTrigonometry.LatLon.nearestOn3}.
         '''
         # remove kwarg B{C{within}} if present
@@ -605,7 +605,7 @@ class LatLon(LatLonSphericalBase):
     def nearestOn3(self, points, closed=False, radius=R_M, **wrap_adjust_limit):
         '''Locate the point on a polygon closest to this point.
 
-           Distances are approximated by function L{pygeodesy.equirectangular_},
+           Distances are approximated by function L{pygeodesy.equirectangular4},
            subject to the supplied B{C{options}}.
 
            @arg points: The polygon points (L{LatLon}[]).
@@ -613,17 +613,17 @@ class LatLon(LatLonSphericalBase):
            @kwarg radius: Mean earth radius (C{meter}).
            @kwarg wrap_adjust_limit: Optional keyword arguments for function
                               L{sphericalTrigonometry.nearestOn3} and
-                              L{pygeodesy.equirectangular_},
+                              L{pygeodesy.equirectangular4},
 
            @return: A L{NearestOn3Tuple}C{(closest, distance, angle)} of the
-                    C{closest} point (L{LatLon}), the L{pygeodesy.equirectangular_}
+                    C{closest} point (L{LatLon}), the L{pygeodesy.equirectangular4}
                     C{distance} between this and the C{closest} point converted to
                     C{meter}, same units as B{C{radius}}.  The C{angle} from this
                     to the C{closest} point is in compass C{degrees360}, like
                     function L{pygeodesy.compassAngle}.
 
            @raise LimitError: Lat- and/or longitudinal delta exceeds B{C{limit}},
-                              see function L{pygeodesy.equirectangular_}.
+                              see function L{pygeodesy.equirectangular4}.
 
            @raise PointsError: Insufficient number of B{C{points}}.
 
@@ -631,7 +631,7 @@ class LatLon(LatLonSphericalBase):
 
            @raise ValueError: Invalid B{C{radius}} or B{C{options}}.
 
-           @see: Functions L{pygeodesy.compassAngle}, L{pygeodesy.equirectangular_}
+           @see: Functions L{pygeodesy.compassAngle}, L{pygeodesy.equirectangular4}
                  and L{pygeodesy.nearestOn5}.
         '''
         return nearestOn3(self, points, closed=closed, radius=radius,
@@ -1222,7 +1222,7 @@ def nearestOn3(point, points, closed=False, radius=R_M, wrap=False, adjust=True,
                                                         limit=9, **LatLon_and_kwds):
     '''Locate the point on a path or polygon closest to a reference point.
 
-       Distances are I{approximated} using function L{pygeodesy.equirectangular_},
+       Distances are I{approximated} using function L{pygeodesy.equirectangular4},
        subject to the supplied B{C{options}}.
 
        @arg point: The reference point (L{LatLon}).
@@ -1231,19 +1231,19 @@ def nearestOn3(point, points, closed=False, radius=R_M, wrap=False, adjust=True,
        @kwarg radius: Mean earth radius (C{meter}).
        @kwarg wrap: If C{True}, wrap or I{normalize} and unroll the
                     B{C{points}} (C{bool}).
-       @kwarg adjust: See function L{pygeodesy.equirectangular_} (C{bool}).
-       @kwarg limit: See function L{pygeodesy.equirectangular_} (C{degrees}),
+       @kwarg adjust: See function L{pygeodesy.equirectangular4} (C{bool}).
+       @kwarg limit: See function L{pygeodesy.equirectangular4} (C{degrees}),
                      default C{9 degrees} is about C{1,000 Kmeter} (for mean
                      spherical earth radius L{R_KM}).
        @kwarg LatLon: Optional class to return the closest point (L{LatLon})
                       or C{None}.
        @kwarg options: Optional keyword arguments for function
-                       L{pygeodesy.equirectangular_}.
+                       L{pygeodesy.equirectangular4}.
 
        @return: A L{NearestOn3Tuple}C{(closest, distance, angle)} with the
                 C{closest} point as B{C{LatLon}} or L{LatLon3Tuple}C{(lat,
                 lon, height)} if B{C{LatLon}} is C{None}.  The C{distance}
-                is the L{pygeodesy.equirectangular_} distance between the
+                is the L{pygeodesy.equirectangular4} distance between the
                 C{closest} and the given B{C{point}} converted to C{meter},
                 same units as B{C{radius}}.  The C{angle} from the given
                 B{C{point}} to the C{closest} is in compass C{degrees360},
@@ -1251,7 +1251,7 @@ def nearestOn3(point, points, closed=False, radius=R_M, wrap=False, adjust=True,
                 the (interpolated) height at the C{closest} point.
 
        @raise LimitError: Lat- and/or longitudinal delta exceeds the B{C{limit}},
-                          see function L{pygeodesy.equirectangular_}.
+                          see function L{pygeodesy.equirectangular4}.
 
        @raise PointsError: Insufficient number of B{C{points}}.
 
@@ -1259,7 +1259,7 @@ def nearestOn3(point, points, closed=False, radius=R_M, wrap=False, adjust=True,
 
        @raise ValueError: Invalid B{C{radius}}.
 
-       @see: Functions L{pygeodesy.equirectangular_} and L{pygeodesy.nearestOn5}.
+       @see: Functions L{pygeodesy.equirectangular4} and L{pygeodesy.nearestOn5}.
     '''
     t = _nearestOn5(point, points, closed=closed, wrap=wrap,
                                    adjust=adjust, limit=limit)

pygeodesy/streprs.py

@@ -12,8 +12,8 @@ from pygeodesy.errors import _or, _AttributeError, _IsnotError, _TypeError, \
 # 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_
+                             _N_, _name_, _not_scalar_, _PERCENT_, _SPACE_, \
+                             _STAR_, _UNDER_
 from pygeodesy.interns import _convergence_, _distant_, _e_, _eps_, _exceeds_, \
                               _EQUALSPACED_, _f_, _F_, _g_, _limit_, _no_, \
                               _tolerance_  # PYCHOK used!
@@ -22,7 +22,7 @@ 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.13'
+__version__ = '24.05.19'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
@@ -499,11 +499,11 @@ def _streprs(prec, objs, fmt, ints, force, strepr):
             f = fmt.replace(_DOTSTAR_, Fmt.DOT(abs(prec)))
             _ = f % (_0_0,)
         except (TypeError, ValueError):
-            raise _ValueError(fmt=fmt, txt=_not_(repr(_DOTSTAR_)))
+            raise _ValueError(fmt=fmt, txt_not_=repr(_DOTSTAR_))
         fmt = f
 
     else:
-        raise _ValueError(fmt=fmt, txt=_not_(repr(_Fspec_)))
+        raise _ValueError(fmt=fmt, txt_not_=repr(_Fspec_))
 
     for i, o in enumerate(objs):
         if force or isinstance(o, float):

pygeodesy/trf.py

@@ -80,8 +80,8 @@ from pygeodesy.interns import MISSING, NN, _AT_, _COMMASPACE_, _conversion_, \
                              _NAD83_, _no_, _PLUS_, _reframe_, _s_, _SPACE_, \
                              _STAR_, _to_, _vs_, _WGS84_, _x_, _intern as _i
 # from pygeodesy.lazily import _ALL_LAZY  # from .units
-from pygeodesy.named import ADict, classname, _lazyNamedEnumItem as _lazy, _Named, \
-                           _NamedEnum, _NamedEnumItem, _NamedTuple,  Fmt, unstr
+from pygeodesy.named import ADict, classname, _lazyNamedEnumItem as _lazy, _name2__, \
+                           _Named, _NamedEnum, _NamedEnumItem, _NamedTuple,  Fmt, unstr
 from pygeodesy.props import deprecated_method, property_doc_, Property_RO, property_RO
 # from pygeodesy.streprs import Fmt, unstr  # from .named
 from pygeodesy.units import Epoch, Float,  _ALL_LAZY
@@ -91,7 +91,7 @@ from math import ceil as _ceil, fabs
 # import operator as _operator  # from .datums
 
 __all__ = _ALL_LAZY.trf
-__version__ = '24.05.13'
+__version__ = '24.05.31'
 
 _EP0CH    =  Epoch(0, low=0)
 _Es       = {_EP0CH: _EP0CH}  # L{Epoch}s, deleted below
@@ -242,7 +242,7 @@ class RefFrame(_NamedEnumItem):
         return _toRefFrame(point, reframe2, reframe=self, **_xkwds(epoch_epoch2_name,
                                                name=_xattr(reframe2, name=self.name)))
 
-    def toStr(self, epoch=None, name=NN, **unused):  # PYCHOK expected
+    def toStr(self, epoch=None, name=NN, **unused):  # PYCHOK signature
         '''Return this reference frame as a string.
 
            @kwarg epoch: Override this reframe's epoch (C{scalar} or C{str}).
@@ -383,14 +383,14 @@ class TransformXform(Transform):
     def __hash__(self):
         return Transform.__hash__(self)
 
-    def inverse(self, name=NN):
+    def inverse(self, **name):
         '''Return the inverse of this transform.
 
-           @kwarg name: Optional, unique name (C{str}).
+           @kwarg name: Optional, unique C{B{name}=NN} (C{str}).
 
            @return: Inverse (L{TransformXform}), unregistered.
         '''
-        r = Transform.inverse(name=name)
+        r = Transform.inverse(self, **name)
         r._Xform = r.Xform.inverse()
         return r
 
@@ -405,10 +405,11 @@ class TransformXform(Transform):
         n = name or (X.toStr() if X else NN)
         return Transform.rename(self, n)
 
-    def toRefFrame(self, point, name=NN):  # PYCHOK signature
+    def toRefFrame(self, point, **name):  # PYCHOK signature
         '''Convert an ellipsoidal point using this transform and Xform.
 
            @arg point: The point to convert (C{Cartesian} or C{LatLon}).
+           @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A copy of the B{C{point}}, converted I{directly} to
                     this transform's Xform's C{refName2} and C{epoch}.
@@ -423,7 +424,7 @@ class TransformXform(Transform):
         if X:  # see _toRefFrame below
             p._reframe = X.reframe2
             p._epoch   = X.epoch
-        p.rename(name or self.name)
+        p.rename(self._name__(name))
         return p
 
     def toTransform(self, epoch1, **epoch2_inverse):
@@ -1043,7 +1044,7 @@ def _sumstr(name1, name2, p_):
 
 
 def _toRefFrame(point, reframe2, reframe=None, epoch=None,
-                       epoch2=None, name=NN, **LatLon_kwds):
+                       epoch2=None, **name_LatLon_kwds):
     '''(INTERNAL) Convert an ellipsoidal point to C{reframe2}
        and C{epoch2 or epoch or pont.epoch or reframe.epoch}.
     '''
@@ -1063,6 +1064,7 @@ def _toRefFrame(point, reframe2, reframe=None, epoch=None,
                            _to_, _AT_(reframe2.name, e2))
         raise TRFError(_no_(_conversion_), txt=t)
 
+    name, LatLon_kwds = _name2__(name_LatLon_kwds)
     if t0:  # is not ()
         if t0.isunity:
             p = point.dup()
@@ -1078,7 +1080,7 @@ def _toRefFrame(point, reframe2, reframe=None, epoch=None,
             p = point.toTransform(t0)
         p._reframe =  reframe2  # see TRFXform.toRefFrame above
         p._epoch   = _xattr(t0.Xform, epoch=e2)
-        p.rename(name or reframe2.name)
+        p.rename(reframe2._name__(name))
     else:
         p = point.dup(_reframe=reframe2,  # ditto
                       _epoch=e2, name=name) if name else point