update example notebooks

Author: thuydotm

examples/user_guide/1_Surface.ipynb

@@ -49,6 +49,7 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
+    "import xarray as xr\n",
     "\n",
     "import datashader as ds\n",
     "\n",
@@ -81,8 +82,8 @@
     "W = 800\n",
     "H = 600\n",
     "\n",
-    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=(-20e6, 20e6), y_range=(-20e6, 20e6))\n",
-    "terrain = generate_terrain(canvas=cvs)\n",
+    "terrain = xr.DataArray(np.zeros((H, W)))\n",
+    "terrain = generate_terrain(terrain)\n",
     "\n",
     "shade(terrain, cmap=['black', 'white'], how='linear')"
    ]
@@ -201,16 +202,17 @@
    "source": [
     "from xrspatial import curvature\n",
     "\n",
-    "terrain_z_one = generate_terrain(canvas=cvs, zfactor=1)\n",
+    "terrain_z_one = xr.DataArray(np.zeros((H, W)))\n",
+    "terrain_z_one = generate_terrain(terrain_z_one, zfactor=1)\n",
     "curv = curvature(terrain_z_one)\n",
     "curv_hi, curv_low = curv.copy(), curv.copy()\n",
     "curv_hi.data = np.where(np.logical_and(curv_hi.data > 1, curv_hi.data < 4), 1, np.nan)\n",
     "curv_low.data = np.where(np.logical_and(curv_low.data > 0.5, curv_low.data < 1), 1, np.nan)\n",
     "\n",
     "stack(shade(terrain,     cmap=['black', 'white'], how='linear'),\n",
     "      shade(illuminated, cmap=['black', 'white'], how='linear', alpha=128),\n",
-    "      shade(curv_hi,        cmap='red',           how='log',    alpha=200),\n",
-    "      shade(curv_low,        cmap='green',        how='log',    alpha=200))"
+    "      shade(curv_hi,     cmap='red',              how='log',    alpha=200),\n",
+    "      shade(curv_low,    cmap='green',            how='log',    alpha=200))"
    ]
   },
   {
@@ -350,16 +352,18 @@
    "source": [
     "from xrspatial import viewshed\n",
     "\n",
-    "\n",
-    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=(-20e6, 20e6), y_range=(-20e6, 20e6))\n",
-    "terrain = generate_terrain(canvas=cvs)\n",
+    "x_range=(-20e6, 20e6)\n",
+    "y_range=(-20e6, 20e6)\n",
+    "terrain = xr.DataArray(np.zeros((H, W)))\n",
+    "terrain = generate_terrain(terrain, x_range=x_range, y_range=y_range)\n",
     "terrain_shaded = shade(terrain, cmap=Elevation, alpha=128, how='linear')\n",
     "\n",
     "illuminated = hillshade(terrain)\n",
     "\n",
     "OBSERVER_X = 0.0\n",
     "OBSERVER_Y = 0.0\n",
     "\n",
+    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=x_range, y_range=y_range)\n",
     "observer_df = pd.DataFrame({'x': [OBSERVER_X],'y': [OBSERVER_Y]})\n",
     "observer_agg = cvs.points(observer_df, 'x', 'y')\n",
     "observer_shaded = dynspread(shade(observer_agg, cmap=['orange']),\n",
@@ -416,8 +420,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

examples/user_guide/2_Proximity.ipynb

@@ -315,8 +315,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

examples/user_guide/3_Zonal.ipynb

@@ -33,15 +33,14 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
+    "import xarray as xr\n",
     "\n",
     "import datashader as ds\n",
     "from datashader.transfer_functions import shade\n",
     "from datashader.transfer_functions import stack\n",
     "from datashader.transfer_functions import dynspread\n",
     "from datashader.transfer_functions import set_background\n",
-    "from datashader.colors import Elevation\n",
-    "\n",
-    "import xrspatial"
+    "from datashader.colors import Elevation"
    ]
   },
   {
@@ -64,8 +63,11 @@
     "W = 800\n",
     "H = 600\n",
     "\n",
-    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=(-20e6, 20e6), y_range=(-20e6, 20e6))\n",
-    "terrain = generate_terrain(canvas=cvs)\n",
+    "template_terrain = xr.DataArray(np.zeros((H, W)))\n",
+    "x_range=(-20e6, 20e6)\n",
+    "y_range=(-20e6, 20e6)\n",
+    "\n",
+    "terrain = generate_terrain(template_terrain, x_range=x_range, y_range=y_range)\n",
     "\n",
     "shade(terrain, cmap=['black', 'white'], how='linear')"
    ]
@@ -122,9 +124,6 @@
     "from xrspatial import hillshade\n",
     "from datashader.colors import Set1\n",
     "\n",
-    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=(-20, 20), y_range=(-20, 20))\n",
-    "\n",
-    "terrain = generate_terrain(canvas=cvs)\n",
     "terrain_shaded = shade(terrain, cmap=Elevation, alpha=128, how='linear')\n",
     "\n",
     "illuminated = hillshade(terrain)\n",
@@ -136,6 +135,8 @@
     "   'trail_segement_id': [11, 12, 13, 14, 15, 16, 17]\n",
     "})\n",
     "\n",
+    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=x_range, y_range=y_range)\n",
+    "\n",
     "zones_agg = cvs.line(zone_df, 'x', 'y', ds.sum('trail_segement_id'))\n",
     "zones_shaded = dynspread(shade(zones_agg, cmap=Set1), max_px=5)\n",
     "\n",
@@ -181,7 +182,7 @@
     "                    elevation_min=np.min,\n",
     "                    elevation_max=np.max)\n",
     "\n",
-    "zonal_stats(zones_agg, terrain, custom_stats)"
+    "zonal_stats(zones=zones_agg, values=terrain, stats_funcs=custom_stats)"
    ]
   },
   {
@@ -193,8 +194,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,

examples/user_guide/4_Focal.ipynb

@@ -32,6 +32,7 @@
    "outputs": [],
    "source": [
     "import numpy as np\n",
+    "import xarray as xr\n",
     "\n",
     "import datashader as ds\n",
     "from datashader.transfer_functions import shade\n",
@@ -64,8 +65,13 @@
     "W = 800\n",
     "H = 600\n",
     "\n",
-    "cvs = ds.Canvas(plot_width=W, plot_height=H, x_range=(-20e6, 20e6), y_range=(-20e6, 20e6))\n",
-    "terrain = generate_terrain(canvas=cvs, seed=1, zfactor=1000)\n",
+    "template_terrain = xr.DataArray(np.zeros((H, W)))\n",
+    "x_range=(-20e6, 20e6)\n",
+    "y_range=(-20e6, 20e6)\n",
+    "\n",
+    "terrain = generate_terrain(\n",
+    "    template_terrain, x_range=x_range, y_range=y_range, seed=1, zfactor=1000\n",
+    ")\n",
     "stack(shade(hillshade(terrain), cmap=['grey', 'white']), shade(terrain, cmap=Elevation, alpha=128))"
    ]
   },
@@ -196,8 +202,22 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
-   "name": "python"
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.5"
   }
  },
  "nbformat": 4,