Fixes #341: Added Highlight switch

Author: joshuacano

folium/features.py

@@ -333,17 +333,24 @@ def __init__(self, data, style_function=None, name=None,
 
         if style_function is None:
             def style_function(x):
-                return {}
+                return {} 
+
         self.style_function = style_function
 
+        self.highlight = highlight_function is not None
+
+        if highlight_function is None:
+            def highlight_function(x):
+                return {} 
+
         self.highlight_function = highlight_function
 
         self.smooth_factor = smooth_factor
 
         self._template = Template(u"""
             {% macro script(this, kwargs) %}
             
-            {% if this.highlight_function is not none %}
+            {% if this.highlight %}
                 {{this.get_name()}}_onEachFeature = function onEachFeature(feature, layer) {
                     layer.on({
                         mouseout: function(e) {
@@ -358,13 +365,13 @@ def style_function(x):
 
                 var {{this.get_name()}} = L.geoJson(
                     {% if this.embed %}{{this.style_data()}}{% else %}"{{this.data}}"{% endif %}
-                    {% if this.smooth_factor is not none or this.highlight_function is not none %}
+                    {% if this.smooth_factor is not none or this.highlight %}
                         , {
                         {% if this.smooth_factor is not none  %}
-                            smoothFactor:{{this.smooth_factor}}}
+                            smoothFactor:{{this.smooth_factor}}
                         {% endif %}
                     
-                        {% if this.highlight_function is not none %}
+                        {% if this.highlight %}
                             {% if this.smooth_factor is not none  %}
                             ,
                             {% endif %}

folium/folium.py

@@ -508,7 +508,8 @@ 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="",
-                   topojson=None, reset=False, smooth_factor=None):
+                   topojson=None, reset=False, smooth_factor=None, 
+                   highlight=None):
         """
         Apply a GeoJSON overlay to the map.
 
@@ -580,6 +581,8 @@ def choropleth(self, geo_path=None, geo_str=None, data_out='data.json',
             How much to simplify the polyline on each zoom level. More means
             better performance and smoother look, and less means more accurate
             representation. Leaflet defaults to 1.0.
+        highlight: boolean, default False
+            Enable highlight functionality when hovering over a GeoJSON area.
 
         Returns
         -------
@@ -596,6 +599,12 @@ def choropleth(self, geo_path=None, geo_str=None, data_out='data.json',
         ...              threshold_scale=[0, 20, 30, 40, 50, 60])
         >>> m.choropleth(geo_path='countries.json',
         ...              topojson='objects.countries')
+        >>> m.choropleth(geo_path='geo.json', data=df,
+        ...              columns=['Data 1', 'Data 2'],
+        ...              key_on='feature.properties.myvalue',
+        ...              fill_color='PuBu',
+        ...              threshold_scale=[0, 20, 30, 40, 50, 60],
+        ...              highlight=True)
 
         """
         if threshold_scale and len(threshold_scale) > 6:
@@ -677,6 +686,7 @@ def style_function(x):
                 "fillColor": color_scale_fun(x)
             }
 
+
         def highlight_function(x):
             return {
                 "weight": line_weight + 2,
@@ -694,7 +704,7 @@ def highlight_function(x):
                 geo_data,
                 style_function=style_function,
                 smooth_factor=smooth_factor,
-                highlight_function=highlight_function)
+                highlight_function=highlight_function if highlight else None)
 
         self.add_child(geo_json)
 

folium/map.py

@@ -22,7 +22,7 @@
 
 _default_js = [
     ('leaflet',
-     "https://npmcdn.com/leaflet@1.0.0-rc.3/dist/leaflet.js"),
+     "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"),
     ('jquery',
      "https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"),
     ('bootstrap',
@@ -37,7 +37,7 @@
 
 _default_css = [
     ("leaflet_css",
-     "https://npmcdn.com/leaflet@1.0.0-rc.3/dist/leaflet.css"),
+     "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css"),
     ("bootstrap_css",
      "https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"),
     ("bootstrap_theme_css",