check coordinates (#679)

Author: ocefpaf

folium/features.py

@@ -17,6 +17,7 @@
 from branca.utilities import (_locations_tolist, _parse_size, image_to_url, iter_points, none_max, none_min)  # noqa
 
 from folium.map import FeatureGroup, Icon, Layer, Marker, Popup
+from folium.utilities import _validate_coordinates, _validate_location
 
 from jinja2 import Template
 
@@ -133,7 +134,10 @@ class RegularPolygonMarker(Marker):
     def __init__(self, location, color='black', opacity=1, weight=2,
                  fill_color='blue', fill_opacity=1,
                  number_of_sides=4, rotation=0, radius=15, popup=None):
-        super(RegularPolygonMarker, self).__init__(location, popup=popup)
+        super(RegularPolygonMarker, self).__init__(
+            _locations_tolist(location),
+            popup=popup
+        )
         self._name = 'RegularPolygonMarker'
         self.color = color
         self.opacity = opacity
@@ -819,7 +823,10 @@ class Circle(Marker):
     """
     def __init__(self, location, radius=500, color='black',
                  fill_color='black', fill_opacity=0.6, popup=None):
-        super(Circle, self).__init__(location, popup=popup)
+        super(Circle, self).__init__(
+            _validate_location(location),
+            popup=popup
+        )
         self._name = 'Circle'
         self.radius = radius
         self.color = color
@@ -928,7 +935,10 @@ def __init__(self, bounds, color='black', weight=1, fill_color='black',
         ... )
 
         """
-        super(RectangleMarker, self).__init__(bounds, popup=popup)
+        super(RectangleMarker, self).__init__(
+            _validate_coordinates(bounds),
+            popup=popup
+        )
         self._name = 'RectangleMarker'
         self.color = color
         self.weight = weight
@@ -986,10 +996,7 @@ def __init__(self, locations, color='black', weight=1, fill_color='black',
         ...         fill_opacity=0.5, popup='Tokyo, Japan'))
 
         """
-        super(PolygonMarker, self).__init__(
-            _locations_tolist(locations),
-            popup=popup
-        )
+        super(PolygonMarker, self).__init__(locations, popup=popup)
         self._name = 'PolygonMarker'
         self.color = color
         self.weight = weight
@@ -1089,7 +1096,7 @@ def __init__(self, locations, color=None, weight=None,
                  opacity=None, popup=None):
         super(PolyLine, self).__init__()
         self._name = 'PolyLine'
-        self.data = _locations_tolist(locations)
+        self.data = _validate_coordinates(locations)
         self.color = color
         self.weight = weight
         self.opacity = opacity

folium/map.py

@@ -20,6 +20,8 @@
 from branca.element import CssLink, Element, Figure, Html, JavascriptLink, MacroElement  # noqa
 from branca.utilities import _parse_size
 
+from folium.utilities import _validate_coordinates, _validate_location
+
 from jinja2 import Environment, PackageLoader, Template
 
 from six import binary_type, text_type
@@ -61,24 +63,6 @@
     ]
 
 
-def _validate_location(location):
-        """Validates and formats location values before setting"""
-        if type(location) not in [list, tuple]:
-            raise TypeError('Expected tuple/list for location, got '
-                            '{!r}'.format(location))
-
-        if len(location) != 2:
-            raise ValueError('Expected two values for location [lat, lon], '
-                             'got {}'.format(len(location)))
-
-        try:
-            location = [float(val) for val in location]
-        except:
-            raise ValueError('Location values must be valid numeric values, '
-                             'got {!r}'.format(location))
-        return location
-
-
 class LegacyMap(MacroElement):
     """Create a Map with Folium and Leaflet.js
 
@@ -668,11 +652,14 @@ class Marker(MacroElement):
     --------
     >>> Marker(location=[45.5, -122.3], popup='Portland, OR')
     >>> Marker(location=[45.5, -122.3], popup=folium.Popup('Portland, OR'))
