speed import, add pymap3d.{vdist,vreckon}]

Don't automatically import less widespread used modules including:

lox
los
rcurve
rsphere

this speeds imports for most users

Author: scivision

Examples/vdist.py

@@ -16,7 +16,7 @@
 
 
 def matlab_func(lat1: float, lon1: float, lat2: float, lon2: float) -> typing.Tuple[float, float]:
-    """ Using Matlab Engine to do same thing as Pymap3d """
+    """Using Matlab Engine to do same thing as Pymap3d"""
     ell = eng.wgs84Ellipsoid()
     return eng.distance(lat1, lon1, lat2, lon2, ell, nargout=2)
 

Examples/vdist_stability.py

@@ -112,6 +112,15 @@ Abbreviations:
 * [NED: North East Down](https://en.wikipedia.org/wiki/North_east_down)
 * [radec: right ascension, declination](https://en.wikipedia.org/wiki/Right_ascension)
 
+### command line
+
+Command line convenience functions provided include:
+
+```sh
+python -m pymap3d.vdist
+python -m pymap3d.vreckon
+```
+
 ### array vs scalar
 
 Use of pymap3d on embedded systems or other streaming data applications often deal with scalar position data.

Examples/vreckon.py

@@ -1,6 +1,6 @@
 [metadata]
 name = pymap3d
-version = 2.6.1
+version = 2.7.0
 author = Michael Hirsch, Ph.D.
 author_email = [email protected]
 description = pure Python (no prereqs) coordinate conversions, following convention of several popular Matlab routines.

README.md

@@ -30,7 +30,7 @@
 """
 
 from .aer import ecef2aer, aer2ecef, geodetic2aer, aer2geodetic
-from .ellipsoid import Ellipsoid
+
 from .enu import enu2geodetic, geodetic2enu, aer2enu, enu2aer
 from .ned import ned2ecef, ned2geodetic, geodetic2ned, ecef2nedv, ned2aer, aer2ned, ecef2ned
 from .ecef import (
@@ -45,34 +45,7 @@
     uvw2enu,
 )
 from .sidereal import datetime2sidereal, greenwichsrt
-from .latitude import (
-    geod2geoc,
-    geoc2geod,
-    geodetic2geocentric,
-    geocentric2geodetic,
-    geodetic2isometric,
-    isometric2geodetic,
-    geodetic2conformal,
-    conformal2geodetic,
-    geodetic2rectifying,
-    rectifying2geodetic,
-    geodetic2authalic,
-    authalic2geodetic,
-    geodetic2parametric,
-    parametric2geodetic,
-)
-from .rcurve import geocentric_radius, rcurve_parallel, rcurve_meridian, rcurve_transverse
-from .rsphere import (
-    rsphere_eqavol,
-    rsphere_authalic,
-    rsphere_rectifying,
-    rsphere_euler,
-    rsphere_curve,
-    rsphere_triaxial,
-    rsphere_biaxial,
-)
-from .lox import meridian_arc, meridian_dist, loxodrome_inverse, loxodrome_direct, departure, meanm
-from .los import lookAtSpheroid
+from .ellipsoid import Ellipsoid
 from .timeconv import str2dt
 
 try:

setup.cfg

@@ -2,19 +2,18 @@
 from __future__ import annotations
 import typing
 
+from math import tau
+
 try:
-    from numpy import asarray, radians, sin, cos, hypot, arctan2 as atan2, degrees, pi, ndarray
+    from numpy import asarray, radians, sin, cos, hypot, arctan2 as atan2, degrees, ndarray
 except ImportError:
-    from math import radians, sin, cos, hypot, atan2, degrees, pi  # type: ignore
+    from math import radians, sin, cos, hypot, atan2, degrees  # type: ignore
 
     ndarray = typing.Any  # type: ignore
 
 from .ecef import geodetic2ecef, ecef2geodetic, enu2ecef, uvw2enu
 from .ellipsoid import Ellipsoid
 
-# py < 3.6 compatible
-tau = 2 * pi
-
 __all__ = ["enu2aer", "aer2enu", "enu2geodetic", "geodetic2enu"]
 
 

src/pymap3d/__init__.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 import typing
+
 from .ellipsoid import Ellipsoid
 from .utils import sanitize
-from .rcurve import rcurve_transverse
+from . import rcurve
 
 try:
     from numpy import radians, degrees, tan, sin, exp, pi, sqrt, inf, ndarray
@@ -115,7 +116,7 @@ def geodetic2geocentric(
     Office, Washington, DC, 1987, pp. 13-18.
     """
     geodetic_lat, ell = sanitize(geodetic_lat, ell, deg)
-    r = rcurve_transverse(geodetic_lat, ell, deg=False)
+    r = rcurve.transverse(geodetic_lat, ell, deg=False)
     geocentric_lat = atan((1 - ell.eccentricity ** 2 * (r / (r + alt_m))) * tan(geodetic_lat))
 
     return degrees(geocentric_lat) if deg else geocentric_lat
@@ -156,7 +157,7 @@ def geocentric2geodetic(
     Office, Washington, DC, 1987, pp. 13-18.
     """
     geocentric_lat, ell = sanitize(geocentric_lat, ell, deg)
-    r = rcurve_transverse(geocentric_lat, ell, deg=False)
+    r = rcurve.transverse(geocentric_lat, ell, deg=False)
     geodetic_lat = atan(tan(geocentric_lat) / (1 - ell.eccentricity ** 2 * (r / (r + alt_m))))
 
     return degrees(geodetic_lat) if deg else geodetic_lat

src/pymap3d/enu.py

@@ -12,8 +12,8 @@
 
 import typing
 from .ellipsoid import Ellipsoid
-from .rcurve import rcurve_parallel
-from .rsphere import rsphere_rectifying
+from . import rcurve
+from . import rsphere
 from .latitude import (
     geodetic2rectifying,
     rectifying2geodetic,
@@ -79,7 +79,7 @@ def meridian_arc(lat1, lat2: ndarray, ell: Ellipsoid = None, deg: bool = True) -
     rlat1 = geodetic2rectifying(lat1, ell, deg=False)
     rlat2 = geodetic2rectifying(lat2, ell, deg=False)
 
-    return rsphere_rectifying(ell) * abs(rlat2 - rlat1)
+    return rsphere.rectifying(ell) * abs(rlat2 - rlat1)
 
 
 def loxodrome_inverse(
@@ -220,7 +220,7 @@ def loxodrome_direct(
 
     # compute the new points
     cosaz = cos(a12)
-    lat2 = reclat + (rng / rsphere_rectifying(ell)) * cosaz  # compute rectifying latitude
+    lat2 = reclat + (rng / rsphere.rectifying(ell)) * cosaz  # compute rectifying latitude
     lat2 = rectifying2geodetic(lat2, ell, deg=False)  # transform to geodetic latitude
 
     newiso = geodetic2isometric(lat2, ell, deg=False)
@@ -265,7 +265,7 @@ def departure(
     if deg:
         lon1, lon2, lat = radians(lon1), radians(lon2), radians(lat)
 
-    return rcurve_parallel(lat, ell, deg=False) * ((lon2 - lon1) % pi)
+    return rcurve.parallel(lat, ell, deg=False) * ((lon2 - lon1) % pi)
 
 
 def meanm(

src/pymap3d/latitude.py

@@ -13,7 +13,7 @@
 from .ellipsoid import Ellipsoid
 from .utils import sanitize
 
-__all__ = ["rcurve_parallel", "rcurve_meridian", "rcurve_transverse", "geocentric_radius"]
+__all__ = ["parallel", "meridian", "transverse", "geocentric_radius"]
 
 
 def geocentric_radius(geodetic_lat: float, ell: Ellipsoid = None, deg: bool = True) -> float:
@@ -36,7 +36,7 @@ def geocentric_radius(geodetic_lat: float, ell: Ellipsoid = None, deg: bool = Tr
     )
 
 
-def rcurve_parallel(lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
+def parallel(lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
     """
     computes the radius of the small circle encompassing the globe at the specified latitude
 
@@ -58,10 +58,10 @@ def rcurve_parallel(lat: ndarray, ell: Ellipsoid = None, deg: bool = True) -> fl
     if deg:
         lat = radians(lat)
 
-    return cos(lat) * rcurve_transverse(lat, ell, deg=False)
+    return cos(lat) * transverse(lat, ell, deg=False)
 
 
-def rcurve_meridian(lat: float, ell: Ellipsoid = None, deg: bool = True) -> float:
+def meridian(lat: float, ell: Ellipsoid = None, deg: bool = True) -> float:
     """computes the meridional radius of curvature for the ellipsoid
 
     like Matlab rcurve('meridian', ...)
@@ -91,7 +91,7 @@ def rcurve_meridian(lat: float, ell: Ellipsoid = None, deg: bool = True) -> floa
     return f1 / sqrt(f2 ** 3)
 
 
-def rcurve_transverse(lat: float | ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
+def transverse(lat: float | ndarray, ell: Ellipsoid = None, deg: bool = True) -> float:
     """computes the radius of the curve formed by a plane
     intersecting the ellipsoid at the latitude which is
     normal to the surface of the ellipsoid