Fix bounds_to_vertices (#255)

xarray-contrib · Aug 10, 2021 · 5523a8f · 5523a8f
1 parent 479ea5e
commit 5523a8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/cf_xarray/helpers.py b/cf_xarray/helpers.py
@@ -90,7 +90,7 @@ def _bounds_helper(values, n_core_dims, nbounds, order):
             top_left = values[..., -1:, :, 3]
             vertex_vals = np.block([[bot_left, bot_right], [top_left, top_right]])
         if order is None:  # We verify if the ccw version works.
-            calc_bnds = vertices_to_bounds(vertex_vals).values
+            calc_bnds = np.moveaxis(vertices_to_bounds(vertex_vals).values, 0, -1)
             order = "counterclockwise" if np.all(calc_bnds == values) else "clockwise"
         if order == "clockwise":
             bot_left = values[..., :, :, 0]

diff --git a/cf_xarray/tests/test_helpers.py b/cf_xarray/tests/test_helpers.py
@@ -18,8 +18,14 @@ def test_bounds_to_vertices():
     assert_array_equal(ds.lat.values + 1.25, lat_c.values[:-1])
 
     # 2D case, CF- order
-    lat_c = cfxr.bounds_to_vertices(mollwds.lat_bounds, bounds_dim="bounds")
-    assert_equal(mollwds.lat_vertices, lat_c)
+    lat_ccw = cfxr.bounds_to_vertices(
+        mollwds.lat_bounds, bounds_dim="bounds", order="counterclockwise"
+    )
+    lat_no = cfxr.bounds_to_vertices(
+        mollwds.lat_bounds, bounds_dim="bounds", order=None
+    )
+    assert_equal(mollwds.lat_vertices, lat_ccw)
+    assert_equal(lat_no, lat_ccw)
 
     # Transposing the array changes the bounds direction
     ds = mollwds.transpose("bounds", "y", "x", "y_vertices", "x_vertices")