better importing

Author: scivision

Examples/astropy_geodetic2ecef.py

@@ -16,7 +16,7 @@
 try:
     from pymap3d.tests.matlab_engine import matlab_ecef2eci, matlab_engine, has_matmap3d
 except ImportError:
-    matlab_engine = None
+    pass
 
 print("Python version:", sys.version)
 print("AstroPy version:", astropy.__version__)
@@ -43,20 +43,18 @@
 print(np.array(ecef))
 
 # %% AstroPy ECEF to ECI (J2000)
-astropy_eci = pm.ecef2eci(ecef[0], ecef[1], ecef[2], dt)
-astropy_eci = np.array(astropy_eci)
+astropy_eci = np.array(pm.ecef2eci(ecef[0], ecef[1], ecef[2], dt))
 print("\nAstroPy: ECI Coordinates (meters):")
 print(astropy_eci)
 
-numpy_eci = pm.ecef2eci(ecef[0], ecef[1], ecef[2], dt, force_non_astropy=True)
-numpy_eci = np.array(numpy_eci)
+numpy_eci = np.array(pm.ecef2eci(ecef[0], ecef[1], ecef[2], dt, force_non_astropy=True))
 print("\nNumpy: ECI Coordinates (meters):")
 print(numpy_eci)
 
 print("\nAstroPy - Numpy Difference (ECI meters):", astropy_eci - numpy_eci)
 
 # %% Matlab comparison
-if matlab_engine is not None:
+if matlab_engine in sys.modules:
     eng = matlab_engine()
     eci_matlab_aerospace = matlab_ecef2eci(eng, False, dt, ecef)
     print("\nMatlab Aerospace Toolbox: ECI Coordinates (meters):")

src/pymap3d/__init__.py

@@ -29,7 +29,7 @@
 * Fortran: [Maptran3D](https://github.com/geospace-code/maptran3d)
 """
 
-__version__ = "3.1.1"
+__version__ = "3.1.2"
 
 from .aer import aer2ecef, aer2geodetic, ecef2aer, geodetic2aer
 from .ecef import (

src/pymap3d/ecef.py

@@ -6,20 +6,13 @@
 
 try:
     from numpy import asarray, empty_like, finfo, where
-
-    from .eci import ecef2eci, eci2ecef
 except ImportError:
-
-    def eci2ecef(x, y, z, time: datetime, force_non_astropy: bool = False) -> tuple:
-        raise ImportError("Numpy required for eci2ecef")
-
-    def ecef2eci(x, y, z, time: datetime, force_non_astropy: bool = False) -> tuple:
-        raise ImportError("Numpy required for ecef2eci")
-
+    pass
 
 from datetime import datetime
 from math import pi
 
+from .eci import ecef2eci, eci2ecef
 from .ellipsoid import Ellipsoid
 from .mathfun import atan, atan2, cos, degrees, hypot, isclose, radians, sin, sqrt, tan
 

src/pymap3d/eci.py

@@ -6,14 +6,14 @@
 import sys
 import logging
 
-import numpy
-
 try:
+    import numpy
     import astropy.units as u
     from astropy.coordinates import GCRS, ITRS, CartesianRepresentation, EarthLocation
 except ImportError:
     pass
 
+
 from .sidereal import greenwichsrt, juliandate
 
 __all__ = ["eci2ecef", "ecef2eci"]
@@ -48,11 +48,13 @@ def eci2ecef(x, y, z, time: datetime, force_non_astropy: bool = False) -> tuple:
         z ECEF coordinate
     """
 
-    if force_non_astropy or "astropy" not in sys.modules:
-        logging.warning(f"{__name__}: Numpy implementation has considerably less accuracy than Astropy")
+    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:
-        xe, ye, ze = eci2ecef_astropy(x, y, z, time)
+        raise ImportError("eci2ecef requires either Numpy or Astropy")
 
     return xe.squeeze()[()], ye.squeeze()[()], ze.squeeze()[()]
 
@@ -135,12 +137,13 @@ def ecef2eci(x, y, z, time: datetime, force_non_astropy: bool = False) -> tuple:
         z ECI coordinate
     """
 
-    # if astropy is imported
-    if force_non_astropy or "astropy" not in sys.modules:
-        logging.warning(f"{__name__}: Numpy implementation has considerably less accuracy than Astropy")
+    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:
-        xe, ye, ze = ecef2eci_astropy(x, y, z, time)
+        raise ImportError("ecef2eci requires either Numpy or Astropy")
 
     return xe, ye, ze
 

src/pymap3d/haversine.py

@@ -10,7 +10,6 @@
 """
 
 import sys
-import logging
 
 try:
     from astropy.coordinates import angular_separation
@@ -110,11 +109,10 @@ def anglesep(
         lon1 = radians(lon1)
         lat1 = radians(lat1)
 
-    if force_non_astropy or "astropy" not in sys.modules:
-        logging.warning(f"{__name__}: Numpy implementation has considerably less accuracy than Astropy")
-        sep_rad = anglesep_meeus(lon0, lat0, lon1, lat1, deg=False)
-    else:
+    if "astropy" in sys.modules and not force_non_astropy:
         sep_rad = angular_separation(lon0, lat0, lon1, lat1)
+    else:
+        sep_rad = anglesep_meeus(lon0, lat0, lon1, lat1, deg=False)
 
     return degrees(sep_rad) if deg else sep_rad
 

src/pymap3d/sidereal.py

@@ -42,12 +42,11 @@ def datetime2sidereal(time: datetime, lon_radians: float, force_non_astropy: boo
     if isinstance(time, (tuple, list)):
         return [datetime2sidereal(t, lon_radians) for t in time]
 
-    if force_non_astropy or "astropy" not in sys.modules:
+    if "astropy" in sys.modules and not force_non_astropy:
+        return datetime2sidereal_astropy(time, lon_radians)
+    else:
         logging.debug(f"{__name__}: Vallado implementation")
         return datetime2sidereal_vallado(time, lon_radians)
-    else:
-        logging.debug(f"{__name__}: Astropy implementation")
-        return datetime2sidereal_astropy(time, lon_radians)
 
 
 def datetime2sidereal_astropy(t: datetime, lon_radians: float):

src/pymap3d/tests/test_eci.py

@@ -50,10 +50,11 @@ def test_eci2ecef_astropy():
     assert isinstance(ecef[2], float)
 
 
-def test_ecef2eci():
+@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=True)
+    eci = pm.ecef2eci(*ECEF, UTC, force_non_astropy=force_non_astropy)
 
     assert isinstance(eci[0], float)
     assert isinstance(eci[1], float)