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

{PyGeodesy-24.5.15.dist-info → PyGeodesy-24.5.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyGeodesy
-Version: 24.5.15
+Version: 24.5.24
 Summary: Pure Python geodesy tools
 Home-page: https://GitHub.com/mrJean1/PyGeodesy
 Author: Jean M. Brouwers
@@ -158,7 +158,7 @@ and McCabe_ using Python 2.7.18 and with Flake8_ using Python 3.11.5, both in 64
 
 For a summary of all *Karney*-based functionality in ``pygeodesy``, see module karney_.
 
-*Last updated: May 15, 2024.*
+*Last updated: May 24, 2024.*
 
 License
 =======

PyGeodesy-24.5.24.dist-info/RECORD

@@ -0,0 +1,116 @@
+pygeodesy/LICENSE,sha256=YfgAiyxOwY6P9Kkb1_5XN81nueTLrpb3Ffkv3EuPgFU,1144
+pygeodesy/__init__.py,sha256=dxRGIMc_KFg9rWL9IHUZhVmCD3d_3a7DJpfSsyRS0is,41050
+pygeodesy/__main__.py,sha256=UmTd6Qw20g_pgnQjdaHePm-xuOEBi1tUNRLO0eL0-rU,4593
+pygeodesy/albers.py,sha256=2t8EjmoFWmkdTb4DUHMlECkwTPDS1wpNf92WD_UWXds,31081
+pygeodesy/azimuthal.py,sha256=RQdZbHoLlHSamhnJ4GMrrRU6UrYmTpa1yK59nYB-A4o,50252
+pygeodesy/basics.py,sha256=QE3Z3JC-BOAyaj_k6pxqwUpVLzkxJx0Ed1Dcjie8lbg,28241
+pygeodesy/booleans.py,sha256=_OMqrm3R8vHHWo3heglKhUCKWdG8HzHmHLGKRNMF0nY,74141
+pygeodesy/cartesianBase.py,sha256=P3EUMYKad9HxNSQQJTbPu4QehQu5HDxqOo9-xYsTdp4,47366
+pygeodesy/clipy.py,sha256=3ysIEWQ89HjvLnSlZm0nZAt9EN5AQxIs1sLLM8yF9zM,27675
+pygeodesy/constants.py,sha256=-KhClvNhehL7UCnqPgZyEnS3cSyYf7EBDRF0Vgmcgks,19190
+pygeodesy/css.py,sha256=RXlLh76tVDFClVh7L1U3FFrLZvjBPFASDf3vq8dHecE,25778
+pygeodesy/datums.py,sha256=GYbtvPyzDChHYgnNleBqsM-MNwLNQqrO2_MMV4Z9kmI,34006
+pygeodesy/dms.py,sha256=VujWxk1L2Kp6OMfnu0XPI-j8bnyJ33sFmtB9_MbHqSU,44455
+pygeodesy/ecef.py,sha256=U_vxQKD1HXB-O10Q_9tZ4EiD9SdFYuG__5lqvrhE_0M,59795
+pygeodesy/elevations.py,sha256=1qZM2w0rDF7jHunydpTEmdLwOwF81KUL9L6RALJC7K4,10807
+pygeodesy/ellipsoidalBase.py,sha256=VTzRrHlfZ-VXAEUczQjDNMDbTN9kVYBgCMuOos021Dk,56710
+pygeodesy/ellipsoidalBaseDI.py,sha256=lPUPP5lVsCzI5RIukxmJ5MH6j2Mb7mdvftQ0tsvsW6g,38585
+pygeodesy/ellipsoidalExact.py,sha256=a_2C6S6hGRumavy5giRoC9QAhnjqpujiXyu92od6nKo,16951
+pygeodesy/ellipsoidalGeodSolve.py,sha256=xfNcb70AuPbIiJUqhisIfg6pCQBqXyQffBNuESEGCfU,16833
+pygeodesy/ellipsoidalKarney.py,sha256=FoOsfNf96oHuGa9k4AB42y_UUBuOkh4xMW7PFGF63SA,19246
+pygeodesy/ellipsoidalNvector.py,sha256=JuxCUqUtot4e8587Q84Npc1_SdahywTYsybRSMTRtSc,30265
+pygeodesy/ellipsoidalVincenty.py,sha256=Uk93B8GFcMnWiwKUOA84TlLwbBlvzVnsAXAx0cU7cn4,26004
+pygeodesy/ellipsoids.py,sha256=I-vlTW3hqNK-Joqo8q3f1KxY-Y3yD4mVxo7TBWSGxYw,120212
+pygeodesy/elliptic.py,sha256=-80MbZvRPk-TeA_ggkfXhjuPv07MzsB4HxNF7gbdhB4,42501
+pygeodesy/epsg.py,sha256=oWHX_QVChE5roktAyXUmPmX49XHiryYmXTHxQzrAprE,8222
+pygeodesy/errors.py,sha256=A8eOE3ddsH9kFP6O60cA5ZuQMjBWpmbRDdWKM2Onvng,28187
+pygeodesy/etm.py,sha256=w0_8tF6p54K2dBAhsOW9YZTTWHJY7BnFnqh34PKm8PU,45075
+pygeodesy/fmath.py,sha256=71kngkiWgwFoLbJ6JKb2dJ0ZBmTFd_mdsGZkU_m-8Ts,34103
+pygeodesy/formy.py,sha256=CmQlz2I1KNXeIU73T9zzHNvTnenMFvfnZVCJCxhSwZg,75693
+pygeodesy/frechet.py,sha256=MwOC2VvOL4lNcvpF-kUaN5FYNp6xudYP5dyBtSwKz3Y,34338
+pygeodesy/fstats.py,sha256=4eIhzSCMnn-2nVP3Q-5cCWCI-rvH0CE-zkk9hp3Pvn8,28642
+pygeodesy/fsums.py,sha256=VdvK7Z01MNRcknf8hWujvD08WMCgJ98OdUCCbT9Xfqk,79434
+pygeodesy/gars.py,sha256=gVnLQIEofyf_dA8dhpLrmhtIxGhBHZVRw8PbWgYUnnY,11400
+pygeodesy/geodesicw.py,sha256=PwUO5jCGExhMt6cKkQwVnPTHMMVadkTrd6pV4UWZYNY,27064
+pygeodesy/geodsolve.py,sha256=gRwdmjYe2oslt2z2vBnMlh_FURqGm9ai7t4XPrnjCxQ,22019
+pygeodesy/geohash.py,sha256=plBNMHbiQa9E8RPq7rgFYoJAl14mhkgnDucGoXD5YHg,32373
+pygeodesy/geoids.py,sha256=25HrOgsCvFnXTjh3ghc1Y1FQKjerPpo_OLlQBNayK_0,80887
+pygeodesy/hausdorff.py,sha256=3mC7QbRZawpqFaguTieHMCaDzVt22PNhJ0s9ZPgQA1k,34712
+pygeodesy/heights.py,sha256=ZqRy20ZUVatumPWWS-j7Vvq3BA7HaRWMOd6BvbMhHm8,43575
+pygeodesy/internals.py,sha256=iTOhd3Lb96JuaeR9BFDv0ixGRktn7O_HpHrp5W_1LTY,19344
+pygeodesy/interns.py,sha256=QoDo_S1qY8IJVqI0pH2jGESLEexEF480PuwWZnTVrRI,23600
+pygeodesy/iters.py,sha256=ML14NjtDpfPRtDJQsUYUtJZ81HH4NPFrCjecxwkcIuM,20309
+pygeodesy/karney.py,sha256=7d0VroQiobcTS5ccaWg99rGRaMUorqRJTaCBaSscKI4,35084
+pygeodesy/ktm.py,sha256=itQElJegrfhpAuMujAWFTcyuMSeKIgSyw5qkkHFs7vE,27519
+pygeodesy/latlonBase.py,sha256=DglIfu916vtMV8-wEUs4GrXmk698-j3dkSud8FOBB6o,77762
+pygeodesy/lazily.py,sha256=FjvgzWyXiM9gJNzTCVWi_RxonR0OrBJOQiFFl0n1Cx4,45478
+pygeodesy/lcc.py,sha256=6vGht5JCN_BYYzbU2YCK6jz3PFcVymvY-RK2Uflt7ZE,25745
+pygeodesy/ltp.py,sha256=QcDoeOXBQLto2vXTWhKUFKre7bfGN4lZLcgLsZLKwMY,49258
+pygeodesy/ltpTuples.py,sha256=bZjcmj4Ug42d2gjofhfzr2Min_A8M62vZOOSINY1K9s,55771
+pygeodesy/mgrs.py,sha256=zddMOnUIs8VSk0c3muTaljTl7OViCgX6JB28gWPdmVM,29029
+pygeodesy/named.py,sha256=SOlbmB6Ned9TacOSTwchi8hcOmvCNAy6A2M_DMhDusM,51204
+pygeodesy/namedTuples.py,sha256=N8fyc6OMdXNHgOk_tK2zhuWwBq6oB-QcAY-PG9xIgWk,27535
+pygeodesy/nvectorBase.py,sha256=Z6tA3XthUu990UOUv0o8l5gjnmE7e2Cqkob69spoXYE,28831
+pygeodesy/osgr.py,sha256=s_-21bYhXUv37thzgIQjGmMmMdT46RlecOixHRufW4o,31044
+pygeodesy/points.py,sha256=9VfKDo9rt935WW61k4PpXSKzSx02demxhLVpf9DRcNk,64412
+pygeodesy/props.py,sha256=o6x5XDCtq3nW17dZtQnNsqlc6FVpf2xjy6JKbdZsbBw,21493
+pygeodesy/resections.py,sha256=nkfBxYrsEdyq2JqAbPrRWKplJBzFkIXLvEZGB4gPu_A,43550
+pygeodesy/simplify.py,sha256=FT3AzXiFjFfvwJ-X2q8iA9cQOUVdBT1vD_BIskM3gK8,25223
+pygeodesy/solveBase.py,sha256=W7qF_dW24Dd9aS2wh0nD9Lj8BgOSImsACxR1-iNRuyQ,16709
+pygeodesy/sphericalBase.py,sha256=sH2WwmY_RL0STyr1OhtCDKvGhO0Ks7o3V-MHLddpiHQ,31944
+pygeodesy/sphericalNvector.py,sha256=TBs_nid_DTcox7bBegh_Djv4zZRGRY4mH6dd1xIHGms,56963
+pygeodesy/sphericalTrigonometry.py,sha256=p9sDwyHH441pdPktUE6zrRtGQpwNO8F4ey07QtUW7z0,64209
+pygeodesy/streprs.py,sha256=AZzil7Encfb1E7NG7tNHHivuayKQ-LZJJTMVumUhsEQ,23993
+pygeodesy/trf.py,sha256=r5d_fFHQiPH8HPnBdzLhCju2rKNRCEDZ8UwIBWujR2E,118904
+pygeodesy/triaxials.py,sha256=5WKymGpixPjsgol4ifSl5pH-f7bTfZsMrmcYFuZBtwY,62040
+pygeodesy/units.py,sha256=DIllydnoz4rfw3ST91D_6-K_QGFiCqNcYvf6B_mUJMs,38827
+pygeodesy/unitsBase.py,sha256=FA4DuXUb88YYsDS3aIkd7BGvj70JATMeuBV_efshUx0,13544
+pygeodesy/ups.py,sha256=Rw4cO7Q20w-y7DKEHiuX7BkansDZnm8uvQRApFJ-USo,23287
+pygeodesy/utily.py,sha256=AOEHXi7H5QsTmgxcp0qOGC2qvIdqS01Mfu0Y8m3Bp6w,36141
+pygeodesy/utm.py,sha256=p1MH5qm5Fi9nWEfY7ww-y1O4FcuQuuR08mNlHp7MLKk,31135
+pygeodesy/utmups.py,sha256=u2hlWSnmZKwR-ApgKw16R9p75sW_yaqQAmbcBUE8Zfg,13007
+pygeodesy/utmupsBase.py,sha256=x9LHKi44aYB473ukVvxt1rRJ68MOAQGWiiOhzRskiio,18974
+pygeodesy/vector2d.py,sha256=zJq5PB777_mFJpKD-rt_T0Vm4SNbVwF7pc3KxX8uCT8,34994
+pygeodesy/vector3d.py,sha256=danoz3QA90EJjqr2dmLPCYP5UG0m_pgiyNuNBW0aNJ8,45065
+pygeodesy/vector3dBase.py,sha256=GhEq2oFfLoF57cDy6lvsB0b-dgTneMcrtDSyIiGr4mY,35630
+pygeodesy/webmercator.py,sha256=1IXiAHBXTm5kMCp5gEI67oBJeRXD7BiPVI7bcRRX1U4,14918
+pygeodesy/wgrs.py,sha256=AKUrYRCC67lOeJ6vUDAiGb_mY6R3ZwflXpOaP3wauOg,14774
+pygeodesy/auxilats/_CX_4.py,sha256=U41njj8Pu8cHMGuoUUVA20QIvRJAq-VGCnyoKJl0Ylo,8662
+pygeodesy/auxilats/_CX_6.py,sha256=x4hrHxunjqqkEsZbVW1dyn3R5mR8EWYOuX77RzDEyh4,14856
+pygeodesy/auxilats/_CX_8.py,sha256=t-OO48t4cCOsOgMi1FoyPw2DQqybVZFsgQMqAYP-jKY,25304
+pygeodesy/auxilats/__init__.py,sha256=xLIJ2uAhO-p_NDywrEi0tJxJ7r7jw3yG5B2CfSjNKJw,2881
+pygeodesy/auxilats/__main__.py,sha256=BsNxHMo-VqXL0-kFTrpMUz5SFUO_K4udQLemXgvTxLE,2896
+pygeodesy/auxilats/auxAngle.py,sha256=ybW0FMGaf69V5FYgVoqZENU-5b43FsmCPSYXcOu2fT8,16740
+pygeodesy/auxilats/auxDLat.py,sha256=U3BHF6AkW5--nrwH9whL5wZVIZLH_keRLfUz6c6KBx4,10950
+pygeodesy/auxilats/auxDST.py,sha256=bdNEh3TdABWH7qW6ngZx5SnzDM3B5rtPLvYhvCnFsKc,10497
+pygeodesy/auxilats/auxLat.py,sha256=GUpK5_rcL8IHjC209dhIibYYBJudFU0Yk7JD-KUApbc,32529
+pygeodesy/auxilats/auxily.py,sha256=ZiCFedYcr32O6TWQ_dcnwMrc9TgogyuhNSbR77WMDpg,8240
+pygeodesy/deprecated/__init__.py,sha256=ZRGqgwSdvtKSYZdw09-LPuGa_i0jMHWKIwrPG3r1hHs,2815
+pygeodesy/deprecated/bases.py,sha256=nxUtxscAg5cb7HEzTSmPJFafLc9Ad2SL5ovwkYaU5z8,1655
+pygeodesy/deprecated/classes.py,sha256=PXgss-2kEu3bzaxvSeVZJGdcRqsdi_6_aRqsESyUQKQ,11662
+pygeodesy/deprecated/consterns.py,sha256=W-rQiw443_zCFEUzjCGykGND-i5P_ghEIyJUSGg7-Nc,1908
+pygeodesy/deprecated/datum.py,sha256=KfuMA64LYGMj1voW2uai2RGcugtWdpvlOL6UHJvpTeQ,1875
+pygeodesy/deprecated/functions.py,sha256=-Ckor43KBiCDa7rbwY5kHvrs5xwuixTlw1TZpNSBgrU,13647
+pygeodesy/deprecated/nvector.py,sha256=_dZf84RdmPr7e7i8Yi683R-8Mqn0ipTqIsDhNl29hGo,2117
+pygeodesy/deprecated/rhumbBase.py,sha256=d7YKW--dnRpobB2CSvhFsntWF0B5-HYJqID2pv5lD5k,1375
+pygeodesy/deprecated/rhumbaux.py,sha256=n29xazYMbVG4MJkLjAGu8B88bbcFF5xnvuj9xSxjfIk,1428
+pygeodesy/deprecated/rhumbsolve.py,sha256=QprjRfo5T1_C4ovaa1cffAcmNczzkhGIfmybAup9a9w,1431
+pygeodesy/deprecated/rhumbx.py,sha256=OS0p_meaoVrpZe5UhK6qZljjlrGpL0pCHWw8gofw7ks,1425
+pygeodesy/geodesicx/_C4_24.py,sha256=kS4XMR9m7iBs01V8K0Oz9qTYmjN-icIQGpc_8iwVhig,90750
+pygeodesy/geodesicx/_C4_27.py,sha256=bPbj2Ckrn9WJglm3SNTXyMkULNwANM0tCQ-LKxP1L58,134258
+pygeodesy/geodesicx/_C4_30.py,sha256=QZO8p971ztJwDGLOaJYgIhklztz9GlqbtS-xRP_E7o4,201964
+pygeodesy/geodesicx/__init__.py,sha256=b5pOZbSBjN9WVP7fOMSBzTIbx1H0omHMXzOgf6rAgvs,2446
+pygeodesy/geodesicx/__main__.py,sha256=FVlmJft__Utk30zYwCbvrJpmAFi_jmyigzbm4An3Wws,3167
+pygeodesy/geodesicx/gx.py,sha256=reyK3UrooZmXTrwPcU36kO0R_ffZ5cMjPZoQ1qWHaO0,61729
+pygeodesy/geodesicx/gxarea.py,sha256=-Kwe6spe2MSQbeLFDd6UN2NOi4JOjYhHAEzonOU3u4A,19409
+pygeodesy/geodesicx/gxbases.py,sha256=nSQpDPuRQFkkzvjOaalBTHOQCYT1fhSOb5uy-5NvvSA,5215
+pygeodesy/geodesicx/gxline.py,sha256=GP7BXfpsePLZy0SLLiIO6ytWKFpBLuPsOaL2Z_-45iU,27373
+pygeodesy/rhumb/__init__.py,sha256=70qKVuNKkddfqMSxZ9c0VCZM1w0_Ka_nBWwtpfxxh2o,2207
+pygeodesy/rhumb/aux_.py,sha256=W4HkgoHAQz_aWaysfsmOA5010nCGvBfUs2Q-bymnHYU,16660
+pygeodesy/rhumb/bases.py,sha256=ZK-t5BHf4LyGypSfH-yaIHol0N9uWioMzUYzp0GI03M,53882
+pygeodesy/rhumb/ekx.py,sha256=lF3tZ-ZY9fPJV8y1kgHW-7EOZCyb3gJr-kR-jj5Fbf8,23871
+pygeodesy/rhumb/solve.py,sha256=nih_QmAjOQNb5PNNXJGWkAZuGrXDTXtlxRKPZj8ZA7c,27795
+PyGeodesy-24.5.24.dist-info/METADATA,sha256=b7AJM6eBNwRiyOCN0orAkHqGorz9KpaFu18NxBuTs48,19364
+PyGeodesy-24.5.24.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+PyGeodesy-24.5.24.dist-info/top_level.txt,sha256=cEQPatCXzKZqrivpULC5V5fuy9_V_bAwaP_gUGid7pQ,10
+PyGeodesy-24.5.24.dist-info/RECORD,,

pygeodesy/__init__.py

@@ -589,7 +589,7 @@ else:
 
 from pygeodesy.internals import _version2,  _DOT_  # PYCHOK import
 # from pygeodesy.interns import _DOT_  # from .internals
-__version__ = '24.05.15'
+__version__ = '24.05.24'
 # see setup.py for similar logic
 version     = _DOT_(*_version2(__version__, n=3))
 

pygeodesy/albers.py

@@ -24,11 +24,11 @@ from pygeodesy.errors import _ValueError, _xkwds
 from pygeodesy.fmath import hypot, hypot1, sqrt3
 from pygeodesy.fsums import Fsum, _Fsum1f_, fsum1f_
 from pygeodesy.interns import NN, _COMMASPACE_, _datum_, _gamma_, _k0_, \
-                             _lat_, _lat1_, _lat2_, _lon_, _name_, _not_, \
-                             _negative_, _scale_, _SPACE_, _x_, _y_
+                             _lat_, _lat1_, _lat2_, _lon_, _negative_, \
+                             _scale_, _SPACE_, _x_, _y_
 from pygeodesy.karney import _diff182, _norm180, _signBit
 from pygeodesy.lazily import _ALL_DOCS, _ALL_LAZY
-from pygeodesy.named import _NamedBase, _NamedTuple, _Pass
+from pygeodesy.named import _name2__, _NamedBase, _NamedTuple, _Pass
 from pygeodesy.props import deprecated_Property_RO, Property_RO, _update_all
 from pygeodesy.streprs import Fmt, strs, unstr
 from pygeodesy.units import Bearing, Float_, Lat, Lat_, Lon, Meter, Scalar_
@@ -38,7 +38,7 @@ from pygeodesy.utily import atan1, atan1d, degrees360, sincos2, sincos2d, \
 from math import atan2, atanh, degrees, fabs, radians, sqrt
 
 __all__ = _ALL_LAZY.albers
-__version__ = '24.05.14'
+__version__ = '24.05.21'
 
 _k1_    = 'k1'
 _NUMIT  =   8  # XXX 4?
@@ -111,12 +111,12 @@ class _AlbersBase(_NamedBase):
 #   _sxi0   =  None  # (INTERNAL) sin(xi)
 #   _txi0   =  None  # (INTERNAL) tan(xi)
 
-    def __init__(self, sa1, ca1, sa2, ca2, k, datum, name):
+    def __init__(self, sa1, ca1, sa2, ca2, k, datum, **name):
         '''(INTERNAL) New C{AlbersEqualArea...} instance.
         '''
         qZ = self._qZ
         if datum not in (None, self._datum):
-            self._datum = _ellipsoidal_datum(datum, name=name)
+            self._datum = _ellipsoidal_datum(datum, **name)
             qZ = _qZx(self)
         elif qZ is None:
             qZ = _qZx(_AlbersBase)
@@ -226,13 +226,13 @@ class _AlbersBase(_NamedBase):
 
     f = flattening
 
-    def forward(self, lat, lon, lon0=0, name=NN):
+    def forward(self, lat, lon, lon0=0, **name):
         '''Convert a geodetic location to east- and northing.
 
            @arg lat: Latitude of the location (C{degrees}).
            @arg lon: Longitude of the location (C{degrees}).
            @kwarg lon0: Optional central meridian longitude (C{degrees}).
-           @kwarg name: Optional name for the location (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the location (C{str}).
 
            @return: An L{Albers7Tuple}C{(x, y, lat, lon, gamma, scale, datum)},
                     with C{lon} offset by B{C{lon0}} and reduced C{[-180,180]}.
@@ -277,7 +277,7 @@ class _AlbersBase(_NamedBase):
         if t:
             k0 = self._azik(t, ta)
         return Albers7Tuple(x, y, lat, lon, g, k0, self.datum,
-                                  name=name or self.name)
+                                       name=self._name__(name))
 
     @Property_RO
     def ispolar(self):
@@ -343,16 +343,16 @@ class _AlbersBase(_NamedBase):
             _update_all(self)
             self._k0s(k0)
 
-    def reverse(self, x, y, lon0=0, name=NN, LatLon=None, **LatLon_kwds):
+    def reverse(self, x, y, lon0=0, LatLon=None, **name_LatLon_kwds):
         '''Convert an east- and northing location to geodetic lat- and longitude.
 
            @arg x: Easting of the location (C{meter}).
            @arg y: Northing of the location (C{meter}).
            @kwarg lon0: Optional central meridian longitude (C{degrees}).
-           @kwarg name: Optional name for the location (C{str}).
            @kwarg LatLon: Class to use (C{LatLon}) or C{None}.
-           @kwarg LatLon_kwds: Optional, additional B{C{LatLon}} keyword
-                               arguments, ignored if C{B{LatLon} is None}.
+           @kwarg name_LatLon_kwds: Optional C{B{name}=NN} for the location
+                              and optional, additional B{C{LatLon}} keyword
+                              arguments, ignored if C{B{LatLon} is None}.
 
            @return: The geodetic (C{LatLon}) or if B{C{LatLon}} is C{None} an
                     L{Albers7Tuple}C{(x, y, lat, lon, gamma, scale, datum)}.
@@ -397,7 +397,7 @@ class _AlbersBase(_NamedBase):
             lon += _norm180(lon0)
         lon = _norm180(lon)
 
-        n = name or self.name
+        n, LatLon_kwds = _name2__(name_LatLon_kwds, _or_nameof=self)
         if LatLon is None:
             g = degrees360(s * th)
             if den:
@@ -540,11 +540,11 @@ class _AlbersBase(_NamedBase):
             (self.lat1,))
         t = strs(t, prec=prec)
         if k:
