Skip to content

Commit 7314185

Browse files
justb4justb4
authored
#159 fix axis ordering in examples and localize to Estonia/Tartu (#163)
1 parent 718705e commit 7314185

3 files changed

Lines changed: 94 additions & 63 deletions

File tree

‎workshop/jupyter/content/notebooks/07-visualization.ipynb‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"source": [
4848
"import folium\n",
4949
"\n",
50-
"folium_map = folium.Map(location=[-34.603722, -58.381592])"
50+
"folium_map = folium.Map(location=[58.378025, 26.728493])"
5151
]
5252
},
5353
{
@@ -207,7 +207,7 @@
207207
"source": [
208208
"from ipyleaflet import *\n",
209209
"\n",
210-
"m = Map(center=(-34.603722, -58.381592), zoom=3, basemap=basemaps.OpenStreetMap.Mapnik)\n",
210+
"m = Map(center=(58.378025, 26.728493), zoom=10, basemap=basemaps.OpenStreetMap.Mapnik)\n",
211211
"m"
212212
]
213213
},
@@ -248,7 +248,8 @@
248248
"metadata": {
249249
"pycharm": {
250250
"name": "#%%\n"
251-
}
251+
},
252+
"scrolled": true
252253
},
253254
"outputs": [],
254255
"source": [
@@ -343,7 +344,7 @@
343344
"source": [
344345
"import ipywidgets\n",
345346
" \n",
346-
"ipywidgets.HBox([m, Map(center=[-34.603722, -58.381592], zoom=8)])"
347+
"ipywidgets.HBox([m, Map(center=[58.378025, 26.728493], zoom=8)])"
347348
]
348349
},
349350
{
@@ -363,12 +364,12 @@
363364
"source": [
364365
"from ipywidgets import HTML\n",
365366
"from ipyleaflet import Map, Marker, Popup\n",
366-
"center = (43.7782731,11.247928)\n",
367+
"center = (58.3734,26.716)\n",
367368
"m = Map(center=center, zoom=17, close_popup_on_click=False)\n",
368-
"marker = Marker(location=(43.7782731,11.247928))\n",
369+
"marker = Marker(location=(58.3734,26.716))\n",
369370
"m.add_layer(marker)\n",
370371
"message2 = HTML()\n",
371-
"message2.value = \"Hey!! I'm speaking at foss4g 2023 🔥\"\n",
372+
"message2.value = \"Hey!! I'm speaking at FOSS4GE 2024 🔥\"\n",
372373
"marker.popup = message2\n",
373374
"m"
374375
]
@@ -932,9 +933,9 @@
932933
"name": "python",
933934
"nbconvert_exporter": "python",
934935
"pygments_lexer": "ipython3",
935-
"version": "3.10.6"
936+
"version": "3.10.12"
936937
}
937938
},
938939
"nbformat": 4,
939-
"nbformat_minor": 2
940+
"nbformat_minor": 4
940941
}

‎workshop/jupyter/content/notebooks/test/07-folium-1.html‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<!DOCTYPE html>
2-
<head>
2+
<html>
3+
<head>
4+
35
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
46

57
<script>
@@ -9,41 +11,44 @@
911

1012
<style>html, body {width: 100%;height: 100%;margin: 0;padding: 0;}</style>
1113
<style>#map {position:absolute;top:0;bottom:0;right:0;left:0;}</style>
12-
<script src="https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.js"></script>
13-
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
14-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
14+
<script src="https://cdn.jsdelivr.net/npm/leaflet@1.9.3/dist/leaflet.js"></script>
15+
<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
16+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js"></script>
1517
<script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
16-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.css"/>
17-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
18-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
19-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>
18+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.9.3/dist/leaflet.css"/>
19+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css"/>
20+
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"/>
21+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.2.0/css/all.min.css"/>
2022
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"/>
2123
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/leaflet.awesome.rotate.min.css"/>
2224

2325
<meta name="viewport" content="width=device-width,
2426
initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
2527
<style>
26-
#map_c2561d9cca50a16434e6c4b3cff96171 {
28+
#map_a4e2f2c32c5078b8180d56fb8b10611b {
2729
position: relative;
2830
width: 100.0%;
2931
height: 100.0%;
3032
left: 0.0%;
3133
top: 0.0%;
3234
}
35+
.leaflet-container { font-size: 1rem; }
3336
</style>
3437

3538
</head>
36-
<body>
39+
<body>
40+
3741

38-
<div class="folium-map" id="map_c2561d9cca50a16434e6c4b3cff96171" ></div>
42+
<div class="folium-map" id="map_a4e2f2c32c5078b8180d56fb8b10611b" ></div>
3943

4044
</body>
41-
<script>
45+
<script>
4246

43-
var map_c2561d9cca50a16434e6c4b3cff96171 = L.map(
44-
"map_c2561d9cca50a16434e6c4b3cff96171",
47+
48+
var map_a4e2f2c32c5078b8180d56fb8b10611b = L.map(
49+
"map_a4e2f2c32c5078b8180d56fb8b10611b",
4550
{
46-
center: [-34.603722, -58.381592],
51+
center: [58.378025, 26.728493],
4752
crs: L.CRS.EPSG3857,
4853
zoom: 10,
4954
zoomControl: true,
@@ -55,9 +60,16 @@
5560

5661

5762

58-
var tile_layer_05d5ffdfff34d0864eeee7bc60542925 = L.tileLayer(
59-
"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
60-
{"attribution": "Data by \u0026copy; \u003ca href=\"http://openstreetmap.org\"\u003eOpenStreetMap\u003c/a\u003e, under \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eODbL\u003c/a\u003e.", "detectRetina": false, "maxNativeZoom": 18, "maxZoom": 18, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
61-
).addTo(map_c2561d9cca50a16434e6c4b3cff96171);
63+
var tile_layer_44ca4ff4b66c51338a126bbd51a6d860 = L.tileLayer(
64+
"https://tile.openstreetmap.org/{z}/{x}/{y}.png",
65+
{"attribution": "\u0026copy; \u003ca href=\"https://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors", "detectRetina": false, "maxNativeZoom": 19, "maxZoom": 19, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
66+
);
67+
68+
69+
tile_layer_44ca4ff4b66c51338a126bbd51a6d860.addTo(map_a4e2f2c32c5078b8180d56fb8b10611b);
70+
71+
72+
tile_layer_44ca4ff4b66c51338a126bbd51a6d860.addTo(map_a4e2f2c32c5078b8180d56fb8b10611b);
6273

63-
</script>
74+
</script>
75+
</html>

‎workshop/jupyter/content/notebooks/test/07-folium-2.html‎

Lines changed: 52 additions & 34 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)