voila_demo: bugfix for empty gdf, improvements for max_plot_points 2

dshean · dshean · commit 5b2a559b448d · 2022-11-29T18:21:06.000-08:00
diff --git a/examples/voila_demo.ipynb b/examples/voila_demo.ipynb
@@ -287,20 +287,26 @@
     "            max_plot_points = 10000\n",
     "            if points_dropdown.value == \"100K\":\n",
     "                max_plot_points = 100000\n",
-    "            elif points_dropdown.value == \"unlimited\":\n",
+    "            elif points_dropdown.value == \"all\":\n",
     "                max_plot_points = 1000000000\n",
+    "            if max_plot_points > atl06_rsps.shape[0]:\n",
+    "                max_plot_points = atl06_rsps.shape[0]\n",
+    "            print(f'Plotting {max_plot_points} of {atl06_rsps.shape[0]} elevations. This may take 10-60+ seconds for larger point datasets.')\n",
     "            m.GeoData(atl06_rsps, column_name=SRwidgets.variable.value, cmap=SRwidgets.colormap, max_plot_points=max_plot_points)\n",
     "\n",
     "# refresh action\n",
     "def on_refresh_clicked(b):\n",
     "    global atl06_rsps\n",
     "    with refresh_output:\n",
-    "        if atl06_rsps and atl06_rsps.shape[0] > 0:\n",
+    "        if atl06_rsps is not None and atl06_rsps.shape[0] > 0:\n",
     "            max_plot_points = 10000\n",
     "            if points_dropdown.value == \"100K\":\n",
     "                max_plot_points = 100000\n",
-    "            elif points_dropdown.value == \"unlimited\":\n",
+    "            elif points_dropdown.value == \"all\":\n",
     "                max_plot_points = 1000000000\n",
+    "            if max_plot_points > atl06_rsps.shape[0]:\n",
+    "                max_plot_points = atl06_rsps.shape[0]\n",
+    "            print(f'Plotting {max_plot_points} of {atl06_rsps.shape[0]} elevations. This may take 10-60+ seconds for larger point datasets.')\n",
     "            m.GeoData(atl06_rsps, column_name=SRwidgets.variable.value, cmap=SRwidgets.colormap, max_plot_points=max_plot_points)\n",
     "\n",
     "# link buttons\n",
@@ -339,7 +345,7 @@
     "\n",
     "# points to plot drop down\n",
     "points_dropdown = widgets.Dropdown(\n",
-    "    options = [\"10K\", \"100K\", \"unlimited\"],\n",
+    "    options = [\"10K\", \"100K\", \"all\"],\n",
     "    value = \"10K\",\n",
     "    description = \"Pts to Draw\",\n",
     "    disabled = False,\n",
@@ -562,13 +568,6 @@
     "display(pc_button)\n",
     "display(pc_output)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -605,7 +604,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.13"
+   "version": "3.10.6"
   },
   "toc-showtags": false
  },
