pygeodesy 24.8.4__py2.py3-none-any.whl → 24.8.24__py2.py3-none-any.whl

pygeodesy/lazily.py

@@ -395,10 +395,10 @@ _ALL_LAZY = _NamedEnum_RO(_name='_ALL_LAZY',
                          utmups=_i('UtmUps', 'UTMUPSError', 'parseUTMUPS5', 'toUtmUps8',
                                    'utmupsValidate', 'utmupsValidateOK', 'utmupsZoneBand5'),
                      utmupsBase=_i(),  # module only
-                       vector2d=_i('Circin6Tuple', 'Circum3Tuple', 'Circum4Tuple', 'Meeus2Tuple', 'Radii11Tuple', 'Soddy4Tuple',
-                                   'circin6', 'circum3', 'circum4_', 'meeus2', 'radii11', 'soddy4'),
+                       vector2d=_i('Circin6Tuple', 'Circum3Tuple', 'Circum4Tuple', 'Meeus2Tuple', 'Radii11Tuple', 'Soddy4Tuple', 'Triaxum5Tuple',
+                                   'circin6', 'circum3', 'circum4', 'circum4_', 'meeus2', 'radii11', 'soddy4', 'triaxum5', 'trilaterate2d2'),
                        vector3d=_i('Vector3d', 'intersection3d3', 'iscolinearWith', 'nearestOn', 'nearestOn6', 'parse3d',
-                                   'trilaterate2d2', 'trilaterate3d2'),
+                                   'trilaterate3d2'),
                    vector3dBase=_i(),  # module only
                     webmercator=_i('Wm', 'WebMercatorError', 'parseWM', 'toWm', 'EasNorRadius3Tuple'),
                            wgrs=_i('Georef', 'WGRSError'),)
