Skip to content

Commit 8ec2d23

Browse files
themiurgothemiurgo
committed
Renaming add_children -> add_child
1 parent fc0aa4d commit 8ec2d23

File tree

12 files changed

+125
-125
lines changed

12 files changed

+125
-125
lines changed

‎examples/Features.ipynb

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@
291291
"pp = features.Popup(\"hello\")\n",
292292
"ic = features.Icon(color='red')\n",
293293
"\n",
294-
"f.add_children(m)\n",
295-
"mk.add_children(ic)\n",
296-
"mk.add_children(pp)\n",
297-
"m.add_children(mk)\n",
294+
"f.add_child(m)\n",
295+
"mk.add_child(ic)\n",
296+
"mk.add_child(pp)\n",
297+
"m.add_child(mk)\n",
298298
"\n",
299299
"f"
300300
]
@@ -438,9 +438,9 @@
438438
"mk = features.RegularPolygonMarker([0,0])\n",
439439
"mk2 = features.RegularPolygonMarker([0,45])\n",
440440
"\n",
441-
"f.add_children(m)\n",
442-
"m.add_children(mk)\n",
443-
"m.add_children(mk2)\n",
441+
"f.add_child(m)\n",
442+
"m.add_child(mk)\n",
443+
"m.add_child(mk2)\n",
444444
"\n",
445445
"f"
446446
]
@@ -738,10 +738,10 @@
738738
"mk = features.Marker([0,0])\n",
739739
"p = features.Popup(\"Hello\")\n",
740740
"v = features.Vega(data, width=\"100%\", height=\"100%\")\n",
741-
"f.add_children(m)\n",
742-
"mk.add_children(p)\n",
743-
"p.add_children(v)\n",
744-
"m.add_children(mk)\n",
741+
"f.add_child(m)\n",
742+
"mk.add_child(p)\n",
743+
"p.add_child(v)\n",
744+
"m.add_child(mk)\n",
745745
"\n",
746746
"f"
747747
]
@@ -993,7 +993,7 @@
993993
"\n",
994994
"f = features.Figure()\n",
995995
"v = features.Vega(data, height=40, width=600)\n",
996-
"f.add_children(v)\n",
996+
"f.add_child(v)\n",
997997
"\n",
998998
"f"
999999
]
@@ -1455,10 +1455,10 @@
14551455
"\n",
14561456
"v2 = features.Vega(data, position='absolute', left=\"0%\", width=\"50%\", height=\"50%\", top='50%')\n",
14571457
"\n",
1458-
"f.add_children(m)\n",
1459-
"f.add_children(m2)\n",
1460-
"f.add_children(v)\n",
1461-
"f.add_children(v2)\n",
1458+
"f.add_child(m)\n",
1459+
"f.add_child(m2)\n",
1460+
"f.add_child(v)\n",
1461+
"f.add_child(v2)\n",
14621462
"\n",
14631463
"f"
14641464
]
@@ -2329,7 +2329,7 @@
23292329
" ],\n",
23302330
" }\n",
23312331
"m = features.Map([48.,5.], zoom_start=6)\n",
2332-
"m.add_children(features.GeoJson(data))\n",
2332+
"m.add_child(features.GeoJson(data))\n",
23332333
"m"
23342334
]
23352335
},
@@ -4076,10 +4076,10 @@
40764076
"for i in range(N):\n",
40774077
" mk = features.Marker([data[i][0],data[i][1]])\n",
40784078
" p = features.Popup(str(data[i][2]))\n",
4079-
" mk.add_children(p)\n",
4080-
" mc.add_children(mk)\n",
4079+
" mk.add_child(p)\n",
4080+
" mc.add_child(mk)\n",
40814081
"\n",
4082-
"m.add_children(mc)\n",
4082+
"m.add_child(mc)\n",
40834083
"m"
40844084
]
40854085
},
@@ -4251,8 +4251,8 @@
42514251
"d1 = f.add_subplot(1,2,1)\n",
42524252
"d2 = f.add_subplot(1,2,2)\n",
42534253
"\n",
4254-
"d1.add_children(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
4255-
"d2.add_children(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
4254+
"d1.add_child(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
4255+
"d2.add_child(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
42564256
"\n",
42574257
"f"
42584258
]
@@ -6092,9 +6092,9 @@
60926092
"m = features.Map([43,-100], zoom_start=4)\n",
60936093
"g = features.GeoJson(geojson_data)\n",
60946094
"\n",
6095-
"f.add_children(m)\n",
6096-
"m.add_children(g)\n",
6097-
"g.add_children(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
6095+
"f.add_child(m)\n",
6096+
"m.add_child(g)\n",
6097+
"g.add_child(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
60986098
"\n",
60996099
"f"
61006100
]

‎folium/element.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def __init__(self, template=None, template_name=None):
3737
def get_name(self):
3838
return _camelify(self._name) + '_' +self._id
3939

