pygeodesy 24.6.9__py2.py3-none-any.whl → 24.7.7__py2.py3-none-any.whl

pygeodesy/frechet.py

@@ -84,26 +84,24 @@ than the well-known C{Hausdorff} distance, see the L{hausdorff} module.
 # from pygeodesy.basics import isscalar  # from .points
 from pygeodesy.constants import EPS, EPS1, INF, NINF
 from pygeodesy.datums import _ellipsoidal_datum, _WGS84
-from pygeodesy.errors import PointsError, _xattr, _xcallable, _xkwds, \
-                            _xkwds_get
+from pygeodesy.errors import PointsError, _xattr, _xcallable, _xkwds, _xkwds_get
 import pygeodesy.formy as _formy
 from pygeodesy.interns import NN, _DOT_, _n_, _units_
 # from pygeodesy.iters import points2 as _points2  # from .points
 from pygeodesy.lazily import _ALL_LAZY, _FOR_DOCS
 from pygeodesy.named import _name2__, _Named, _NamedTuple, _Pass
 # from pygeodesy.namedTuples import PhiLam2Tuple  # from .points
-from pygeodesy.points import _distanceTo, _fractional,  isscalar, \
-                              PhiLam2Tuple, points2 as _points2, radians
+from pygeodesy.points import _distanceTo, _fractional, isscalar, PhiLam2Tuple, \
+                              points2 as _points2, radians
 from pygeodesy.props import Property, property_doc_, property_RO
-from pygeodesy.units import FIx, Float, Number_, _xUnit, _xUnits
-from pygeodesy.unitsBase import _Str_degrees, _Str_meter, _Str_NN, \
-                                _Str_radians, _Str_radians2
+from pygeodesy.units import FIx, Float, Number_
+from pygeodesy import unitsBase as _unitsBase  # _Str_..., _xUnit, _xUnits
 
 from collections import defaultdict as _defaultdict
 # from math import radians  # from .points
 
 __all__ = _ALL_LAZY.frechet
-__version__ = '24.06.10'
+__version__ = '24.06.15'
 
 
 def _fraction(fraction, n):
@@ -134,7 +132,7 @@ class Frechet(_Named):
     _kwds  = {}     # func_ options
     _n1    =  0
     _ps1   =  None
-    _units = _Str_NN  # XXX Str to _Pass and for backward compatibility
+    _units = _unitsBase._Str_NN  # XXX Str to _Pass and for backward compatibility
 
     def __init__(self, point1s, fraction=None, units=NN, **name__kwds):
         '''New C{Frechet...} calculator/interpolator.
@@ -316,7 +314,7 @@ class Frechet(_Named):
 
            @raise TypeError: Invalid B{C{units}}.
         '''
-        self._units = _xUnits(units, Base=Float)
+        self._units = _unitsBase._xUnits(units, Base=Float)
 
     @property_RO
     def wrap(self):
@@ -328,7 +326,7 @@ class Frechet(_Named):
 class FrechetDegrees(Frechet):
     '''DEPRECATED, use an other C{Frechet*} class.
     '''
-    _units = _Str_degrees
+    _units = _unitsBase._Str_degrees
 
     if _FOR_DOCS:
         __init__ = Frechet.__init__
@@ -342,7 +340,7 @@ class FrechetDegrees(Frechet):
 class FrechetRadians(Frechet):
     '''DEPRECATED, use an other C{Frechet*} class.
     '''
-    _units = _Str_radians
+    _units = _unitsBase._Str_radians
 
     if _FOR_DOCS:
         __init__ = Frechet.__init__
@@ -369,8 +367,8 @@ class _FrechetMeterRadians(Frechet):
        the optional keyword arguments supplied at instantiation
        of the C{Frechet*} sub-class.
     '''
-    _units  = _Str_meter
-    _units_ = _Str_radians
+    _units  = _unitsBase._Str_meter
+    _units_ = _unitsBase._Str_radians
 
     def discrete(self, point2s, fraction=None):
         '''Overloaded method L{Frechet.discrete} to determine
@@ -464,7 +462,7 @@ class FrechetDistanceTo(Frechet):  # FrechetMeter
     '''Compute the C{Frechet} distance based on the distance from the
        point1s' C{LatLon.distanceTo} method, conventionally in C{meter}.
     '''
-    _units = _Str_meter
+    _units = _unitsBase._Str_meter
 
     def __init__(self, point1s, **fraction_name__distanceTo_kwds):
         '''New L{FrechetDistanceTo} calculator/interpolator.
@@ -500,7 +498,7 @@ class FrechetEquirectangular(Frechet):
     '''Compute the C{Frechet} distance based on the I{equirectangular}
        distance in C{radians squared} like function L{pygeodesy.equirectangular}.
     '''
-    _units = _Str_radians2
+    _units = _unitsBase._Str_radians2
 
     def __init__(self, point1s, **fraction_name__adjust_limit_wrap):
         '''New L{FrechetEquirectangular} calculator/interpolator.
