added a cluster marker group, and simple markers can be added to the cluster group through the clustered_marker bool on generation

Author: birdage

folium/folium.py

@@ -176,7 +176,7 @@ def __init__(self, location=None, width=960, height=500,
  self.tile_types.update({'Custom': {'template': tiles, 'attr': attr}})
 
  @iter_obj('simple')
- def simple_marker(self, location=None, popup='Pop Text', popup_on=True,marker_color='blue',marker_icon='info-sign'):
+ def simple_marker(self, location=None, popup='Pop Text', popup_on=True,marker_color='blue',marker_icon='info-sign',clustered_marker=False):
  '''Create a simple stock Leaflet marker on the map, with optional
  popup text or Vincent visualization.
 
@@ -193,6 +193,8 @@ def simple_marker(self, location=None, popup='Pop Text', popup_on=True,marker_co
  color of marker you want
  marker_icon
  icon from (http://getbootstrap.com/components/) you want on the marker
+ clustered_marker
+ boolean of whether or not you want the marker clustered with other markers 
 
  Returns
  -------
@@ -228,9 +230,17 @@ def simple_marker(self, location=None, popup='Pop Text', popup_on=True,marker_co
  count=count,
  popup_on=popup_on)
 
- add_mark = 'map.addLayer(marker_{0})'.format(count)
+ 
 
- self.template_vars.setdefault('custom_markers', []).append((icon,
+ if clustered_marker:
+ add_mark = 'clusteredmarkers.addLayer(marker_{0})'.format(count)
+ self.template_vars.setdefault('cluster_markers', []).append((icon,
+ marker,
+ popup_out,
+ add_mark))
+ else:
+ add_mark = 'map.addLayer(marker_{0})'.format(count)
+ self.template_vars.setdefault('custom_markers', []).append((icon,
  marker,
  popup_out,
  add_mark))

folium/templates/cluster_marker.js

@@ -62,16 +62,17 @@
  attribution: '{{ attr }}'
  }).addTo(map);
 
- var markers = L.markerClusterGroup();
-
- for (var i = 0; i < 5; i++) {
- var title = "test";
- var markerTest = L.marker(new L.LatLng(40+i, -68+i), { title: title });
- markerTest.bindPopup(title);
- markers.addLayer(markerTest);
- }
-
- map.addLayer(markers);
+ //cluster group
+ var clusteredmarkers = L.markerClusterGroup();
+ //section for adding clustered markers
+ {% for icon, mark, popup, add_mark in cluster_markers %}
+ {{ icon }}
+ {{ mark }}
+ {{ popup }}
+ {{ add_mark }}
+ {% endfor %}
+ //add the clustered markers to the group anyway
+ map.addLayer(clusteredmarkers);
 
  {% for icon, mark, popup, add_mark in custom_markers %}
  {{ icon }}