@@ -416,8 +416,8 @@ _ALL_DEPRECATED = _NamedEnum_RO(_name='_ALL_DEPRECATED',
                      deprecated_datum=_i('Curvature2Tuple', 'Datum',  'Ellipsoid',  'Transform',  # assert
                                                             'Datums', 'Ellipsoids', 'Transforms',
                                          'R_FM', 'R_KM', 'R_M', 'R_MA', 'R_MB', 'R_NM', 'R_SM', 'R_VM'),
-                 deprecated_functions=_i('anStr', 'areaof', 'atand', 'bounds',  # most of the DEPRECATED functions, except ...
-                                         'clipCS3', 'clipDMS', 'clipStr', 'collins', 'copysign',  # ...  ellipsoidal, spherical flavors
+                 deprecated_functions=_i('anStr', 'areaof', 'atand', 'bounds',  # most of the DEPRECATED functions, except ellipsoidal ...
+                                         'clipCS3', 'clipDMS', 'clipStr', 'collins', 'copysign',  # ... and spherical flavors
                                          'decodeEPSG2', 'encodeEPSG', 'enStr2', 'equirectangular_', 'equirectangular3',
                                          'excessAbc', 'excessGirard', 'excessLHuilier',
                                          'false2f', 'falsed2f', 'float0', 'fStr', 'fStrzs', 'hypot3',
@@ -521,7 +521,7 @@ class _ALL_MODS(_internals._MODS_Base):
 _internals._MODS = _ALL_MODS = _ALL_MODS()  # PYCHOK singleton
 
 __all__ = _ALL_LAZY.lazily
-__version__ = '24.08.01'
+__version__ = '24.08.18'
 
 
 def _ALL_OTHER(*objs):

pygeodesy/ltp.py

@@ -44,7 +44,7 @@ from pygeodesy.vector3d import _ALL_LAZY, Vector3d
 # from math import fabs, floor as _floor  # from .fmath, .fsums
 
 __all__ = _ALL_LAZY.ltp
-__version__ = '24.07.25'
+__version__ = '24.08.18'
 
 _height0_ = _height_ + _0_
 _narrow_  = 'narrow'
@@ -165,7 +165,7 @@ class Attitude(_NamedBase):
         '''
         try:
             try:
-                xyz = map2(float, x_xyz.xyz)
+                xyz = map2(float, x_xyz.xyz3)
             except AttributeError:
                 xyz = map1(float, x_xyz, y, z)
         except (TypeError, ValueError) as x:
@@ -876,7 +876,7 @@ class ChLV(_ChLV, Ltp):
 
            @arg Y: Unfalsed I{Swiss Y} easting (C{meter}).
            @arg X: Unfalsed I{Swiss X} northing (C{meter}).
-           @kwarg LV95: If C{True} add C{LV95} falsing, if C{False} add
+           @kwarg LV95: If C{True}, add C{LV95} falsing, if C{False} add
                         C{LV03} falsing, otherwise leave unfalsed.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
@@ -928,9 +928,8 @@ class ChLV(_ChLV, Ltp):
 
            @arg e: Falsed I{Swiss E_LV95} or I{y_LV03} easting (C{meter}).
            @arg n: Falsed I{Swiss N_LV95} or I{x_LV03} northing (C{meter}).
-           @kwarg LV95: If C{True} remove I{LV95} falsing, if C{False} remove
-                        I{LV03} falsing, otherwise use method C{isLV95(B{e},
-                        B{n})}.
+           @kwarg LV95: If C{True}, remove I{LV95} falsing, if C{False} remove
+                        I{LV03} falsing, otherwise use method C{isLV95(B{e}, B{n})}.
            @kwarg name: Optional C{B{name}=NN} (C{str}).
 
            @return: A L{ChLVYX2Tuple}C{(Y, X)} with the unfalsed B{C{e}}

pygeodesy/ltpTuples.py

@@ -36,7 +36,7 @@ from pygeodesy.vector3d import Vector3d
 # from math import cos, radians  # from .utily
 
 __all__ = _ALL_LAZY.ltpTuples
-__version__ = '24.07.25'
+__version__ = '24.08.18'
 
 _aer_        = 'aer'
 _alt_        = 'alt'
@@ -189,6 +189,12 @@ class _AbcBase(_NamedBase):
         '''
         return Vector3Tuple(self.x, self.y, self.z, name=self.name)  # like Ecef9Tuple.xyz, Local6tuple.xyz
 
+    @property_RO
+    def xyz3(self):
+        '''Get the I{local} C{(X, Y, Z)} coordinates as C{3-tuple}.
+        '''
+        return tuple(self.xyz)
+
     @property_RO
     def xyz4(self):  # PYCHOK no cover
         '''I{Must be overloaded}.'''

pygeodesy/named.py

@@ -34,7 +34,7 @@ from pygeodesy.streprs import attrs, Fmt, lrstrip, pairs, reprs, unstr
 # from pygeodesy.units import _toUnit  # _MODS
 
 __all__ = _ALL_LAZY.named
-__version__ = '24.07.12'
+__version__ = '24.08.13'
 
 _COMMANL_           = _COMMA_ + _NL_
 _COMMASPACEDOT_     = _COMMASPACE_ + _DOT_
@@ -214,8 +214,8 @@ class _Named(object):
     def copy(self, deep=False, **name):
         '''Make a shallow or deep copy of this instance.
 
-           @kwarg deep: If C{True} make a deep, otherwise
-                        a shallow copy (C{bool}).
+           @kwarg deep: If C{True}, make a deep, otherwise a shallow
+                        copy (C{bool}).
            @kwarg name: Optional, non-empty C{B{name}=NN} (C{str}).
 
            @return: The copy (C{This class}).
@@ -233,7 +233,8 @@ class _Named(object):
     def dup(self, deep=False, **items):
         '''Duplicate this instance, replacing some attributes.
 
-           @kwarg deep: If C{True} duplicate deep, otherwise shallow.
+           @kwarg deep: If C{True}, duplicate deep, otherwise shallow
+                        (C{bool}).
            @kwarg items: Attributes to be changed (C{any}), including
                          optional C{B{name}} (C{str}).
 

pygeodesy/namedTuples.py

@@ -28,7 +28,7 @@ from pygeodesy.units import Band, Bearing, Degrees, Degrees2, Easting, FIx, \
                             Radius, Scalar, Str,  INT0
 
 __all__ = _ALL_LAZY.namedTuples
-__version__ = '24.06.08'
+__version__ = '24.08.18'
 
 # __DUNDER gets mangled in class
 _closest_     = 'closest'
@@ -676,6 +676,12 @@ class Vector3Tuple(_NamedTuple):
         '''
         return self
 
+    @property_RO
+    def xyz3(self):
+        '''Get X, Y and Z components as C{3-tuple}.
+        '''
+        return tuple(self)
+
 
 class Vector4Tuple(_NamedTuple):  # .nvector.py
     '''4-Tuple C{(x, y, z, h)} of (geocentric) components, all
@@ -697,6 +703,13 @@ class Vector4Tuple(_NamedTuple):  # .nvector.py
         '''
         return Vector3Tuple(*self[:3])
 
+    @property_RO
+    def xyz3(self):
+        '''Get X, Y and Z components as C{3-tuple}.
+        '''
+        return tuple(self[:3])
+
+
 # **) MIT License
 #
 # Copyright (C) 2016-2024 -- mrJean1 at Gmail -- All Rights Reserved.

pygeodesy/osgr.py

@@ -53,7 +53,7 @@ from pygeodesy.utily import degrees90, degrees180, sincostan3, truncate
 from math import cos, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.osgr
-__version__ = '24.06.15'
+__version__ = '24.08.13'
 
 _equivalent_ = 'equivalent'
 _OSGR_       = 'OSGR'
@@ -289,9 +289,9 @@ class Osgr(_NamedBase):
            @kwarg datum: Optional datum to convert to (L{Datum},
                          L{Ellipsoid}, L{Ellipsoid2}, L{Ellipsoid2}
                          or L{a_f2Tuple}).
-           @kwarg kTM: If C{True} use I{Karney}'s Krüger method from
-                       module L{ktm}, otherwise use the Ordnance
-                       Survey formulation (C{bool}).
+           @kwarg kTM: If C{True}, use I{Karney}'s Krüger method from
+                       module L{ktm}, otherwise use the Ordnance Survey
+                       formulation (C{bool}).
            @kwarg eps: Tolerance for OS convergence (C{meter}).
            @kwarg LatLon_kwds: Optional, additional B{C{LatLon}} keyword
                                arguments, ignored if C{B{LatLon} is None}.
@@ -585,9 +585,9 @@ def toOsgr(latlon, lon=None, kTM=False, datum=_WGS84, Osgr=Osgr,  # MCCABE 14
        @arg latlon: Latitude (C{degrees}) or an (ellipsoidal) geodetic
                     C{LatLon} point.
        @kwarg lon: Optional longitude in degrees (scalar or C{None}).
-       @kwarg kTM: If C{True} use I{Karney}'s Krüger method from
-                   module L{ktm}, otherwise use the Ordnance
-                   Survey formulation (C{bool}).
+       @kwarg kTM: If C{True}, use I{Karney}'s Krüger method from
+                   module L{ktm}, otherwise use the Ordnance Survey
+                   formulation (C{bool}).
        @kwarg datum: Optional datum to convert B{C{lat, lon}} from
                      (L{Datum}, L{Ellipsoid}, L{Ellipsoid2} or
                      L{a_f2Tuple}).

pygeodesy/points.py

@@ -62,7 +62,7 @@ from pygeodesy.utily import atan2b, degrees90, degrees180, degrees2m, \
 from math import cos, fabs, fmod as _fmod, radians, sin
 
 __all__ = _ALL_LAZY.points
-__version__ = '24.06.15'
+__version__ = '24.08.13'
 
 _ilat_  = 'ilat'
 _ilon_  = 'ilon'
@@ -217,7 +217,7 @@ class _Basequence(_Sequence):  # immutable, on purpose
     def copy(self, deep=False):  # PYCHOK no cover
         '''Make a shallow or deep copy of this instance.
 
-           @kwarg deep: If C{True} make a deep, otherwise a
+           @kwarg deep: If C{True}, make a deep, otherwise a
                         shallow copy (C{bool}).
 
            @return: The copy (C{This class}).

pygeodesy/resections.py

@@ -34,7 +34,7 @@ from pygeodesy.vector3d import _otherV3d, Vector3d
 from math import cos, atan2, degrees, fabs, radians, sin, sqrt
 
 __all__ = _ALL_LAZY.resections
-__version__ = '24.04.14'
+__version__ = '24.08.18'
 
 _concyclic_ = 'concyclic'
 _PA_        = 'PA'
@@ -356,8 +356,8 @@ def pierlot(point1, point2, point3, alpha12, alpha23, useZ=False, eps=EPS,
 def _pierlot3(B1, B2, B3, a12, a23, useZ, cot):
     '''(INTERNAL) Shared L{pierlot} and L{pierlotx}.
     '''
-    x1_, y1_, _ = B1.minus(B2).xyz
-    x3_, y3_, _ = B3.minus(B2).xyz
+    x1_, y1_, _ = B1.minus(B2).xyz3
+    x3_, y3_, _ = B3.minus(B2).xyz3
 
     s12, c12, s23, c23 = sincos2d_(a12, a23)
     # cot31 = (1 - cot12 * cot23) / (cot12 + cot32)
@@ -402,7 +402,7 @@ def _pierlot3(B1, B2, B3, a12, a23, useZ, cot):
         x, y = _pierlotxy2(B2, -K, Y12_23, X12_23, (X31_23 * Y12_23 -
                                                     X12_23 * Y31_23))
     else:
-        x, y, _ = B2.xyz
+        x, y, _ = B2.xyz3
     return x, y, _zidw(x, y, useZ, B1, B2, B3)
 
 
@@ -484,8 +484,8 @@ def _pierlotx3(a_z_Bs, useZ, cot, Cs):
         Cs(4)
         return _pierlot3(B1, B2, B3, a12, a23, useZ, cot)
 
-    x1_, y1_, _ = B1.minus(B3).xyz
-    x2_, y2_, _ = B2.minus(B3).xyz
+    x1_, y1_, _ = B1.minus(B3).xyz3
+    x2_, y2_, _ = B2.minus(B3).xyz3
 
     K = _Fsumf_(y1_ * x2_, -x1_ * y2_)
     if K:
@@ -508,7 +508,7 @@ def _pierlotx3(a_z_Bs, useZ, cot, Cs):
         x, y = _pierlotxy2(B3, K, Y31_23, X31_23, (X31_23 * _Fsumf_(x2_, -x1_) +
                                                    Y31_23 * _Fsumf_(y2_, -y1_)))
     else:
-        x, y, _ = B3.xyz
+        x, y, _ = B3.xyz3
     return x, y, _zidw(x, y, useZ, B1, B2, B3)
 
 

pygeodesy/rhumb/solve.py

@@ -21,7 +21,7 @@ from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.rhumb_solve
-__version__ = '24.07.11'
+__version__ = '24.08.13'
 
 
 class _RhumbSolveBase(_SolveGDictBase):
@@ -94,8 +94,8 @@ class RhumbSolve(_RhumbSolveBase):
 #       '''Set up a L{RhumbArea} to compute area and
 #          perimeter of a polygon.
 #
-#          @kwarg polyline: If C{True} perimeter only, otherwise
-#                           area and perimeter (C{bool}).
+#          @kwarg polyline: If C{True}, compute the perimeter only,
+#                           otherwise perimeter and area (C{bool}).
 #          @kwarg name: Optional C{B{name}=NN} (C{str}).
 #
 #          @return: A L{RhumbArea} instance.

pygeodesy/simplify.py

@@ -86,7 +86,7 @@ from pygeodesy.units import _ALL_LAZY, _1mm, Radius_
 from math import degrees, fabs, radians
 
 __all__ = _ALL_LAZY.simplify
-__version__ = '24.05.25'
+__version__ = '24.08.13'
 
 
 # try:
@@ -383,7 +383,7 @@ def simplify1(points, distance=_1mm, radius=R_M, indices=False, **options):
        @arg points: Path points (C{LatLon}[]).
        @kwarg distance: Tolerance (C{meter}, same units as B{C{radius}}).
        @kwarg radius: Mean earth radius (C{meter}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.
@@ -426,9 +426,9 @@ def simplifyRDP(points, distance=_1mm, radius=R_M, shortest=False,
        @arg points: Path points (C{LatLon}[]).
        @kwarg distance: Tolerance (C{meter}, same units as B{C{radius}}).
        @kwarg radius: Mean earth radius (C{meter}).
-       @kwarg shortest: If C{True} use the I{shortest} otherwise the
+       @kwarg shortest: If C{True}, use the I{shortest} otherwise the
                         I{perpendicular} distance (C{bool}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.
@@ -460,9 +460,9 @@ def simplifyRDPm(points, distance=_1mm, radius=R_M, shortest=False,
        @arg points: Path points (C{LatLon}[]).
        @kwarg distance: Tolerance (C{meter}, same units as B{C{radius}}).
        @kwarg radius: Mean earth radius (C{meter}).
-       @kwarg shortest: If C{True} use the I{shortest} otherwise the
+       @kwarg shortest: If C{True}, use the I{shortest} otherwise the
                         I{perpendicular} distance (C{bool}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.
@@ -491,9 +491,9 @@ def simplifyRW(points, pipe=_1mm, radius=R_M, shortest=False,
        @kwarg pipe: Pipe radius, half-width (C{meter}, same units as
                     B{C{radius}}).
        @kwarg radius: Mean earth radius (C{meter}).
-       @kwarg shortest: If C{True} use the I{shortest} otherwise the
+       @kwarg shortest: If C{True}, use the I{shortest} otherwise the
                         I{perpendicular} distance (C{bool}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.
@@ -544,7 +544,7 @@ def simplifyVW(points, area=_1mm, radius=R_M, attr=None,
        @kwarg radius: Mean earth radius (C{meter}).
        @kwarg attr: Optional, points attribute to save the area value
                     (C{str}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.
@@ -600,7 +600,7 @@ def simplifyVWm(points, area=_1mm, radius=R_M, attr=None,
        @kwarg radius: Mean earth radius (C{meter}).
        @kwarg attr: Optional, points attribute to save the area value
                     (C{str}).
-       @kwarg indices: If C{True} return the simplified point indices
+       @kwarg indices: If C{True}, return the simplified point indices
                        instead of the simplified points (C{bool}).
        @kwarg options: Optional keyword arguments passed thru to
                        function L{pygeodesy.equirectangular4}.

pygeodesy/sphericalBase.py

@@ -40,7 +40,7 @@ from pygeodesy.utily import acos1, asin1, atan2b, atan2d, degrees90, \
 from math import cos, fabs, log, sin, sqrt
 
 __all__ = _ALL_LAZY.sphericalBase
-__version__ = '24.06.12'
+__version__ = '24.08,13'
 
 
 class CartesianSphericalBase(CartesianBase):
@@ -210,7 +210,7 @@ class LatLonSphericalBase(LatLonBase):
                        B{C{point}} I{of} the (great circle) line (compass
                        C{degrees}).
            @kwarg radius: Mean earth radius (C{meter}, conventionally).
-           @kwarg exact: If C{True} use the I{exact} rhumb methods for azimuth,
+           @kwarg exact: If C{True}, use the I{exact} rhumb methods for azimuth,
                          destination and distance, if C{False} use the basic
                          rhumb methods (C{bool}) or if C{None} use the I{great
                          circle} methods.
@@ -474,7 +474,7 @@ class LatLonSphericalBase(LatLonBase):
            @arg other: An other point (this I{on} C{LatLon}) or the azimuth I{of}
                        (compass C{degrees}) the rhumb line.
            @kwarg radius: Mean earth radius (C{meter}, conventionally).
-           @kwarg exact: If C{True} use the I{exact} rhumb methods for azimuth,
+           @kwarg exact: If C{True}, use the I{exact} rhumb methods for azimuth,
                          destination and distance, if C{False} use the basic
                          rhumb methods (C{bool}) or if C{None} use the I{great
                          circle} methods.

pygeodesy/sphericalTrigonometry.py

@@ -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.06.21'
+__version__ = '24.08.13'
 
 _PI_EPS4 = PI - EPS4
 if _PI_EPS4 >= PI:
@@ -706,7 +706,7 @@ class LatLon(LatLonSphericalBase):
            @arg distance2: Distance to point2 (C{meter}, same units as B{C{radius}}).
            @arg point3: Third center point (C{LatLon}).
            @arg distance3: Distance to point3 (C{meter}, same units as B{C{radius}}).
-           @kwarg area: If C{True} compute the area overlap, otherwise the perimeter
+           @kwarg area: If C{True}, compute the area overlap, otherwise the perimeter
                         intersection of the circles (C{bool}).
            @kwarg eps: The required I{minimal overlap} for C{B{area}=True} or the
                        I{intersection margin} if C{B{area}=False} (C{meter}, same

pygeodesy/streprs.py

@@ -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.06.15'
+__version__ = '24.08.13'
 
 _at_        = 'at'         # PYCHOK used!
 _EN_PREC    =  6           # max MGRS/OSGR precision, 1 micrometer
@@ -310,8 +310,8 @@ def fstr(floats, prec=6, fmt=Fmt.F, ints=False, sep=_COMMASPACE_, strepr=None, f
        @kwarg strepr: Optional callable to format non-C{floats} (typically
                       C{repr}, C{str}) or C{None} to raise a TypeError and used
                       only if C{B{force} is not True}.
-       @kwarg force: If C{True} format all B{C{floats}} using B{C{fmt}},
-                     otherwise use B{C{strepr}} for non-C{floats}.
+       @kwarg force: If C{True}, format all B{C{floats}} using B{C{fmt}},
+                     otherwise use B{C{strepr}} for non-C{floats} (C{bool}).
 
        @return: The C{sep.join(strs(floats, ...)} joined (C{str}) or single
                 C{strs((floats,), ...)} (C{str}) if B{C{floats}} is C{scalar}.