Skip to content

Commit c8255f3

Browse files
committed
Typos and pep8
1 parent 1ad2336 commit c8255f3

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

folium/folium.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ def add_tile_layer(self, tile_name=None, tile_url=None, **kw):
226226
227227
"""
228228
# Same defaults.
229-
tms = kw.pop('tms', 'false')
229+
tms = kw.pop('tms', False)
230230
minZoom = kw.pop('minZoom', 0)
231231
opacity = kw.pop('opacity', 1)
232232
maxZoom = kw.pop('maxZoom', 18)
233-
noWrap = kw.pop('noWrap', 'false')
233+
noWrap = kw.pop('noWrap', False)
234234
zoomOffset = kw.pop('zoomOffset', 0)
235-
zoomReverse = kw.pop('zoomReverse', 'false')
236-
continuousWorld = kw.pop('continuousWorld', 'false')
235+
zoomReverse = kw.pop('zoomReverse', False)
236+
continuousWorld = kw.pop('continuousWorld', False)
237237

238238
if tile_name not in self.added_layers:
239239
tile_name = tile_name.replace(" ", "_")
@@ -824,9 +824,9 @@ def geo_json(self, geo_path=None, geo_str=None, data_out='data.json',
824824
keyword argument will enable conversion to GeoJSON.
825825
reset: boolean, default False
826826
Remove all current geoJSON layers, start with new layer
827-
freescale: if True use free format for the scale, where min and max values
828-
are taken from the data. It also allow to plot allow to plot values < 0
829-
and float legend labels.
827+
freescale: if True use free format for the scale, where min and max
828+
values are taken from the data. It also allow to plot
829+
values < 0 and float legend labels.
830830
831831
Output
832832
------
@@ -915,7 +915,7 @@ def json_style(style_cnt, line_color, line_weight, line_opacity,
915915

916916
# D3 Color scale.
917917
series = data[columns[1]]
918-
if freescale == False:
918+
if not freescale:
919919
if threshold_scale and len(threshold_scale) > 6:
920920
raise ValueError
921921
domain = threshold_scale or utilities.split_six(series=series)
@@ -940,18 +940,15 @@ def json_style(style_cnt, line_color, line_weight, line_opacity,
940940

941941
if not freescale:
942942
legend = leg_templ.render({'lin_min': 0,
943-
'lin_max': int(domain[-1]*1.1),
944-
'tick_labels': tick_labels,
945-
'caption': name})
946-
947-
943+
'lin_max': int(domain[-1]*1.1),
944+
'tick_labels': tick_labels,
945+
'caption': name})
948946
else:
949947
legend = leg_templ.render({'lin_min': domain[0],
950948
'lin_max': domain[-1],
951949
'tick_labels': tick_labels,
952950
'caption': name})
953951

954-
955952
self.template_vars.setdefault('map_legends', []).append(legend)
956953

957954
# Style with color brewer colors.

0 commit comments

Comments
 (0)