Merge pull request #939 from ocefpaf/update_leaflet_to_1.3.4

ocefpaf · web-flow · commit 000c7ecca649 · 2018-08-25T08:27:33.000-07:00
Bump leaflet version
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,9 @@
+0.7.0
+~~~~~
+
+- Update leaflet to 1.3.4 (ocefpaf #939)
+
+
 0.6.0
 ~~~~~
 
diff --git a/folium/folium.py b/folium/folium.py
@@ -27,7 +27,7 @@
 
 _default_js = [
     ('leaflet',
-     'https://cdn.jsdelivr.net/npm/leaflet@1.2.0/dist/leaflet.js'),
+     'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.js'),
     ('jquery',
      'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'),
     ('bootstrap',
@@ -38,7 +38,7 @@
 
 _default_css = [
     ('leaflet_css',
-     'https://cdn.jsdelivr.net/npm/leaflet@1.2.0/dist/leaflet.css'),
+     'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css'),
     ('bootstrap_css',
      'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'),
     ('bootstrap_theme_css',
diff --git a/folium/templates/fol_template.html b/folium/templates/fol_template.html
@@ -2,11 +2,11 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <script>L_PREFER_CANVAS=false; L_NO_TOUCH=false; L_DISABLE_3D=false;</script>
-    <script src="https://cdn.jsdelivr.net/npm/leaflet@1.2.0/dist/leaflet.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.2.0/dist/leaflet.css"/>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +0.7.0
 +~~~~~
++
 +- Update leaflet to 1.3.4 (ocefpaf #939)
++
++
 .6.0
 ~~~~~