Skip to content

Commit 545dfb7

Browse files
oefeoefe
committed
Merge branch 'main' into github-actions-badges
2 parents 558328f + cd9285f commit 545dfb7

16 files changed

Lines changed: 44 additions & 44 deletions

‎examples/CheckZorder.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"\n",
2626
"\n",
2727
"url = (\n",
28-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
28+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
2929
")\n",
3030
"state_geo = f\"{url}/us-states.json\"\n",
3131
"state_unemployment = f\"{url}/US_Unemployment_Oct2012.csv\"\n",
@@ -63,7 +63,7 @@
6363
],
6464
"metadata": {
6565
"kernelspec": {
66-
"display_name": "Python 3",
66+
"display_name": "Python 3 (ipykernel)",
6767
"language": "python",
6868
"name": "python3"
6969
},
@@ -77,7 +77,7 @@
7777
"name": "python",
7878
"nbconvert_exporter": "python",
7979
"pygments_lexer": "ipython3",
80-
"version": "3.9.0"
80+
"version": "3.9.7"
8181
}
8282
},
8383
"nbformat": 4,

‎examples/Colormaps.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"\n",
2626
"\n",
2727
"url = (\n",
28-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
28+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
2929
")\n",
3030
"us_states = f\"{url}/us-states.json\"\n",
3131
"US_Unemployment_Oct2012 = f\"{url}/US_Unemployment_Oct2012.csv\"\n",
@@ -1115,7 +1115,7 @@
11151115
],
11161116
"metadata": {
11171117
"kernelspec": {
1118-
"display_name": "Python 3",
1118+
"display_name": "Python 3 (ipykernel)",
11191119
"language": "python",
11201120
"name": "python3"
11211121
},
@@ -1129,7 +1129,7 @@
11291129
"name": "python",
11301130
"nbconvert_exporter": "python",
11311131
"pygments_lexer": "ipython3",
1132-
"version": "3.9.0"
1132+
"version": "3.9.7"
11331133
}
11341134
},
11351135
"nbformat": 4,

‎examples/CustomPanes.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"Load GeoJSON as in [GeoJSON_and_choropleth.ipynb](https://github.com/python-visualization/folium/blob/master/examples/GeoJSON_and_choropleth.ipynb)."
7+
"Load GeoJSON as in [GeoJSON_and_choropleth.ipynb](https://github.com/python-visualization/folium/blob/main/examples/GeoJSON_and_choropleth.ipynb)."
88
]
99
},
1010
{
@@ -25,7 +25,7 @@
2525
"\n",
2626
"\n",
2727
"url = (\n",
28-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
28+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
2929
")\n",
3030
"us_states = f\"{url}/us-states.json\"\n",
3131
"geo_json_data = json.loads(requests.get(us_states).text)"
@@ -175,7 +175,7 @@
175175
],
176176
"metadata": {
177177
"kernelspec": {
178-
"display_name": "Python 3",
178+
"display_name": "Python 3 (ipykernel)",
179179
"language": "python",
180180
"name": "python3"
181181
},
@@ -189,7 +189,7 @@
189189
"name": "python",
190190
"nbconvert_exporter": "python",
191191
"pygments_lexer": "ipython3",
192-
"version": "3.9.0"
192+
"version": "3.9.7"
193193
}
194194
},
195195
"nbformat": 4,

‎examples/FloatImage.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"\n",
2727
"url = (\n",
2828
" \"https://raw.githubusercontent.com/SECOORA/static_assets/\"\n",
29-
" \"master/maps/img/rose.png\"\n",
29+
" \"main/maps/img/rose.png\"\n",
3030
")\n",
3131
"\n",
3232
"m = folium.Map([-13, -38.15], zoom_start=10)\n",
@@ -39,7 +39,7 @@
3939
],
4040
"metadata": {
4141
"kernelspec": {
42-
"display_name": "Python 3",
42+
"display_name": "Python 3 (ipykernel)",
4343
"language": "python",
4444
"name": "python3"
4545
},
@@ -53,7 +53,7 @@
5353
"name": "python",
5454
"nbconvert_exporter": "python",
5555
"pygments_lexer": "ipython3",
56-
"version": "3.9.0"
56+
"version": "3.9.7"
5757
}
5858
},
5959
"nbformat": 4,

