Skip to content

Commit d88257f

Browse files
committed
Tidy up post code review
1 parent a6634a3 commit d88257f

2 files changed

Lines changed: 11 additions & 16 deletions

File tree

folium/plugins/fast_marker_cluster.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,16 @@ def __init__(self, data, callback=None):
3030
self._name = 'Script'
3131
self._data = data
3232
if callback is None:
33-
self._callback = self.create_marker()
33+
self._callback = ('var callback;\n' +
34+
'callback = function (row) {\n' +
35+
'\tvar icon, marker;\n' +
36+
'\t// Returns a L.marker object\n' +
37+
'\ticon = L.AwesomeMarkers.icon();\n' +
38+
'\tmarker = L.marker(new L.LatLng(row[0], ' +
39+
'row[1]));\n' +
40+
'\tmarker.setIcon(icon);\n' +
41+
'\treturn marker;\n' +
42+
'};')
3443
else:
3544
self._callback = "var callback = {};".format(callback)
3645

@@ -52,17 +61,3 @@ def __init__(self, data, callback=None):
5261
cluster.addTo(map);
5362
})();
5463
{% endmacro %}""")
55-
56-
def create_marker(self):
57-
"""Returns a L.marker object"""
58-
t = ('var callback;\n' +
59-
'callback = function (row) {\n' +
60-
'\tvar icon, marker;\n' +
61-
'\t// Returns a L.marker object\n' +
62-
'\ticon = L.AwesomeMarkers.icon();\n' +
63-
'\tmarker = L.marker(new L.LatLng(row[0], row[1]));\n' +
64-
'\tmarker.setIcon(icon);\n' +
65-
'\treturn marker;\n' +
66-
'};')
67-
68-
return t

tests/plugins/test_fast_marker_cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_fast_marker_cluster():
2525
m._repr_html_()
2626

2727
out = m._parent.render()
28-
print(out)
28+
2929
# We verify that imports
3030
assert ('<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.'
3131
'markercluster/1.0.0/leaflet.markercluster.js"></script>') in out

0 commit comments

Comments
 (0)