CI template

typo

test geodetic <> ecef

correct singularity

vers

Author: scivision

.appveyor.yml

@@ -1,6 +1,6 @@
 image:
 - Visual Studio 2017
-- ubuntu1804
+- Ubuntu1804
 
 stack: python 3
 

.coveragerc

@@ -0,0 +1,20 @@
+[run]
+cover_pylib = false
+omit =
+  /home/travis/virtualenv/*
+  */site-packages/*
+  */bin/*
+
+[report]
+exclude_lines =
+  pragma: no cover
+  def __repr__
+  except RuntimeError
+  except NotImplementedError
+  except ImportError
+  except FileNotFoundError
+  except CalledProcessError
+  logging.warning
+  logging.error
+  logging.critical
+  if __name__ == .__main__.:

.travis.yml

@@ -20,7 +20,7 @@ matrix:
     - flake8
     - mypy . --ignore-missing-imports
     after_success:
-    - pytest --cov --cov-config=setup.cfg
+    - pytest --cov
     - coveralls
   - os: osx
     language: sh

pymap3d/ecef.py

@@ -141,7 +141,8 @@ def ecef2geodetic(x: float, y: float, z: float,
     huE = hypot(u, E)
 
     # eqn. 4b
-    Beta = arctan(huE / u * z / hypot(x, y))
+    with np.errstate(divide='ignore'):
+        Beta = arctan(huE / u * z / hypot(x, y))
 
     # eqn. 13
     eps = ((ell.b * u - ell.a * huE + E**2) * sin(Beta)) / (ell.a * huE * 1 / cos(Beta) - E**2 * cos(Beta))

pymap3d/enu.py

@@ -13,7 +13,7 @@
 __all__ = ['enu2aer', 'aer2enu', 'enu2geodetic', 'geodetic2enu']
 
 
-def enu2aer(e: float, n: float, u: float, deg: bool = True) -> Tuple[float, float, float]:
+def enu2aer(e: np.ndarray, n: np.ndarray, u: np.ndarray, deg: bool = True) -> Tuple[float, float, float]:
     """
     ENU to Azimuth, Elevation, Range
 
@@ -27,6 +27,17 @@ def enu2aer(e: float, n: float, u: float, deg: bool = True) -> Tuple[float, floa
     * azimuth, elevation (degrees/radians)                             [0,360),[0,90]
     * slant range [meters]                                             [0,Infinity)
     """
+    # 1 millimeter precision for singularity
+
+    e = np.atleast_1d(e)
+    n = np.atleast_1d(n)
+    u = np.atleast_1d(u)
+
+    with np.errstate(invalid='ignore'):
+        e[abs(e) < 1e-3] = 0.
+        n[abs(n) < 1e-3] = 0.
+        u[abs(u) < 1e-3] = 0.
+
     r = hypot(e, n)
     slantRange = hypot(r, u)
     elev = arctan2(u, r)
@@ -36,7 +47,7 @@ def enu2aer(e: float, n: float, u: float, deg: bool = True) -> Tuple[float, floa
         az = degrees(az)
         elev = degrees(elev)
 
-    return az, elev, slantRange
+    return az[()].squeeze(), elev[()].squeeze(), slantRange[()].squeeze()
 
 
 def aer2enu(az: float, el: float, srange: float, deg: bool = True) -> Tuple[float, float, float]:

pytest.ini

@@ -0,0 +1,7 @@
+[pytest]
+minversion = 3.5
+
+filterwarnings =
+  ignore::DeprecationWarning
+
+

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pymap3d
-version = 1.7.12
+version = 1.7.13
 author = Michael Hirsch, Ph.D.
 author_email = [email protected]
 description = pure Python coordinate conversions, following convention of several popular Matlab routines.
@@ -56,34 +56,8 @@ console_scripts =
   vdist = vdist:main
   vreckon = vreckon:main
 
-
-
-[tool:pytest]
-filterwarnings =
-  ignore::DeprecationWarning
-
 [flake8]
 max-line-length = 132
 ignore = E501, W504
 exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/
 
-[coverage:run]
-cover_pylib = false
-omit =
-  /home/travis/virtualenv/*
-  */site-packages/*
-  */bin/*
-
-[coverage:report]
-exclude_lines =
-  pragma: no cover
-  def __repr__
-  except RuntimeError
-  except NotImplementedError
-  except ImportError
-  except FileNotFoundError
-  except CalledProcessError
-  logging.warning
-  logging.error
-  logging.critical
-  if __name__ == .__main__.:

tests/test_geodetic.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 import pytest
 from pytest import approx
-import pymap3d as pm
 from math import radians, nan
 import numpy as np
 
+import pymap3d as pm
+
 lla0 = (42, -82, 200)
 rlla0 = (radians(lla0[0]), radians(lla0[1]), lla0[2])
 lla1 = (42.002582, -81.997752, 1.1397018e3)
@@ -19,6 +20,8 @@
 
 E = pm.Ellipsoid()
 
+atol_dist = 1e-6  # 1 micrometer
+
 
 def test_ecef():
     xyz = pm.geodetic2ecef(*lla0)
@@ -36,7 +39,28 @@ def test_ecef():
     assert pm.ecef2geodetic(*xyz, deg=False) == approx(rlla0)
 
     assert pm.ecef2geodetic((E.a - 1) / np.sqrt(2),
-                            (E.a - 1) / np.sqrt(2), 0)
+                            (E.a - 1) / np.sqrt(2), 0) == approx([0, 45, -1])
+
+
+@pytest.mark.parametrize('lla, xyz', [((0, 0, -1), (E.a - 1, 0, 0)),
+                                      ((0, 90, -1), (0, E.a - 1, 0)),
+                                      ((0, -90, -1), (0, -E.a + 1, 0)),
+                                      ((90, 0, -1), (0, 0, E.b - 1)),
+                                      ((90, 15, -1), (0, 0, E.b - 1)),
+                                      ((-90, 0, -1), (0, 0, -E.b + 1))
+                                      ])
+def test_geodetic2ecef(lla, xyz):
+    assert pm.geodetic2ecef(*lla) == approx(xyz, abs=atol_dist)
+
+
+@pytest.mark.parametrize('xyz, lla', [((E.a - 1, 0, 0), (0, 0, -1)),
+                                      ((0, E.a - 1, 0), (0, 90, -1)),
+                                      ((0, 0, E.b - 1), (90, 0, -1)),
+                                      ((0, 0, -E.b + 1), (-90, 0, -1)),
+                                      ((-E.a + 1, 0, 0), (0, 180, -1)),
+                                      ])
+def test_ecef2geodetic(xyz, lla):
+    assert pm.ecef2geodetic(*xyz) == approx(lla)
 
 
 def test_aer():

tests/test_main.py

@@ -33,6 +33,8 @@
 vx, vy, vz = (5, 3, 2)
 ve, vn, vu = (5.368859646588048, 3.008520763668120, -0.352347711524077)
 
+E = pm.Ellipsoid()
+
 
 def test_losint():
     az = [0., 10., 125.]
@@ -69,6 +71,16 @@ def test_aer_ecef():
     assert pm.ecef2aer(*xyz, *rlla0, deg=False) == approx(raer0)
 
 
+@pytest.mark.parametrize('xyz, lla, aer', [((E.a - 1, 0, 0), (0, 0, 0), (0, -90, 1)),
+                                           ((-E.a + 1, 0, 0), (0, 180, 0), (0, -90, 1)),
+                                           ((0, E.a - 1, 0), (0, 90, 0), (0, -90, 1)),
+                                           ((0, -E.a + 1, 0), (0, -90, 0), (0, -90, 1)),
+                                           ((0, 0, E.b - 1), (90, 0, 0), (0, -90, 1)),
+                                           ((0, 0, -E.b + 1), (-90, 0, 0), (0, -90, 1)), ])
+def test_ecef2aer(xyz, lla, aer):
+    assert pm.ecef2aer(*xyz, *lla) == approx(aer)
+
+
 def test_aer_enu():
     xyz = pm.aer2ecef(*aer0, *lla0)