correct Ellipsoid imports

Author: scivision

pymap3d/__init__.py

@@ -46,7 +46,8 @@
     from .azelradec import radec2azel, azel2radec  # noqa: F401
     from .eci import eci2ecef, ecef2eci  # noqa: F401
     from .sidereal import datetime2sidereal  # noqa: F401
-    from .ecef import geodetic2ecef, ecef2geodetic, eci2geodetic, Ellipsoid, ecef2enuv, enu2ecef, ecef2enu, enu2uvw, uvw2enu  # noqa: F401
+    from .ecef import geodetic2ecef, ecef2geodetic, eci2geodetic, ecef2enuv, enu2ecef, ecef2enu, enu2uvw, uvw2enu  # noqa: F401
+    from .ellipsoid import Ellipsoid  # noqa: F401
     from .ned import ned2ecef, ned2geodetic, geodetic2ned, ecef2nedv, ned2aer, aer2ned, ecef2ned  # noqa: F401
     from .enu import enu2geodetic, geodetic2enu, aer2enu, enu2aer  # noqa: F401
     from .aer import ecef2aer, aer2ecef, geodetic2aer, aer2geodetic, eci2aer, aer2eci  # noqa: F401

pymap3d/aer.py

@@ -1,9 +1,10 @@
 """ transforms involving AER: azimuth, elevation, slant range"""
 from typing import Tuple
 from datetime import datetime
-from .ecef import ecef2enu, geodetic2ecef, ecef2geodetic, enu2uvw, Ellipsoid
+from .ecef import ecef2enu, geodetic2ecef, ecef2geodetic, enu2uvw
 from .enu import geodetic2enu, aer2enu, enu2aer
 from .eci import eci2ecef, ecef2eci
+from .ellipsoid import Ellipsoid
 
 __all__ = ['aer2ecef', 'ecef2aer', 'geodetic2aer', 'aer2geodetic']
 

pymap3d/enu.py

@@ -7,7 +7,8 @@
 except ImportError:
     tau = 2 * np.pi
 
-from .ecef import geodetic2ecef, ecef2geodetic, enu2ecef, uvw2enu, Ellipsoid
+from .ecef import geodetic2ecef, ecef2geodetic, enu2ecef, uvw2enu
+from .ellipsoid import Ellipsoid
 
 
 __all__ = ['enu2aer', 'aer2enu', 'enu2geodetic', 'geodetic2enu']

pymap3d/los.py

@@ -3,7 +3,8 @@
 import numpy as np
 from math import pi
 from .aer import aer2enu
-from .ecef import enu2uvw, geodetic2ecef, Ellipsoid, ecef2geodetic
+from .ecef import enu2uvw, geodetic2ecef, ecef2geodetic
+from .ellipsoid import Ellipsoid
 
 __all__ = ['lookAtSpheroid']
 

pymap3d/lox.py

@@ -1,6 +1,6 @@
 """ isometric latitude, meridian distance """
 import numpy as np
-from .ecef import Ellipsoid
+from .ellipsoid import Ellipsoid
 
 
 def isometric(lat: float, ell: Ellipsoid = None, deg: bool = True):

pymap3d/ned.py

@@ -1,6 +1,7 @@
 """ Transforms involving NED North East Down """
 from .enu import geodetic2enu, aer2enu, enu2aer
-from .ecef import ecef2geodetic, ecef2enuv, ecef2enu, enu2ecef, Ellipsoid
+from .ecef import ecef2geodetic, ecef2enuv, ecef2enu, enu2ecef
+from .ellipsoid import Ellipsoid
 from typing import Tuple
 
 

pymap3d/vincenty.py

@@ -6,7 +6,7 @@
 import logging
 from numpy import arctan, sqrt, tan, sign, sin, cos, arctan2, arcsin, nan, pi
 import numpy as np
-from .ecef import Ellipsoid
+from .ellipsoid import Ellipsoid
 
 __all__ = ['vdist', 'vreckon', 'track2']