Remove outdated basemaps from the docs (#924)

* Ipyleaflet basemap library modified * undo changes to notebooks * ipyflex added in environment.yml file
jupyter-widgets · Feb 9, 2022 · c738402 · c738402
1 parent b5b367b
commit c738402
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 145 deletions.
diff --git a/docs/source/api_reference/basemaps.rst b/docs/source/api_reference/basemaps.rst
@@ -20,12 +20,6 @@ your own ``TileLayer`` layer.
     Map(basemap=basemaps.OpenStreetMap.Mapnik, center=center, zoom=zoom)
 
 
-.. jupyter-execute::
-
-
-    Map(basemap=basemaps.OpenStreetMap.BlackAndWhite, center=center, zoom=zoom)
-
-
 .. jupyter-execute::
 
     Map(basemap=basemaps.OpenStreetMap.France, center=center, zoom=zoom)
@@ -49,16 +43,6 @@ your own ``TileLayer`` layer.
     Map(basemap=basemaps.Gaode.Satellite, center=center, zoom=zoom)
 
 
-.. jupyter-execute::
-
-    Map(basemap=basemaps.Hydda.Full, center=center, zoom=zoom)
-
-
-.. jupyter-execute::
-
-    Map(basemap=basemaps.Hydda.Base, center=center, zoom=zoom)
-
-
 .. jupyter-execute::
 
     Map(basemap=basemaps.Esri.WorldStreetMap, center=center, zoom=zoom)
@@ -89,9 +73,6 @@ your own ``TileLayer`` layer.
     Map(basemap=basemaps.HikeBike.HikeBike, center=center, zoom=zoom)
 
 
-.. jupyter-execute::
-
-    Map(basemap=basemaps.MtbMap, center=center, zoom=zoom)
 
 
 .. jupyter-execute::

diff --git a/environment.yml b/environment.yml
@@ -1,3 +1,4 @@
+
 name: ipyleaflet
 channels:
   - conda-forge
@@ -15,3 +16,4 @@ dependencies:
   - geopandas
   - netcdf4
   - xarray
+  - ipyflex
diff --git a/examples/AntPath.ipynb b/examples/AntPath.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/examples/CanvasRenderer.ipynb b/examples/CanvasRenderer.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "24ede0d7-88e1-4955-9094-e10a9aebe5e7",
    "metadata": {},
    "outputs": [],
@@ -15,7 +15,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "c667213f-cfed-4f0c-835a-a52a0f57ffe8",
    "metadata": {},
    "outputs": [],
@@ -31,25 +31,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "id": "b7a07e2f-8396-4424-8ec0-8bdad8a1e982",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "4f0a677d25ad4f6a8505d1858039e9f4",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Map(center=[48.1, 17.1], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_out…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "outputs": [],
    "source": [
     "m = Map(center=(48.1, 17.1), zoom=8, prefer_canvas=True)\n",
     "\n",

diff --git a/examples/GeoData.ipynb b/examples/GeoData.ipynb
@@ -180,7 +180,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -194,9 +194,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/examples/GeoJSON.ipynb b/examples/GeoJSON.ipynb
@@ -159,23 +159,23 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.13"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }
diff --git a/examples/GeoJson_EU_on_hover.ipynb b/examples/GeoJson_EU_on_hover.ipynb
@@ -72,7 +72,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -86,9 +86,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.10.0"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/examples/Image_slider.ipynb b/examples/Image_slider.ipynb
@@ -410,9 +410,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "VBox([date_slider, snapshot, m])"

diff --git a/examples/LegendControl.ipynb b/examples/LegendControl.ipynb
@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 104,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -25,7 +25,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 105,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -34,24 +34,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 106,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "e3697c421ece40cd9508549298ad457a",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Map(center=[-10, -45], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_out_t…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "mymap"
    ]
@@ -72,7 +57,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 107,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -85,7 +70,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 108,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -108,20 +93,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 109,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'Risk'"
-      ]
-     },
-     "execution_count": 109,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "a_legend.name = \"Risk\"  ## set name\n",
     "a_legend.name  # get name"
@@ -136,7 +110,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 110,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -148,7 +122,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 111,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -164,20 +138,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 112,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'topright'"
-      ]
-     },
-     "execution_count": 112,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "a_legend.positioning = \"topright\"  # set positioning : possible values are topleft, topright, bottomleft, bottomright\n",
     "a_legend.positioning  # get current positioning"

diff --git a/examples/Radiation.ipynb b/examples/Radiation.ipynb
@@ -111,9 +111,67 @@
     "\n",
     "m.add_control(search)\n",
     "\n",
-    "\n",
-    "m"
+    "\n"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "049eafa5-e939-442a-a24e-cfd69ef3372d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from ipyflex import FlexLayout\n",
+    "w={\"dashboard\": m } \n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "54d29b4f-682c-4991-8758-1af10ded84cc",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "a = FlexLayout(w, template='kk.json', editable=False)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "30b41636-a1fe-45db-8ae9-a14b8bc8f6df",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "a"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f01ea9ca-6c51-442b-aeb6-e8d76a120802",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "slider = IntSlider()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "68e6ed4f-a38e-4508-a9b7-004d86a6bde2",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "a.add('hh', slider)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3c9cf06f-e32b-4495-a521-6e7395aeeb78",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {