From 983445afafea0cdc91af28eccca97b5c73fd15b9 Mon Sep 17 00:00:00 2001 From: Frank <33519926+Conengmo@users.noreply.github.com> Date: Sun, 5 Jan 2020 11:53:17 +0100 Subject: [PATCH] Upgrade Leaflet 1.5.1 -> 1.6.0 --- folium/features.py | 4 ++-- folium/folium.py | 6 +++--- folium/map.py | 8 ++++---- folium/plugins/draw.py | 2 +- folium/raster_layers.py | 6 +++--- folium/vector_layers.py | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/folium/features.py b/folium/features.py index e96d171be2..13a0e72ac9 100644 --- a/folium/features.py +++ b/folium/features.py @@ -931,7 +931,7 @@ class GeoJsonTooltip(GeoJsonDetail): Whether the tooltip should follow the mouse. **kwargs: Assorted. These values will map directly to the Leaflet Options. More info - available here: https://leafletjs.com/reference-1.5.1#tooltip + available here: https://leafletjs.com/reference-1.6.0#tooltip Examples -------- @@ -1287,7 +1287,7 @@ class DivIcon(MacroElement): html : string A custom HTML code to put inside the div element. - See https://leafletjs.com/reference-1.5.1.html#divicon + See https://leafletjs.com/reference-1.6.0.html#divicon """ diff --git a/folium/folium.py b/folium/folium.py index 38827eecb7..6c13b86e28 100644 --- a/folium/folium.py +++ b/folium/folium.py @@ -26,7 +26,7 @@ _default_js = [ ('leaflet', - 'https://cdn.jsdelivr.net/npm/leaflet@1.5.1/dist/leaflet.js'), + 'https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.js'), ('jquery', 'https://code.jquery.com/jquery-1.12.4.min.js'), ('bootstrap', @@ -37,7 +37,7 @@ _default_css = [ ('leaflet_css', - 'https://cdn.jsdelivr.net/npm/leaflet@1.5.1/dist/leaflet.css'), + 'https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.css'), ('bootstrap_css', 'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'), ('bootstrap_theme_css', @@ -137,7 +137,7 @@ class Map(MacroElement): Display zoom controls on the map. **kwargs Additional keyword arguments are passed to Leaflets Map class: - https://leafletjs.com/reference-1.5.1.html#map + https://leafletjs.com/reference-1.6.0.html#map Returns ------- diff --git a/folium/map.py b/folium/map.py index 88b528e99c..38abf71a15 100644 --- a/folium/map.py +++ b/folium/map.py @@ -61,7 +61,7 @@ class FeatureGroup(Layer): Whether the layer will be shown on opening (only for overlays). **kwargs Additional (possibly inherited) options. See - https://leafletjs.com/reference-1.5.1.html#featuregroup + https://leafletjs.com/reference-1.6.0.html#featuregroup """ _template = Template(u""" @@ -102,7 +102,7 @@ class LayerControl(MacroElement): its layers so that the order is preserved when switching them on/off. **kwargs Additional (possibly inherited) options. See - https://leafletjs.com/reference-1.5.1.html#control-layers + https://leafletjs.com/reference-1.6.0.html#control-layers """ _template = Template(""" @@ -386,7 +386,7 @@ class Tooltip(MacroElement): Whether the tooltip should follow the mouse. **kwargs These values will map directly to the Leaflet Options. More info - available here: https://leafletjs.com/reference-1.5.1#tooltip + available here: https://leafletjs.com/reference-1.6.0#tooltip """ _template = Template(u""" @@ -500,7 +500,7 @@ class CustomPane(MacroElement): determine which map elements lie over/under it. The default (625) corresponds to between markers and tooltips. Default panes and z-indexes can be found at - https://leafletjs.com/reference-1.5.1.html#map-pane + https://leafletjs.com/reference-1.6.0.html#map-pane pointer_events: bool, default False Whether or not layers in the pane should interact with the cursor. Setting to False will prevent interfering with diff --git a/folium/plugins/draw.py b/folium/plugins/draw.py index 2b5e92185f..98c6ae93b5 100644 --- a/folium/plugins/draw.py +++ b/folium/plugins/draw.py @@ -17,7 +17,7 @@ class Draw(MacroElement): Name of geojson file position : {'topleft', 'toprigth', 'bottomleft', 'bottomright'} Position of control. - See https://leafletjs.com/reference-1.5.1.html#control + See https://leafletjs.com/reference-1.6.0.html#control draw_options : dict, optional The options used to configure the draw toolbar. See http://leaflet.github.io/Leaflet.draw/docs/leaflet-draw-latest.html#drawoptions diff --git a/folium/raster_layers.py b/folium/raster_layers.py index 337d9cad67..5a00e3f777 100644 --- a/folium/raster_layers.py +++ b/folium/raster_layers.py @@ -155,7 +155,7 @@ class WmsTileLayer(Layer): for setting extra tileLayer.wms parameters or as extra parameters in the WMS request. - See https://leafletjs.com/reference-1.5.1.html#tilelayer-wms + See https://leafletjs.com/reference-1.6.0.html#tilelayer-wms """ _template = Template(u""" {% macro script(this, kwargs) %} @@ -224,7 +224,7 @@ class ImageOverlay(Layer): show: bool, default True Whether the layer will be shown on opening (only for overlays). - See https://leafletjs.com/reference-1.5.1.html#imageoverlay for more + See https://leafletjs.com/reference-1.6.0.html#imageoverlay for more options. """ @@ -310,7 +310,7 @@ class VideoOverlay(Layer): Whether the layer will be shown on opening (only for overlays). **kwargs: Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#videooverlay + https://leafletjs.com/reference-1.6.0.html#videooverlay """ _template = Template(u""" diff --git a/folium/vector_layers.py b/folium/vector_layers.py index 8937bc9aac..f50697337c 100644 --- a/folium/vector_layers.py +++ b/folium/vector_layers.py @@ -59,7 +59,7 @@ def path_options(line=False, radius=False, **kwargs): Note that the presence of `fill_color` will override `fill=False`. - See https://leafletjs.com/reference-1.5.1.html#path + See https://leafletjs.com/reference-1.6.0.html#path """ @@ -142,7 +142,7 @@ class PolyLine(BaseMultiLocation): Disable polyline clipping. **kwargs Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#polyline + https://leafletjs.com/reference-1.6.0.html#polyline """ @@ -176,7 +176,7 @@ class Polygon(BaseMultiLocation): Display a text when hovering over the object. **kwargs Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#polygon + https://leafletjs.com/reference-1.6.0.html#polygon """ @@ -210,7 +210,7 @@ class Rectangle(BaseMultiLocation): Display a text when hovering over the object. **kwargs Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#rectangle + https://leafletjs.com/reference-1.6.0.html#rectangle """ @@ -250,7 +250,7 @@ class Circle(Marker): Radius of the circle, in meters. **kwargs Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#circle + https://leafletjs.com/reference-1.6.0.html#circle """ @@ -287,7 +287,7 @@ class CircleMarker(Marker): Radius of the circle marker, in pixels. **kwargs Other valid (possibly inherited) options. See: - https://leafletjs.com/reference-1.5.1.html#circlemarker + https://leafletjs.com/reference-1.6.0.html#circlemarker """