Skip to content

Use correct ECEF coordinates #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhodes73 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use correct ECEF coordinates #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions reverse_geocoder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,23 @@ def __init__(self, mode=2, verbose=True, stream=None):
else:
coordinates, self.locations = self.extract(rel_path(RG_FILE))

ecef_coordinates = geodetic_in_ecef(coordinates)
if mode == 1: # Single-process
self.tree = KDTree(coordinates)
self.tree = KDTree(ecef_coordinates)
else: # Multi-process
self.tree = KDTree_MP.cKDTree_MP(coordinates)
self.tree = KDTree_MP.cKDTree_MP(ecef_coordinates)

def query(self, coordinates):
"""
Function to query the K-D tree to find the nearest city
Args:
coordinates (list): List of tuple coordinates, i.e. [(latitude, longitude)]
"""
ecef_coordinates = geodetic_in_ecef(coordinates)
if self.mode == 1:
_, indices = self.tree.query(coordinates, k=1)
_, indices = self.tree.query(ecef_coordinates, k=1)
else:
_, indices = self.tree.pquery(coordinates, k=1)
_, indices = self.tree.pquery(ecef_coordinates, k=1)
return [self.locations[index] for index in indices]

def load(self, stream):
Expand Down Expand Up @@ -260,7 +262,7 @@ def geodetic_in_ecef(geo_coords):

x = normal * np.cos(lat_r) * np.cos(lon_r)
y = normal * np.cos(lat_r) * np.sin(lon_r)
z = normal * (1 - E2) * np.sin(lat)
z = normal * (1 - E2) * np.sin(lat_r)

return np.column_stack([x, y, z])

Expand Down