Typos + geo_json -> choropleth

Author: Martin Journois

folium/features.py

@@ -204,14 +204,14 @@ def __init__(self, data, style_function=None):
         if 'read' in dir(data):
             self.data = json.load(data)
         elif type(data) is dict:
-            self.data = json.loads(json.dumps(data)) # a lazy way of doing deep copy.
+            self.data = json.loads(json.dumps(data)) # A lazy way of doing deep copy.
         else:
             self.data = json.loads(data)
 
         if 'features' not in self.data.keys():
-            # Catch case when GEOJson is just a single Feature or a geometry.
+            # Catch case when GeoJSON is just a single Feature or a geometry.
             if not (isinstance(self.data, dict) and 'geometry' in self.data.keys()):
-                # Catch case when GEOJson is just a geometry.
+                # Catch case when GeoJSON is just a geometry.
                 self.data = {'type' : 'Feature', 'geometry' : self.data}
             self.data = {'type' : 'FeatureCollection', 'features' : [self.data]}
 

folium/folium.py

@@ -438,7 +438,12 @@ def add_plugin(self, plugin):
 #
 #        self.template_vars.update({'fit_bounds': fit_bounds_str.strip()})
 
-    def geo_json(self, geo_path=None, geo_str=None, data_out='data.json',
+    def geo_json(self, **kwargs):
+        """This method is deprecated, see `Map.choropleth` instead."""
+        warnings.warn('This method is deprecated. Please use Map.choropleth instead.')
+        return self.choropleth(**kwargs)
+
+    def choropleth(self, geo_path=None, geo_str=None, 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=None,
@@ -604,15 +609,9 @@ def geo_json(self, geo_path=None, geo_str=None, data_out='data.json',
         else:
             geo_json = GeoJson(geo_data, style_function=style_function)
 
-        # Create GeoJsonStyle.
-        #geo_json_style = GeoJsonStyle(
-        #    color_domain, fill_color, color_data=color_data, key_on=key_on,
-        #    weight=line_weight, opacity=line_opacity, color=line_color,
-        #    fill_opacity=fill_opacity)
-
-        #geo_json.add_children(geo_json_style)
         self.add_children(geo_json)
-        # Create ColorScale
+
+        # Create ColorScale.
         if color_domain:
             color_scale = ColorScale(color_domain, fill_color, caption=legend_name)
             self.add_children(color_scale)