adapt the tests

Author: ocefpaf

tests/plugins/test_image_overlay.py

@@ -92,23 +92,6 @@ def test_divicon():
     assert div.html == html
 
 
-# WmsTileLayer.
-def test_wms_service():
-    m = Map([40, -100], zoom_start=4)
-    url = 'http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi'
-    w = folium.WmsTileLayer(url,
-                              name='test',
-                              fmt='image/png',
-                              layers='nexrad-n0r-900913',
-                              attr=u'Weather data © 2012 IEM Nexrad',
-                              transparent=True)
-    w.add_to(m)
-    m._repr_html_()
-
-    bounds = m.get_bounds()
-    assert bounds == [[None, None], [None, None]], bounds
-
-
 # ColorLine.
 def test_color_line():
     m = Map([22.5, 22.5], zoom_start=3)

tests/test_features.py

@@ -162,27 +162,6 @@ def test_custom_tile(self):
         bounds = m.get_bounds()
         assert bounds == [[None, None], [None, None]], bounds
 
-    def test_custom_tile_subdomains(self):
-        """Test custom tile subdomains."""
-
-        url = 'http://{s}.custom_tiles.org/{z}/{x}/{y}.png'
-        m = folium.Map(location=[45.52, -122.67], tiles=url,
-                       attr='attribution',
-                       subdomains='1234')
-
-        url_with_name = 'http://{s}.custom_tiles-subdomains.org/{z}/{x}/{y}.png'  # noqa
-        tile_layer = folium.TileLayer(url,
-                                      name='subdomains2',
-                                      attr='attribution',
-                                      subdomains='5678')
-        m.add_child(tile_layer)
-        m.add_tile_layer(tiles=url_with_name, attr='attribution',
-                         subdomains='9012')
-
-        out = m._parent.render()
-        assert '1234' in out
-        assert '5678' in out
-        assert '9012' in out
 
     def test_feature_group(self):
         """Test FeatureGroup."""
@@ -334,21 +313,6 @@ def test_custom_icon(self):
         bounds = self.m.get_bounds()
         assert bounds == [[45, -100], [45, -100]], bounds
 
-    def test_tile_layer(self):
-        m = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
-        layer = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
-        m.add_child(folium.TileLayer(layer, name='OpenStreetMap',
-                                     attr='attribution'))
-        m.add_child(folium.TileLayer(layer,
-                                     name='OpenStreetMap2',
-                                     attr='attribution2',
-                                     overlay=True))
-        m.add_child(folium.LayerControl())
-        m._repr_html_()
-
-        bounds = m.get_bounds()
-        assert bounds == [[None, None], [None, None]], bounds
-
     def test_global_switches(self):
         m = folium.Map(prefer_canvas=True)
         assert (m.global_switches.prefer_canvas is True and

tests/test_folium.py

@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+
+"""
+Test ImageOverlay
+-----------------
+
+"""
+
+from __future__ import (absolute_import, division, print_function)
+
+import folium
+
+from jinja2 import Template
+
+
+def test_tile_layer():
+    m = folium.Map([48., 5.], tiles='stamentoner', zoom_start=6)
+    layer = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+
+    folium.raster_layers.TileLayer(
+        tiles=layer,
+        name='OpenStreetMap',
+        attr='attribution'
+    ).add_to(m)
+
+    folium.raster_layers.TileLayer(
+        tiles=layer,
+        name='OpenStreetMap2',
+        attr='attribution2',
+        overlay=True).add_to(m)
+
+    folium.LayerControl().add_to(m)
+    m._repr_html_()
+
+    bounds = m.get_bounds()
+    assert bounds == [[None, None], [None, None]], bounds
+
+
+def test_custom_tile_subdomains():
+    """Test custom tile subdomains."""
+
+    url = 'http://{s}.custom_tiles.org/{z}/{x}/{y}.png'
+    m = folium.Map(location=[45.52, -122.67], tiles=url,
+                   attr='attribution',
+                   subdomains='1234')
+
+    url_with_name = 'http://{s}.custom_tiles-subdomains.org/{z}/{x}/{y}.png'
+    tile_layer = folium.raster_layers.TileLayer(
+        tiles=url,
+        name='subdomains2',
+        attr='attribution',
+        subdomains='5678'
+    )
+    tile_layer.add_to(m)
+
+    m.add_tile_layer(
+        tiles=url_with_name, attr='attribution',
+        subdomains='9012'
+    )
+
+    out = m._parent.render()
+    assert '1234' in out
+    assert '5678' in out
+    assert '9012' in out
+
+
+def test_wms():
+    m = folium.Map([40, -100], zoom_start=4)
+    url = 'http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi'
+    w = folium.raster_layers.WmsTileLayer(
+        url=url,
+        name='test',
+        fmt='image/png',
+        layers='nexrad-n0r-900913',
+        attr=u'Weather data © 2012 IEM Nexrad',
+        transparent=True
+    )
+    w.add_to(m)
+    m._repr_html_()
+
+    bounds = m.get_bounds()
+    assert bounds == [[None, None], [None, None]], bounds
+
+
+def test_image_overlay():
+    """Test image overlay."""
+    data = [[[1, 0, 0, 1], [0, 0, 0, 0], [0, 0, 0, 0]],
+            [[1, 1, 0, 0.5], [0, 0, 1, 1], [0, 0, 1, 1]]]
+
+    m = folium.Map()
+    io = folium.raster_layers.ImageOverlay(
+        data, [[0, -180], [90, 180]],
+        mercator_project=True
+    )
+    io.add_to(m)
+    m._repr_html_()
+
+    out = m._parent.render()
+
+    # Verify the URL generation.
+    url = ('data:image/png;base64,'
+           'iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAA'
+           'AF0lEQVR42mP4z8AARFDw/z/DeiA5H4QBV60H6ABl9ZIAAAAASUVORK5CYII=')
+    assert io.url == url
+
+    # Verify the script part is okay.
+    tmpl = Template("""
+                var {{this.get_name()}} = L.imageOverlay(
+                    '{{ this.url }}',
+                    {{ this.bounds }},
+                    {{ this.options }}
+                    ).addTo({{this._parent.get_name()}});
+    """)
+    assert tmpl.render(this=io) in out
+
+    bounds = m.get_bounds()
+    assert bounds == [[0, -180], [90, 180]], bounds