Merge develop into main @ 0.2.7 (#30)

* 12 support non latlon grib grids (#16)

* Adds support for non-lat-lon GRIB data points

* Re-enable automatic legend titles with proper fallback if no metadata found

* QA tweaks

* Rollback version of micromamba used with unit tests to v12

* Testing latest micromamba

* Migrate to new setup-micromamba

* Improve levels auto_range with proper symmetry (#17)

* Improve levels auto_range with proper symmetry

* Ensure symmetry around arbitrary divergence point

* Removes obsolete math import

---------

Co-authored-by: James Varndell <[email protected]>

* Fix datetime metadata for xarray for single-time datasets (#18)

* Only check for unstructured grid if normal plotting fails

* Adds convience save function at subplot level

* Fix earthkit mutably messing up an xarray's longitude (#22)

* Fix dimensionless unit formatting (#19)

* Fix dimensionless unit formatting

* Update src/earthkit/plots/metadata/units.py

Co-authored-by: James Varndell <[email protected]>

---------

Co-authored-by: James Varndell <[email protected]>

* Adds plugin support for Python 3.9 (#23)

* Feature/interactive plots (#25)

* Moves interactive plots into earthkit.plots.interactive

* Adds plotly to requirements

* Moves interactive plots into earthkit.plots.interactive

* Remove empty notebook

* QA tweaks

* Adds default style to improve look and feel with >5 quantiles

* Adds default style to improve look and feel with >5 quantiles

* Adds docstrings

* Adds tests for interactive plots

* QA tweaks

* Feature/vertical plots (#26)

* Moves interactive plots into earthkit.plots.interactive

* Adds plotly to requirements

* Moves interactive plots into earthkit.plots.interactive

* Remove empty notebook

* QA tweaks

* Adds default style to improve look and feel with >5 quantiles

* Adds default style to improve look and feel with >5 quantiles

* Adds docstrings

* Adds tests for interactive plots

* QA tweaks

* Adds better support for interactive vertical plots

* Bugfix/numpy input (#29)

* Adds numpy array plotting example

* Fixes bug when detecting z-values from numpy input

* Fixes bug when detecting x and y from irregular grid data

* Adds extra test for numpy z-detection from data argument

---------

Co-authored-by: Juniper Tyree <[email protected]>

docs/examples/gallery/gallery.ipynb

@@ -54,7 +54,8 @@
     "* [Temperature and pressure](gridded-data/temperature-and-pressure.ipynb)\n",
     "* [Time zones](gridded-data/time-zones.ipynb)\n",
     "* [Weather forecast steps](gridded-data/weather-forecast-steps.ipynb)\n",
-    "* [Unstructured grids](gridded-data/unstructured-grids.ipynb)"
+    "* [Unstructured grids](gridded-data/unstructured-grids.ipynb)\n",
+    "* [Numpy arrays](gridded-data/numpy-arrays.ipynb)"
    ]
   },
   {

src/earthkit/plots/sources/earthkit.py

@@ -132,6 +132,8 @@ def extract_xy(self):
                     f"'{self.gridspec['grid']}' grid"
                 )
             points = get_points(1)
+            x = points["x"]
+            y = points["y"]
         else:
             try:
                 points = self.data.to_points(flatten=False)

src/earthkit/plots/sources/numpy.py

@@ -48,6 +48,17 @@ def extract_xyz(self):
                 xyz = np.arange(len(self.data)), self.data, None
             elif len(self.data.shape) == 2:
                 xyz = np.arange(len(self.data[0])), np.arange(len(self.data)), self.data
+        elif self._z is None:
+            if self.data is not None and len(self.data.shape) == 1:
+                data = None
+            else:
+                data = self.data
+            if self._x is None:
+                xyz = np.arange(len(self._y)), self._y, data
+            elif self._y is None:
+                xyz = self._x, np.arange(len(self._x)), data
+            else:
+                xyz = self._x, self._y, data
         return xyz
 
     def extract_x(self):

tests/sources/test_numpy.py

@@ -51,6 +51,13 @@ def test_NumpySource_xy():
     assert source.z_values is None
 
 
+def test_NumpySource_xyz():
+    source = NumpySource([[1, 2], [4, 5]], x=[1, 2], y=[3, 4])
+    assert np.array_equal(source.x_values, [1, 2])
+    assert np.array_equal(source.y_values, [3, 4])
+    assert np.array_equal(source.z_values, [[1, 2], [4, 5]])
+
+
 def test_NumpySource_3_args():
     source = NumpySource([1, 2, 3], [3, 6, 4], [[1, 2, 3], [4, 5, 6]])
     assert np.array_equal(source.x_values, [1, 2, 3])