‎examples/GeoJSON_and_choropleth.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"import requests\n",
2828
"\n",
2929
"url = (\n",
30-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
30+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
3131
")\n",
3232
"us_states = f\"{url}/us-states.json\"\n",
3333
"\n",
@@ -882,7 +882,7 @@
882882
],
883883
"metadata": {
884884
"kernelspec": {
885-
"display_name": "Python 3",
885+
"display_name": "Python 3 (ipykernel)",
886886
"language": "python",
887887
"name": "python3"
888888
},
@@ -896,7 +896,7 @@
896896
"name": "python",
897897
"nbconvert_exporter": "python",
898898
"pygments_lexer": "ipython3",
899-
"version": "3.9.0"
899+
"version": "3.9.7"
900900
},
901901
"toc": {
902902
"base_numbering": 1,

‎examples/GeoJsonPopupAndTooltip.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
"\n",
212212
"\n",
213213
"response = requests.get(\n",
214-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data/us-states.json\"\n",
214+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data/us-states.json\"\n",
215215
")\n",
216216
"data = response.json()\n",
217217
"states = geopandas.GeoDataFrame.from_features(data, crs=\"EPSG:4326\")\n",
@@ -686,7 +686,7 @@
686686
],
687687
"metadata": {
688688
"kernelspec": {
689-
"display_name": "Python 3",
689+
"display_name": "Python 3 (ipykernel)",
690690
"language": "python",
691691
"name": "python3"
692692
},
@@ -700,7 +700,7 @@
700700
"name": "python",
701701
"nbconvert_exporter": "python",
702702
"pygments_lexer": "ipython3",
703-
"version": "3.9.0"
703+
"version": "3.9.7"
704704
}
705705
},
706706
"nbformat": 4,

‎examples/Geopandas_and_geo_interface.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"import geopandas\n",
125125
"\n",
126126
"url = (\n",
127-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
127+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
128128
")\n",
129129
"nybb = f\"{url}/nybb.zip\"\n",
130130
"boros = geopandas.read_file(nybb)\n",
@@ -376,7 +376,7 @@
376376
],
377377
"metadata": {
378378
"kernelspec": {
379-
"display_name": "Python 3",
379+
"display_name": "Python 3 (ipykernel)",
380380
"language": "python",
381381
"name": "python3"
382382
},
@@ -390,7 +390,7 @@
390390
"name": "python",
391391
"nbconvert_exporter": "python",
392392
"pygments_lexer": "ipython3",
393-
"version": "3.9.0"
393+
"version": "3.9.7"
394394
}
395395
},
396396
"nbformat": 4,

‎examples/Quickstart.ipynb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
"import requests\n",
365365
"\n",
366366
"url = (\n",
367-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
367+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
368368
")\n",
369369
"vis1 = json.loads(requests.get(f\"{url}/vis1.json\").text)\n",
370370
"vis2 = json.loads(requests.get(f\"{url}/vis2.json\").text)\n",
@@ -422,7 +422,7 @@
422422
"cell_type": "markdown",
423423
"metadata": {},
424424
"source": [
425-
"For more information about popups, please visit [Popups.ipynb](https://nbviewer.jupyter.org/github/python-visualization/folium/blob/master/examples/Popups.ipynb)"
425+
"For more information about popups, please visit [Popups.ipynb](https://nbviewer.jupyter.org/github/python-visualization/folium/blob/main/examples/Popups.ipynb)"
426426
]
427427
},
428428
{
@@ -457,7 +457,7 @@
457457
],
458458
"source": [
459459
"url = (\n",
460-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
460+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
461461
")\n",
462462
"antarctic_ice_edge = f\"{url}/antarctic_ice_edge.json\"\n",
463463
"antarctic_ice_shelf_topo = f\"{url}/antarctic_ice_shelf_topo.json\"\n",
@@ -515,7 +515,7 @@
515515
"import pandas as pd\n",
516516
"\n",
517517
"url = (\n",
518-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
518+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
519519
")\n",
520520
"state_geo = f\"{url}/us-states.json\"\n",
521521
"state_unemployment = f\"{url}/US_Unemployment_Oct2012.csv\"\n",
@@ -628,7 +628,7 @@
628628
"import branca\n",
629629
"\n",
630630
"url = (\n",
631-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
631+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
632632
")\n",
633633
"county_data = f\"{url}/us_county_data.csv\"\n",
634634
"county_geo = f\"{url}/us_counties_20m_topo.json\"\n",
@@ -759,13 +759,13 @@
759759
"source": [
760760
"For more examples and use cases please take a look at the gallery:\n",
761761
"\n",
762-
"https://nbviewer.jupyter.org/github/python-visualization/folium_contrib/tree/master/notebooks/"
762+
"https://nbviewer.jupyter.org/github/python-visualization/folium_contrib/tree/main/notebooks/"
763763
]
764764
}
765765
],
766766
"metadata": {
767767
"kernelspec": {
768-
"display_name": "Python 3",
768+
"display_name": "Python 3 (ipykernel)",
769769
"language": "python",
770770
"name": "python3"
771771
},
@@ -779,7 +779,7 @@
779779
"name": "python",
780780
"nbconvert_exporter": "python",
781781
"pygments_lexer": "ipython3",
782-
"version": "3.9.0"
782+
"version": "3.9.7"
783783
},
784784
"toc": {
785785
"base_numbering": 1,

‎examples/SmoothFactor.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"\n",
4444
"\n",
4545
"url = (\n",
46-
" \"https://raw.githubusercontent.com/python-visualization/folium/master/examples/data\"\n",
46+
" \"https://raw.githubusercontent.com/python-visualization/folium/main/examples/data\"\n",
4747
")\n",
4848
"fname = f\"{url}/antarctic_ice_shelf_topo.json\"\n",
4949
"topo = json.loads(requests.get(fname).text)\n",
@@ -74,7 +74,7 @@
7474
],
7575
"metadata": {
7676
"kernelspec": {
77-
"display_name": "Python 3",
77+
"display_name": "Python 3 (ipykernel)",
7878
"language": "python",
7979
"name": "python3"
8080
},
@@ -88,7 +88,7 @@
8888
"name": "python",
8989
"nbconvert_exporter": "python",
9090
"pygments_lexer": "ipython3",
91-
"version": "3.9.0"
91+
"version": "3.9.7"
9292
}
9393
},
9494
"nbformat": 4,

‎examples/plugin-Search.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"\n",
1818
"\n",
1919
"states = geopandas.read_file(\n",
20-
" \"https://rawcdn.githack.com/PublicaMundi/MappingAPI/master/data/geojson/us-states.json\",\n",
20+
" \"https://rawcdn.githack.com/PublicaMundi/MappingAPI/main/data/geojson/us-states.json\",\n",
2121
" driver=\"GeoJSON\",\n",
2222
")\n",
2323
"\n",
@@ -516,7 +516,7 @@
516516
],
517517
"metadata": {
518518
"kernelspec": {
519-
"display_name": "Python 3",
519+
"display_name": "Python 3 (ipykernel)",
520520
"language": "python",
521521
"name": "python3"
522522
},
@@ -530,7 +530,7 @@
530530
"name": "python",
531531
"nbconvert_exporter": "python",
532532
"pygments_lexer": "ipython3",
533-
"version": "3.9.0"
533+
"version": "3.9.7"
534534
}
535535
},
536536
"nbformat": 4,

0 commit comments

Comments
 (0)