Merge pull request #1084 from dskkato/master

Relaxing location data type restriction.

Author: ocefpaf

folium/folium.py

@@ -231,7 +231,7 @@ def __init__(self, location=None, width='100%', height='100%',
         self._png_image = None
         self.png_enabled = png_enabled
 
-        if not location:
+        if location is None:
             # If location is not passed we center and zoom out.
             self.location = [0, 0]
             self.zoom_start = 1

folium/utilities.py

@@ -12,6 +12,10 @@
 import copy
 import uuid
 import collections
+try:
+    from collections import abc
+except ImportError:
+    import collections as abc
 
 import numpy as np
 
@@ -23,18 +27,23 @@
 _VALID_URLS.discard('')
 
 
+def _is_sized_iterable(arg):
+    """Validates the arg is Sized & Iterable"""
+    return isinstance(arg, abc.Sized) & isinstance(arg, abc.Iterable)
+
+
 def _validate_location(location):
     """Validates and formats location values before setting."""
-    if _isnan(location):
-        raise ValueError('Location values cannot contain NaNs, '
-                         'got {!r}'.format(location))
-    if type(location) not in [list, tuple]:
-        raise TypeError('Expected tuple/list for location, got '
+    if not _is_sized_iterable(location):
+        raise TypeError('Expected a collection object for location, got '
                         '{!r}'.format(location))
-
     if len(location) != 2:
         raise ValueError('Expected two values for location [lat, lon], '
                          'got {}'.format(len(location)))
+    if _isnan(location):
+        raise ValueError('Location values cannot contain NaNs, '
+                         'got {!r}'.format(location))
+
     location = _iter_tolist(location)
     return location
 
@@ -58,7 +67,7 @@ def _iter_tolist(x):
 
 def _flatten(container):
     for i in container:
-        if isinstance(i, (list, tuple, np.ndarray)):
+        if _is_sized_iterable(i):
             for j in _flatten(i):
                 yield j
         else:

tests/test_folium.py

@@ -19,6 +19,7 @@
 import jinja2
 from jinja2 import Environment, PackageLoader
 
+import numpy as np
 import pandas as pd
 
 import pytest
@@ -62,6 +63,17 @@ def test_get_templates():
     assert isinstance(env, jinja2.environment.Environment)
 
 
+def test_location_args():
+    """Test some data types for a location arg."""
+    location = np.array([45.5236, -122.6750])
+    m = folium.Map(location)
+    assert m.location == [45.5236, -122.6750]
+
+    df = pd.DataFrame({"location": [45.5236, -122.6750]})
+    m = folium.Map(df["location"])
+    assert m.location == [45.5236, -122.6750]
+
+
 class TestFolium(object):
     """Test class for the Folium library."""