manual merge from development

Author: jpswinski

.gitignore

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

README.md

@@ -15,7 +15,7 @@ Detailed [documentation](https://slideruleearth.io/rtd/) on installing and using
 conda install -c conda-forge sliderule
 ```
 
-For alternate methods to install SlideRule, including options for developers, please see the detailed [installation instructions](https://slideruleearth.io/rtd/getting_started/Install.html).
+For alternate methods to install SlideRule, including options for developers, please see the [installation instructions](https://slideruleearth.io/rtd/getting_started/Install.html).
 
 ### Dependencies
 
@@ -33,7 +33,7 @@ Example usage:
 from sliderule import icesat2
 
 # initialize
-icesat2.init("icesat2sliderule.org", verbose=True)
+icesat2.init("slideruleearth.io", verbose=True)
 
 # region of interest
 region = [ {"lon":-105.82971551223244, "lat": 39.81983728534918},

RELEASE.sh

@@ -5,11 +5,11 @@
 # the tags annotation in git.
 #
 VERSION=$1
-if [[ "$VERSION" != *"."*"."* ]]; then
+if [[ "$VERSION" != "v"*"."*"."* ]]; then
     echo "Invalid version number"
     exit 1
 fi
-if git tag -l | grep -w v$VERSION; then
+if git tag -l | grep -w $VERSION; then
     echo "Git tag already exists"
 	exit 1
 fi
@@ -24,11 +24,11 @@ rm sliderule-python-$VERSION.tar.gz 2> /dev/null
 #
 echo $VERSION > version.txt
 git add version.txt
-git commit -m "Version v$VERSION"
+git commit -m "Version $VERSION"
 
 #
 # Create tag and acrhive
 #
-git tag -a v$VERSION -m "version $VERSION"
-git archive --format=tar.gz --prefix=sliderule-python/ v$VERSION > sliderule-python-$VERSION.tar.gz
+git tag -a $VERSION -m "version $VERSION"
+git archive --format=tar.gz --prefix=sliderule-python/ $VERSION > sliderule-python-$VERSION.tar.gz
 

environment.yml

@@ -4,7 +4,6 @@ channels:
   - conda-forge
 dependencies:
   - geopandas
-  - gdal
   - h5py
   - ipykernel
   - ipywidgets>=7.6,<8.0

examples/Grand_mesa_ATL03_classification.ipynb

@@ -39,7 +39,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "url = \"icesat2sliderule.org\"\n",
+    "url = \"slideruleearth.io\"\n",
     "icesat2.init(url, verbose=False)\n",
     "asset = \"nsidc-s3\""
    ]
@@ -274,7 +274,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -288,7 +288,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,

examples/api_widgets_demo.ipynb

@@ -10,7 +10,7 @@
     "\n",
     "The SlideRule ICESat-2 plug-in is a cloud-optimized version of the [ATL06 algorithm](https://nsidc.org/sites/nsidc.org/files/technical-references/ICESat2_ATL06_ATBD_r005.pdf) that can process the lower-level [ATL03 geolocated photon height data products](https://nsidc.org/data/atl03) hosted on AWS by the NSIDC DAAC.  \n",
     "\n",
-    "[Documentation for using SlideRule](http://icesat2sliderule.org/rtd) is available from the [project website](http://icesat2sliderule.org) \n",
+    "[Documentation for using SlideRule](https://slideruleearth.io/rtd) is available from the [project website](https://slideruleearth.io) \n",
     "\n",
     "### Background\n",
     "SlideRule creates a simplified version of the [ICESat-2 ATL06 land ice height product](https://nsidc.org/data/atl06) that can be adjusted to suit different needs.  SlideRule let's you create customized ICESat-2 segment heights _directly_ from the photon height data anywhere on the globe, _on-demand_ and quickly.\n",
@@ -63,7 +63,7 @@
    "source": [
     "# set the url for the sliderule service\n",
     "# set the logging level\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)"
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)"
    ]
   },
   {
@@ -255,7 +255,7 @@
     "### Review GeoDataFrame output\n",
     "Can inspect the columns, number of returns and returns at the top of the GeoDataFrame.\n",
     "\n",
-    "See the [ICESat-2 documentation](http://icesat2sliderule.org/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
+    "See the [ICESat-2 documentation](https://slideruleearth.io/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
    ]
   },
   {
@@ -312,6 +312,7 @@
     "### Create plots for a single track\n",
     "- cycles: Will plot all available cycles of data returned by SlideRule for a single RGT and ground track\n",
     "- scatter: Will plot data returned by SlideRule for a single RGT, ground track and cycle\n",
+    "- (to select a track from the leaflet plot above, click on one of the plotted elevations and the RGT and Cycle will automatically get populated below)\n",
     "\n",
     "The cycles plots should only be used in regions with [repeat Reference Ground Track (RGT) pointing](https://icesat-2.gsfc.nasa.gov/science/specs)"
    ]
@@ -443,14 +444,21 @@
     "SRwidgets.set_values(parms)\n",
     "m.add_region(regions)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "interpreter": {
    "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6"
   },
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -464,7 +472,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,

examples/atl03_widgets_demo.ipynb

@@ -8,7 +8,7 @@
     "\n",
     "SlideRule is an on-demand science data processing service that runs in on Amazon Web Services and responds to REST API calls to process and return science results.  SlideRule was designed to enable researchers and other data systems to have low-latency access to custom-generated, high-level, analysis-ready data products using processing parameters supplied at the time of the request. \n",
     "\n",
-    "[Documentation for using SlideRule](http://icesat2sliderule.org/rtd) is available from the [project website](http://icesat2sliderule.org) \n",
+    "[Documentation for using SlideRule](https://slideruleearth.io/rtd) is available from the [project website](https://slideruleearth.io) \n",
     "\n",
     "### Background\n",
     "SlideRule can subset ATL03 geolocated photon height data _on-demand_ and calculate photon classifications to suit different needs.\n",
@@ -61,7 +61,7 @@
    "source": [
     "# set the url for the sliderule service\n",
     "# set the logging level\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)"
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)"
    ]
   },
   {
@@ -270,7 +270,7 @@
     "### Review GeoDataFrame output\n",
     "Can inspect the columns, number of returns and returns at the top of the GeoDataFrame.\n",
     "\n",
-    "See the [ICESat-2 documentation](http://icesat2sliderule.org/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
+    "See the [ICESat-2 documentation](https://slideruleearth.io/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
    ]
   },
   {
@@ -456,14 +456,21 @@
     "SRwidgets.set_values(parms)\n",
     "m.add_region(regions)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "interpreter": {
    "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6"
   },
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -477,7 +484,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,

examples/boulder_watershed_demo.ipynb

@@ -59,7 +59,7 @@
    "outputs": [],
    "source": [
     "# Configure ICESat-2 API\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)\n",
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)\n",
     "icesat2.get_version()\n",
     "\n",
     "# dropdown menu for ICESat-2 product\n",
@@ -287,7 +287,7 @@
     "print(\"Completed in {:.3f} seconds of wall-clock time\".format(perf_duration))\n",
     "print(\"Reference Ground Tracks: {}\".format(gdf[\"rgt\"].unique()))\n",
     "print(\"Cycles: {}\".format(gdf[\"cycle\"].unique()))\n",
-    "print(\"Received {} elevations\".format(gdf.shape[0]))"
+    "print(\"Received {} segments\".format(gdf.shape[0]))"
    ]
   },
   {
@@ -315,14 +315,22 @@
     "    style={'color': 'black', 'opacity':1, 'weight':0.1})\n",
     "m.map.add_layer(geodata)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "interpreter": {
    "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6"
   },
   "kernelspec": {
-   "display_name": "Python 3.8.10 64-bit",
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
    "name": "python3"
   },
   "language_info": {
@@ -335,7 +343,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,

examples/cmr_debug_regions.ipynb

@@ -54,7 +54,7 @@
    "outputs": [],
    "source": [
     "# Configure ICESat-2 API\n",
-    "icesat2.init(\"icesat2sliderule.org\", verbose=False)"
+    "icesat2.init(\"slideruleearth.io\", verbose=False)"
    ]
   },
   {