Merge branch 'dschurman-dschurman/fix/ecef-alt-valueerror'

Author: scivision

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymap3d"
-version = "2.5.1"
+version = "2.6.1"
 description = "pure Python (no prereqs) coordinate conversions, following convention of several popular Matlab routines."
 readme = "README.md"
 requires-python = ">=3.7"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pymap3d
-version = 2.6.0
+version = 2.6.1
 author = Michael Hirsch, Ph.D.
 author_email = [email protected]
 description = pure Python (no prereqs) coordinate conversions, following convention of several popular Matlab routines.

src/pymap3d/ecef.py

@@ -187,7 +187,7 @@ def ecef2geodetic(
     try:
         if inside.any():  # type: ignore
             # avoid all false assignment bug
-            alt[inside] = -alt
+            alt[inside] = -alt[inside]
     except (TypeError, AttributeError):
         if inside:
             alt = -alt

src/pymap3d/tests/test_geodetic.py

@@ -55,6 +55,38 @@ def test_3d_ecef2geodetic():
     assert [lat, lon, alt] == approx(lla0, rel=1e-4)
 
 
+def test_array_ecef2geodetic():
+    """
+    tests ecef2geodetic can handle numpy array data in addition to singular floats
+    """
+    np = pytest.importorskip("numpy")
+    # test values with no points inside ellipsoid
+    lla0_array = (
+        np.array([lla0[0], lla0[0]]),
+        np.array([lla0[1], lla0[1]]),
+        np.array([lla0[2], lla0[2]]),
+    )
+    xyz = pm.geodetic2ecef(*lla0_array)
+    lats, lons, alts = pm.ecef2geodetic(*xyz)
+
+    assert lats == approx(lla0_array[0])
+    assert lons == approx(lla0_array[1])
+    assert alts == approx(lla0_array[2])
+
+    # test values with some (but not all) points inside ellipsoid
+    lla0_array_inside = (
+        np.array([lla0[0], lla0[0]]),
+        np.array([lla0[1], lla0[1]]),
+        np.array([lla0[2], -lla0[2]]),
+    )
+    xyz = pm.geodetic2ecef(*lla0_array_inside)
+    lats, lons, alts = pm.ecef2geodetic(*xyz)
+
+    assert lats == approx(lla0_array_inside[0])
+    assert lons == approx(lla0_array_inside[1])
+    assert alts == approx(lla0_array_inside[2])
+
+
 def test_xarray():
     xarray = pytest.importorskip("xarray")
     xr_lla = xarray.DataArray(list(lla0))