diff --git a/CHANGES.txt b/CHANGES.txt index 67ffe423bb..85ea2b95fe 100644 --- 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 index ffa572b93c..931d2643fc 100644 --- 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 index c7a7243c41..43dfb86401 100644 --- a/folium/templates/fol_template.html +++ b/folium/templates/fol_template.html @@ -2,14 +2,14 @@ - + - + @@ -86,4 +86,3 @@ {% endfor %} -