Merge pull request #456 from BibMartin/fix/issue402

Fix key error in choropleth (#402)

Author: ocefpaf

examples/choropleth_counties.py

@@ -29,7 +29,7 @@ def set_id(fips):
 
 # Apply set_id, drop NaN.
 df['GEO_ID'] = df['FIPS_Code'].apply(set_id)
-df = df.dropna()
+df.dropna(subset=['GEO_ID'], inplace=True)
 
 # Number of employed with auto scale.
 map_1 = folium.Map(location=[48, -102], zoom_start=3)

folium/folium.py

@@ -664,6 +664,7 @@ def get_by_key(obj, key):
             def color_scale_fun(x):
                 return color_range[len(
                     [u for u in color_domain if
+                     get_by_key(x, key_on) in color_data and
                      u <= color_data[get_by_key(x, key_on)]])]
         else:
             def color_scale_fun(x):