40-
def add_children(self, child, name=None, index=None):
41-
"""Add a children."""
40+
def add_child(self, child, name=None, index=None):
41+
"""Add a child element."""
4242
if name is None:
4343
name = child.get_name()
4444
if index is None:
@@ -51,7 +51,7 @@ def add_children(self, child, name=None, index=None):
5151

5252
def add_to(self, parent, name=None, index=None):
5353
"""Add element to a parent."""
54-
parent.add_children(self, name=name, index=index)
54+
parent.add_child(self, name=name, index=index)
5555

5656
def to_dict(self, depth=-1, ordered=True, **kwargs):
5757
if ordered:
@@ -244,19 +244,19 @@ def __init__(self, width="100%", height=None, ratio="60%", figsize=None):
244244
""")
245245

246246
# Create the meta tag
247-
self.header.add_children(Element(
247+
self.header.add_child(Element(
248248
'<meta http-equiv="content-type" content="text/html; charset=UTF-8" />'),
249249
name='meta_http')
250250

251251
# Import Javascripts
252252
for name, url in _default_js:
253-
self.header.add_children(JavascriptLink(url), name=name)
253+
self.header.add_child(JavascriptLink(url), name=name)
254254

255255
# Import Css
256256
for name, url in _default_css:
257-
self.header.add_children(CssLink(url), name=name)
257+
self.header.add_child(CssLink(url), name=name)
258258

259-
self.header.add_children(Element("""
259+
self.header.add_child(Element("""
260260
<style>
261261
262262
html, body {
@@ -335,7 +335,7 @@ def add_subplot(self, x,y,n,margin=0.05):
335335
left="{}%".format(100.*left),
336336
top="{}%".format(100.*top),
337337
)
338-
self.add_children(div)
338+
self.add_child(div)
339339
return div
340340

341341
class Html(Element):
@@ -411,24 +411,24 @@ def render(self, **kwargs):
411411
element.render(**kwargs)
412412

413413
for name, element in self.header._children.items():
414-
figure.header.add_children(element, name=name)
414+
figure.header.add_child(element, name=name)
415415

416416
for name, element in self.script._children.items():
417-
figure.script.add_children(element, name=name)
417+
figure.script.add_child(element, name=name)
418418

419419
header = self._template.module.__dict__.get('header',None)
420420
if header is not None:
421-
figure.header.add_children(Element(header(self, kwargs)),
421+
figure.header.add_child(Element(header(self, kwargs)),
422422
name=self.get_name())
423423

424424
html = self._template.module.__dict__.get('html',None)
425425
if html is not None:
426-
figure.html.add_children(Element(html(self, kwargs)),
426+
figure.html.add_child(Element(html(self, kwargs)),
427427
name=self.get_name())
428428

429429
script = self._template.module.__dict__.get('script',None)
430430
if script is not None:
431-
figure.script.add_children(Element(script(self, kwargs)),
431+
figure.script.add_child(Element(script(self, kwargs)),
432432
name=self.get_name())
433433

434434
def _repr_html_(self, **kwargs):
@@ -474,17 +474,17 @@ def render(self, **kwargs):
474474

475475
header = self._template.module.__dict__.get('header',None)
476476
if header is not None:
477-
figure.header.add_children(Element(header(self, kwargs)),
477+
figure.header.add_child(Element(header(self, kwargs)),
478478
name=self.get_name())
479479

480480
html = self._template.module.__dict__.get('html',None)
481481
if html is not None:
482-
figure.html.add_children(Element(html(self, kwargs)),
482+
figure.html.add_child(Element(html(self, kwargs)),
483483
name=self.get_name())
484484

485485
script = self._template.module.__dict__.get('script',None)
486486
if script is not None:
487-
figure.script.add_children(Element(script(self, kwargs)),
487+
figure.script.add_child(Element(script(self, kwargs)),
488488
name=self.get_name())
489489

490490
for name, element in self._children.items():

‎folium/features.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def __init__(self, location, popup=None,
6868
self.rotation = rotation
6969
self.radius = radius
7070
if popup is not None:
71-
self.add_children(popup)
71+
self.add_child(popup)
7272

7373
self._template = Template(u"""
7474
{% macro script(this, kwargs) %}
@@ -96,7 +96,7 @@ def render(self, **kwargs):
9696
assert isinstance(figure,Figure), ("You cannot render this Element "
9797
"if it's not in a Figure.")
9898

99-
figure.header.add_children(\
99+
figure.header.add_child(\
100100
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf"
101101
"/0.2/leaflet-dvf.markers.min.js"),
102102
name='dvf_js')
@@ -121,19 +121,19 @@ def __init__(self, data, width='100%', height='100%',
121121
def render(self, **kwargs):
122122
self.json = json.dumps(self.data)
123123

124-
self._parent.html.add_children(Element(Template("""
124+
self._parent.html.add_child(Element(Template("""
125125
<div id="{{this.get_name()}}"></div>
126126
""").render(this=self, kwargs=kwargs)), name=self.get_name())
127127

128-
self._parent.script.add_children(Element(Template("""
128+
self._parent.script.add_child(Element(Template("""
129129
vega_parse({{this.json}},{{this.get_name()}});
130130
""").render(this=self)), name=self.get_name())
131131

132132
figure = self.get_root()
133133
assert isinstance(figure,Figure), ("You cannot render this Element "
134134
"if it's not in a Figure.")
135135

136-
figure.header.add_children(Element(Template("""
136+
figure.header.add_child(Element(Template("""
137137
<style> #{{this.get_name()}} {
138138
position : {{this.position}};
139139
width : {{this.width[0]}}{{this.width[1]}};
@@ -143,19 +143,19 @@ def render(self, **kwargs):
143143
</style>
144144
""").render(this=self, **kwargs)), name=self.get_name())
145145

146-
figure.header.add_children(\
146+
figure.header.add_child(\
147147
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
148148
name='d3')
149149

150-
figure.header.add_children(\
150+
figure.header.add_child(\
151151
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3/vega.min.js"),
152152
name='vega')
153153

154-
figure.header.add_children(\
154+
figure.header.add_child(\
155155
JavascriptLink("https://code.jquery.com/jquery-2.1.0.min.js"),
156156
name='jquery')
157157

158-
figure.script.add_children(\
158+
figure.script.add_child(\
159159
Template("""function vega_parse(spec, div) {
160160
vg.parse.spec(spec, function(chart) { chart({el:div}).update(); });}"""),
161161
name='vega_parse')
@@ -229,7 +229,7 @@ def render(self,**kwargs):
229229
assert isinstance(figure,Figure), ("You cannot render this Element "
230230
"if it's not in a Figure.")
231231

232-
figure.header.add_children(\
232+
figure.header.add_child(\
233233
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/topojson/1.6.9/topojson.min.js"),
234234
name='topojson')
235235

@@ -298,7 +298,7 @@ def render(self,**kwargs):
298298
assert isinstance(figure,Figure), ("You cannot render this Element "
299299
"if it's not in a Figure.")
300300

301-
figure.header.add_children(\
301+
figure.header.add_child(\
302302
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
303303
name='d3')
304304

@@ -325,15 +325,15 @@ def render(self,**kwargs):
325325
assert isinstance(figure,Figure), ("You cannot render this Element "
326326
"if it's not in a Figure.")
327327

328-
figure.header.add_children(\
328+
figure.header.add_child(\
329329
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
330330
name='d3')
331331

332332
class MarkerCluster(MacroElement):
333333
"""Adds a MarkerCluster layer on the map."""
334334
def __init__(self):
335335
"""Creates a MarkerCluster element to append into a map with
336-
Map.add_children.
336+
Map.add_child.
337337
338338
Parameters
339339
----------
@@ -352,21 +352,21 @@ def render(self, **kwargs):
352352
figure = self.get_root()
353353
assert isinstance(figure,Figure), ("You cannot render this Element "
354354
"if it's not in a Figure.")
355-
figure.header.add_children(\
355+
figure.header.add_child(\
356356
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster"
357357
"/0.4.0/leaflet.markercluster-src.js"),
358358
name='marker_cluster_src')
359359

360-
figure.header.add_children(\
360+
figure.header.add_child(\
361361
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster"
362362
"/0.4.0/leaflet.markercluster.js"),
363363
name='marker_cluster')
364364

365-
figure.header.add_children(\
365+
figure.header.add_child(\
366366
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"),
367367
name='marker_cluster_css')
368368

369-
figure.header.add_children(\
369+
figure.header.add_child(\
370370
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"),
371371
name="marker_cluster_default_css")
372372

@@ -401,7 +401,7 @@ def __init__(self, location, radius=500, color='black',
401401
self.fill_color = fill_color
402402
self.fill_opacity = fill_opacity
403403
if popup is not None:
404-
self.add_children(popup)
404+
self.add_child(popup)
405405

406406
self._template = Template(u"""
407407
{% macro script(this, kwargs) %}
@@ -468,7 +468,7 @@ def __init__(self, popup=None):
468468

469469
class PolyLine(MacroElement):
470470
def __init__(self, locations, color=None, weight=None, opacity=None, latlon=True):
471-
"""Creates a PolyLine object to append into a map with Map.add_children.
471+
"""Creates a PolyLine object to append into a map with Map.add_child.
472472
473473
Parameters
474474
----------
@@ -504,7 +504,7 @@ def __init__(self, locations, color=None, weight=None, opacity=None, latlon=True
504504

505505
class MultiPolyLine(MacroElement):
506506
def __init__(self, locations, color=None, weight=None, opacity=None, latlon=True):
507-
"""Creates a MultiPolyLine object to append into a map with Map.add_children.
507+
"""Creates a MultiPolyLine object to append into a map with Map.add_child.
508508
509509
Parameters
510510
----------

0 commit comments

Comments
 (0)