Skip to content

Commit c738402

Browse files
MackyDIARRAMackyDIARRA
authored
Remove outdated basemaps from the docs (#924)
* Ipyleaflet basemap library modified * undo changes to notebooks * ipyflex added in environment.yml file
1 parent b5b367b commit c738402

12 files changed

+107
-145
lines changed

‎docs/source/api_reference/basemaps.rst

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ your own ``TileLayer`` layer.
2020
Map(basemap=basemaps.OpenStreetMap.Mapnik, center=center, zoom=zoom)
2121

2222

23-
.. jupyter-execute::
24-
25-
26-
Map(basemap=basemaps.OpenStreetMap.BlackAndWhite, center=center, zoom=zoom)
27-
28-
2923
.. jupyter-execute::
3024

3125
Map(basemap=basemaps.OpenStreetMap.France, center=center, zoom=zoom)
@@ -49,16 +43,6 @@ your own ``TileLayer`` layer.
4943
Map(basemap=basemaps.Gaode.Satellite, center=center, zoom=zoom)
5044

5145

52-
.. jupyter-execute::
53-
54-
Map(basemap=basemaps.Hydda.Full, center=center, zoom=zoom)
55-
56-
57-
.. jupyter-execute::
58-
59-
Map(basemap=basemaps.Hydda.Base, center=center, zoom=zoom)
60-
61-
6246
.. jupyter-execute::
6347

6448
Map(basemap=basemaps.Esri.WorldStreetMap, center=center, zoom=zoom)
@@ -89,9 +73,6 @@ your own ``TileLayer`` layer.
8973
Map(basemap=basemaps.HikeBike.HikeBike, center=center, zoom=zoom)
9074

9175

92-
.. jupyter-execute::
93-
94-
Map(basemap=basemaps.MtbMap, center=center, zoom=zoom)
9576

9677

9778
.. jupyter-execute::

‎environment.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
name: ipyleaflet
23
channels:
34
- conda-forge
@@ -15,3 +16,4 @@ dependencies:
1516
- geopandas
1617
- netcdf4
1718
- xarray
19+
- ipyflex

‎examples/AntPath.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": 2,
5+
"execution_count": null,
66
"metadata": {},
77
"outputs": [],
88
"source": [

‎examples/CanvasRenderer.ipynb

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": 1,
5+
"execution_count": null,
66
"id": "24ede0d7-88e1-4955-9094-e10a9aebe5e7",
77
"metadata": {},
88
"outputs": [],
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"cell_type": "code",
18-
"execution_count": 8,
18+
"execution_count": null,
1919
"id": "c667213f-cfed-4f0c-835a-a52a0f57ffe8",
2020
"metadata": {},
2121
"outputs": [],
@@ -31,25 +31,10 @@
3131
},
3232
{
3333
"cell_type": "code",
34-
"execution_count": 9,
34+
"execution_count": null,
3535
"id": "b7a07e2f-8396-4424-8ec0-8bdad8a1e982",
3636
"metadata": {},
37-
"outputs": [
38-
{
39-
"data": {
40-
"application/vnd.jupyter.widget-view+json": {
41-
"model_id": "4f0a677d25ad4f6a8505d1858039e9f4",
42-
"version_major": 2,
43-
"version_minor": 0
44-
},
45-
"text/plain": [
46-
"Map(center=[48.1, 17.1], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_out…"
47-
]
48-
},
49-
"metadata": {},
50-
"output_type": "display_data"
51-
}
52-
],
37+
"outputs": [],
5338
"source": [
5439
"m = Map(center=(48.1, 17.1), zoom=8, prefer_canvas=True)\n",
5540
"\n",

‎examples/GeoData.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
],
181181
"metadata": {
182182
"kernelspec": {
183-
"display_name": "Python 3",
183+
"display_name": "Python 3 (ipykernel)",
184184
"language": "python",
185185
"name": "python3"
186186
},
@@ -194,9 +194,9 @@
194194
"name": "python",
195195
"nbconvert_exporter": "python",
196196
"pygments_lexer": "ipython3",
197-
"version": "3.7.3"
197+
"version": "3.10.0"
198198
}
199199
},
200200
"nbformat": 4,
201-
"nbformat_minor": 2
201+
"nbformat_minor": 4
202202
}

