Merge branch 'development' of github.com:ICESat2-SlideRule/sliderule-python into development

Author: elidwa

.gitignore

@@ -130,4 +130,6 @@ dmypy.json
 
 # User
 .vscode/
-pytrace.*
+.DS_Store
+.DS_Store?
+pytrace.*

README.md

@@ -1,20 +1,21 @@
 # sliderule-python
 [![Tests](https://github.com/ICESat2-SlideRule/sliderule-python/actions/workflows/test.yml/badge.svg)](https://github.com/ICESat2-SlideRule/sliderule-python/actions/workflows/test.yml)
+[![Read the Docs](https://readthedocs.org/projects/sliderule-python/badge/?version=latest)](https://slideruleearth.io/rtd/)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://gke.mybinder.org/v2/gh/ICESat2-SlideRule/sliderule-python/main?urlpath=lab)
 [![badge](https://img.shields.io/static/v1.svg?logo=Jupyter&label=PangeoBinderAWS&message=us-west-2&color=orange)](https://aws-uswest2-binder.pangeo.io/v2/gh/ICESat2-SlideRule/sliderule-python/main?urlpath=lab)
 [![DOI](https://zenodo.org/badge/311384982.svg)](https://zenodo.org/badge/latestdoi/311384982)
 
 SlideRule's Python client makes it easier to interact with SlideRule from a Python script.
 
-Detailed [documentation](https://www.slideruleearth.org/rtd/) on installing and using this client can be found at [slideruleearth.io](https://www.slideruleearth.org).
+Detailed [documentation](https://slideruleearth.io/rtd/) on installing and using this client can be found at [slideruleearth.io](https://slideruleearth.io/).
 
 ## I. Installing the SlideRule Python Client
 
 ```bash
 conda install -c conda-forge sliderule
 ```
 
-For alternate methods to install SlideRule, including options for developers, please see the [installation instructions](https://www.slideruleearth.org/rtd/getting_started/Install.html) on slideruleearth.io.
+For alternate methods to install SlideRule, including options for developers, please see the [installation instructions](https://slideruleearth.io/rtd/getting_started/Install.html).
 
 ### Dependencies
 
@@ -59,7 +60,7 @@ More extensive examples in the form of Jupyter Notebooks can be found in the [ex
 
 ## III. Reference and User's Guide
 
-Please see our [documentation](https://www.slideruleearth.org/rtd/) page for reference and user's guide material.
+Please see our [documentation](https://slideruleearth.io/rtd/) page for reference and user's guide material.
 
 ## IV. Licensing
 

examples/api_widgets_demo.ipynb

@@ -118,7 +118,7 @@
    "source": [
     "### Interactive Mapping with Leaflet\n",
     "\n",
-    "Interactive maps within the SlideRule python API are build upon [ipyleaflet](https://ipyleaflet.readthedocs.io).\n",
+    "Interactive maps within the SlideRule python API are built upon [ipyleaflet](https://ipyleaflet.readthedocs.io).\n",
     "\n",
     "#### Leaflet Basemaps and Layers\n",
     "\n",
@@ -138,6 +138,7 @@
     "            <li><a href=\"https://asterweb.jpl.nasa.gov/gdem.asp\">ASTER GDEM Hillshade</a></li>\n",
     "            <li><a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\">ESRI Imagery</a></li>\n",
     "            <li><a href=\"http://glims.colorado.edu/glacierdata/\">Global Land Ice Measurements from Space (GLIMS)</a></li>\n",
+    "            <li><a href=\"https://www.glims.org/RGI/\">Randolph Glacier Inventory (RGI)</a></li>\n",
     "        </ul>\n",
     "       </td>\n",
     "       <td align='left' valign='top' width=\"30%\">\n",
@@ -151,6 +152,7 @@
     "            <li><a href=\"https://lima.usgs.gov/\">Landsat Image Mosaic of Antarctica (LIMA)</a></li>\n",
     "            <li><a href=\"https://nsidc.org/data/nsidc-0280\">MODIS Mosaic of Antarctica (MOA)</a></li>\n",
     "            <li><a href=\"https://nsidc.org/data/NSIDC-0103\">Radarsat Antarctic Mapping Project (RAMP)</a></li>\n",
+    "            <li><a href=\"https://www.pgc.umn.edu/data/rema\">Reference Elevation Model of Antarctica (REMA)</a></li>\n",
     "        </ul>\n",
     "      </td>\n",
     "    </tr>\n",
@@ -168,7 +170,8 @@
    "source": [
     "widgets.VBox([\n",
     "    SRwidgets.projection,\n",
-    "    SRwidgets.layers\n",
+    "    SRwidgets.layers,\n",
+    "    SRwidgets.raster_functions\n",
     "])"
    ]
   },
@@ -201,7 +204,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "m.add_layer(layers=SRwidgets.layers.value)"
+    "m.add_layer(\n",
+    "    layers=SRwidgets.layers.value,\n",
+    "    rendering_rule=SRwidgets.rendering_rule\n",
+    ")"
    ]
   },
   {

examples/atl03_widgets_demo.ipynb

@@ -108,7 +108,7 @@
    "source": [
     "### Interactive Mapping with Leaflet\n",
     "\n",
-    "Interactive maps within the SlideRule python API are build upon [ipyleaflet](https://ipyleaflet.readthedocs.io).\n",
+    "Interactive maps within the SlideRule python API are built upon [ipyleaflet](https://ipyleaflet.readthedocs.io).\n",
     "\n",
     "#### Leaflet Basemaps and Layers\n",
     "\n",
@@ -128,6 +128,7 @@
     "            <li><a href=\"https://asterweb.jpl.nasa.gov/gdem.asp\">ASTER GDEM Hillshade</a></li>\n",
     "            <li><a href=\"https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9\">ESRI Imagery</a></li>\n",
     "            <li><a href=\"http://glims.colorado.edu/glacierdata/\">Global Land Ice Measurements from Space (GLIMS)</a></li>\n",
+    "            <li><a href=\"https://www.glims.org/RGI/\">Randolph Glacier Inventory (RGI)</a></li>\n",
     "        </ul>\n",
     "       </td>\n",
     "       <td align='left' valign='top' width=\"30%\">\n",
@@ -141,6 +142,7 @@
     "            <li><a href=\"https://lima.usgs.gov/\">Landsat Image Mosaic of Antarctica (LIMA)</a></li>\n",
     "            <li><a href=\"https://nsidc.org/data/nsidc-0280\">MODIS Mosaic of Antarctica (MOA)</a></li>\n",
     "            <li><a href=\"https://nsidc.org/data/NSIDC-0103\">Radarsat Antarctic Mapping Project (RAMP)</a></li>\n",
+    "            <li><a href=\"https://www.pgc.umn.edu/data/rema\">Reference Elevation Model of Antarctica (REMA)</a></li>\n",
     "        </ul>\n",
     "      </td>\n",
     "    </tr>\n",
@@ -158,7 +160,8 @@
    "source": [
     "widgets.VBox([\n",
     "    SRwidgets.projection,\n",
-    "    SRwidgets.layers\n",
+    "    SRwidgets.layers,\n",
+    "    SRwidgets.raster_functions\n",
     "])"
    ]
   },
@@ -191,7 +194,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "m.add_layer(layers=SRwidgets.layers.value)"
+    "m.add_layer(\n",
+    "    layers=SRwidgets.layers.value,\n",
+    "    rendering_rule=SRwidgets.rendering_rule\n",
+    ")"
    ]
   },
   {

examples/voila_demo.ipynb

@@ -76,6 +76,9 @@
     "import numpy as np\n",
     "import matplotlib.lines\n",
     "import matplotlib.pyplot as plt\n",
+    "# autoreload\n",
+    "%load_ext autoreload\n",
+    "%autoreload 2\n",
     "%matplotlib inline"
    ]
   },
@@ -124,6 +127,7 @@
     "results = []\n",
     "SRwidgets = ipysliderule.widgets()\n",
     "points_dropdown = None\n",
+    "update_button = widgets.Button(description=\"Update Map\")\n",
     "run_button = widgets.Button(description=\"Run SlideRule!\")\n",
     "run_output = widgets.Output()\n",
     "refresh_button = widgets.Button(description=\"Refresh Plot\")\n",
@@ -151,11 +155,49 @@
    "outputs": [],
    "source": [
     "# create ipyleaflet map in specified projection\n",
-    "m = ipysliderule.leaflet('Global', layer_control=False)\n",
+    "m = ipysliderule.leaflet(SRwidgets.projection.value)\n",
+    "# install click handler callback\n",
+    "m.add_selected_callback(SRwidgets.atl06_click_handler)\n",
     "display(m.map)\n",
     "display(run_output)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "extensions": {
+     "jupyter_dashboards": {
+      "version": 1,
+      "views": {
+       "default_view": {
+        "hidden": true
+       }
+      }
+     }
+    }
+   },
+   "outputs": [],
+   "source": [
+    "# update map\n",
+    "def on_update_clicked(b):\n",
+    "    m.add_layer(\n",
+    "        layers=SRwidgets.layers.value,\n",
+    "        rendering_rule=SRwidgets.rendering_rule\n",
+    "    )\n",
+    "    \n",
+    "# map widgets\n",
+    "display(widgets.VBox([\n",
+    "    SRwidgets.projection,\n",
+    "    SRwidgets.layers,\n",
+    "    SRwidgets.raster_functions\n",
+    "]))\n",
+    "\n",
+    "# update button\n",
+    "update_button.on_click(on_update_clicked)\n",
+    "display(update_button)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -177,17 +219,19 @@
     "\n",
     "# callbacks for events and exceptions\n",
     "def demo_logeventrec(rec):\n",
-    "    print(f'{rec[\"attr\"]}                                                        \\r', end=\"\")\n",
+    "    # print(f'{rec[\"attr\"]}                                                        \\r', end=\"\")\n",
+    "    pass\n",
     "\n",
     "def demo_exceptrec(rec):\n",
-    "    print(f'{rec[\"text\"]}                                                        \\r', end=\"\")\n",
+    "    if \"Successfully\" in rec[\"text\"]:\n",
+    "        print(f'{rec[\"text\"]}                                                        \\r', end=\"\")\n",
     "\n",
     "# build and transmit requests to SlideRule\n",
     "def runSlideRule():\n",
     "    global url_textbox, parms, results\n",
     "    \n",
     "    # set the url for the sliderule service\n",
-    "    icesat2.init(url_textbox.value, loglevel=logging.WARNING, max_resources=1000)\n",
+    "    icesat2.init(url_textbox.value, loglevel=logging.ERROR, max_resources=1000)\n",
     "\n",
     "    # sliderule asset and data release\n",
     "    asset = SRwidgets.asset.value\n",
@@ -251,14 +295,14 @@
     "def on_refresh_clicked(b):\n",
     "    global atl06_rsps\n",
     "    with refresh_output:\n",
-    "        if atl06_rsps.shape[0] > 0:\n",
+    "        if atl06_rsps 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",
     "                max_plot_points = 1000000000\n",
     "            m.GeoData(atl06_rsps, column_name=SRwidgets.variable.value, cmap=SRwidgets.colormap, max_plot_points=max_plot_points)\n",
-    "        \n",
+    "\n",
     "# link buttons\n",
     "run_button.on_click(on_run_clicked)\n",
     "refresh_button.on_click(on_refresh_clicked)"
@@ -316,7 +360,7 @@
     "    SRwidgets.variable,\n",
     "    SRwidgets.cmap,\n",
     "    points_dropdown,\n",
-    "    SRwidgets.reverse\n",
+    "    SRwidgets.reverse,\n",
     "]))\n",
     "\n",
     "# display buttons\n",
@@ -402,7 +446,7 @@
     "        url = 'host.docker.internal'\n",
     "    else:\n",
     "        url = url_textbox.value\n",
-    "    icesat2.init(url, loglevel=logging.WARNING)\n",
+    "    icesat2.init(url, loglevel=logging.ERROR)\n",
     "\n",
     "    # sliderule asset and data release\n",
     "    asset = SRwidgets.asset.value\n",
@@ -518,6 +562,13 @@
     "display(pc_button)\n",
     "display(pc_output)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

sliderule/icesat2.py

@@ -362,8 +362,7 @@ def __query_resources(parm, version, return_polygons=False):
 
     # Check Resources are Under Limit #
     if(len(resources) > max_requested_resources):
-        logger.error("Exceeded maximum requested resources: %d (current max is %d)\nConsider using icesat2.set_max_resources to set a higher limit.", len(resources), max_requested_resources)
-        resources = []
+        raise RuntimeError('Exceeded maximum requested granules: {} (current max is {})\nConsider using icesat2.set_max_resources to set a higher limit.'.format(len(resources), max_requested_resources))
     else:
         logger.info("Identified %d resources to process", len(resources))