Skip to content

decode the grid_mapping attribute #17

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
Chilipp merged 4 commits into from
Apr 7, 2020
Merged

decode the grid_mapping attribute #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
903192a
decode the grid_mapping attribute
Chilipp Apr 7, 2020
5c8549d
add test for decoded grid_mappings
Chilipp Apr 7, 2020
93a6bc9
warn when dimension list matches multiples
Chilipp Apr 7, 2020
f72c3b8
update changelog
Chilipp Apr 7, 2020
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
11 changes: 11 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
v1.2.2
======
Added
-----
* `psyplot.data.open_dataset` now decodes grid_mappings attributes,
see `#17 <https://github.com/psyplot/psyplot/pull/17>`__

Changed
-------
* psyplot has been moved from https://github.com/Chilipp/psyplot to https://github.com/psyplot/psyplot,
see `#16 <https://github.com/psyplot/psyplot/pull/16>`__
* Specifying names in `x`, `y`, `t` and `z` attributes of the `CFDecoder` class
now means that any other attribute (such as the `coordinates` or `axis` attribute)
are ignored


v1.2.1
======
Expand Down
22 changes: 17 additions & 5 deletions psyplot/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,8 @@ def add_attrs(obj):
if 'coordinates' in obj.attrs:
extra_coords.update(obj.attrs['coordinates'].split())
obj.encoding['coordinates'] = obj.attrs.pop('coordinates')
if 'grid_mapping' in obj.attrs:
extra_coords.add(obj.attrs['grid_mapping'])
if 'bounds' in obj.attrs:
extra_coords.add(obj.attrs['bounds'])
if gridfile is not None and not isinstance(gridfile, xr.Dataset):
Expand Down Expand Up @@ -915,16 +917,26 @@ def get_variable_by_axis(self, var, axis, coords=None):
if not coord_names:
return
ret = []
matched = []
for coord in map(lambda dim: coords[dim], filter(
lambda dim: dim in coords, chain(
coord_names, var.dims))):
# check for the axis attribute or whether the coordinate is in the
# list of possible coordinate names
if (coord.name not in (c.name for c in ret) and
(coord.attrs.get('axis', '').lower() == axis or
coord.name in getattr(self, axis))):
ret.append(coord)
if ret:
if coord.name not in (c.name for c in ret):
if coord.name in getattr(self, axis):
matched.append(coord)
elif coord.attrs.get('axis', '').lower() == axis:
ret.append(coord)
if matched:
if len(matched) > 1:
warn("Found multiple matches for %s coordinate in the "
"coordinates: %s. I use %s" % (
axis, ', '.join([c.name for c in matched]),
matched[0].name),
PsyPlotRuntimeWarning)
return matched[0]
elif ret:
return None if len(ret) > 1 else ret[0]
# If the coordinates attribute is specified but the coordinate
# variables themselves have no 'axis' attribute, we interpret the
Expand Down
9 changes: 9 additions & 0 deletions tests/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ def assertAlmostArrayEqual(self, actual, desired, rtol=1e-07, atol=0,
class DecoderTest(unittest.TestCase, AlmostArrayEqualMixin):
"""Test the :class:`psyplot.data.CFDecoder` class"""

def test_decode_grid_mapping(self):
ds = xr.Dataset()
ds['var'] = (('x', 'y'), np.zeros((5, 4)), {'grid_mapping': 'crs'})
ds['crs'] = ((), 1)

self.assertNotIn('crs', ds.coords)
ds = psyd.CFDecoder.decode_coords(ds)
self.assertIn('crs', ds.coords)

def test_1D_cf_bounds(self):
"""Test whether the CF Conventions for 1D bounaries are correct"""
final_bounds = np.arange(-180, 181, 30)
Expand Down