@@ -547,7 +545,7 @@ class FrechetExact(Frechet):
     '''Compute the C{Frechet} distance based on the I{angular} distance
        in C{degrees} from method L{GeodesicExact}C{.Inverse}.
     '''
-    _units = _Str_degrees
+    _units = _unitsBase._Str_degrees
 
     def __init__(self, point1s, datum=None, **fraction_name__wrap):
         '''New L{FrechetExact} calculator/interpolator.
@@ -576,7 +574,7 @@ class FrechetFlatLocal(_FrechetMeterRadians):
     '''Compute the C{Frechet} distance based on the I{angular} distance in
        C{radians squared} like function L{pygeodesy.flatLocal_}/L{pygeodesy.hubeny}.
     '''
-    _units_ = _Str_radians2  # see L{flatLocal_}
+    _units_ = _unitsBase._Str_radians2  # see L{flatLocal_}
 
     def __init__(self, point1s, **fraction_name__datum_scaled_wrap):
         '''New L{FrechetFlatLocal}/L{FrechetHubeny} calculator/interpolator.
@@ -659,7 +657,7 @@ class FrechetKarney(Frechet):
        <https://GeographicLib.SourceForge.io/Python/doc/code.html>}
        C{Inverse} method.
     '''
-    _units = _Str_degrees
+    _units = _unitsBase._Str_degrees
 
     def __init__(self, point1s, datum=None, **fraction_name__wrap):
         '''New L{FrechetKarney} calculator/interpolator.
@@ -845,7 +843,7 @@ class Frechet6Tuple(_NamedTuple):
     def toUnits(self, **Error_name):  # PYCHOK expected
         '''Overloaded C{_NamedTuple.toUnits} for C{fd} units.
         '''
-        U = _xUnit(self.units, Float)  # PYCHOK expected
+        U = _unitsBase._xUnit(self.units, Float)  # PYCHOK expected
         return _NamedTuple.toUnits(self.reUnit(U), **Error_name)  # PYCHOK self
 
 #   def __gt__(self, other):

pygeodesy/fsums.py

@@ -47,7 +47,7 @@ from pygeodesy.streprs import Fmt, fstr, unstr
 from math import ceil as _ceil, fabs, floor as _floor  # PYCHOK used! .ltp
 
 __all__ = _ALL_LAZY.fsums
-__version__ = '24.06.09'
+__version__ = '24.06.11'
 
 _add_op_      = _PLUS_  # in .auxilats.auxAngle
 _eq_op_       = _EQUAL_ * 2  # _DEQUAL_
@@ -559,7 +559,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase
 
            @note: If B{C{mod}} is given, the result will be an C{integer}
                   L{Fsum} in Python 3+ if this instance C{is_integer} or
-                  set to C{as_integer} and B{C{mod}} is given as C{None}.
+                  set to C{as_integer} and B{C{mod}} is given and C{None}.
 
            @raise OverflowError: Partial C{2sum} overflow.
 
@@ -1665,7 +1665,7 @@ class Fsum(_Named):  # sync __methods__ with .vector3dBase.Vector3dBase
            @raise ResidualError: Non-zero, significant residual or invalid
                                  B{C{RESIDUAL}}.
 
-           @note: If B{C{mod}} is given as C{None}, the result will be an
+           @note: If B{C{mod}} is given and C{None}, the result will be an
                   C{integer} L{Fsum} provided this instance C{is_integer}
                   or set to C{integer} by an L{Fsum.fint} call.
 

pygeodesy/gars.py

@@ -17,20 +17,19 @@ by I{Charles Karney}.  See also U{Global Area Reference System
 from pygeodesy.constants import _off90, _1_over, _0_5, \
                                 _1_0  # PYCHOK used!
 from pygeodesy.dms import parse3llh,   Fmt  # parseDMS2
-from pygeodesy.errors import _ValueError, _xkwds
+from pygeodesy.errors import _ValueError, _xkwds, _xStrError
 from pygeodesy.interns import NN, _0to9_, _AtoZnoIO_, _COMMA_
 from pygeodesy.lazily import _ALL_LAZY, _ALL_OTHER
 from pygeodesy.named import _name__,  isstr, Property_RO
 from pygeodesy.namedTuples import LatLon2Tuple, LatLonPrec3Tuple
 # from pygeodesy.props import Property_RO  # from .named
 # from pygeodesy.streprs import Fmt  # from .dms
-from pygeodesy.units import Int_, Lat, Lon, Precision_, Scalar_, \
-                            Str, _xStrError
+from pygeodesy.units import Int_, Lat, Lon, Precision_, Scalar_, Str
 
 from math import floor
 
 __all__ = _ALL_LAZY.gars
-__version__ = '24.05.24'
+__version__ = '24.06.15'
 
 _Digits  = _0to9_
 _LatLen  =    2