diff --git a/folium/features.py b/folium/features.py index 37c9ccc0e..ae219ae3a 100644 --- 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 index f809fa821..4fddc9b93 100644 --- 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 index 557587b2d..2a70b033a 100644 --- 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 index 0a7c99559..7af1fa66f 100644 --- a/folium/templates/fol_template.html +++ b/folium/templates/fol_template.html @@ -2,11 +2,11 @@
- + - + diff --git a/folium/vector_layers.py b/folium/vector_layers.py index 89e126b92..9a7ae58a4 100644 --- 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(