Fix xarray metadata

climetlab/__init__.py

@@ -25,7 +25,7 @@
 
 # import logging
 
-__version__ = "0.1.7"
+__version__ = "0.1.8"
 
 
 # if ipython_active:

climetlab/datasets/__init__.py

@@ -128,9 +128,11 @@ def __getattr__(self, name):
 
 def load_dataset(name, *args, **kwargs):
     try:
+        # Backwards compatibility
+        ds = dataset(name, *args, **kwargs)
+        assert getattr(ds, "_load", None) is None
+        return ds
+    except Exception:
         ds = dataset(name)
         ds._load(*args, **kwargs)
         return ds
-    except Exception:
-        # Backwards compatibility
-        return dataset(name, *args, **kwargs)

climetlab/helpers/ndarray.py

@@ -27,7 +27,7 @@ def plot_map(self, driver):
         )
 
         driver.plot_numpy(
-            self.data,
+            self.data.reshape(metadata.get("shape", self.data.shape)),
             metadata=metadata,
         )
 

climetlab/helpers/xarray.py

@@ -45,15 +45,20 @@ def plot_map(self, driver):
         driver.plot_xarray(self.data, self.name, dimension_settings)
 
     def field_metadata(self):
-        return dict(
-            north=self.north,
-            south=self.south,
-            east=self.east,
-            west=self.west,
-            # # TODO:
-            # south_north_increment=None,
-            # west_east_increment=None,
+        result = dict(shape=self.var.shape)
+        result.update(self.var.attrs)
+        result.update(
+            dict(
+                north=self.north,
+                south=self.south,
+                east=self.east,
+                west=self.west,
+                # # TODO:
+                # south_north_increment=None,
+                # west_east_increment=None,
+            )
         )
+        return result
 
 
 def helper(data, *args, **kwargs):

climetlab/plotting/drivers/magics/driver.py

@@ -149,14 +149,22 @@ def plot_numpy(
                 data.shape[-1] - 1
             )
 
+        # TODO: remove me when Magics supports full json
+        def tidy(x):
+            r = {}
+            for k, v in x.items():
+                if v is None or isinstance(v, (int, float, str, bool)):
+                    r[k] = v
+            return r
+
         self._push_layer(
             minput(
                 input_field=data,
                 input_field_initial_latitude=float(north),
                 input_field_latitude_step=-float(south_north_increment),
                 input_field_initial_longitude=float(west),
                 input_field_longitude_step=float(west_east_increment),
-                input_metadata=metadata,
+                input_metadata=tidy(metadata),
             )
         )
 

climetlab/sources/readers/grib.py

@@ -125,6 +125,7 @@ def field_metadata(self):
             p = self.handle.get(n)
             if p is not None:
                 m[n] = str(p)
+        m["shape"] = self.shape
         return m
 
     def helper(self):