azel radec numpy/ no numpy

Author: scivision

pymap3d/los.py

@@ -1,9 +1,11 @@
 """ Line of sight intersection of space observer to ellipsoid """
 from typing import Tuple
+
 try:
     from numpy import pi, nan, sqrt, vectorize
 except ImportError:
     from math import pi, nan, sqrt
+
     vectorize = None
 
 from .aer import aer2enu

pymap3d/lox.py

@@ -3,6 +3,7 @@
     from numpy import radians, degrees, cos, arctan2 as atan2, tan, pi, ndarray, vectorize
 except ImportError:
     from math import radians, degrees, cos, atan2, tan, pi
+
     vectorize = None
 import typing
 from .ellipsoid import Ellipsoid
@@ -46,7 +47,9 @@ def meridian_arc(lat1: float, lat2: float, ell: Ellipsoid = None, deg: bool = Tr
     return rsphere_rectifying(ell) * abs(rlat2 - rlat1)
 
 
-def loxodrome_inverse(lat1: float, lon1: float, lat2: float, lon2: float, ell: Ellipsoid = None, deg: bool = True) -> typing.Tuple[float, float]:
+def loxodrome_inverse(
+    lat1: float, lon1: float, lat2: float, lon2: float, ell: Ellipsoid = None, deg: bool = True
+) -> typing.Tuple[float, float]:
     """
     computes the arc length and azimuth of the loxodrome
     between two points on the surface of the reference ellipsoid
@@ -98,7 +101,9 @@ def loxodrome_inverse(lat1: float, lon1: float, lat2: float, lon2: float, ell: E
         return loxodrome_inverse_point(lat1, lon1, lat2, lon2, ell, deg)
 
 
-def loxodrome_inverse_point(lat1: float, lon1: float, lat2: float, lon2: float, ell: Ellipsoid = None, deg: bool = True) -> typing.Tuple[float, float]:
+def loxodrome_inverse_point(
+    lat1: float, lon1: float, lat2: float, lon2: float, ell: Ellipsoid = None, deg: bool = True
+) -> typing.Tuple[float, float]:
     if deg:
         lat1, lon1, lat2, lon2 = radians(lat1), radians(lon1), radians(lat2), radians(lon2)
 

pymap3d/vallado.py

@@ -9,7 +9,11 @@
 Michael Hirsch implementation of algorithms from D. Vallado
 """
 from datetime import datetime
-from math import sin, cos, degrees, radians, asin, atan2
+
+try:
+    from numpy import sin, cos, degrees, radians, arcsin as asin, arctan2 as atan2
+except ImportError:
+    from math import sin, cos, degrees, radians, asin, atan2
 from typing import Tuple
 from .sidereal import datetime2sidereal
 

tests/test_pyproj.py

@@ -33,4 +33,4 @@ def test_compare_geodetic():
 
 
 if __name__ == "__main__":
-    pytest.main(["-xrsv", __file__])
+    pytest.main(["-v", __file__])

tests/test_sky.py

@@ -16,11 +16,25 @@ def test_azel2radec(usevallado):
     assert radec1 == approx(radec, rel=0.01)
 
 
+@pytest.mark.parametrize("usevallado", [True, False])
+def test_numpy_azel2radec(usevallado):
+    pytest.importorskip("numpy")
+    radec1 = pm.azel2radec([180.1, 180.1], [80, 80], lat, lon, t0, usevallado=usevallado)
+    assert radec1 == approx(radec, rel=0.01)
+
+
 @pytest.mark.parametrize("usevallado", [True, False])
 def test_radec2azel(usevallado):
     azel1 = pm.radec2azel(*radec, lat, lon, t0, usevallado=usevallado)
     assert azel1 == approx(azel, rel=0.01)
 
 
+@pytest.mark.parametrize("usevallado", [True, False])
+def test_numpy_radec2azel(usevallado):
+    pytest.importorskip("numpy")
+    azel1 = pm.radec2azel([166.503208, 166.503208], [55, 55], lat, lon, t0, usevallado=usevallado)
+    assert azel1 == approx(azel, rel=0.01)
+
+
 if __name__ == "__main__":
-    pytest.main(["-xrsv", __file__])
+    pytest.main(["-v", __file__])