track2() coerce asarray required for clarity

Author: scivision

src/pymap3d/tests/test_vincenty.py

@@ -3,19 +3,23 @@
 import pytest
 from pytest import approx
 
+from math import radians
+
 
 @pytest.mark.parametrize("deg", [True, False])
 def test_track2_unit(deg):
     np = pytest.importorskip("numpy")
 
     lat1, lon1 = 0.0, 80.0
     lat2, lon2 = 0.0, 81.0
-    lat0 = np.array([0.0, 0.0, 0.0, 0.0])
-    lon0 = np.array([80.0, 80.33333, 80.66666, 81.0])
+    lat0 = [0.0, 0.0, 0.0, 0.0]
+    lon0 = [80.0, 80.33333, 80.66666, 81.0]
     if not deg:
-        lat1, lon1, lat2, lon2 = np.radians((lat1, lon1, lat2, lon2))
-        lat0 = np.radians(lat0)
-        lon0 = np.radians(lon0)
+        lat1 = radians(lat1)
+        lon1 = radians(lon1)
+        lat2 = radians(lat2)
+        lon2 = radians(lon2)
+        lon0 = list(map(radians, lon0))
 
     lats, lons = vincenty.track2(lat1, lon1, lat2, lon2, npts=4, deg=deg)
 

src/pymap3d/vincenty.py

@@ -6,14 +6,19 @@
 
 import warnings
 
-from ._typing import FloatArray, FloatLike
 import logging
 from copy import copy
 
 from .ellipsoid import Ellipsoid, resolve_ellipsoid
 from .mathfun import isnan, linspace, degrees, radians, sign, sqrt, atan2, cos, sin, tan, asin, atan
 from math import pi, tau, nan
 
+try:
+    from numpy import asarray
+except ImportError:
+    pass
+
+
 __all__ = ["vdist", "vreckon", "track2"]
 
 
@@ -447,7 +452,8 @@ def track2(
     deg: bool = True,
 ) -> tuple:
     """
-    computes great circle tracks starting at the point lat1, lon1 and ending at lat2, lon2
+    computes great circle tracks starting at the point lat1, lon1 and ending at lat2, lon2.
+    track2() REQUIRES NumPy.
 
     Parameters
     ----------
@@ -501,7 +507,7 @@ def track2(
     distance, azimuth = vdist(lat1, lon1, lat2, lon2, ell, deg=False)
     dists = linspace(0, distance, npts)
 
-    lats, lons = vreckon(lat1, lon1, dists, azimuth, ell, deg=False)
+    lats, lons = vreckon(lat1, lon1, asarray(dists), azimuth, ell, deg=False)
 
     if deg:
         lats = degrees(lats)