‎examples/GeoJSON.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,23 @@
159159
],
160160
"metadata": {
161161
"kernelspec": {
162-
"display_name": "Python 3",
162+
"display_name": "Python 3 (ipykernel)",
163163
"language": "python",
164164
"name": "python3"
165165
},
166166
"language_info": {
167167
"codemirror_mode": {
168168
"name": "ipython",
169-
"version": 2
169+
"version": 3
170170
},
171171
"file_extension": ".py",
172172
"mimetype": "text/x-python",
173173
"name": "python",
174174
"nbconvert_exporter": "python",
175-
"pygments_lexer": "ipython2",
176-
"version": "2.7.13"
175+
"pygments_lexer": "ipython3",
176+
"version": "3.10.0"
177177
}
178178
},
179179
"nbformat": 4,
180-
"nbformat_minor": 1
180+
"nbformat_minor": 4
181181
}

‎examples/GeoJson_EU_on_hover.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
],
7373
"metadata": {
7474
"kernelspec": {
75-
"display_name": "Python 3",
75+
"display_name": "Python 3 (ipykernel)",
7676
"language": "python",
7777
"name": "python3"
7878
},
@@ -86,9 +86,9 @@
8686
"name": "python",
8787
"nbconvert_exporter": "python",
8888
"pygments_lexer": "ipython3",
89-
"version": "3.8.1"
89+
"version": "3.10.0"
9090
}
9191
},
9292
"nbformat": 4,
93-
"nbformat_minor": 2
93+
"nbformat_minor": 4
9494
}

