Skip to content

Commit 61a2736

Browse files
committed
no Numpy: better error msg on eci*ecef funcs
1 parent 39e262d commit 61a2736

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

src/pymap3d/aer.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@
1111
try:
1212
from .eci import ecef2eci, eci2ecef
1313
except ImportError:
14-
pass
14+
15+
def eci2ecef(x, y, z, time: datetime) -> tuple:
16+
raise ImportError("Numpy required for eci2ecef")
17+
18+
def ecef2eci(x, y, z, time: datetime) -> tuple:
19+
raise ImportError("Numpy required for ecef2eci")
20+
1521

1622
__all__ = ["aer2ecef", "ecef2aer", "geodetic2aer", "aer2geodetic", "eci2aer", "aer2eci"]
1723

@@ -62,6 +68,7 @@ def ecef2aer(
6268
srange : float
6369
slant range [meters]
6470
"""
71+
6572
xEast, yNorth, zUp = ecef2enu(x, y, z, lat0, lon0, h0, ell, deg=deg)
6673

6774
return enu2aer(xEast, yNorth, zUp, deg=deg)
@@ -255,10 +262,7 @@ def aer2eci(
255262

256263
x, y, z = aer2ecef(az, el, srange, lat0, lon0, h0, ell, deg=deg)
257264

258-
try:
259-
return ecef2eci(x, y, z, t)
260-
except NameError:
261-
raise ImportError("pip install numpy")
265+
return ecef2eci(x, y, z, t)
262266

263267

264268
def aer2ecef(

src/pymap3d/ecef.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99

1010
from .eci import ecef2eci, eci2ecef
1111
except ImportError:
12-
pass
12+
13+
def eci2ecef(x, y, z, time: datetime) -> tuple:
14+
raise ImportError("Numpy required for eci2ecef")
15+
16+
def ecef2eci(x, y, z, time: datetime) -> tuple:
17+
raise ImportError("Numpy required for ecef2eci")
18+
1319

1420
from datetime import datetime
1521
from math import pi
@@ -432,10 +438,7 @@ def eci2geodetic(x, y, z, t: datetime, ell: Ellipsoid = ELL, *, deg: bool = True
432438
eci2geodetic() a.k.a. eci2lla()
433439
"""
434440

435-
try:
436-
xecef, yecef, zecef = eci2ecef(x, y, z, t)
437-
except NameError:
438-
raise ImportError("pip install numpy")
441+
xecef, yecef, zecef = eci2ecef(x, y, z, t)
439442

440443
return ecef2geodetic(xecef, yecef, zecef, ell, deg)
441444

@@ -475,10 +478,7 @@ def geodetic2eci(lat, lon, alt, t: datetime, ell: Ellipsoid = ELL, *, deg: bool
475478

476479
x, y, z = geodetic2ecef(lat, lon, alt, ell, deg)
477480

478-
try:
479-
return ecef2eci(x, y, z, t)
480-
except NameError:
481-
raise ImportError("pip install numpy")
481+
return ecef2eci(x, y, z, t)
482482

483483

484484
def enu2ecef(

0 commit comments

Comments
 (0)