correct Ellipsoid imports

scivision · scivision · commit a931739d4789 · 2019-06-29T22:54:07.000-04:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -14,7 +14,8 @@ build: off
 init:
 - cmd: set PATH=%PY_DIR%;%PY_DIR%\Scripts;%PATH%
 
-install: pip install -e .[tests,full]
+install:
+- pip install -e .[tests,full]
 
 test_script: pytest -rsv
 
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+ko_fi: scivision
diff --git a/GenTest.py b/GenTest.py
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -8,6 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![image](https://zenodo.org/badge/DOI/10.5281/zenodo.213676.svg)](https://doi.org/10.5281/zenodo.213676)
+
 [![image](http://joss.theoj.org/papers/10.21105/joss.00580/status.svg)](https://doi.org/10.21105/joss.00580)
 [![image](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)](http://www.astropy.org/)
 [![image](https://travis-ci.org/scivision/pymap3d.svg?branch=master)](https://travis-ci.org/scivision/pymap3d)
@@ -84,6 +85,8 @@ lla = pm.aer2geodetic(*aer,*obslla)
 where tuple `lla` is comprised of scalar or N-D arrays `(lat,lon,alt)`.
 
 
+Example scripts are in the [examples](./examples) directory.
+
 ### Functions
 
 Popular mapping toolbox functions ported to Python include the
@@ -109,12 +112,12 @@ Additional functions:
 
 Abbreviations:
 
--   [AER: Azimuth, Elevation, Range](https://en.wikipedia.org/wiki/Spherical_coordinate_system)
--   [ECEF: Earth-centered, Earth-fixed](https://en.wikipedia.org/wiki/ECEF)
--   [ECI: Earth-centered Inertial](https://en.wikipedia.org/wiki/Earth-centered_inertial)
--   [ENU: East North Up](https://en.wikipedia.org/wiki/Axes_conventions#Ground_reference_frames:_ENU_and_NED)
--   [NED: North East Down](https://en.wikipedia.org/wiki/North_east_down)
--   [radec: right ascension, declination](https://en.wikipedia.org/wiki/Right_ascension)
+* [AER: Azimuth, Elevation, Range](https://en.wikipedia.org/wiki/Spherical_coordinate_system)
+* [ECEF: Earth-centered, Earth-fixed](https://en.wikipedia.org/wiki/ECEF)
+* [ECI: Earth-centered Inertial](https://en.wikipedia.org/wiki/Earth-centered_inertial)
+* [ENU: East North Up](https://en.wikipedia.org/wiki/Axes_conventions#Ground_reference_frames:_ENU_and_NED)
+* [NED: North East Down](https://en.wikipedia.org/wiki/North_east_down)
+* [radec: right ascension, declination](https://en.wikipedia.org/wiki/Right_ascension)
 
 ### Caveats
 
@@ -126,14 +129,11 @@ Abbreviations:
 
 As compared to [PyProj](https://github.com/jswhit/pyproj):
 
--   PyMap3D does not require anything beyond pure Python + Numpy.
--   PyMap3D API is similar to Matlab Mapping Toolbox, while PyProj's interface is quite distinct
--   PyMap3D intrinsically handles local coordinate systems such as ENU,
-    while for PyProj ENU requires some [additional
-    effort](https://github.com/jswhit/pyproj/issues/105).
--   PyProj is oriented towards points on the planet surface, while
-    PyMap3D handles points on or above the planet surface equally well,
-    particularly important for airborne vehicles and remote sensing.
+* PyMap3D does not require anything beyond pure Python -- not even Numpy is required for basic functions.
+* PyMap3D API is similar to Matlab Mapping Toolbox, while PyProj's interface is quite distinct
+* PyMap3D intrinsically handles local coordinate systems such as ENU,
+  while PyProj ENU requires some [additional effort](https://github.com/jswhit/pyproj/issues/105).
+* PyProj is oriented towards points on the planet surface, while PyMap3D handles points on or above the planet surface equally well, particularly important for airborne vehicles and remote sensing.
 
 ### AstroPy.Units.Quantity
 
diff --git a/examples/angle_distance.py b/examples/angle_distance.py
diff --git a/examples/azel2radec.py b/examples/azel2radec.py
diff --git a/examples/radec2azel.py b/examples/radec2azel.py
diff --git a/examples/vdist.py b/examples/vdist.py
@@ -12,7 +12,8 @@ def main():
     P = p.parse_args()
 
     dist_m = vdist(P.lat1, P.lon1, P.lat2, P.lon2)
-    print('distance between WGS-84 points: {} m'.format(dist_m))
+
+    print('{:.3f} {:.3f} {:.3f}'.format(*dist_m))
 
 
 if __name__ == '__main__':  # pragma: no cover
diff --git a/examples/vdist_poi.py b/examples/vdist_poi.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+"""
+Example of using Google Maps queries and PyMap3D
+
+https://developers.google.com/places/web-service/search
+
+This requires a Google Cloud key, and costs a couple US cents per query.
+
+TODO: Would like to instead query a larger region, would OSM be an option?
+"""
+from pathlib import Path
+from argparse import ArgumentParser
+import requests
+import functools
+import pandas
+
+from pymap3d.vincenty import vdist
+
+
+URL = 'https://maps.googleapis.com/maps/api/place/nearbysearch/json?'
+
+
+@functools.lru_cache()
+def get_place_coords(place_type: str,
+                     latitude: float, longitude: float,
+                     search_radius_km: int,
+                     keyfn: Path) -> pandas.DataFrame:
+    """
+    Get places using Google Maps Places API
+    Requires you to have a Google Cloud account with API key.
+    """
+
+    keyfn = Path(keyfn).expanduser()
+    key = keyfn.read_text()
+
+    stub = URL + 'location={},{}'.format(latitude, longitude)
+
+    stub += '&radius={}'.format(search_radius_km * 1000)
+
+    stub += '&types={}'.format(place_type)
+
+    stub += '&key={}'.format(key)
+
+    r = requests.get(stub)
+    r.raise_for_status()
+
+    place_json = r.json()['results']
+
+    places = pandas.DataFrame(index=[p['name'] for p in place_json],
+                              columns=['latitude', 'longitude', 'distance_km', 'vicinity'])
+    places['latitude'] = [p['geometry']['location']['lat'] for p in place_json]
+    places['longitude'] = [p['geometry']['location']['lng'] for p in place_json]
+    places['vicinity'] = [p['vicinity'] for p in place_json]
+
+    return places
+
+
+if __name__ == '__main__':
+    p = ArgumentParser()
+    p.add_argument('place_type', help='Place type to search: https://developers.google.com/places/supported_types')
+    p.add_argument('searchloc', help='initial latituude, longitude to search from', nargs=2, type=float)
+    p.add_argument('radius', help='search radius (kilometers)', type=int)
+    p.add_argument('refloc', help='reference location (lat, lon)', nargs=2, type=float)
+    p.add_argument('-k', '--keyfn', help='Google Places API key file', default='~/googlemaps.key')
+    a = p.parse_args()
+
+    place_coords = get_place_coords(a.place_type, *a.searchloc, a.radius, a.keyfn)
+
+    place_coords['distance_km'] = vdist(place_coords['latitude'], place_coords['longitude'], *a.refloc)[0] / 1e3
diff --git a/examples/vreckon.py b/examples/vreckon.py
@@ -4,16 +4,17 @@
 
 
 def main():
-    p = ArgumentParser(description='Python port of vreckon.m')
+    p = ArgumentParser(description='Given starting latitude, longitude: find final lat,lon for distance and azimuth')
     p.add_argument('lat', help='latitude WGS-84 [degrees]', type=float)
     p.add_argument('lon', help='longitude WGS-84 [degrees]', type=float)
     p.add_argument('range', help='range from start point [meters]', type=float)
-    p.add_argument('azimuth', help='azimuth to start [deg.]', type=float)
+    p.add_argument('azimuth', help='clockwise from north: azimuth to start [degrees]', type=float)
     P = p.parse_args()
 
     lat2, lon2, a21 = vreckon(P.lat, P.lon, P.range, P.azimuth)
-    print('new (lat, lon)  ({}, {}) '.format(lat2, lon2))
-    print('az back to start:', a21)
+
+    print('{:.4f} {:.4f}'.format(lat2, lon2))
+    print('{:.1f}'.format(a21))
 
 
 if __name__ == '__main__':  # pragma: no cover
diff --git a/mypy.ini b/mypy.ini
@@ -1,4 +1,6 @@
 [mypy]
 ignore_missing_imports = True
 strict_optional = False
-allow_redefinition = True
+allow_redefinition = True
+show_error_context = False
+show_column_numbers = True
diff --git a/pymap3d/__init__.py b/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
diff --git a/pymap3d/aer.py b/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']
 
diff --git a/pymap3d/enu.py b/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']
diff --git a/pymap3d/los.py b/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']
 
diff --git a/pymap3d/lox.py b/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):
diff --git a/pymap3d/ned.py b/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
 
 
diff --git a/pymap3d/vincenty.py b/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']
 
diff --git a/setup.cfg b/setup.cfg
@@ -24,7 +24,8 @@ classifiers =
   Programming Language :: Python :: Implementation :: CPython
   Programming Language :: Python :: Implementation :: PyPy
   Topic :: Scientific/Engineering :: GIS
-license_file = LICENSE
+license_files =
+  LICENSE.txt
 long_description = file: README.md
 long_description_content_type = text/markdown
 
@@ -33,10 +34,14 @@ python_requires = >= 2.6
 setup_requires =
   pip >= 10
   setuptools >= 38.6.0
-  twine >= 1.11.0
-  wheel >= 0.31.0
-include_package_data = True
 packages = find:
+scripts =
+  examples/angle_distance.py
+  examples/radec2azel.py
+  examples/vdist_poi.py
+  examples/azel2radec.py
+  examples/vdist.py
+  examples/vreckon.py
 install_requires =
 
 [options.extras_require]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# These are supported funding model platforms`
	`2`	`+`
	`3`	`+ko_fi: scivision`