Skip to content

Commit 3404f11

Browse files
themiurgothemiurgo
committed
Merge
1 parent b15461d commit 3404f11

File tree

9 files changed

+237
-38
lines changed

9 files changed

+237
-38
lines changed

‎folium/element.py

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(self, template=None, template_name=None):
4040
def get_name(self):
4141
return _camelify(self._name) + '_' + self._id
4242

43-
def add_children(self, child, name=None, index=None):
43+
def add_child(self, child, name=None, index=None):
4444
"""Add a children."""
4545
if name is None:
4646
name = child.get_name()
@@ -55,7 +55,7 @@ def add_children(self, child, name=None, index=None):
5555

5656
def add_to(self, parent, name=None, index=None):
5757
"""Add element to a parent."""
58-
parent.add_children(self, name=name, index=index)
58+
parent.add_child(self, name=name, index=index)
5959

6060
def to_dict(self, depth=-1, ordered=True, **kwargs):
6161
if ordered:
@@ -253,19 +253,19 @@ def __init__(self, width="100%", height=None, ratio="60%", figsize=None):
253253
""")
254254

255255
# Create the meta tag
256-
self.header.add_children(Element(
256+
self.header.add_child(Element(
257257
'<meta http-equiv="content-type" content="text/html; charset=UTF-8" />'),
258258
name='meta_http')
259259

260260
# Import Javascripts
261261
for name, url in _default_js:
262-
self.header.add_children(JavascriptLink(url), name=name)
262+
self.header.add_child(JavascriptLink(url), name=name)
263263

264264
# Import Css
265265
for name, url in _default_css:
266-
self.header.add_children(CssLink(url), name=name)
266+
self.header.add_child(CssLink(url), name=name)
267267

268-
self.header.add_children(Element("""
268+
self.header.add_child(Element("""
269269
<style>
270270
271271
html, body {
@@ -341,7 +341,7 @@ def add_subplot(self, x, y, n, margin=0.05):
341341
left="{}%".format(100.*left),
342342
top="{}%".format(100.*top),
343343
)
344-
self.add_children(div)
344+
self.add_child(div)
345345
return div
346346

347347

@@ -418,24 +418,29 @@ def render(self, **kwargs):
418418
element.render(**kwargs)
419419

420420
for name, element in self.header._children.items():
421-
figure.header.add_children(element, name=name)
421+
figure.header.add_child(element, name=name)
422422

423423
for name, element in self.script._children.items():
424-
figure.script.add_children(element, name=name)
424+
figure.script.add_child(element, name=name)
425425

426426
header = self._template.module.__dict__.get('header', None)
427427
if header is not None:
428-
figure.header.add_children(Element(header(self, kwargs)),
428+
figure.header.add_child(Element(header(self, kwargs)),
429429
name=self.get_name())
430430

431431
html = self._template.module.__dict__.get('html', None)
432432
if html is not None:
433+
<<<<<<< HEAD
433434
figure.html.add_children(Element(html(self, kwargs)),
434435
name=self.get_name())
436+
=======
437+
figure.html.add_child(Element(html(self, kwargs)),
438+
name=self.get_name())
439+
>>>>>>> fb52791... Renaming add_children -> add_child
435440

436441
script = self._template.module.__dict__.get('script', None)
437442
if script is not None:
438-
figure.script.add_children(Element(script(self, kwargs)),
443+
figure.script.add_child(Element(script(self, kwargs)),
439444
name=self.get_name())
440445

441446
def _repr_html_(self, **kwargs):
@@ -481,17 +486,22 @@ def render(self, **kwargs):
481486

482487
header = self._template.module.__dict__.get('header', None)
483488
if header is not None:
484-
figure.header.add_children(Element(header(self, kwargs)),
489+
figure.header.add_child(Element(header(self, kwargs)),
485490
name=self.get_name())
486491

487492
html = self._template.module.__dict__.get('html', None)
488493
if html is not None:
494+
<<<<<<< HEAD
489495
figure.html.add_children(Element(html(self, kwargs)),
490496
name=self.get_name())
497+
=======
498+
figure.html.add_child(Element(html(self, kwargs)),
499+
name=self.get_name())
500+
>>>>>>> fb52791... Renaming add_children -> add_child
491501

492502
script = self._template.module.__dict__.get('script', None)
493503
if script is not None:
494-
figure.script.add_children(Element(script(self, kwargs)),
504+
figure.script.add_child(Element(script(self, kwargs)),
495505
name=self.get_name())
496506

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

‎folium/features.py

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, location, popup=None,
6969
self.rotation = rotation
7070
self.radius = radius
7171
if popup is not None:
72-
self.add_children(popup)
72+
self.add_child(popup)
7373

7474
self._template = Template(u"""
7575
{% macro script(this, kwargs) %}
@@ -98,8 +98,14 @@ def render(self, **kwargs):
9898
assert isinstance(figure, Figure), ("You cannot render this Element "
9999
"if it's not in a Figure.")
100100

101+
<<<<<<< HEAD
101102
figure.header.add_children(
102103
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.2/leaflet-dvf.markers.min.js"),
104+
=======
105+
figure.header.add_child(\
106+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf"
107+
"/0.2/leaflet-dvf.markers.min.js"),
108+
>>>>>>> fb52791... Renaming add_children -> add_child
103109
name='dvf_js')
104110

105111

@@ -122,19 +128,19 @@ def __init__(self, data, width='100%', height='100%',
122128
def render(self, **kwargs):
123129
self.json = json.dumps(self.data)
124130

125-
self._parent.html.add_children(Element(Template("""
131+
self._parent.html.add_child(Element(Template("""
126132
<div id="{{this.get_name()}}"></div>
127133
""").render(this=self, kwargs=kwargs)), name=self.get_name())
128134

129-
self._parent.script.add_children(Element(Template("""
135+
self._parent.script.add_child(Element(Template("""
130136
vega_parse({{this.json}},{{this.get_name()}});
131137
""").render(this=self)), name=self.get_name())
132138

133139
figure = self.get_root()
134140
assert isinstance(figure, Figure), ("You cannot render this Element "
135141
"if it's not in a Figure.")
136142

137-
figure.header.add_children(Element(Template("""
143+
figure.header.add_child(Element(Template("""
138144
<style> #{{this.get_name()}} {
139145
position : {{this.position}};
140146
width : {{this.width[0]}}{{this.width[1]}};
@@ -144,6 +150,7 @@ def render(self, **kwargs):
144150
</style>
145151
""").render(this=self, **kwargs)), name=self.get_name())
146152

153+
<<<<<<< HEAD
147154
figure.header.add_children(
148155
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
149156
name='d3')
@@ -157,6 +164,21 @@ def render(self, **kwargs):
157164
name='jquery')
158165

159166
figure.script.add_children(
167+
=======
168+
figure.header.add_child(\
169+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
170+
name='d3')
171+
172+
figure.header.add_child(\
173+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/vega/1.4.3/vega.min.js"),
174+
name='vega')
175+
176+
figure.header.add_child(\
177+
JavascriptLink("https://code.jquery.com/jquery-2.1.0.min.js"),
178+
name='jquery')
179+
180+
figure.script.add_child(\
181+
>>>>>>> fb52791... Renaming add_children -> add_child
160182
Template("""function vega_parse(spec, div) {
161183
vg.parse.spec(spec, function(chart) { chart({el:div}).update(); });}"""),
162184
name='vega_parse')
@@ -233,7 +255,11 @@ def render(self, **kwargs):
233255
assert isinstance(figure, Figure), ("You cannot render this Element "
234256
"if it's not in a Figure.")
235257

258+
<<<<<<< HEAD
236259
figure.header.add_children(
260+
=======
261+
figure.header.add_child(\
262+
>>>>>>> fb52791... Renaming add_children -> add_child
237263
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/topojson/1.6.9/topojson.min.js"),
238264
name='topojson')
239265

@@ -305,7 +331,11 @@ def render(self, **kwargs):
305331
assert isinstance(figure, Figure), ("You cannot render this Element "
306332
"if it's not in a Figure.")
307333

334+
<<<<<<< HEAD
308335
figure.header.add_children(
336+
=======
337+
figure.header.add_child(\
338+
>>>>>>> fb52791... Renaming add_children -> add_child
309339
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
310340
name='d3')
311341

@@ -333,7 +363,11 @@ def render(self, **kwargs):
333363
assert isinstance(figure, Figure), ("You cannot render this Element "
334364
"if it's not in a Figure.")
335365

366+
<<<<<<< HEAD
336367
figure.header.add_children(
368+
=======
369+
figure.header.add_child(\
370+
>>>>>>> fb52791... Renaming add_children -> add_child
337371
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js"),
338372
name='d3')
339373

@@ -342,7 +376,7 @@ class MarkerCluster(MacroElement):
342376
"""Adds a MarkerCluster layer on the map."""
343377
def __init__(self):
344378
"""Creates a MarkerCluster element to append into a map with
345-
Map.add_children.
379+
Map.add_child.
346380
347381
Parameters
348382
----------
@@ -360,6 +394,7 @@ def render(self, **kwargs):
360394
super(MarkerCluster, self).render()
361395

362396
figure = self.get_root()
397+
<<<<<<< HEAD
363398
assert isinstance(figure, Figure), ("You cannot render this Element "
364399
"if it's not in a Figure.")
365400
figure.header.add_children(
@@ -375,6 +410,25 @@ def render(self, **kwargs):
375410
name='marker_cluster_css')
376411

377412
figure.header.add_children(
413+
=======
414+
assert isinstance(figure,Figure), ("You cannot render this Element "
415+
"if it's not in a Figure.")
416+
figure.header.add_child(\
417+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster"
418+
"/0.4.0/leaflet.markercluster-src.js"),
419+
name='marker_cluster_src')
420+
421+
figure.header.add_child(\
422+
JavascriptLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster"
423+
"/0.4.0/leaflet.markercluster.js"),
424+
name='marker_cluster')
425+
426+
figure.header.add_child(\
427+
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.css"),
428+
name='marker_cluster_css')
429+
430+
figure.header.add_child(\
431+
>>>>>>> fb52791... Renaming add_children -> add_child
378432
CssLink("https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/MarkerCluster.Default.css"),
379433
name="marker_cluster_default_css")
380434

@@ -411,7 +465,7 @@ def __init__(self, location, radius=500, color='black',
411465
self.fill_color = fill_color
412466
self.fill_opacity = fill_opacity
413467
if popup is not None:
414-
self.add_children(popup)
468+
self.add_child(popup)
415469

416470
self._template = Template(u"""
417471
{% macro script(this, kwargs) %}
@@ -480,10 +534,15 @@ def __init__(self, popup=None):
480534

481535

482536
class PolyLine(MacroElement):
537+
<<<<<<< HEAD
483538
def __init__(self, locations, color=None, weight=None,
484539
opacity=None, latlon=True):
485540
"""Creates a PolyLine object to append into a map with
486541
Map.add_children.
542+
=======
543+
def __init__(self, locations, color=None, weight=None, opacity=None, latlon=True):
544+
"""Creates a PolyLine object to append into a map with Map.add_child.
545+
>>>>>>> fb52791... Renaming add_children -> add_child
487546

488547
Parameters
489548
----------
@@ -521,10 +580,15 @@ def __init__(self, locations, color=None, weight=None,
521580
522581
523582
class MultiPolyLine(MacroElement):
583+
<<<<<<< HEAD
524584
def __init__(self, locations, color=None, weight=None,
525585
opacity=None, latlon=True):
526586
"""Creates a MultiPolyLine object to append into a map with
527587
Map.add_children.
588+
=======
589+
def __init__(self, locations, color=None, weight=None, opacity=None, latlon=True):
590+
"""Creates a MultiPolyLine object to append into a map with Map.add_child.
591+
>>>>>>> fb52791... Renaming add_children -> add_child
528592
529593
Parameters
530594
----------

0 commit comments

Comments
 (0)