Skip to content

Commit 983445a

Browse files
committed
Upgrade Leaflet 1.5.1 -> 1.6.0
1 parent 61daf0c commit 983445a

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

folium/features.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ class GeoJsonTooltip(GeoJsonDetail):
931931
Whether the tooltip should follow the mouse.
932932
**kwargs: Assorted.
933933
These values will map directly to the Leaflet Options. More info
934-
available here: https://leafletjs.com/reference-1.5.1#tooltip
934+
available here: https://leafletjs.com/reference-1.6.0#tooltip
935935
936936
Examples
937937
--------
@@ -1287,7 +1287,7 @@ class DivIcon(MacroElement):
12871287
html : string
12881288
A custom HTML code to put inside the div element.
12891289
1290-
See https://leafletjs.com/reference-1.5.1.html#divicon
1290+
See https://leafletjs.com/reference-1.6.0.html#divicon
12911291
12921292
"""
12931293

folium/folium.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
_default_js = [
2828
('leaflet',
29-
'https://cdn.jsdelivr.net/npm/leaflet@1.5.1/dist/leaflet.js'),
29+
'https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.js'),
3030
('jquery',
3131
'https://code.jquery.com/jquery-1.12.4.min.js'),
3232
('bootstrap',
@@ -37,7 +37,7 @@
3737

3838
_default_css = [
3939
('leaflet_css',
40-
'https://cdn.jsdelivr.net/npm/leaflet@1.5.1/dist/leaflet.css'),
40+
'https://cdn.jsdelivr.net/npm/leaflet@1.6.0/dist/leaflet.css'),
4141
('bootstrap_css',
4242
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'),
4343
('bootstrap_theme_css',
@@ -137,7 +137,7 @@ class Map(MacroElement):
137137
Display zoom controls on the map.
138138
**kwargs
139139
Additional keyword arguments are passed to Leaflets Map class:
140-
https://leafletjs.com/reference-1.5.1.html#map
140+
https://leafletjs.com/reference-1.6.0.html#map
141141
142142
Returns
143143
-------

folium/map.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class FeatureGroup(Layer):
6161
Whether the layer will be shown on opening (only for overlays).
6262
**kwargs
6363
Additional (possibly inherited) options. See
64-
https://leafletjs.com/reference-1.5.1.html#featuregroup
64+
https://leafletjs.com/reference-1.6.0.html#featuregroup
6565
6666
"""
6767
_template = Template(u"""
@@ -102,7 +102,7 @@ class LayerControl(MacroElement):
102102
its layers so that the order is preserved when switching them on/off.
103103
**kwargs
104104
Additional (possibly inherited) options. See
105-
https://leafletjs.com/reference-1.5.1.html#control-layers
105+
https://leafletjs.com/reference-1.6.0.html#control-layers
106106
107107
"""
108108
_template = Template("""
@@ -386,7 +386,7 @@ class Tooltip(MacroElement):
386386
Whether the tooltip should follow the mouse.
387387
**kwargs
388388
These values will map directly to the Leaflet Options. More info
389-
available here: https://leafletjs.com/reference-1.5.1#tooltip
389+
available here: https://leafletjs.com/reference-1.6.0#tooltip
390390
391391
"""
392392
_template = Template(u"""
@@ -500,7 +500,7 @@ class CustomPane(MacroElement):
500500
determine which map elements lie over/under it. The default
501501
(625) corresponds to between markers and tooltips. Default
502502
panes and z-indexes can be found at
503-
https://leafletjs.com/reference-1.5.1.html#map-pane
503+
https://leafletjs.com/reference-1.6.0.html#map-pane
504504
pointer_events: bool, default False
505505
Whether or not layers in the pane should interact with the
506506
cursor. Setting to False will prevent interfering with

folium/plugins/draw.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Draw(MacroElement):
1717
Name of geojson file
1818
position : {'topleft', 'toprigth', 'bottomleft', 'bottomright'}
1919
Position of control.
20-
See https://leafletjs.com/reference-1.5.1.html#control
20+
See https://leafletjs.com/reference-1.6.0.html#control
2121
draw_options : dict, optional
2222
The options used to configure the draw toolbar. See
2323
http://leaflet.github.io/Leaflet.draw/docs/leaflet-draw-latest.html#drawoptions

folium/raster_layers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class WmsTileLayer(Layer):
155155
for setting extra tileLayer.wms parameters or as extra parameters in
156156
the WMS request.
157157
158-
See https://leafletjs.com/reference-1.5.1.html#tilelayer-wms
158+
See https://leafletjs.com/reference-1.6.0.html#tilelayer-wms
159159
"""
160160
_template = Template(u"""
161161
{% macro script(this, kwargs) %}
@@ -224,7 +224,7 @@ class ImageOverlay(Layer):
224224
show: bool, default True
225225
Whether the layer will be shown on opening (only for overlays).
226226
227-
See https://leafletjs.com/reference-1.5.1.html#imageoverlay for more
227+
See https://leafletjs.com/reference-1.6.0.html#imageoverlay for more
228228
options.
229229
230230
"""
@@ -310,7 +310,7 @@ class VideoOverlay(Layer):
310310
Whether the layer will be shown on opening (only for overlays).
311311
**kwargs:
312312
Other valid (possibly inherited) options. See:
313-
https://leafletjs.com/reference-1.5.1.html#videooverlay
313+
https://leafletjs.com/reference-1.6.0.html#videooverlay
314314
315315
"""
316316
_template = Template(u"""

folium/vector_layers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def path_options(line=False, radius=False, **kwargs):
5959
6060
Note that the presence of `fill_color` will override `fill=False`.
6161
62-
See https://leafletjs.com/reference-1.5.1.html#path
62+
See https://leafletjs.com/reference-1.6.0.html#path
6363
6464
"""
6565

@@ -142,7 +142,7 @@ class PolyLine(BaseMultiLocation):
142142
Disable polyline clipping.
143143
**kwargs
144144
Other valid (possibly inherited) options. See:
145-
https://leafletjs.com/reference-1.5.1.html#polyline
145+
https://leafletjs.com/reference-1.6.0.html#polyline
146146
147147
"""
148148

@@ -176,7 +176,7 @@ class Polygon(BaseMultiLocation):
176176
Display a text when hovering over the object.
177177
**kwargs
178178
Other valid (possibly inherited) options. See:
179-
https://leafletjs.com/reference-1.5.1.html#polygon
179+
https://leafletjs.com/reference-1.6.0.html#polygon
180180
181181
"""
182182

@@ -210,7 +210,7 @@ class Rectangle(BaseMultiLocation):
210210
Display a text when hovering over the object.
211211
**kwargs
212212
Other valid (possibly inherited) options. See:
213-
https://leafletjs.com/reference-1.5.1.html#rectangle
213+
https://leafletjs.com/reference-1.6.0.html#rectangle
214214
215215
"""
216216

@@ -250,7 +250,7 @@ class Circle(Marker):
250250
Radius of the circle, in meters.
251251
**kwargs
252252
Other valid (possibly inherited) options. See:
253-
https://leafletjs.com/reference-1.5.1.html#circle
253+
https://leafletjs.com/reference-1.6.0.html#circle
254254
255255
"""
256256

@@ -287,7 +287,7 @@ class CircleMarker(Marker):
287287
Radius of the circle marker, in pixels.
288288
**kwargs
289289
Other valid (possibly inherited) options. See:
290-
https://leafletjs.com/reference-1.5.1.html#circlemarker
290+
https://leafletjs.com/reference-1.6.0.html#circlemarker
291291
292292
"""
293293

0 commit comments

Comments
 (0)