Merge pull request #102 from ocefpaf/jsonpopup

GeoJSON popup.

Author: birdage

CHANGES.txt

@@ -1,3 +1,7 @@
+0.1.5.dev
+~~~~~~~~~
+- GeoJSON popup.  @ocefpaf
+
 0.1.4
 ~~~~~
 - Popups allow unicode.  @apatil

folium/folium.py

@@ -850,7 +850,8 @@ def json_style(style_cnt, line_color, line_weight, line_opacity,
             style = json_style(style_count, line_color, line_weight,
                                line_opacity, fill_color, fill_opacity, None)
 
-        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2}}}).addTo(map)'
+        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2},'
+                 'onEachFeature: onEachFeature}}).addTo(map)'
                  .format(self.mark_cnt['geojson'], layer_var, style_count))
 
         self.template_vars.setdefault('json_paths', []).append(geo_path)

folium/templates/geojson_template.html

@@ -48,6 +48,13 @@
           {%- endfor %}
           .await(makeMap)
 
+      function onEachFeature(feature, layer) {
+          // does this feature have a property named popupContent?
+          if (feature.properties && feature.properties.popupContent) {
+              layer.bindPopup(feature.properties.popupContent);
+              }
+          };
+
       function makeMap(error, {% for var in func_vars %}{{ var }}
                        {%- if not loop.last %},{%- endif %}{%- endfor %}) {
 

tests/folium_tests.py

@@ -272,7 +272,8 @@ def test_geo_json(self):
                                    'line_opacity': 1,
                                    'fill_color': 'blue',
                                    'fill_opacity': 0.6})
-        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2}}}).addTo(map)'
+        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2},'
+                 'onEachFeature: onEachFeature}}).addTo(map)'
                  .format(1, layer_var, 'style_1'))
 
         templ = self.map.template_vars
@@ -325,7 +326,8 @@ def test_geo_json(self):
                                    'quantize_fill': color,
                                    'fill_opacity': 0.6})
 
-        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2}}}).addTo(map)'
+        layer = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2},'
+                 'onEachFeature: onEachFeature}}).addTo(map)'
                  .format(1, layer_var, 'style_1'))
 
         templ = self.map.template_vars
@@ -343,7 +345,8 @@ def test_geo_json(self):
         layer_var_2 = 'topo_2'
         topo_func = ('topo_2 = topojson.feature(tjson_2,'
                      ' tjson_2.objects.or_counties_geo);')
-        fmt = 'gJson_layer_{0} = L.geoJson({1}, {{style: {2}}}).addTo(map)'
+        fmt = ('gJson_layer_{0} = L.geoJson({1}, {{style: {2},'
+               'onEachFeature: onEachFeature}}).addTo(map)')
         layer_2 = fmt.format(2, layer_var_2, 'style_2')
 
         templ = self.map.template_vars