Update with ipyurl v0.1.2

Author: davidbrochart

examples/introduction.ipynb

@@ -36,33 +36,6 @@
     "import matplotlib.pyplot as plt"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "These two cells are necessary to retrieve the server's URL:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "w = Url()\n",
-    "w"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def get_base_url(_):\n",
-    "    return w.url.rstrip('/')"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -176,7 +149,7 @@
    },
    "outputs": [],
    "source": [
-    "l = da.leaflet.plot(m, colormap=plt.cm.terrain, get_base_url=get_base_url)\n",
+    "l = da.leaflet.plot(m, colormap=plt.cm.terrain)\n",
     "# l.interact(opacity=(0., 1.))"
    ]
   },

setup.py

@@ -22,7 +22,7 @@ def get_data_files():
     'affine>=2',
     'mercantile>=1',
     'ipyspin>=0.1.1',
-    'ipyurl',
+    'ipyurl>=0.1.2',
 ]
 
 setup_requirements = [ ]

xarray_leaflet/xarray_leaflet.py

@@ -203,12 +203,10 @@ def plot(self,
             self.dx = float((self.x_right - self.x_left) / (x.size - 1))
             self.dy = float((self.y_upper - self.y_lower) / (y.size - 1))
 
-            if get_base_url is not None:
-                self.base_url = get_base_url(self.m.window_url)
+            if get_base_url is None:
+                self.base_url = None
             else:
-                self.url_widget = Url()
-                display(self.url_widget)
-                self.base_url = self.url_widget.url.rstrip('/') or None
+                self.base_url = get_base_url(self.m.window_url)
 
             if fit_bounds:
                 asyncio.ensure_future(self.async_fit_bounds())
@@ -422,7 +420,9 @@ async def async_wait_for_bounds(self):
             if len(self.m.bounds) == 0:
                 await wait_for_change(self.m, 'bounds')
             if self.base_url is None:
-                self.base_url = await self.url_widget.get_url().rstrip('/')
+                self.url_widget = Url()
+                display(self.url_widget)
+                self.base_url = (await self.url_widget.get_url()).rstrip('/')
             self.map_ready = True
 
 
@@ -456,5 +456,7 @@ async def async_fit_bounds(self):
                         await wait_for_change(self.m, 'bounds')
                         break
             if self.base_url is None:
-                self.base_url = await self.url_widget.get_url().rstrip('/')
+                self.url_widget = Url()
+                display(self.url_widget)
+                self.base_url = (await self.url_widget.get_url()).rstrip('/')
             self.map_ready = True