Skip to content

Fix typo #260

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

Merged
merged 1 commit into from
Nov 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion folium/element.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def __init__(self, width="100%", height=None, ratio="60%", figsize=None):
figsize : tuple of two int, default None
If you're a matplotlib addict, you can overwrite width and height.
Values will be converted into pixels in using 60 dpi.
For example figsize=(10,5) wil result in width="600px", height="300px".
For example figsize=(10,5) will result in width="600px", height="300px".
"""
super(Figure, self).__init__()
self._name = 'Figure'
Expand Down
2 changes: 1 addition & 1 deletion folium/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def __init__(self, image, bounds, opacity=1., attribution=None,
image: string, file or array-like object
The data you want to draw on the map.
* If string, it will be written directly in the output file.
* If file, it's content will be converted as embeded in the output file.
* If file, it's content will be converted as embedded in the output file.
* If array-like, it will be converted to PNG base64 string and embedded in the output.
bounds: list
Image bounds on the map in the form [[lat_min, lon_min], [lat_max, lon_max]]
Expand Down
2 changes: 1 addition & 1 deletion folium/folium.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ def geo_json(self, geo_path=None, geo_str=None, data_out='data.json',
# To avoid explicit pandas dependency ; changed default behavior.
warnings.warn("'threshold_scale' default behavior has changed."
" Now you get a linear scale between the 'min' and"
" the 'mas' of your data."
" the 'max' of your data."
" To get former behavior, use"
" folium.utilities.split_six.",
FutureWarning, stacklevel=2)
Expand Down
2 changes: 1 addition & 1 deletion folium/plugins/timestamped_geo_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self, data, transition_time=200, loop=True, auto_play=True):
The timestamped geo-json data you want to plot.

If file, then data will be read in the file and fully embedded in Leaflet's javascript.
If dict, then data will be converted to json and embeded in the javascript.
If dict, then data will be converted to json and embedded in the javascript.
If str, then data will be passed to the javascript as-is.

A geo-json is timestamped if:
Expand Down