+
     """
     def __init__(self, location, popup=None, icon=None):
         super(Marker, self).__init__()
         self._name = 'Marker'
-        self.location = location
+        # Must be _validate_coordinates b/c some markers are defined with
+        # multiple coordinates values, like Polygons.
+        self.location = _validate_coordinates(location)
         if icon is not None:
             self.add_child(icon)
         if isinstance(popup, text_type) or isinstance(popup, binary_type):

folium/plugins/boat_marker.py

@@ -7,6 +7,7 @@
 from branca.element import Figure, JavascriptLink
 
 from folium.map import Marker
+from folium.utilities import _validate_location
 
 from jinja2 import Template
 
@@ -35,7 +36,11 @@ class BoatMarker(Marker):
     """
     def __init__(self, location, popup=None, icon=None,
                  heading=0, wind_heading=None, wind_speed=0, **kwargs):
-        super(BoatMarker, self).__init__(location, popup=popup, icon=icon)
+        super(BoatMarker, self).__init__(
+            _validate_location(location),
+            popup=popup,
+            icon=icon
+        )
         self._name = 'BoatMarker'
         self.heading = heading
         self.wind_heading = wind_heading

folium/plugins/fast_marker_cluster.py

@@ -3,6 +3,7 @@
 from __future__ import (absolute_import, division, print_function)
 
 from folium.plugins.marker_cluster import MarkerCluster
+from folium.utilities import _validate_coordinates
 
 from jinja2 import Template
 
@@ -34,7 +35,7 @@ class FastMarkerCluster(MarkerCluster):
     def __init__(self, data, callback=None):
         super(FastMarkerCluster, self).__init__([])
         self._name = 'FastMarkerCluster'
-        self._data = data
+        self._data = _validate_coordinates(data)
 
         if callback is None:
             self._callback = ('var callback;\n' +

folium/plugins/heat_map.py

@@ -8,6 +8,7 @@
 from branca.utilities import none_max, none_min
 
 from folium.map import TileLayer
+from folium.utilities import _isnan
 
 from jinja2 import Template
 
@@ -41,9 +42,11 @@ class HeatMap(TileLayer):
     def __init__(self, data, name=None, min_opacity=0.5, max_zoom=18,
                  max_val=1.0, radius=25, blur=15, gradient=None, overlay=True):
         super(TileLayer, self).__init__(name=name)
+        if _isnan(data):
+            raise ValueError('data cannot contain NaNs, '
+                             'got:\n{!r}'.format(data))
         self._name = 'HeatMap'
         self.tile_name = name if name is not None else self.get_name()
-
         self.data = [[x for x in line] for line in data]
         self.min_opacity = min_opacity
         self.max_zoom = max_zoom

folium/utilities.py

@@ -0,0 +1,50 @@
+from __future__ import (absolute_import, division, print_function)
+
+import math
+
+
+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 '
+                        '{!r}'.format(location))
+
+    if len(location) != 2:
+        raise ValueError('Expected two values for location [lat, lon], '
+                         'got {}'.format(len(location)))
+    location = _locations_tolist(location)
+    return location
+
+
+def _validate_coordinates(coordinates):
+    """Validates multiple coordinates for the various markers in folium."""
+    if _isnan(coordinates):
+        raise ValueError('Location values cannot contain NaNs, '
+                         'got:\n{!r}'.format(coordinates))
+    coordinates = _locations_tolist(coordinates)
+    return coordinates
+
+
+def _locations_tolist(x):
+    """Transforms recursively a list of iterables into a list of list."""
+    if hasattr(x, '__iter__'):
+        return list(map(_locations_tolist, x))
+    else:
+        return x
+
+
+def _flatten(container):
+    for i in container:
+        if isinstance(i, (list, tuple)):
+            for j in _flatten(i):
+                yield j
+        else:
+            yield i
+
+
+def _isnan(values):
+    """Check if there are NaNs values in the iterable."""
+    return any(math.isnan(value) for value in _flatten(values))