Merge pull request #639 from ocefpaf/update_leaflet

ocefpaf · web-flow · commit dc34582d1377 · 2017-06-27T21:17:16.000-03:00
update to leafet 1.1.0
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,7 @@
 ~~~~~
 - Experimental support for a static png output (ocefpaf #634)
 - Added support for subdomains options in TileLayer (damselem #623)
+- Updated to leaflet 1.1.0 (ocefpaf #639)
 
 0.3.0
 ~~~~~
diff --git a/folium/map.py b/folium/map.py
@@ -28,7 +28,7 @@
 
 _default_js = [
     ('leaflet',
-     'https://unpkg.com/leaflet@1.0.1/dist/leaflet.js'),
+     'https://unpkg.com/leaflet@1.1.0/dist/leaflet.js'),
     ('jquery',
      'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'),
     ('bootstrap',
@@ -43,7 +43,7 @@
 
 _default_css = [
     ('leaflet_css',
-     'https://unpkg.com/leaflet@1.0.1/dist/leaflet.css'),
+     'https://unpkg.com/leaflet@1.1.0/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,14 +2,14 @@
 <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://unpkg.com/leaflet@1.0.1/dist/leaflet.js"></script>
+   <script src="https://unpkg.com/leaflet@1.1.0/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>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster-src.js"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.0.0/leaflet.markercluster.js"></script>
 
-   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.1/dist/leaflet.css" />
+   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.1.0/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"/>
@@ -86,4 +86,3 @@
     {% endfor %}
 
 </script>
-
