More dimension bug fixes

xpublish-community · Dec 15, 2023 · 8487510 · 8487510
1 parent 04bb76d
commit 8487510
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/xpublish_wms/grid.py b/xpublish_wms/grid.py
@@ -355,7 +355,7 @@ def mask(
         if "time" in mask.cf.coords:
             mask = mask.cf.isel(time=0).squeeze(drop=True).cf.drop_vars("time")
         else:
-            mask = mask.cf.squeeze(drop=True).cf
+            mask = mask.cf.squeeze(drop=True)
 
         mask[:-1, :] = mask[:-1, :].where(mask[1:, :] == 1, 0)
         mask[:, :-1] = mask[:, :-1].where(mask[:, 1:] == 1, 0)

diff --git a/xpublish_wms/wms/get_map.py b/xpublish_wms/wms/get_map.py
@@ -187,8 +187,6 @@ def select_time(self, da: xr.DataArray) -> xr.DataArray:
         elif self.TIME_CF_NAME in da.cf.coords:
             da = da.cf.isel({self.TIME_CF_NAME: -1})
 
-        return da
-
     def select_elevation(self, ds: xr.Dataset, da: xr.DataArray) -> xr.DataArray:
         """
         Ensure elevation selection
@@ -285,6 +283,9 @@ def render(
             y_range=(self.bbox[1], self.bbox[3]),
         )
 
+        # Squeeze single value dimensions
+        da = da.squeeze()
+
         if ds.gridded.render_method == RenderMethod.Quad:
             mesh = cvs.quadmesh(
                 da,