‎examples/Image_slider.ipynb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,7 @@
410410
{
411411
"cell_type": "code",
412412
"execution_count": null,
413-
"metadata": {
414-
"scrolled": false
415-
},
413+
"metadata": {},
416414
"outputs": [],
417415
"source": [
418416
"VBox([date_slider, snapshot, m])"

‎examples/LegendControl.ipynb

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"cell_type": "code",
19-
"execution_count": 104,
19+
"execution_count": null,
2020
"metadata": {},
2121
"outputs": [],
2222
"source": [
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"cell_type": "code",
28-
"execution_count": 105,
28+
"execution_count": null,
2929
"metadata": {},
3030
"outputs": [],
3131
"source": [
@@ -34,24 +34,9 @@
3434
},
3535
{
3636
"cell_type": "code",
37-
"execution_count": 106,
38-
"metadata": {},
39-
"outputs": [
40-
{
41-
"data": {
42-
"application/vnd.jupyter.widget-view+json": {
43-
"model_id": "e3697c421ece40cd9508549298ad457a",
44-
"version_major": 2,
45-
"version_minor": 0
46-
},
47-
"text/plain": [
48-
"Map(center=[-10, -45], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_out_t…"
49-
]
50-
},
51-
"metadata": {},
52-
"output_type": "display_data"
53-
}
54-
],
37+
"execution_count": null,
38+
"metadata": {},
39+
"outputs": [],
5540
"source": [
5641
"mymap"
5742
]
@@ -72,7 +57,7 @@
7257
},
7358
{
7459
"cell_type": "code",
75-
"execution_count": 107,
60+
"execution_count": null,
7661
"metadata": {},
7762
"outputs": [],
7863
"source": [
@@ -85,7 +70,7 @@
8570
},
8671
{
8772
"cell_type": "code",
88-
"execution_count": 108,
73+
"execution_count": null,
8974
"metadata": {},
9075
"outputs": [],
9176
"source": [
@@ -108,20 +93,9 @@
10893
},
10994
{
11095
"cell_type": "code",
111-
"execution_count": 109,
112-
"metadata": {},
113-
"outputs": [
114-
{
115-
"data": {
116-
"text/plain": [
117-
"'Risk'"
118-
]
119-
},
120-
"execution_count": 109,
121-
"metadata": {},
122-
"output_type": "execute_result"
123-
}
124-
],
96+
"execution_count": null,
97+
"metadata": {},
98+
"outputs": [],
12599
"source": [
126100
"a_legend.name = \"Risk\" ## set name\n",
127101
"a_legend.name # get name"
@@ -136,7 +110,7 @@
136110
},
137111
{
138112
"cell_type": "code",
139-
"execution_count": 110,
113+
"execution_count": null,
140114
"metadata": {},
141115
"outputs": [],
142116
"source": [
@@ -148,7 +122,7 @@
148122
},
149123
{
150124
"cell_type": "code",
151-
"execution_count": 111,
125+
"execution_count": null,
152126
"metadata": {},
153127
"outputs": [],
154128
"source": [
@@ -164,20 +138,9 @@
164138
},
165139
{
166140
"cell_type": "code",
167-
"execution_count": 112,
168-
"metadata": {},
169-
"outputs": [
170-
{
171-
"data": {
172-
"text/plain": [
173-
"'topright'"
174-
]
175-
},
176-
"execution_count": 112,
177-
"metadata": {},
178-
"output_type": "execute_result"
179-
}
180-
],
141+
"execution_count": null,
142+
"metadata": {},
143+
"outputs": [],
181144
"source": [
182145
"a_legend.positioning = \"topright\" # set positioning : possible values are topleft, topright, bottomleft, bottomright\n",
183146
"a_legend.positioning # get current positioning"

‎examples/Radiation.ipynb

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,67 @@
111111
"\n",
112112
"m.add_control(search)\n",
113113
"\n",
114-
"\n",
115-
"m"
114+
"\n"
116115
]
116+
},
117+
{
118+
"cell_type": "code",
119+
"execution_count": null,
120+
"id": "049eafa5-e939-442a-a24e-cfd69ef3372d",
121+
"metadata": {},
122+
"outputs": [],
123+
"source": [
124+
"from ipyflex import FlexLayout\n",
125+
"w={\"dashboard\": m } \n"
126+
]
127+
},
128+
{
129+
"cell_type": "code",
130+
"execution_count": null,
131+
"id": "54d29b4f-682c-4991-8758-1af10ded84cc",
132+
"metadata": {},
133+
"outputs": [],
134+
"source": [
135+
"a = FlexLayout(w, template='kk.json', editable=False)"
136+
]
137+
},
138+
{
139+
"cell_type": "code",
140+
"execution_count": null,
141+
"id": "30b41636-a1fe-45db-8ae9-a14b8bc8f6df",
142+
"metadata": {},
143+
"outputs": [],
144+
"source": [
145+
"a"
146+
]
147+
},
148+
{
149+
"cell_type": "code",
150+
"execution_count": null,
151+
"id": "f01ea9ca-6c51-442b-aeb6-e8d76a120802",
152+
"metadata": {},
153+
"outputs": [],
154+
"source": [
155+
"slider = IntSlider()"
156+
]
157+
},
158+
{
159+
"cell_type": "code",
160+
"execution_count": null,
161+
"id": "68e6ed4f-a38e-4508-a9b7-004d86a6bde2",
162+
"metadata": {},
163+
"outputs": [],
164+
"source": [
165+
"a.add('hh', slider)"
166+
]
167+
},
168+
{
169+
"cell_type": "code",
170+
"execution_count": null,
171+
"id": "3c9cf06f-e32b-4495-a521-6e7395aeeb78",
172+
"metadata": {},
173+
"outputs": [],
174+
"source": []
117175
}
118176
],
119177
"metadata": {

0 commit comments

Comments
 (0)