Skip to content

Commit 49b620b

Browse files
ocefpafocefpaf
committed
Update to leaflet 1.0.1
1 parent 3d3d26a commit 49b620b

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎folium/map.py‎

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

2525
_default_js = [
2626
('leaflet',
27-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.js"),
27+
'https://unpkg.com/leaflet@1.0.1/dist/leaflet.js'),
2828
('jquery',
29-
"https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"),
29+
'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'),
3030
('bootstrap',
31-
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"),
31+
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js'),
3232
('awesome_markers',
33-
"https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"), # noqa
33+
'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/1.0.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/1.0.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 = [
41-
("leaflet_css",
42-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.css"),
43-
("bootstrap_css",
44-
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"),
45-
("bootstrap_theme_css",
46-
"https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"), # noqa
47-
("awesome_markers_font_css",
48-
"https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"), # noqa
49-
("awesome_markers_css",
50-
"https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css"), # noqa
51-
("marker_cluster_default_css",
52-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css"), # noqa
53-
("marker_cluster_css",
54-
"https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css"), # noqa
55-
("awesome_rotate_css",
56-
"https://rawgit.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css"), # noqa
41+
('leaflet_css',
42+
'https://unpkg.com/leaflet@1.0.1/dist/leaflet.css'),
43+
('bootstrap_css',
44+
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'),
45+
('bootstrap_theme_css',
46+
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css'), # noqa
47+
('awesome_markers_font_css',
48+
'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css'), # noqa
49+
('awesome_markers_css',
50+
'https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'), # noqa
51+
('marker_cluster_default_css',
52+
'https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.Default.css'), # noqa
53+
('marker_cluster_css',
54+
'https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/MarkerCluster.css'), # noqa
55+
('awesome_rotate_css',
56+
'https://rawgit.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css'), # noqa
5757
]
5858

5959

‎folium/templates/fol_template.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
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/1.0.0/leaflet.js"></script>
5+
<script src="https://unpkg.com/leaflet@1.0.1/dist/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>
99
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster-src.js"></script>
1010
<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/1.0.0/leaflet.css" />
12+
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.1/dist/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"/>

0 commit comments

Comments
 (0)