choropleth can take gdf

Author: ocefpaf

folium/features.py

@@ -21,6 +21,8 @@
 
 from jinja2 import Template
 
+import requests
+
 from six import binary_type, text_type
 
 
@@ -473,8 +475,11 @@ def __init__(self, data, style_function=None, name=None,
             self.embed = True
             self.data = data
         elif isinstance(data, text_type) or isinstance(data, binary_type):
-            if data.lstrip()[0] in '[{':  # This is a GeoJSON inline string
-                self.embed = True
+            self.embed = True
+            if data.lower().startswith(('http:', 'ftp:', 'https:')):
+                self.data = requests.get(data).json()
+                print(data)
+            elif data.lstrip()[0] in '[{':  # This is a GeoJSON inline string
                 self.data = json.loads(data)
             else:  # This is a filename
                 self.embed = False

folium/folium.py

@@ -16,8 +16,6 @@
 from folium.features import GeoJson, TopoJson
 from folium.map import FitBounds, LegacyMap
 
-import requests
-
 
 class Map(LegacyMap):
     """Create a Map with Folium and Leaflet.js
@@ -143,7 +141,7 @@ def fit_bounds(self, bounds, padding_top_left=None,
                                  )
                        )
 
-    def choropleth(self, geo_path=None, geo_str=None, data_out='data.json',
+    def choropleth(self, geo_data, data_out='data.json',
                    data=None, columns=None, key_on=None, threshold_scale=None,
                    fill_color='blue', fill_opacity=0.6, line_color='black',
                    line_weight=1, line_opacity=1, legend_name='',
@@ -252,17 +250,6 @@ def choropleth(self, geo_path=None, geo_str=None, data_out='data.json',
             raise ValueError('Please pass a valid color brewer code to '
                              'fill_local. See docstring for valid codes.')
 
-        # Create GeoJson object
-        if geo_path:
-            if geo_path.lower().startswith(('http:', 'ftp:', 'https:')):
-                geo_data = requests.get(geo_path).json()
-            else:
-                geo_data = open(geo_path)
-        elif geo_str:
-            geo_data = geo_str
-        else:
-            geo_data = {}
-
         # Create color_data dict
         if hasattr(data, 'set_index'):
             # This is a pd.DataFrame

tests/test_folium.py

@@ -291,10 +291,8 @@ def test_topo_json_smooth_factor(self):
         self.m = folium.Map([43, -100], zoom_start=4)
 
         # Adding TopoJSON as additional layer.
-        path = os.path.join(rootpath, 'or_counties_topo.json')
-        self.m.choropleth(geo_path=path,
-                          topojson='objects.or_counties_geo',
-                          smooth_factor=0.5)
+        with open(os.path.join(rootpath, 'or_counties_topo.json')) as f:
+            self.m.choropleth(f, topojson='objects.or_counties_geo', smooth_factor=0.5)
 
         out = self.m._parent.render()
 
@@ -462,8 +460,7 @@ def test_json_request(self):
         self.m = folium.Map(zoom_start=4)
 
         # Adding remote GeoJSON as additional layer.
-        self.m.choropleth(geo_path=remote_url,
-                          smooth_factor=0.5)
+        self.m.choropleth(remote_url, smooth_factor=0.5)
 
         self.m._parent.render()
         bounds = self.m.get_bounds()