Merge pull request #581 from california-civic-data-coalition/weight-circle-marker

Added weight option to CircleMarker

Author: ocefpaf

folium/features.py

@@ -753,6 +753,8 @@ class CircleMarker(Marker):
         use Circle.
     color: str, default 'black'
         The color of the marker's edge in a HTML-compatible format.
+    weight: int, default 2
+        Stroke weight in pixels
     fill_color: str, default 'black'
         The fill color of the marker in a HTML-compatible format.
     fill_opacity: float, default 0.6
@@ -762,11 +764,13 @@ class CircleMarker(Marker):
 
     """
     def __init__(self, location, radius=500, color='black',
-                 fill_color='black', fill_opacity=0.6, popup=None):
+                 weight=2, fill_color='black', fill_opacity=0.6,
+                 popup=None):
         super(CircleMarker, self).__init__(location, popup=popup)
         self._name = 'CircleMarker'
         self.radius = radius
         self.color = color
+        self.weight = weight
         self.fill_color = fill_color
         self.fill_opacity = fill_opacity
 
@@ -777,6 +781,7 @@ def __init__(self, location, radius=500, color='black',
                 [{{this.location[0]}},{{this.location[1]}}],
                 {
                     color: '{{ this.color }}',
+                    weight: {{ this.weight }},
                     fillColor: '{{ this.fill_color }}',
                     fillOpacity: {{ this.fill_opacity }}
                     }

folium/templates/circle_marker.js

@@ -1,5 +1,6 @@
 var {{ circle }} = L.circleMarker([{{ lat }}, {{ lon }}], {
                             color: '{{ line_color }}',
+                            weight: {{ weight }},
                             fillColor: '{{ fill_color }}',
                             fillOpacity: {{ fill_opacity }}
-                            }).setRadius({{ radius }})
+                            }).setRadius({{ radius }})

tests/test_features.py

@@ -72,6 +72,7 @@ def test_marker_popups():
     features.RegularPolygonMarker([45, 0], popup=Popup('0')).add_to(m)
     features.CircleMarker([45, 60], popup='60').add_to(m)
     features.CircleMarker([45, 120], popup=Popup('120')).add_to(m)
+    features.CircleMarker([45, 90], popup=Popup('90'), weight=0).add_to(m)
     m._repr_html_()
 
     bounds = m.get_bounds()

tests/test_folium.py

@@ -169,18 +169,20 @@ def test_circle_marker(self):
         circle_1 = circ_templ.render({'circle': marker.get_name(),
                                       'lat': 45.60,
                                       'lon': -122.8, 'radius': 500,
+                                      'weight': 2,
                                       'line_color': 'black',
                                       'fill_color': 'black',
                                       'fill_opacity': 0.6})
         assert (''.join(circle_1.split())[:-1] in
                 ''.join(self.map.get_root().render().split()))
 
         # Second circle marker.
-        marker = folium.features.CircleMarker([45.70, -122.9], popup='Hi')
+        marker = folium.features.CircleMarker([45.70, -122.9], popup='Hi', weight=1)
         self.map.add_child(marker)
         circle_2 = circ_templ.render({'circle': marker.get_name(),
                                       'lat': 45.70,
                                       'lon': -122.9, 'radius': 500,
+                                      'weight': 1,
                                       'line_color': 'black',
                                       'fill_color': 'black',
                                       'fill_opacity': 0.6})