pygeodesy 24.6.24__py2.py3-none-any.whl → 24.7.24__py2.py3-none-any.whl

pygeodesy/props.py

@@ -25,7 +25,7 @@ from pygeodesy.lazily import _ALL_LAZY, _ALL_MODS as _MODS, \
 from functools import wraps as _wraps
 
 __all__ = _ALL_LAZY.props
-__version__ = '24.05.26'
+__version__ = '24.07.23'
 
 _class_       = 'class'
 _dont_use_    = _DEPRECATED_ + ", don't use."
@@ -48,11 +48,12 @@ def _allPropertiesOf(Clas_or_inst, *Bases, **excls):
         except AttributeError:
             raise
             S = ()  # not an inst
-    B    = Bases or _PropertyBase
-    _isa = isinstance
+    B =  Bases or _PropertyBase
+    P = _property_RO___
     for C in S:
         for n, p in C.__dict__.items():
-            if _isa(p, B) and p.name == n and n not in excls:
+            if isinstance(p, B) and p.name == n and not (
+               isinstance(p, P) or n in excls):
                 yield p
 
 
@@ -251,9 +252,9 @@ class Property_RO(_PropertyBase):
                  <https://Docs.Python.org/3/library/functools.html#functools.cache>}
                  to I{cache} or I{memoize} the property value.
 
