Skip to content

greate_circle_distance: fix lat-lon #36

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

Merged
merged 1 commit into from
May 15, 2020
Merged

greate_circle_distance: fix lat-lon #36

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
9 changes: 5 additions & 4 deletions xrspatial/proximity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def manhattan_distance(x1, x2, y1, y2):

@njit(nogil=True)
def great_circle_distance(x1, x2, y1, y2, radius=6378137):
"""Calculate great-circle distance between (x1, y1) and (x2, y2), assuming each point is a longitude, latitude pair.
"""Calculate great-circle distance between (x1, y1) and (x2, y2),
assuming each point is a longitude, latitude pair.

Parameters
----------
Expand Down Expand Up @@ -109,7 +110,7 @@ def great_circle_distance(x1, x2, y1, y2, radius=6378137):
raise ValueError('Invalid y-coordinate of the second point.'
'Must be in the range [-90, 90]')

lon1, lat1, lon2, lat2 = (np.radians(y1), np.radians(x1),
lat1, lon1, lat2, lon2 = (np.radians(y1), np.radians(x1),
np.radians(y2), np.radians(x2))
dlon = lon2 - lon1
dlat = lat2 - lat1
Expand Down Expand Up @@ -364,8 +365,8 @@ def proximity(raster, target_values=[], distance_metric='EUCLIDEAN'):
y_coords = raster.coords['y'].values
x_coords = raster.coords['x'].values

proximity_img = _proximity(img, x_coords, y_coords, target_values,
distance_metric)
proximity_img = _proximity(img, x_coords, y_coords, target_values,
distance_metric)

result = xarray.DataArray(proximity_img,
coords=raster.coords,
Expand Down