Merge pull request #657 from ocefpaf/expand_float_check

Minor fixes to the float check...

Author: ocefpaf

CHANGES.txt

@@ -5,32 +5,43 @@
 - Updated to leaflet 1.1.0 (ocefpaf #639)
 - Added `FastMarkerCluster` (James Gardiner #585 (proposed by @ruoyu0088))
 
+Bug Fixes
+
+- Checking if the lat, lon locations are floats to avoid empty maps
+  (radumas #626)
+
+
 0.3.0
 ~~~~~
 
 - Added `FastMarkerCluster` (James Gardiner #585 (proposed by @ruoyu0088))
 - Added style option to 'Timestamped geojson' plugin (soymsk #627)
 - Switched to `leaflet 1.0.1` (juoceano #531 and ocefpaf #535)
-- Added `continuous_world`, `world_copy_jump`, and `no_wrap` options (ocefpaf #508)
+- Added `continuous_world`, `world_copy_jump`, and `no_wrap` options
+  (ocefpaf #508)
 - Update font-awesome to 4.6.3 (ocefpaf #478)
 - Added text path (talespaiva #451 and ocefpaf #474)
 - More options added to `LayerControl` (qingkaikong #473)
 - More options added to `fullscreen` plugin (qingkaikong #468)
 - Added `ColorLine` object (bibmartin #449)
 - Added highlight function to `GeoJSON`, and `Chrorpleth` (JoshuaCano #341)
 - Added `fullscreen` plugin (sanga #437)
-- Added `smooth_factor `option to `GeoJSON`, `TopoJSON` and `Choropleth` (JamesGardiner #428)
+- Added `smooth_factor `option to `GeoJSON`, `TopoJSON` and `Choropleth`
+  (JamesGardiner #428)
 - `Map` object now accepts Leaflet global switches (sgvandijk #424)
 - Added weight option to CircleMarker (palewire #581)
-- Added requests support to enable http(s) and ftp for geo_path parameter (jreades #602)
+- Added requests support to enable http(s) and ftp for geo_path parameter
+  (jreades #602)
 
 Bug Fixes
 
 - Fixed image order (juoceano #536)
 - Fixed Icon rotation (juoceano #530 and sseemayer #527)
 - Fixed MIME type (text/plain) is not executable (talespaiva #440)
-- Update Travis-CI testing to incorporate branca and fix notebook tests (ocefpaf #436)
-- Removed MultiPolyLine and MultiPolygon, both are handled by PolyLine and PolyLine in leaflet 1.0.* (ocefpaf #554)
+- Update Travis-CI testing to incorporate branca and fix notebook tests
+  (ocefpaf #436)
+- Removed MultiPolyLine and MultiPolygon, both are handled by PolyLine and
+  PolyLine in leaflet 1.0.* (ocefpaf #554)
 - Removed deprecated MapQuest tiles (HashCode55 #562)
 
 0.2.1

folium/map.py

@@ -60,19 +60,23 @@
      'https://rawgit.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css'),  # noqa
     ]
 
-def _validate_location(values):
+
+def _validate_location(location):
         """Validates and formats location values before setting"""
-        if type(values) not in [list, tuple]:
-            raise TypeError("Location is not a list, expecting ex: location=[45.523, -122.675]")
+        if type(location) not in [list, tuple]:
+            raise TypeError('Expected tuple/list for location, got '
+                            '{!r}'.format(location))
 
-        if len(values) != 2:
-            raise ValueError("Location should have two values, [lat, lon]")
+        if len(location) != 2:
+            raise ValueError('Expected two values for location [lat, lon], '
+                             'got {}'.format(len(location)))
 
         try:
-            values = [float(val) for val in values]
+            location = [float(val) for val in location]
         except:
-            raise ValueError("Location values should be numeric, {} is not a number".format(val))
-        return values
+            raise ValueError('Location values must be valid numeric values, '
+                             'got {!r}'.format(location))
+        return location
 
 
 class LegacyMap(MacroElement):
@@ -351,6 +355,7 @@ def render(self, **kwargs):
 
         super(LegacyMap, self).render(**kwargs)
 
+
 class GlobalSwitches(Element):
     def __init__(self, prefer_canvas=False, no_touch=False, disable_3d=False):
         super(GlobalSwitches, self).__init__()