-           @see: Luciano Ramalho, "Fluent Python", O'Reilly, Example 19-24, 2016
-                 p. 636 or Example 22-28, 2022 p. 870 and U{class Property
-                 <https://docs.Python.org/3/howto/descriptor.html>}.
+           @see: Luciano Ramalho, "Fluent Python", O'Reilly, 2016 p. 636
+                 Example 19-24 or 2022 p. 870 Example 22-28 and U{class
+                 Property<https://docs.Python.org/3/howto/descriptor.html>}.
         '''
         _fget = method if _FOR_DOCS else self._fget  # XXX force method.__doc__ to epydoc
         _PropertyBase.__init__(self, method, _fget, self._fset_error)
@@ -355,6 +356,61 @@ class property_RO(_PropertyBase):
                 inst.__dict__.pop(uname)
 
 
+class _property_RO___(_PropertyBase):
+    # No __doc__ on purpose
+
+    def __init__(self, method, doc=NN):  # PYCHOK expected
+        '''New C{property_ROnce} or C{property_ROver}, holding a singleton value as
+           class attribute for all instances of that class and overwriting C{self},
+           the C{property_ROver} instance in the 1st invokation.
+
+           @see: L{property_RO} for further details.
+        '''
+        _PropertyBase.__init__(self, method, self._fget, self._fset_error, doc=doc)
+
+    def _fdel(self, unused):  # PYCHOK no cover
+        '''Silently ignored, always.
+        '''
+        pass
+
+    def _update(self, *unused):  # PYCHOK signature
+        '''(INTERNAL) No-op, ignore updates.
+        '''
+        pass
+
+
+class property_ROnce(_property_RO___):
+    # No __doc__ on purpose
+
+    def _fget(self, inst):
+        '''Get the C{property} value, only I{once} and memoize/cache it.
+        '''
+        try:
+            v = self._val
+        except AttributeError:
+            v = self._val = self.method(inst)
+        return v
+
+
+class property_ROver(_property_RO___):
+    # No __doc__ on purpose
+
+    def _fget(self, inst):
+        '''Get the C{property} value I{once} and overwrite C{self}, this C{property} instance.
+        '''
+        v = self.method(inst)
+        n = self.name
+        C = inst.__class__
+        for c in C.__mro__:  # [:-1]
+            if getattr(c, n, None) is self:
+                setattr(c, n, v)  # overwrite property_ROver
+                break
+        else:
+            n = _DOT_(C.__name__, n)
+            raise _AssertionError(_EQUALSPACED_(n, v))
+        return v
+
+
 class _NamedProperty(property):
     '''Class C{property} with retrievable name.
     '''
@@ -372,16 +428,18 @@ def property_doc_(doc):
 
        @example:
 
-        >>> @property_doc_("documentation text.")
-        >>> def name(self):
-        >>>     ...
+        >>>class Clas(object):
+        >>>
+        >>>     @property_doc_("documentation text.")
+        >>>     def name(self):
+        >>>         ...
         >>>
-        >>> @name.setter
-        >>> def name(self, value):
-        >>>     ...
+        >>>     @name.setter
+        >>>     def name(self, value):
+        >>>         ...
     '''
-    # See Luciano Ramalho, "Fluent Python", O'Reilly, Example 7-23,
-    # 2016 p. 212+, 2022 p. 331+, Example 9-22 and <https://
+    # See Luciano Ramalho, "Fluent Python", O'Reilly, 2016 p. 212+
+    # Example 7-23 or 2022 p. 331+ Example 9-22 and <https://
     # Python-3-Patterns-Idioms-Test.ReadTheDocs.io/en/latest/PythonDecorators.html>
 
     def _documented_property(method):
@@ -396,8 +454,8 @@ def property_doc_(doc):
 def _deprecated(call, kind, qual_d):
     '''(INTERNAL) Decorator for DEPRECATED functions, methods, etc.
 
-       @see: Brett Slatkin, "Effective Python", page 105, 2nd ed,
-             Addison-Wesley, 2019.
+       @see: Brett Slatkin, "Effective Python", 2019 page 105, 2nd
+             ed, Addison-Wesley.
     '''
     doc = _docof(call)
 

pygeodesy/rhumb/solve.py

@@ -17,21 +17,21 @@ from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY, _ALL_MODS as _MODS, _getenv,
                              _PYGEODESY_RHUMBSOLVE_
 from pygeodesy.namedTuples import Destination3Tuple, Distance3Tuple
 from pygeodesy.props import deprecated_method, Property, Property_RO
-from pygeodesy.solveBase import _SolveBase, _SolveLineBase
+from pygeodesy.solveBase import _SolveGDictBase, _SolveGDictLineBase
 from pygeodesy.utily import _unrollon, _Wrap, wrap360
 
 __all__ = _ALL_LAZY.rhumb_solve
-__version__ = '24.06.04'
+__version__ = '24.07.11'
 
 
-class _RhumbSolveBase(_SolveBase):
+class _RhumbSolveBase(_SolveGDictBase):
     '''(INTERNAL) Base class for L{RhumbSolve} and L{RhumbLineSolve}.
     '''
     _Error         =  RhumbError
     _Names_Direct  = _lat2_, _lon2_, _S12_
     _Names_Inverse = _azi12_, _s12_, _S12_
-    _Solve_name    = 'RhumbSolve'
-    _Solve_path    = _getenv(_PYGEODESY_RHUMBSOLVE_, _PYGEODESY_RHUMBSOLVE_)
+    _Xable_name    = 'RhumbSolve'
+    _Xable_path    = _getenv(_PYGEODESY_RHUMBSOLVE_, _PYGEODESY_RHUMBSOLVE_)
 
     @Property_RO
     def _cmdBasic(self):
@@ -46,7 +46,7 @@ class _RhumbSolveBase(_SolveBase):
         '''Get the U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/RhumbSolve.1.html>}
            executable (C{filename}).
         '''
-        return self._Solve_path
+        return self._Xable_path
 
     @RhumbSolve.setter  # PYCHOK setter!
     def RhumbSolve(self, path):
@@ -56,7 +56,7 @@ class _RhumbSolveBase(_SolveBase):
            @raise RhumbError: Invalid B{C{path}}, B{C{path}} doesn't exist or isn't
                               the C{RhumbSolve} executable.
         '''
-        self._setSolve(path)
+        self._setXable(path)
 
     @Property_RO
     def _s_option(self):  # == not -E for GeodSolve
@@ -65,11 +65,11 @@ class _RhumbSolveBase(_SolveBase):
     def toStr(self, **prec_sep):  # PYCHOK signature
         '''Return this C{RhumbSolve} as string.
 
-           @kwarg prec_sep: Keyword argumens C{B{prec}=6} and C{B{sep}=', '}
+           @kwarg prec_sep: Keyword argumens C{B{prec}=6} and C{B{sep}=", "}
                       for the C{float} C{prec}ision, number of decimal digits
                       (0..9) and the C{sep}arator string to join.  Trailing
-                      zero decimals are stripped for B{C{prec}} values of
-                      1 and above, but kept for negative B{C{prec}} values.
+                      zero decimals are stripped for B{C{prec}} values of 1
+                      and above, but kept for negative B{C{prec}} values.
 
            @return: RhumbSolve items (C{str}).
         '''
@@ -173,8 +173,7 @@ class RhumbSolve(_RhumbSolveBase):
         return r
 
     def _GDictInverse(self, lat1, lon1, lat2, lon2, *unused, **floats):  # PYCHOK signature
-        '''(INTERNAL) Get C{_GenInverse}-like result as an 8-item C{GDict}, but
-           I{without} C{_SALPs_CALPs_}.
+        '''(INTERNAL) Get C{_GenInverse}-like result as an 8-item C{GDict}, but I{without} C{_SALP_CALPs_}.
         '''
         i = _RhumbSolveBase._GDictInverse(self, lat1, lon1, lat2, lon2, **floats)
         a = _over(float(i.s12), self._mpd)  # for .Inverse1
@@ -231,7 +230,7 @@ class RhumbSolve(_RhumbSolveBase):
     Line = DirectLine
 
 
-class RhumbLineSolve(_RhumbSolveBase, _SolveLineBase):
+class RhumbLineSolve(_RhumbSolveBase, _SolveGDictLineBase):
     '''Wrapper to invoke I{Karney}'s U{RhumbSolve<https://GeographicLib.SourceForge.io/C++/doc/RhumbSolve.1.html>}
        like a class, similar to L{pygeodesy.RhumbLine} and L{pygeodesy.RhumbLineAux}.
 
@@ -267,7 +266,7 @@ class RhumbLineSolve(_RhumbSolveBase, _SolveLineBase):
         _xinstanceof(RhumbSolve, rhumb=rhumb)
         if (caps & Caps.LINE_OFF):  # copy to avoid updates
             rhumb = rhumb.copy(deep=False, name=NN(_UNDER_, rhumb.name))
-        _SolveLineBase.__init__(self, rhumb, lat1, lon1, caps, azi12=azi12, **name)
+        _SolveGDictLineBase.__init__(self, rhumb, lat1, lon1, caps, azi12=azi12, **name)
         try:
             self.RhumbSolve = rhumb.RhumbSolve  # rhumb or copy of rhumb
         except RhumbError:
@@ -283,7 +282,7 @@ class RhumbLineSolve(_RhumbSolveBase, _SolveLineBase):
 #                   azi12, a12, s12, S12}.
 #       '''
 #       s = a12 * self._mpd
-#       a = self._GDictInvoke(self._cmdArc, True, self._Names_Direct, s)
+#       a = self._GDictInvoke(self._cmdArc, self._Names_Direct, s)
 #       r = GDict(a12=a12, s12=s, **self._lla1)
 #       r.updated(a)
 #       return r
@@ -318,7 +317,7 @@ class RhumbLineSolve(_RhumbSolveBase, _SolveLineBase):
            @return: A L{GDict} with 7 items C{lat1, lon1, lat2, lon2,
                     azi12, s12, S12}.
         '''
-        d = self._GDictInvoke(self._cmdDistance, True, self._Names_Direct, s12)
+        d = self._GDictInvoke(self._cmdDistance, self._Names_Direct, s12)
         r = GDict(s12=s12, **self._lla1)  # a12=_over(s12, self._mpd)
         r.update(d)
         return r
@@ -326,16 +325,16 @@ class RhumbLineSolve(_RhumbSolveBase, _SolveLineBase):
     def toStr(self, **prec_sep):  # PYCHOK signature
         '''Return this C{RhumbLineSolve} as string.
 
-           @kwarg prec_sep: Keyword argumens C{B{prec}=6} and C{B{sep}=', '}
+           @kwarg prec_sep: Keyword argumens C{B{prec}=6} and C{B{sep}=", "}
                       for the C{float} C{prec}ision, number of decimal digits
                       (0..9) and the C{sep}arator string to join.  Trailing
-                      zero decimals are stripped for B{C{prec}} values of
-                      1 and above, but kept for negative B{C{prec}} values.
+                      zero decimals are stripped for B{C{prec}} values of 1
+                      and above, but kept for negative B{C{prec}} values.
 
            @return: RhumbLineSolve items (C{str}).
         '''
-        return _SolveLineBase._toStr(self, azi12=self.azi12, rhumb=self._solve,
-                                           RhumbSolve=self.RhumbSolve, **prec_sep)
+        return _SolveGDictLineBase._toStr(self, azi12=self.azi12, rhumb=self._solve,
+                                                RhumbSolve=self.RhumbSolve, **prec_sep)
 
 
 class RhumbSolve7Tuple(Rhumb8Tuple):
@@ -396,7 +395,7 @@ if __name__ == '__main__':
     rS.verbose = '--verbose' in argv  # or '-v' in argv
 
     if rS.RhumbSolve in (_PYGEODESY_RHUMBSOLVE_, None):  # not set
-        rS.RhumbSolve = '/opt/local/bin/RhumbSolve'  # '/opt/local/Cellar/geographiclib/2.2/bin/RhumbSolve'  # HomeBrew
+        rS.RhumbSolve = '/opt/local/bin/RhumbSolve'  # '/opt/local/Cellar/geographiclib/2.3/bin/RhumbSolve'  # HomeBrew
     printf('version: %s', rS.version)
 
     if len(argv) > 6:  # 60 0 30 0 45 1e6