Skip to content

Commit 39ca695

Browse files
ocefpafocefpaf
authored
Merge pull request #1047 from Conengmo/leaflet-1-4
Update to Leaflet 1.4.0
2 parents 3b972c8 + 3b4a8cb commit 39ca695

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

‎folium/features.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,10 +1063,10 @@ class DivIcon(MacroElement):
10631063
html : string
10641064
A custom HTML code to put inside the div element.
10651065
1066-
1067-
http://leafletjs.com/reference-1.2.0.html#divicon
1066+
See https://leafletjs.com/reference-1.4.0.html#divicon
10681067
10691068
"""
1069+
10701070
_template = Template(u"""
10711071
{% macro script(this, kwargs) %}
10721072

‎folium/folium.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
_default_js = [
2525
('leaflet',
26-
'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.js'),
26+
'https://cdn.jsdelivr.net/npm/leaflet@1.4.0/dist/leaflet.js'),
2727
('jquery',
2828
'https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'),
2929
('bootstrap',
@@ -34,7 +34,7 @@
3434

3535
_default_css = [
3636
('leaflet_css',
37-
'https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css'),
37+
'https://cdn.jsdelivr.net/npm/leaflet@1.4.0/dist/leaflet.css'),
3838
('bootstrap_css',
3939
'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'),
4040
('bootstrap_theme_css',

‎folium/raster_layers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class WmsTileLayer(Layer):
163163
for setting extra tileLayer.wms parameters or as extra parameters in
164164
the WMS request.
165165
166-
http://leafletjs.com/reference-1.2.0.html#tilelayer-wms
166+
See https://leafletjs.com/reference-1.4.0.html#tilelayer-wms
167167
"""
168168
_template = Template(u"""
169169
{% macro script(this, kwargs) %}
@@ -234,7 +234,7 @@ class ImageOverlay(Layer):
234234
show: bool, default True
235235
Whether the layer will be shown on opening (only for overlays).
236236
237-
See http://leafletjs.com/reference-1.2.0.html#imageoverlay for more
237+
See https://leafletjs.com/reference-1.4.0.html#imageoverlay for more
238238
options.
239239
240240
"""

‎folium/templates/fol_template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<head>
33
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
44
<script>L_PREFER_CANVAS=false; L_NO_TOUCH=false; L_DISABLE_3D=false;</script>
5-
<script src="https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.js"></script>
5+
<script src="https://cdn.jsdelivr.net/npm/leaflet@1.4.0/dist/leaflet.js"></script>
66
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
77
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
88
<script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.js"></script>
9-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.3.4/dist/leaflet.css"/>
9+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/leaflet@1.4.0/dist/leaflet.css"/>
1010
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"/>
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"/>
1212
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css"/>

‎folium/vector_layers.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ def path_options(line=False, radius=False, **kwargs):
6262
6363
Note that the presence of `fill_color` will override `fill=False`.
6464
65-
66-
http://leafletjs.com/reference-1.2.0.html#path
65+
See https://leafletjs.com/reference-1.4.0.html#path
6766
6867
"""
6968

@@ -130,9 +129,10 @@ class PolyLine(Marker):
130129
Disable polyline clipping.
131130
132131
133-
http://leafletjs.com/reference-1.2.0.html#polyline
132+
See https://leafletjs.com/reference-1.4.0.html#polyline
134133
135134
"""
135+
136136
_template = Template(u"""
137137
{% macro script(this, kwargs) %}
138138
var {{this.get_name()}} = L.polyline(
@@ -168,9 +168,10 @@ class Polygon(Marker):
168168
Display a text when hovering over the object.
169169
170170
171-
http://leafletjs.com/reference-1.2.0.html#polygon
171+
See https://leafletjs.com/reference-1.4.0.html#polygon
172172
173173
"""
174+
174175
_template = Template(u"""
175176
{% macro script(this, kwargs) %}
176177
@@ -206,9 +207,10 @@ class Rectangle(Marker):
206207
Display a text when hovering over the object.
207208
208209
209-
http://leafletjs.com/reference-1.2.0.html#rectangle
210+
See https://leafletjs.com/reference-1.4.0.html#rectangle
210211
211212
"""
213+
212214
_template = Template(u"""
213215
{% macro script(this, kwargs) %}
214216
@@ -250,9 +252,10 @@ class Circle(Marker):
250252
Radius of the circle, in meters.
251253
252254
253-
http://leafletjs.com/reference-1.2.0.html#circle
255+
See https://leafletjs.com/reference-1.4.0.html#circle
254256
255257
"""
258+
256259
_template = Template(u"""
257260
{% macro script(this, kwargs) %}
258261
@@ -289,9 +292,10 @@ class CircleMarker(Marker):
289292
Radius of the circle marker, in pixels.
290293
291294
292-
http://leafletjs.com/reference-1.2.0.html#circlemarker
295+
See https://leafletjs.com/reference-1.4.0.html#circlemarker
293296
294297
"""
298+
295299
_template = Template(u"""
296300
{% macro script(this, kwargs) %}
297301
var {{this.get_name()}} = L.circleMarker(

0 commit comments

Comments
 (0)