Merge pull request #1047 from Conengmo/leaflet-1-4

Update to Leaflet 1.4.0
python-visualization · Jan 3, 2019 · 39ca695 · 39ca695
2 parents 3b972c8 + 3b4a8cb
commit 39ca695
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/folium/features.py b/folium/features.py
@@ -1063,10 +1063,10 @@ class DivIcon(MacroElement):
     html : string
         A custom HTML code to put inside the div element.
 
-
-    http://leafletjs.com/reference-1.2.0.html#divicon
+    See https://leafletjs.com/reference-1.4.0.html#divicon
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
 

diff --git a/folium/folium.py b/folium/folium.py
@@ -23,7 +23,7 @@
 
 _default_js = [
     ('leaflet',
-     'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.js'),
+     'https://cdn.jsdelivr.net/npm/leaflet@1.4.0/dist/leaflet.js'),
     ('jquery',
      'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'),
     ('bootstrap',
@@ -34,7 +34,7 @@
 
 _default_css = [
     ('leaflet_css',
-     'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css'),
+     'https://cdn.jsdelivr.net/npm/leaflet@1.4.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/raster_layers.py b/folium/raster_layers.py
@@ -163,7 +163,7 @@ class WmsTileLayer(Layer):
         for setting extra tileLayer.wms parameters or as extra parameters in
         the WMS request.
 
-    http://leafletjs.com/reference-1.2.0.html#tilelayer-wms
+    See https://leafletjs.com/reference-1.4.0.html#tilelayer-wms
     """
     _template = Template(u"""
         {% macro script(this, kwargs) %}
@@ -234,7 +234,7 @@ class ImageOverlay(Layer):
     show: bool, default True
         Whether the layer will be shown on opening (only for overlays).
 
-    See http://leafletjs.com/reference-1.2.0.html#imageoverlay for more
+    See https://leafletjs.com/reference-1.4.0.html#imageoverlay for more
     options.
 
     """

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.3.4/dist/leaflet.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/leaflet@1.4.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>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css"/>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.4.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"/>

diff --git a/folium/vector_layers.py b/folium/vector_layers.py
@@ -62,8 +62,7 @@ def path_options(line=False, radius=False, **kwargs):
 
     Note that the presence of `fill_color` will override `fill=False`.
 
-
-    http://leafletjs.com/reference-1.2.0.html#path
+    See https://leafletjs.com/reference-1.4.0.html#path
 
     """
 
@@ -130,9 +129,10 @@ class PolyLine(Marker):
         Disable polyline clipping.
 
 
-    http://leafletjs.com/reference-1.2.0.html#polyline
+    See https://leafletjs.com/reference-1.4.0.html#polyline
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
                 var {{this.get_name()}} = L.polyline(
@@ -168,9 +168,10 @@ class Polygon(Marker):
         Display a text when hovering over the object.
 
 
-    http://leafletjs.com/reference-1.2.0.html#polygon
+    See https://leafletjs.com/reference-1.4.0.html#polygon
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
 
@@ -206,9 +207,10 @@ class Rectangle(Marker):
         Display a text when hovering over the object.
 
 
-    http://leafletjs.com/reference-1.2.0.html#rectangle
+    See https://leafletjs.com/reference-1.4.0.html#rectangle
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
 
@@ -250,9 +252,10 @@ class Circle(Marker):
         Radius of the circle, in meters.
 
 
-    http://leafletjs.com/reference-1.2.0.html#circle
+    See https://leafletjs.com/reference-1.4.0.html#circle
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
 
@@ -289,9 +292,10 @@ class CircleMarker(Marker):
         Radius of the circle marker, in pixels.
 
 
-    http://leafletjs.com/reference-1.2.0.html#circlemarker
+    See https://leafletjs.com/reference-1.4.0.html#circlemarker
 
     """
+
     _template = Template(u"""
             {% macro script(this, kwargs) %}
             var {{this.get_name()}} = L.circleMarker(