-            t  =  t[:-1] + (Fmt.EQUAL(k, t[-1]),)
+            t  = t[:-1] + (Fmt.EQUAL(k, t[-1]),)
         if self.datum != _WGS84:
-            t += (Fmt.EQUAL(_datum_, self.datum),)
+            t += Fmt.EQUAL(datum=self.datum),
         if self.name:
-            t += (Fmt.EQUAL(_name_, repr(self.name)),)
+            t += Fmt.EQUAL(name=repr(self.name)),
         return t if sep is None else sep.join(t)
 
     def _txif(self, ta):  # in .Ellipsoid.auxAuthalic
@@ -575,20 +575,20 @@ class AlbersEqualArea(_AlbersBase):
     '''
     _k = _k0_
 
-    def __init__(self, lat, k0=1, datum=_WGS84, name=NN):
+    def __init__(self, lat, k0=1, datum=_WGS84, **name):
         '''New L{AlbersEqualArea} projection.
 
            @arg lat: Standard parallel (C{degrees}).
            @kwarg k0: Azimuthal scale on the standard parallel (C{scalar}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
 
            @raise AlbersError: Invalid B{C{lat}}, B{C{k0}} or no convergence.
         '''
         self._lat1 = self._lat2 = lat = _Lat(lat1=lat)
-        args = tuple(sincos2d(lat)) * 2 + (_Ks(k0=k0), datum, name)
-        _AlbersBase.__init__(self, *args)
+        args = tuple(sincos2d(lat)) * 2 + (_Ks(k0=k0), datum)
+        _AlbersBase.__init__(self, *args, **name)
 
 
 class AlbersEqualArea2(_AlbersBase):
@@ -598,7 +598,7 @@ class AlbersEqualArea2(_AlbersBase):
     '''
     _k = _k1_
 
-    def __init__(self, lat1, lat2, k1=1, datum=_WGS84, name=NN):
+    def __init__(self, lat1, lat2, k1=1, datum=_WGS84, **name):
         '''New L{AlbersEqualArea2} projection.
 
            @arg lat1: First standard parallel (C{degrees}).
@@ -606,14 +606,14 @@ class AlbersEqualArea2(_AlbersBase):
            @kwarg k1: Azimuthal scale on the standard parallels (C{scalar}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
 
            @raise AlbersError: Invalid B{C{lat1}}m B{C{lat2}}, B{C{k1}}
                                or no convergence.
         '''
         self._lat1, self._lat2 = lats = _Lat(lat1=lat1), _Lat(lat2=lat2)
-        args = tuple(sincos2d_(*lats)) + (_Ks(k1=k1), datum, name)
-        _AlbersBase.__init__(self, *args)
+        args = tuple(sincos2d_(*lats)) + (_Ks(k1=k1), datum)
+        _AlbersBase.__init__(self, *args, **name)
 
 
 class AlbersEqualArea4(_AlbersBase):
@@ -624,7 +624,7 @@ class AlbersEqualArea4(_AlbersBase):
     '''
     _k = _k1_
 
-    def __init__(self, slat1, clat1, slat2, clat2, k1=1, datum=_WGS84, name=NN):
+    def __init__(self, slat1, clat1, slat2, clat2, k1=1, datum=_WGS84, **name):
         '''New L{AlbersEqualArea4} projection.
 
            @arg slat1: Sine of first standard parallel (C{scalar}).
@@ -634,20 +634,20 @@ class AlbersEqualArea4(_AlbersBase):
            @kwarg k1: Azimuthal scale on the standard parallels (C{scalar}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
 
            @raise AlbersError: Negative B{C{clat1}} or B{C{clat2}}, B{C{slat1}}
                                and B{C{slat2}} have opposite signs (hemispheres),
                                invalid B{C{k1}} or no convergence.
         '''
-        def _Lat_s_c3(name, s, c):
-            r =  Float_(hypot(s, c), name=name, Error=AlbersError)
-            L = _Lat(atan1d(s, c), name=name)
+        def _Lat_s_c3(n, s, c):
+            r =  Float_(hypot(s, c), name=n, Error=AlbersError)
+            L = _Lat(  atan1d(s, c), name=n)
             return L, (s / r), (c / r)
 
         self._lat1, sa1, ca1 = _Lat_s_c3(_lat1_, slat1, clat1)
         self._lat2, sa2, ca2 = _Lat_s_c3(_lat2_, slat2, clat2)
-        _AlbersBase.__init__(self, sa1, ca1, sa2, ca2, _Ks(k1=k1), datum, name)
+        _AlbersBase.__init__(self, sa1, ca1, sa2, ca2, _Ks(k1=k1), datum, **name)
 
 
 class AlbersEqualAreaCylindrical(_AlbersBase):
@@ -656,16 +656,16 @@ class AlbersEqualAreaCylindrical(_AlbersBase):
     '''
     _lat1 = _lat2 = _Lat(lat1=_0_0)
 
-    def __init__(self, lat=_0_0, datum=_WGS84, name=NN):
+    def __init__(self, lat=_0_0, datum=_WGS84, **name):
         '''New L{AlbersEqualAreaCylindrical} projection.
 
            @kwarg lat: Standard parallel (C{0 degrees} I{fixed}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
         '''
         _xlat(lat, _0_0, AlbersEqualAreaCylindrical)
-        _AlbersBase.__init__(self, _0_0, _1_0, _0_0, _1_0, 1, datum, name)
+        _AlbersBase.__init__(self, _0_0, _1_0, _0_0, _1_0, 1, datum, **name)
 
 
 class AlbersEqualAreaNorth(_AlbersBase):
@@ -674,16 +674,16 @@ class AlbersEqualAreaNorth(_AlbersBase):
     '''
     _lat1 = _lat2 = _Lat(lat1=_90_0)
 
-    def __init__(self, lat=_90_0, datum=_WGS84, name=NN):
+    def __init__(self, lat=_90_0, datum=_WGS84, **name):
         '''New L{AlbersEqualAreaNorth} projection.
 
            @kwarg lat: Standard parallel (C{90 degrees} I{fixed}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
         '''
         _xlat(lat, _90_0, AlbersEqualAreaNorth)
-        _AlbersBase.__init__(self, _1_0, _0_0, _1_0, _0_0, 1, datum, name)
+        _AlbersBase.__init__(self, _1_0, _0_0, _1_0, _0_0, 1, datum, **name)
 
 
 class AlbersEqualAreaSouth(_AlbersBase):
@@ -692,16 +692,16 @@ class AlbersEqualAreaSouth(_AlbersBase):
     '''
     _lat1 = _lat2 = _Lat(lat1=_N_90_0)
 
-    def __init__(self, lat=_N_90_0, datum=_WGS84, name=NN):
+    def __init__(self, lat=_N_90_0, datum=_WGS84, **name):
         '''New L{AlbersEqualAreaSouth} projection.
 
            @kwarg lat: Standard parallel (C{-90 degrees} I{fixed}).
            @kwarg datum: Optional datum or ellipsoid (L{Datum}, L{Ellipsoid},
                          L{Ellipsoid2} or L{a_f2Tuple}).
-           @kwarg name: Optional name for the projection (C{str}).
+           @kwarg name: Optional C{B{name}=NN} for the projection (C{str}).
         '''
         _xlat(lat, _N_90_0, AlbersEqualAreaSouth)
-        _AlbersBase.__init__(self, _N_1_0, _0_0, _N_1_0, _0_0, 1, datum, name)
+        _AlbersBase.__init__(self, _N_1_0, _0_0, _N_1_0, _0_0, 1, datum, **name)
 
 
 class Albers7Tuple(_NamedTuple):
@@ -832,7 +832,7 @@ def _xlat(lat, f, where):
     '''
     if lat is not f and _Lat(lat=lat) != f:
         t = unstr(where, lat=lat)
-        raise AlbersError(t, txt=_not_(f))
+        raise AlbersError(t, txt_not_=f)
 
 
 __all__ += _ALL_DOCS(_AlbersBase)

pygeodesy/auxilats/__init__.py

@@ -29,7 +29,7 @@ from pygeodesy.lazily import _ALL_OTHER
 # no modules: auxAngle, auxDLat, auxDST, auxily, auxLat
 __all__ = _ALL_OTHER(Aux, AuxAngle, AuxDLat, AuxDST, AuxLat,
                      AuxBeta, AuxChi, AuxMu, AuxPhi, AuxTheta, AuxXi)
-__version__ = '23.12.07'
+__version__ = '24.05.24'
 
 # **) MIT License
 #

pygeodesy/auxilats/auxAngle.py

@@ -14,16 +14,15 @@ under the MIT/X11 License.  For more information, see the U{GeographicLib
 # make sure int/int division yields float quotient, see .basics
 from __future__ import division as _; del _  # PYCHOK semicolon
 
-from pygeodesy.auxilats.auxily import Aux, _Aux2Greek,  AuxError
-from pygeodesy.basics import _xinstanceof,  _xkwds_get
+from pygeodesy.auxilats.auxily import Aux, _Aux2Greek
+from pygeodesy.basics import _xinstanceof
 from pygeodesy.constants import EPS, _INF_NAN_NINF, MAX, NAN, _0_0, _0_5, _1_0, \
                                _copysign_1_0, _over, _pos_self, isfinite, isnan
-# from pygeodesy.errors import AuxError, _xkwds_get  # from .auxily, .basics
+from pygeodesy.errors import AuxError, _UnexpectedError, _xkwds_pop2
 from pygeodesy.fmath import hypot,  unstr
-from pygeodesy.fsums import _add_op_, _iadd_op_, _isub_op_, _sub_op_,  _Named, NN
-# from pygeodesy.interns import NN  # from .fsums
-# from pygeodesy.named import _Named  # from .fsums
-from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS
+from pygeodesy.fsums import _add_op_, _iadd_op_, _isub_op_, _sub_op_
+from pygeodesy.named import _name2__, _Named,  _ALL_DOCS, _MODS
+# from pygeodesy.lazily import _ALL_DOCS, _ALL_MODS as _MODS  # from .named
 from pygeodesy.props import Property, Property_RO, property_RO, _update_all
 # from pygeodesy.streprs import unstr  # from .fmath
 from pygeodesy.units import Degrees, Radians
@@ -32,7 +31,7 @@ from pygeodesy.utily import atan2d, sincos2, sincos2d
 from math import asinh, atan2, copysign, degrees, fabs, radians, sinh
 
 __all__ = ()
-__version__ = '24.04.26'
+__version__ = '24.05.24'
 
 _0_INF_NAN_NINF = (0, _0_0) + _INF_NAN_NINF
 _MAX_2          =  MAX * _0_5  # PYCHOK used!
@@ -49,18 +48,18 @@ class AuxAngle(_Named):
     _y    = _0_0
     _x    = _1_0
 
-    def __init__(self, y_angle=_0_0, x=_1_0, name=NN, **aux):
+    def __init__(self, y_angle=_0_0, x=_1_0, **aux_name):
         '''New L{AuxAngle}.
 
            @kwarg y_angle: The Y component (C{scalar}, including C{INF}, C{NAN}
                            and C{NINF}) or a previous L{AuxAngle} instance.
            @kwarg x: The X component, ignored if C{B{y_angle}} is non-C{scalar}.
-           @kwarg name: Optional name (C{str}).
-           @kwarg aux: I{Auxiliary} kind (C{Aux.KIND}), ignored if B{C{y_angle}}
-                       is non-C{scalar}.
+           @kwarg aux_name: Optional C{B{name}=NN} (C{str}) and I{Auxiliary} kind
+                      (C{B{aux}=Aux.KIND}), ignored if B{C{y_angle}} is L{AuxAngle}.
 
            @raise AuxError: Invalid B{C{y_angle}}, B{C{x}} or B{C{aux}}.
         '''
+        name, aux = _name2__(**aux_name)
         try:
             yx = y_angle._yx
             if self._AUX is None:
@@ -70,11 +69,13 @@ class AuxAngle(_Named):
         except AttributeError:
             yx = y_angle, x
             if aux:
-                aux = _xkwds_get(aux, aux=self._AUX)
-                if self._AUX is not aux:
-                    if aux not in _AUXClass:
-                        raise AuxError(aux=aux)
-                    self._AUX = aux
+                a, kwds = _xkwds_pop2(aux, aux=self._AUX)
+                if kwds:
+                    raise _UnexpectedError(**kwds)
+                if a is not self._AUX:
+                    if a not in _AUXClass:
+                        raise AuxError(aux=a)
+                    self._AUX = a
         self._y, self._x = _yx2(yx)
         if name:
             self.name = name
@@ -428,16 +429,16 @@ class AuxBeta(AuxAngle):
     _AUX = Aux.BETA
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxBeta} from degrees.
         '''
-        return AuxBeta(*sincos2d(deg), name=name)
+        return AuxBeta(*sincos2d(deg), **name)
 
     @staticmethod
-    def fromRadians(rad, name=NN):
+    def fromRadians(rad, **name):
         '''Get an L{AuxBeta} from radians.
         '''
-        return AuxBeta(*sincos2(rad), name=name)
+        return AuxBeta(*sincos2(rad), **name)
 
 
 class AuxChi(AuxAngle):
@@ -446,10 +447,10 @@ class AuxChi(AuxAngle):
     _AUX = Aux.CHI
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxChi} from degrees.
         '''
-        return AuxChi(*sincos2d(deg), name=name)
+        return AuxChi(*sincos2d(deg), **name)
 
 
 class AuxMu(AuxAngle):
@@ -458,10 +459,10 @@ class AuxMu(AuxAngle):
     _AUX = Aux.MU
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxMu} from degrees.
         '''
-        return AuxMu(*sincos2d(deg), name=name)
+        return AuxMu(*sincos2d(deg), **name)
 
 
 class AuxPhi(AuxAngle):
@@ -471,10 +472,10 @@ class AuxPhi(AuxAngle):
     _diff = _1_0  # see .auxLat._Newton
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxPhi} from degrees.
         '''
-        return AuxPhi(*sincos2d(deg), name=name)
+        return AuxPhi(*sincos2d(deg), **name)
 
 
 class AuxTheta(AuxAngle):
@@ -483,10 +484,10 @@ class AuxTheta(AuxAngle):
     _AUX = Aux.THETA
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxTheta} from degrees.
         '''
-        return AuxTheta(*sincos2d(deg), name=name)
+        return AuxTheta(*sincos2d(deg), **name)
 
 
 class AuxXi(AuxAngle):
@@ -495,10 +496,10 @@ class AuxXi(AuxAngle):
     _AUX = Aux.XI
 
     @staticmethod
-    def fromDegrees(deg, name=NN):
+    def fromDegrees(deg, **name):
         '''Get an L{AuxXi} from degrees.
         '''
-        return AuxXi(*sincos2d(deg), name=name)
+        return AuxXi(*sincos2d(deg), **name)
 
 
 _AUXClass = {Aux.BETA:  AuxBeta,