added default options to tile_layer

missing template added

Otherwise ``folium.initialize_notebook()`` causes error.

added test

Author: ozak

folium/folium.py

@@ -221,7 +221,9 @@ def __init__(self, location=None, width='100%', height='100%',
         self.template_vars.setdefault('tile_layers', [])
 
     @iter_obj('simple')
-    def add_tile_layer(self, tile_name=None, tile_url=None, active=False):
+    def add_tile_layer(self, tile_name=None, tile_url=None, active=False, minZoom=0,
+                        maxZoom=18, tms=False, continuousWorld=False, noWrap=False, zoomOffset=0,
+                        zoomReverse=False, opacity=1, attribution='Leaflet'):
         """Adds a simple tile layer.
 
         Parameters
@@ -236,9 +238,17 @@ def add_tile_layer(self, tile_name=None, tile_url=None, active=False):
         if tile_name not in self.added_layers:
             tile_name = tile_name.replace(" ", "_")
             tile_temp = self.env.get_template('tile_layer.js')
-
             tile = tile_temp.render({'tile_name': tile_name,
-                                     'tile_url': tile_url})
+                                     'tile_url': tile_url,
+                                     'minZoom': minZoom,
+                                     'maxZoom': maxZoom,
+                                     'tms': str(tms).lower(),
+                                     'continuousWorld': str(continuousWorld).lower(),
+                                     'noWrap': str(noWrap).lower(),
+                                     'zoomOffset': zoomOffset,
+                                     'zoomReverse': str(zoomReverse).lower(),
+                                     'opacity': opacity,
+                                     })
 
             self.template_vars.setdefault('tile_layers', []).append((tile))
 

folium/templates/leaflet-dvf.markers.min.js

@@ -1 +1,10 @@
-var {{ tile_name }} = L.tileLayer('{{ tile_url }}');
+var {{ tile_name }} = L.tileLayer('{{ tile_url }}',{
+                            'minZoom': {{minZoom}},
+                            'maxZoom': {{maxZoom}},
+                            'tms': {{tms}},
+                            'continuousWorld': {{continuousWorld}},
+                            'noWrap': {{noWrap}},
+                            'zoomOffset': {{zoomOffset}},
+                            'zoomReverse': {{zoomReverse}},
+                            'opacity': {{opacity}} 
+                            });

folium/templates/tile_layer.js

@@ -139,6 +139,38 @@ def test_wms_layer(self):
                                'wms_transparent': 'true'})
         assert map.template_vars['wms_layers'][0] == wms
 
+    def test_add_tile_layer(self):
+        '''Test add_layer URLs'''
+
+        map = folium.Map(location=[44, -73], zoom_start=3)
+        tile_name = "Temperature"
+        tile_url = 'http://gis.srh.noaa.gov/arcgis/services/NDFDTemps/'
+        tile_url += 'MapServer/WMSServer'
+        minZoom = 1
+        maxZoom = 5
+        tms = True
+        continuousWorld = False
+        noWrap = True
+        zoomOffset = 1
+        zoomReverse = True
+        opacity = 2
+        map.add_tile_layer(tile_name=tile_name, tile_url=tile_url, active=True, minZoom=minZoom,
+                        maxZoom=maxZoom, tms=tms, continuousWorld=continuousWorld, noWrap=noWrap, zoomOffset=zoomOffset,
+                        zoomReverse=zoomReverse, opacity=opacity, attribution='Leaflet')
+        tile_temp = self.env.get_template('tile_layer.js')
+        tile = tile_temp.render({'tile_name': tile_name,
+                          'tile_url': tile_url,
+                          'minZoom': minZoom,
+                          'maxZoom': maxZoom,
+                          'tms': str(tms).lower(),
+                          'continuousWorld': str(continuousWorld).lower(),
+                          'noWrap': str(noWrap).lower(),
+                          'zoomOffset': zoomOffset,
+                          'zoomReverse': str(zoomReverse).lower(),
+                          'opacity': opacity,
+                      })
+        assert map.template_vars['tile_layers'][0] == tile
+
     def test_simple_marker(self):
         '''Test simple marker addition'''