Fix test_boat_marker

Author: Martin Journois

folium/plugins/boat_marker.py

@@ -6,10 +6,11 @@
 Creates a marker shaped like a boat. Optionally you can append a wind direction. 
 """
 import json
+from jinja2 import Template
 
-from .plugin import Plugin
+from folium.element import JavascriptLink, MacroElement, Figure
 
-class BoatMarker(Plugin):
+class BoatMarker(MacroElement):
     """Adds a BoatMarker layer on the map."""
     def __init__(self, position=None, heading=0, wind_heading=None, wind_speed=0, **kwargs):
         """Creates a BoatMarker plugin to append into a map with
@@ -32,30 +33,28 @@ def __init__(self, position=None, heading=0, wind_heading=None, wind_speed=0, **
                 Speed of the wind in knots.
         """
         super(BoatMarker, self).__init__()
-        self.plugin_name = 'BoatMarker'
+        self._name = 'BoatMarker'
         self.position = None if position is None else tuple(position)
         self.heading = heading
         self.wind_heading = wind_heading
         self.wind_speed = wind_speed
-        self.kwargs = kwargs.copy()
-        
-    def render_header(self, nb):
-        """Generates the HTML part of the plugin."""
-        return """
-            <script src="https://thomasbrueggemann.github.io/leaflet.boatmarker/js/leaflet.boatmarker.min.js"></script>
-            """  if nb==0 else ""
-
-    def render_js(self, nb):
-        """Generates the Javascript part of the plugin."""
-        kwargs_str =  "{%s}" % ",".join(["%s : %s" % (key,json.dumps(val)) for (key,val) in self.kwargs.items()])
-        position_str = "map.getCenter()" if self.position is None else "[%.12f,%.12f]"%self.position
-        out = 'var boatMarker_%s = L.boatMarker(%s, %s).addTo(map);' % (nb,position_str,kwargs_str)
-        
-        if self.wind_heading is None:
-            out += "boatMarker_%s.setHeading(%s);" % (nb,int(self.heading))
-        else:
-            out += "boatMarker_%s.setHeadingWind(%s, %s, %s);"%(nb,int(self.heading),
-                                                             int(self.wind_speed),
-                                                             int(self.wind_heading),
-                                                             )
-        return out
+        self.kwargs = json.dumps(kwargs)
+
+        self._template = Template(u"""
+            {% macro script(this, kwargs) %}
+                var {{this.get_name()}} = L.boatMarker(
+                    [{{this.position[0]}},{{this.position[1]}}],
+                    {{this.kwargs}}).addTo({{this._parent.get_name()}});
+                {{this.get_name()}}.setHeadingWind({{this.heading}}, {{this.wind_speed}}, {{this.wind_heading}});
+            {% endmacro %}
+            """)
+    def render(self,**kwargs):
+        super(BoatMarker,self).render(**kwargs)
+
+        figure = self.get_root()
+        assert isinstance(figure,Figure), ("You cannot render this Element "
+            "if it's not in a Figure.")
+
+        figure.header.add_children(\
+            JavascriptLink("https://thomasbrueggemann.github.io/leaflet.boatmarker/js/leaflet.boatmarker.min.js"),
+                                   name='markerclusterjs')

tests/test_plugins.py

@@ -39,17 +39,17 @@ def test_terminator(self):
 
     def test_boat_marker(self):
         mapa = folium.Map([30., 0.], zoom_start=3)
-        mapa.add_plugin(plugins.BoatMarker((34, -43),
+        mapa.add_children(plugins.BoatMarker((34, -43),
                                            heading=45,
                                            wind_heading=150,
                                            wind_speed=45,
                                            color="#8f8"))
-        mapa.add_plugin(plugins.BoatMarker((46, -30),
+        mapa.add_children(plugins.BoatMarker((46, -30),
                                            heading=-20,
                                            wind_heading=46,
                                            wind_speed=25,
                                            color="#88f"))
-        mapa._build_map()
+        mapa._repr_html_()
 
     def test_layer(self):
         mapa = folium.Map([48., 5.], zoom_start=6)