Fix test_layer

Author: Martin Journois

folium/map.py

@@ -7,6 +7,7 @@
 """
 import warnings
 import json
+from collections import OrderedDict
 
 from jinja2 import Template
 
@@ -173,7 +174,7 @@ def add_tile_layer(self, tiles='OpenStreetMap', name=None,
 
 class TileLayer(MacroElement):
     def __init__(self, tiles='OpenStreetMap', name=None,
-                 min_zoom=1, max_zoom=18, attr=None, API_key=None):
+                 min_zoom=1, max_zoom=18, attr=None, API_key=None, overlay = False):
         """TODO docstring here
         Parameters
         ----------
@@ -185,6 +186,8 @@ def __init__(self, tiles='OpenStreetMap', name=None,
         self.min_zoom = min_zoom
         self.max_zoom = max_zoom
 
+        self.overlay = overlay
+
         self.tiles = ''.join(tiles.lower().strip().split())
         if self.tiles in ('cloudmade', 'mapbox') and not API_key:
             raise ValueError('You must pass an API key if using Cloudmade'
@@ -219,6 +222,42 @@ def __init__(self, tiles='OpenStreetMap', name=None,
         {% endmacro %}
         """)
 
+class LayerControl(MacroElement):
+    """Adds a layer control to the map."""
+    def __init__(self):
+        """Creates a LayerControl object to be added on a folium map.
+
+        Parameters
+        ----------
+        """
+        super(LayerControl, self).__init__()
+        self._name = 'LayerControl'
+
+        self.base_layers = OrderedDict()
+        self.overlays = OrderedDict()
+
+        self._template = Template("""
+        {% macro script(this,kwargs) %}
+            var {{this.get_name()}} = {
+                base_layers : { {% for key,val in this.base_layers.items() %}"{{key}}" : {{val}},{% endfor %} },
+                overlays : { {% for key,val in this.overlays.items() %}"{{key}}" : {{val}},{% endfor %} }
+                };
+            L.control.layers(
+                {{this.get_name()}}.base_layers,
+                {{this.get_name()}}.overlays
+                ).addTo({{this._parent.get_name()}});
+        {% endmacro %}
+        """)
+
+    def render(self, **kwargs):
+        """TODO : docstring here."""
+        self.base_layers = OrderedDict([(val.tile_name,val.get_name()) \
+                       for key,val in self._parent._children.items() if isinstance(val,TileLayer) and not val.overlay])
+        self.overlays = OrderedDict([(val.tile_name,val.get_name()) \
+                       for key,val in self._parent._children.items() if isinstance(val,TileLayer) and val.overlay])
+
+        super(LayerControl, self).render()
+
 class Icon(MacroElement):
     def __init__(self, color='blue', icon='info-sign', angle=0):
         """TODO : docstring here"""

tests/test_plugins.py

@@ -52,11 +52,12 @@ def test_boat_marker(self):
         mapa._repr_html_()
 
     def test_layer(self):
-        mapa = folium.Map([48., 5.], zoom_start=6)
-        layer = '//otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png'
-        mapa.add_plugin(plugins.Layer(layer, layer_name='MapQuest'))
-        mapa.add_plugin(plugins.LayerControl())
-        mapa._build_map()
+        mapa = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
+        layer = 'http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png'
+        mapa.add_children(folium.map.TileLayer(layer, name='MapQuest',  attr='attribution'))
+        mapa.add_children(folium.map.TileLayer(layer, name='MapQuest2', attr='attribution2', overlay=True))
+        mapa.add_children(folium.map.LayerControl())
+        mapa._repr_html_()
 
     def test_geo_json(self):
         N = 100