*eci* functions no longer require Numpy

Author: scivision

src/pymap3d/eci.py

@@ -3,13 +3,11 @@
 from __future__ import annotations
 
 from datetime import datetime
-import sys
-import logging
 
-from ._typing import FloatLike, NDArray
+from .mathfun import cos, sin
+from ._typing import FloatLike
 
 try:
-    import numpy as np
     import astropy.units as u
     from astropy.coordinates import GCRS, ITRS, CartesianRepresentation, EarthLocation
 except ImportError:
@@ -52,20 +50,16 @@ def eci2ecef(
         z ECEF coordinate
     """
 
-    if "astropy" in sys.modules and not force_non_astropy:
-        xe, ye, ze = eci2ecef_astropy(x, y, z, time)
-    elif "numpy" in sys.modules:
-        logging.warning(f"{__name__}: Numpy implementation has much less accuracy than Astropy")
-        xe, ye, ze = eci2ecef_numpy(x, y, z, time)
-    else:
-        raise ImportError("eci2ecef requires either Numpy or Astropy")
+    if force_non_astropy:
+        return eci2ecef_stdlib(x, y, z, time)
 
-    return xe, ye, ze
+    try:
+        return eci2ecef_astropy(x, y, z, time)
+    except NameError:
+        return eci2ecef_stdlib(x, y, z, time)
 
 
-def eci2ecef_astropy(
-    x: FloatLike, y: FloatLike, z: FloatLike, t: datetime
-) -> tuple[NDArray, NDArray, NDArray]:
+def eci2ecef_astropy(x, y, z, t: datetime) -> tuple:
     """
     eci2ecef using Astropy
 
@@ -82,17 +76,15 @@ def eci2ecef_astropy(
     return x_ecef, y_ecef, z_ecef
 
 
-def eci2ecef_numpy(x, y, z, t: datetime) -> tuple:
-    """
-    eci2ecef using Numpy
-
+def eci2ecef_stdlib(x, y, z, t: datetime) -> tuple:
+    """ eci2ecef without Astropy
     see eci2ecef() for description
     """
 
     gst = greenwichsrt(juliandate(t))
 
-    c = np.cos(gst)
-    s = np.sin(gst)
+    c = cos(gst)
+    s = sin(gst)
 
     x_ecef = c * x + s * y
     y_ecef = -s * x + c * y
@@ -132,20 +124,16 @@ def ecef2eci(
         z ECI coordinate
     """
 
-    if "astropy" in sys.modules and not force_non_astropy:
-        xe, ye, ze = ecef2eci_astropy(x, y, z, time)
-    elif "numpy" in sys.modules:
-        logging.warning(f"{__name__}: Numpy implementation has much less accuracy than Astropy")
-        xe, ye, ze = ecef2eci_numpy(x, y, z, time)
-    else:
-        raise ImportError("ecef2eci requires either Numpy or Astropy")
+    if force_non_astropy:
+        return ecef2eci_stdlib(x, y, z, time)
 
-    return xe, ye, ze
+    try:
+        return ecef2eci_astropy(x, y, z, time)
+    except NameError:
+        return ecef2eci_stdlib(x, y, z, time)
 
 
-def ecef2eci_astropy(
-    x: FloatLike, y: FloatLike, z: FloatLike, t: datetime
-) -> tuple[NDArray, NDArray, NDArray]:
+def ecef2eci_astropy(x, y, z, t: datetime) -> tuple:
     """ecef2eci using Astropy
     see ecef2eci() for description
     """
@@ -156,15 +144,15 @@ def ecef2eci_astropy(
     return eci.x.value, eci.y.value, eci.z.value
 
 
-def ecef2eci_numpy(x, y, z, t: datetime) -> tuple:
-    """ecef2eci using Numpy
+def ecef2eci_stdlib(x, y, z, t: datetime) -> tuple:
+    """ecef2eci without Astropy
     see ecef2eci() for description
     """
 
     gst = greenwichsrt(juliandate(t))
 
-    c = np.cos(gst)
-    s = np.sin(gst)
+    c = cos(gst)
+    s = sin(gst)
 
     x_eci = c * x - s * y
     y_eci = s * x + c * y

src/pymap3d/latitude.py

@@ -46,8 +46,8 @@
 
 
 def geoc2geod(
-    geocentric_lat,
-    geocentric_distance,
+    geocentric_lat: FloatLike,
+    geocentric_distance: FloatLike,
     ell: Ellipsoid | None = None,
     deg: bool = True,
 ):
@@ -97,7 +97,7 @@ def geoc2geod(
     return degrees(geodetic_lat) if deg else geodetic_lat
 
 
-def geodetic2geocentric(geodetic_lat, alt_m, ell: Ellipsoid | None = None, deg: bool = True):
+def geodetic2geocentric(geodetic_lat: FloatLike, alt_m: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     convert geodetic latitude to geocentric latitude on spheroid surface
 
@@ -142,7 +142,7 @@ def geodetic2geocentric(geodetic_lat, alt_m, ell: Ellipsoid | None = None, deg:
 geod2geoc = geodetic2geocentric
 
 
-def geocentric2geodetic(geocentric_lat, alt_m, ell: Ellipsoid | None = None, deg: bool = True):
+def geocentric2geodetic(geocentric_lat: FloatLike, alt_m, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from geocentric latitude to geodetic latitude
 
@@ -184,7 +184,7 @@ def geocentric2geodetic(geocentric_lat, alt_m, ell: Ellipsoid | None = None, deg
     return degrees(geodetic_lat) if deg else geodetic_lat
 
 
-def geodetic2isometric(geodetic_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def geodetic2isometric(geodetic_lat: FloatArray, ell: Ellipsoid | None = None, deg: bool = True):
     """
     computes isometric latitude on an ellipsoid
 
@@ -248,7 +248,7 @@ def geodetic2isometric(geodetic_lat, ell: Ellipsoid | None = None, deg: bool = T
         return isometric_lat
 
 
-def isometric2geodetic(isometric_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def isometric2geodetic(isometric_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from isometric latitude to geodetic latitude
 
@@ -284,7 +284,7 @@ def isometric2geodetic(isometric_lat, ell: Ellipsoid | None = None, deg: bool =
     return degrees(geodetic_lat) if deg else geodetic_lat
 
 
-def conformal2geodetic(conformal_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def conformal2geodetic(conformal_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from conformal latitude to geodetic latitude
 
@@ -437,7 +437,7 @@ def geodetic2rectifying(
     return degrees(rectifying_lat) if deg else rectifying_lat
 
 
-def rectifying2geodetic(rectifying_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def rectifying2geodetic(rectifying_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from rectifying latitude to geodetic latitude
 
@@ -488,7 +488,7 @@ def rectifying2geodetic(rectifying_lat, ell: Ellipsoid | None = None, deg: bool
 
 
 # %% authalic
-def geodetic2authalic(geodetic_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def geodetic2authalic(geodetic_lat: FloatArray, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from geodetic latitude to authalic latitude
 
@@ -536,7 +536,7 @@ def geodetic2authalic(geodetic_lat, ell: Ellipsoid | None = None, deg: bool = Tr
     return degrees(authalic_lat) if deg else authalic_lat
 
 
-def authalic2geodetic(authalic_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def authalic2geodetic(authalic_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from authalic latitude to geodetic latitude
 
@@ -585,7 +585,7 @@ def authalic2geodetic(authalic_lat, ell: Ellipsoid | None = None, deg: bool = Tr
 
 
 # %% parametric
-def geodetic2parametric(geodetic_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def geodetic2parametric(geodetic_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from geodetic latitude to parametric latitude
 
@@ -623,7 +623,7 @@ def geodetic2parametric(geodetic_lat, ell: Ellipsoid | None = None, deg: bool =
     return degrees(parametric_lat) if deg else parametric_lat
 
 
-def parametric2geodetic(parametric_lat, ell: Ellipsoid | None = None, deg: bool = True):
+def parametric2geodetic(parametric_lat: FloatLike, ell: Ellipsoid | None = None, deg: bool = True):
     """
     converts from parametric latitude to geodetic latitude
 

src/pymap3d/tests/test_eci.py

@@ -13,22 +13,9 @@
 ECEF = [-5762640.0, -1682738.0, 3156028.0]
 UTC = datetime.datetime(2019, 1, 4, 12, tzinfo=datetime.timezone.utc)
 
-
-def test_eci2ecef():
-    pytest.importorskip("numpy")
-    # this example from Matlab eci2ecef docs
-    ecef = pm.eci2ecef(*ECI, UTC)
-
-    assert isinstance(ecef[0], float)
-    assert isinstance(ecef[1], float)
-    assert isinstance(ecef[2], float)
-
-
-def test_eci2ecef_numpy():
-    pytest.importorskip("numpy")
-
-    ecef = pm.eci2ecef(*ECI, UTC, force_non_astropy=True)
-
+@pytest.mark.parametrize("force_non_astropy", [True, False])
+def test_eci2ecef(force_non_astropy):
+    ecef = pm.eci2ecef(*ECI, UTC, force_non_astropy=force_non_astropy)
     rel = 0.025
 
     assert ecef == approx(ECEF, rel=rel)
@@ -52,20 +39,8 @@ def test_eci2ecef_astropy():
 
 @pytest.mark.parametrize("force_non_astropy", [True, False])
 def test_ecef2eci(force_non_astropy):
-    pytest.importorskip("numpy")
     # this example from Matlab ecef2eci docs
     eci = pm.ecef2eci(*ECEF, UTC, force_non_astropy=force_non_astropy)
-
-    assert isinstance(eci[0], float)
-    assert isinstance(eci[1], float)
-    assert isinstance(eci[2], float)
-
-
-def test_ecef2eci_numpy():
-    pytest.importorskip("numpy")
-
-    eci = pm.eci.ecef2eci_numpy(*ECEF, UTC)
-
     rel = 0.025
 
     assert eci == approx(ECI, rel=rel)
@@ -88,8 +63,6 @@ def test_ecef2eci_astropy():
 
 
 def test_eci2geodetic():
-    pytest.importorskip("numpy")
-
     lla = pm.eci2geodetic(*ECI, UTC)
 
     rel = 0.01 if astropy is None else 0.0001
@@ -98,7 +71,6 @@ def test_eci2geodetic():
 
 
 def test_geodetic2eci():
-    pytest.importorskip("numpy")
 
     lla = [27.880801, -163.722058, 408850.646]
 
@@ -111,7 +83,6 @@ def test_geodetic2eci():
 
 def test_eci_aer():
     # test coords from Matlab eci2aer
-    pytest.importorskip("numpy")
     t = datetime.datetime(2022, 1, 2, 3, 4, 5, tzinfo=datetime.timezone.utc)
 
     eci = [4500000, -45000000, 3000000]