Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor marker cluster #704

Merged

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented Sep 3, 2017

MarkerCluster had two different implementation, one in features and another one in plugins.
The former required an external loop, while the latter could take a list of objects.

I merged them into one that accepts both but I am leaning towards removing the external loop version b/c the list is virtually 100% equivalent.

  • updated to markercluster 1.1.0
  • added icon_create_function example
  • cleanup the template

@@ -16,7 +16,7 @@
from branca.element import (CssLink, Element, Figure, JavascriptLink, MacroElement) # noqa
from branca.utilities import (_locations_tolist, _parse_size, image_to_url, iter_points, none_max, none_min) # noqa

from folium.map import FeatureGroup, Icon, Layer, Marker
from folium.map import FeatureGroup, Icon, Layer, Popup, Marker

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F401 'folium.map.Popup' imported but unused

@ocefpaf ocefpaf merged commit 34ed7e5 into python-visualization:master Sep 4, 2017
@ocefpaf ocefpaf deleted the refactor_marker_cluster branch September 4, 2017 11:23
sanga pushed a commit to sanga/folium that referenced this pull request Oct 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants