Skip to content

Commit 91b32f2

Browse files
ocefpafocefpaf
authored
Merge pull request #531 from juoceano/use_leaflet_1
Use leaflet 1.0.0
2 parents f6fce3c + 2059228 commit 91b32f2

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎folium/features.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def render(self, **kwargs):
167167
"if it's not in a Figure.")
168168

169169
figure.header.add_child(
170-
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.2/leaflet-dvf.markers.min.js"), # noqa
170+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.0/leaflet-dvf.markers.min.js"), # noqa
171171
name='dvf_js')
172172

173173

@@ -624,19 +624,19 @@ def render(self, **kwargs):
624624
assert isinstance(figure, Figure), ("You cannot render this Element "
625625
"if it's not in a Figure.")
626626
figure.header.add_child(
627-
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster-src.js"), # noqa
627+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster-src.js"), # noqa
628628
name='marker_cluster_src')
629629

630630
figure.header.add_child(
631-
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js"), # noqa
631+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster.js"), # noqa
632632
name='marker_cluster')
633633

634634
figure.header.add_child(
635-
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"), # noqa
635+
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css"), # noqa
636636
name='marker_cluster_css')
637637

638638
figure.header.add_child(
639-
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"), # noqa
639+
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css"), # noqa
640640
name="marker_cluster_default_css")
641641

642642

‎folium/map.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424

2525
_default_js = [
2626
('leaflet',
27-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"),
27+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.js"),
2828
('jquery',
2929
"https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"),
3030
('bootstrap',
3131
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"),
3232
('awesome_markers',
3333
"https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"), # noqa
3434
('marker_cluster_src',
35-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster-src.js"), # noqa
35+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster-src.js"), # noqa
3636
('marker_cluster',
37-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js"), # noqa
37+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster.js"), # noqa
3838
]
3939

4040
_default_css = [
4141
("leaflet_css",
42-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css"),
42+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.css"),
4343
("bootstrap_css",
4444
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"),
4545
("bootstrap_theme_css",
@@ -49,9 +49,9 @@
4949
("awesome_markers_css",
5050
"https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"), # noqa
5151
("marker_cluster_default_css",
52-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"), # noqa
52+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css"), # noqa
5353
("marker_cluster_css",
54-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"), # noqa
54+
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css"), # noqa
5555
("awesome_rotate_css",
5656
"https://rawgit.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css"), # noqa
5757
]

‎folium/plugins/marker_cluster.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ def render(self, **kwargs):
6363
"if it's not in a Figure.")
6464

6565
figure.header.add_child(
66-
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js"), # noqa
66+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster.js"), # noqa
6767
name='markerclusterjs')
6868

6969
figure.header.add_child(
70-
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"), # noqa
70+
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css"), # noqa
7171
name='markerclustercss')
7272

7373
figure.header.add_child(
74-
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"), # noqa
74+
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css"), # noqa
7575
name='markerclusterdefaultcss')

‎folium/plugins/polyline_text_path.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@ def render(self, **kwargs):
8383
"if it's not in a Figure.")
8484

8585
figure.header.add_child(
86-
JavascriptLink("https://rawgit.com/makinacorpus/Leaflet.TextPath/gh-pages/leaflet.textpath.js"), # noqa
86+
JavascriptLink("https://rawgit.com/makinacorpus/Leaflet.TextPath/leaflet0.8-dev/leaflet.textpath.js"), # noqa
8787
name='polylinetextpath')

‎folium/templates/fol_template.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
<head>
33
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
44
<script>L_PREFER_CANVAS=false; L_NO_TOUCH=false; L_DISABLE_3D=false;</script>
5-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
5+
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.js"></script>
66
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
77
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
88
<script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
9-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster-src.js"></script>
10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js"></script>
9+
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster-src.js"></script>
10+
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster.js"></script>
1111

12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.css" />
1313
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
1414
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
1515
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>
1616
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"/>
17-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"/>
18-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"/>
17+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css"/>
18+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css"/>
1919
<link rel="stylesheet" href="https://rawgit.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css"/>
2020

2121
<style>

‎tests/plugins/test_marker_cluster.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ def test_marker_cluster():
2828

2929
# We verify that imports
3030
assert ('<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.'
31-
'markercluster/0.4.0/leaflet.markercluster.js"></script>') in out
31+
'markercluster/1.0.0/leaflet.markercluster.js"></script>') in out
3232
assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
33-
'libs/leaflet.markercluster/0.4.0/MarkerCluster.css" />') in out
33+
'libs/leaflet.markercluster/1.0.0/MarkerCluster.css" />') in out
3434
assert ('<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/'
35-
'libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css" />'
35+
'libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css" />'
3636
) in out
3737

3838
# Verify the script part is okay.

‎tests/plugins/test_polyline_text_path.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_polyline_text_path():
4545
out = m._parent.render()
4646

4747
# We verify that the script import is present.
48-
script = '<script src="https://rawgit.com/makinacorpus/Leaflet.TextPath/gh-pages/leaflet.textpath.js"></script>' # noqa
48+
script = '<script src="https://rawgit.com/makinacorpus/Leaflet.TextPath/leaflet0.8-dev/leaflet.textpath.js"></script>' # noqa
4949
assert script in out
5050

5151
# We verify that the script part is correct.

0 commit comments

Comments
 (0)