Skip to content

Consistency in lon/lat return order #2238

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
pelson merged 2 commits into from
Nov 3, 2017
Merged

Consistency in lon/lat return order #2238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd35d7f
Consistency in lon/lat return order
DPeterK Nov 9, 2016
c3cb21e
Update usages
DPeterK Nov 3, 2017
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
10 changes: 5 additions & 5 deletions lib/iris/analysis/cartography.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ def rotate_pole(lons, lats, pole_lon, pole_lat):
return rotated_lon, rotated_lat


def _get_lat_lon_coords(cube):
def _get_lon_lat_coords(cube):
lat_coords = [coord for coord in cube.coords()
if "latitude" in coord.name()]
lon_coords = [coord for coord in cube.coords()
if "longitude" in coord.name()]
if len(lat_coords) > 1 or len(lon_coords) > 1:
raise ValueError(
"Calling _get_lat_lon_coords() with multiple lat or lon coords"
"Calling `_get_lon_lat_coords` with multiple lat or lon coords"
" is currently disallowed")
lat_coord = lat_coords[0]
lon_coord = lon_coords[0]
return (lat_coord, lon_coord)
return (lon_coord, lat_coord)


def _xy_range(cube, mode=None):
Expand Down Expand Up @@ -379,7 +379,7 @@ def area_weights(cube, normalize=False):

# Get the lon and lat coords and axes
try:
lat, lon = _get_lat_lon_coords(cube)
lon, lat = _get_lon_lat_coords(cube)
except IndexError:
raise ValueError('Cannot get latitude/longitude '
'coordinates from cube {!r}.'.format(cube.name()))
Expand Down Expand Up @@ -575,7 +575,7 @@ def project(cube, target_proj, nx=None, ny=None):

"""
try:
lat_coord, lon_coord = _get_lat_lon_coords(cube)
lon_coord, lat_coord = _get_lon_lat_coords(cube)
except IndexError:
raise ValueError('Cannot get latitude/longitude '
'coordinates from cube {!r}.'.format(cube.name()))
Expand Down