Merge pull request #7 from ecmwf/merge-plots-maps

Improvements to examples

.readthedocs.yml

@@ -0,0 +1,9 @@
+version: 2
+formats: []
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.9"
+python:
+  install:
+  - requirements: docs/requirements.txt

docs/examples/gallery/gallery.ipynb

@@ -122,6 +122,27 @@
     "* [Cities in Japan](ancillary/japan-cities.ipynb)\n",
     "* [Shapefiles](ancillary/shapefiles.ipynb)"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "9f89aba9",
+   "metadata": {},
+   "source": [
+    "### Time series"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "115789bc",
+   "metadata": {
+    "tags": [
+     "nbsphinx-gallery"
+    ]
+   },
+   "source": [
+    "* [Global average temperature climatology](time-series/global-average-temperature.ipynb)\n",
+    "* [CMIP6 climate projections](time-series/cmip6.ipynb)"
+   ]
   }
  ],
  "metadata": {

src/earthkit/plots/__init__.py

@@ -19,8 +19,6 @@
 
 from earthkit.plots import styles
 from earthkit.plots.components.figures import Figure
-
-# from earthkit.plots.components.globes import globe
 from earthkit.plots.components.maps import Map
 from earthkit.plots.components.subplots import Subplot
 from earthkit.plots.definitions import FONTS_DIR
@@ -39,7 +37,6 @@
     "Figure",
     "Subplot",
     "Map",
-    # "globe",
     "schema",
     "styles",
 ]

src/earthkit/plots/components/globes.py

@@ -95,11 +95,14 @@ def globe(
 
     figure = Figure(left=0, right=1, bottom=0, top=1, size=(figsize, figsize))
 
-    crs = data.projection().to_cartopy_crs()
+    try:
+        crs = data.projection().to_cartopy_crs()
+    except AttributeError:
+        crs = ccrs.PlateCarree()
     if crs.__class__.__name__ != "PlateCarree":
         crs = ccrs.PlateCarree()
 
-    subplot = figure.add_map(crs=crs)
+    subplot = figure.add_map(crs=crs, domain=[-180, 180, -90, 90])
     getattr(subplot, how)(data, style=style, transform_first=True)
     extent = subplot.ax.get_extent()
     if extent != (-180.0, 180.0, -90.0, 90.0):

src/earthkit/plots/components/subplots.py

@@ -514,9 +514,11 @@ def envelope(self, data_1, data_2=0, alpha=0.4, **kwargs):
         return mappable
 
     @schema.envelope.apply()
-    def quantiles(self, data, quantiles=[0, 1], dim=None, alpha=0.4, **kwargs):
+    def quantiles(self, data, quantiles=[0, 1], dim=None, alpha=0.15, **kwargs):
         prop_cycle = plt.rcParams["axes.prop_cycle"]
-        facecolor = kwargs.pop("facecolor", next(cycle(prop_cycle.by_key()["color"])))
+        facecolor = kwargs.pop(
+            "facecolor", kwargs.get("color", next(cycle(prop_cycle.by_key()["color"])))
+        )
         color = kwargs.pop("color", next(cycle(prop_cycle.by_key()["color"])))
         if isinstance(data, earthkit.data.core.Base):
             data = data.to_xarray()
@@ -541,6 +543,7 @@ def quantiles(self, data, quantiles=[0, 1], dim=None, alpha=0.4, **kwargs):
                 )
             else:
                 x, y, _ = self._extract_plottables_2(y=lines, **kwargs)
+                kwargs.pop("label", None)
                 mappable = self.ax.plot(
                     x, y, color=color, **{k: v for k, v in kwargs.items() if k != "x"}
                 )

src/earthkit/plots/geo/healpix.py

@@ -11,6 +11,7 @@ def nnshow(var, nx=1000, ny=1000, ax=None, nest=False, style=None, **kwargs):
     ax: axis to plot on
     kwargs: additional arguments to imshow
     """
+    kwargs.pop("transform_first", None)
     xlims = ax.get_xlim()
     ylims = ax.get_ylim()
     # NOTE: we want the center coordinate of each pixel, thus we have to