add mask to colorbar, correct extreme values in legend sizes, correct…

… example
Ouranosinc · Apr 3, 2024 · bee56cc · bee56cc
1 parent 2911423
commit bee56cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/docs/notebooks/figanos_docs.ipynb b/docs/notebooks/figanos_docs.ipynb
@@ -623,15 +623,13 @@
    "outputs": [],
    "source": [
     "# create a fictional observational dataset from scratch\n",
-    "nb = 10\n",
-    "\n",
-    "names = ['station_' + str(i) for i in np.arange(nb)]\n",
-    "lat = 45 + np.random.rand(nb)*3\n",
-    "lon = np.linspace(-76,-70, nb)\n",
-    "tas = 20 + np.random.rand(9)*7\n",
-    "tas = np.append(tas, np.nan)\n",
-    "yrs = (10+30 * np.random.rand(9)).astype(int)\n",
-    "yrs = np.append( np.nan, yrs)\n",
+    "names = ['station_' + str(i) for i in np.arange(10)]\n",
+    "lat = 45 + np.random.rand(10)*3\n",
+    "lon = np.linspace(-76,-70, 10)\n",
+    "tas = 20 + np.random.rand(10)*7\n",
+    "tas[9] = np.nan\n",
+    "yrs = (10+30 * np.random.rand(10))\n",
+    "yrs[0] = np.nan\n",
     "\n",
     "attrs = {'units': 'degC', 'standard_name': 'air_temperature', 'long_name': 'Near-Surface Daily Maximum Air Temperature'}\n",
     "\n",
@@ -660,7 +658,7 @@
     "                  transform=ccrs.PlateCarree(),\n",
     "                  sizes ='years',\n",
     "                  size_range=(15, 100),\n",
-    "                  #divergent=23.5,\n",
+    "                  divergent=23.5,\n",
     "                  features=features,\n",
     "                  plot_kw={\n",
     "                           \"xlim\": (-78,-68),\n",

diff --git a/figanos/matplotlib/plot.py b/figanos/matplotlib/plot.py
@@ -1661,8 +1661,8 @@ def scattermap(
             plot_kw.setdefault("s", pt_sizes[0])
 
     # norm
-    plot_kw.setdefault("vmin", np.nanmin(plot_data.values))
-    plot_kw.setdefault("vmax", np.nanmax(plot_data.values))
+    plot_kw.setdefault("vmin", np.nanmin(plot_data[mask].values))
+    plot_kw.setdefault("vmax", np.nanmax(plot_data[mask].values))
 
     norm = custom_cmap_norm(
         cmap,

diff --git a/figanos/matplotlib/utils.py b/figanos/matplotlib/utils.py
@@ -1338,7 +1338,7 @@ def size_legend_elements(
                 lw=0,
                 markerfacecolor="w",
                 label=label,
-                markersize=np.sqrt(s),
+                markersize=np.sqrt(np.abs(s)),
             )
         )