Merge pull request #134 from themiurgo/autobounds

Autobounds

Author: ocefpaf

folium/folium.py

@@ -128,12 +128,14 @@ def __init__(self, location=None, width='100%', height='100%',
         self.json_data = {}
         self.plugins = {}
 
-        # Location.
-        if not location:
-            raise ValueError('You must pass a Lat/Lon location to initialize'
-                             ' your map')
+        # No location means we will use automatic bounds and ignore zoom
         self.location = location
 
+        # If location is not passed, we center the map at 0,0
+        if not location:
+            location = [0, 0]
+            zoom_start = min_zoom
+
         # Map Size Parameters.
         try:
             if isinstance(width, int):
@@ -651,6 +653,31 @@ def fit_bounds(self, bounds, padding_top_left=None,
         self.template_vars.update({'fit_bounds': fit_bounds_str})
 
 
+    def _auto_bounds(self):
+        if 'fit_bounds' in self.template_vars:
+            return
+        # Get count for each feature type
+        ft_names = ["marker", "line", "circle", "polygon", "multiline"]
+        ft_names = [i for i in ft_names if i in self.mark_cnt]
+
+        # Make a comprehensive list of all the features we want to fit
+        feat_str = ["{name}_{count}".format(name=ft_name,
+                                            count=self.mark_cnt[ft_name])
+                    for ft_name in ft_names
+                    for count in range(1, self.mark_cnt[ft_name]+1)
+        ]
+        feat_str = "[" + ', '.join(feat_str) + "]"
+
+        fit_bounds = self.env.get_template('fit_bounds.js')
+        fit_bounds_str = fit_bounds.render({
+            'autobounds': not self.location,
+            'features': feat_str,
+            'fit_bounds_options': json.dumps({'padding' : [30, 30]}),
+        })
+
+        self.template_vars.update({'fit_bounds': fit_bounds_str.strip()})
+
+
     def _popup_render(self, popup=None, mk_name=None, count=None,
                       width=300):
         """Popup renderer: either text or Vincent/Vega.
@@ -922,6 +949,7 @@ def json_style(style_cnt, line_color, line_weight, line_opacity,
         self.template_vars.setdefault('gjson_layers', []).append(layer)
 
     def _build_map(self, html_templ=None, templ_type='string'):
+        self._auto_bounds()
         """Build HTML/JS/CSS from Templates given current map type."""
         if html_templ is None:
             map_types = {'base': 'fol_template.html',

folium/templates/fit_bounds.js

@@ -1,3 +1,11 @@
+{% if autobounds %}
+var autobounds = L.featureGroup({{ features }}).getBounds()
+{% if not bounds %}
+{% set bounds = "autobounds" %}
+{% endif %}
+{% endif %}
+{% if bounds %}
 map.fitBounds({{ bounds }},
     {{ fit_bounds_options }}
 );
+{% endif %}

folium/templates/fol_template.html

@@ -149,7 +149,7 @@
 
       {{ click_pop }}
 
-      {{ fit_bounds }}
+{% if fit_bounds %}{{ fit_bounds }}{% endif %}
 
    </script>
 

tests/folium_tests.py

@@ -58,8 +58,6 @@ def test_init(self):
         assert self.map.location == [45.5236, -122.6750]
         assert self.map.map_size == {'width': 900, 'height': 400}
 
-        nt.assert_raises(ValueError, callableObj=folium.Map)
-
         tmpl = {'Tiles': 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
                 'attr': ('Map data (c) <a href="http://openstreetmap.org">'
                          'OpenStreetMap</a> contributors'),