Skip to content
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 CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Bug Fixes
API changes

- Removed features `MarkerCluster` in lieu of the plugin version (ocefpaf #704)
- `choropleth` now takes a single `geo_data` instad of `geo_path`/`geo_str`
- `choropleth` now takes a single `geo_data` instead of `geo_path`/`geo_str`
leaving the parsing to `GeoJSON`, remove the unused `data_out` option,
add geopandas support (ocefpaf #702)
- All popups are considered HTML text by default (ocefpaf #689)
Expand Down
4 changes: 2 additions & 2 deletions examples/Colormaps.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"If you specify no index, colors will be set uniformely."
"If you specify no index, colors will be set uniformly."
]
},
{
Expand Down Expand Up @@ -398,7 +398,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"## Build-in\n",
"## Built-in\n",
"\n",
"For convenience, we provide a (small) set of built-in linear colormaps, in `folium.colormap.linear`."
]
Expand Down
2 changes: 1 addition & 1 deletion examples/ContinuousWorld.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"m = folium.Map(world_copy_jump=False, no_wrap=False)\n",
"\n",
"folium.Marker(\n",
" location=[0, 0], popup=\"I will disapear when moved outside the wrapped map domain.\"\n",
" location=[0, 0], popup=\"I will disappear when moved outside the wrapped map domain.\"\n",
").add_to(m)\n",
"\n",
"m"
Expand Down
2 changes: 1 addition & 1 deletion examples/GeoJSON_and_choropleth.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"We need also to convert the table into a dictionnary, in order to map a feature to it's unemployment value."
"We need also to convert the table into a dictionary, in order to map a feature to it's unemployment value."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/Geopandas_and_geo_interface.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"source": [
"Quite easy.\n",
"\n",
"Well, you can also take advantage of your `GeoDataFrame` structure to set the style of the data. For this, just create a column `style` containing each feature's style in a dictionnary."
"Well, you can also take advantage of your `GeoDataFrame` structure to set the style of the data. For this, just create a column `style` containing each feature's style in a dictionary."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/HeatMapWithTime.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"source": [
"In this example we show the most basic usage of the HeatMapWithTime plugin.\n",
"\n",
"We generate a random set of points with lat/lon coordinates to draw on the map, and then move these points slowly in a random direction to simulate a time dimension. The points are aranged into a list of sets of data to draw."
"We generate a random set of points with lat/lon coordinates to draw on the map, and then move these points slowly in a random direction to simulate a time dimension. The points are arranged into a list of sets of data to draw."
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions examples/ImageOverlay.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"This works exactly the same way if you want to put a JPG intead of a PNG."
"This works exactly the same way if you want to put a JPG instead of a PNG."
]
},
{
Expand All @@ -136,7 +136,7 @@
"Now you may wish to create your own image, based on another python computation.\n",
"For this, you'll need to have numpy installed on your machine.\n",
"\n",
"Let's creater an image to draw a rectangle in the bounds `[[0, -60], [60, 60]]`."
"Let's create an image to draw a rectangle in the bounds `[[0, -60], [60, 60]]`."
]
},
{
Expand Down Expand Up @@ -290,7 +290,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"This time, the lines are properly positionned (at the precision of the array)."
"This time, the lines are properly positioned (at the precision of the array)."
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion examples/MiniMap.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Make the minimap collapsable"
"### Make the minimap collapsible"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/Plugins.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@
"metadata": {},
"source": [
"## DualMap\n",
"The DualMap plugin can be used to display two maps side by side, where panning and zooming is syncronized.\n",
"The DualMap plugin can be used to display two maps side by side, where panning and zooming is synchronized.\n",
"\n",
"The `DualMap` class can be used just like the normal `Map` class. The two sub-maps can be accessed with its `m1` and `m2` attributes."
]
Expand Down Expand Up @@ -736,7 +736,7 @@
"\n",
"plugins.LocateControl().add_to(m)\n",
"\n",
"# If you want get the user device positon after load the map, set auto_start=True\n",
"# If you want get the user device position after load the map, set auto_start=True\n",
"plugins.LocateControl(auto_start=True).add_to(m)\n",
"\n",
"m"
Expand Down
2 changes: 1 addition & 1 deletion examples/Popups.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Note that you can put another `Figure` into an `IFrame` ; this should let you do stange things..."
"Note that you can put another `Figure` into an `IFrame` ; this should let you do strange things..."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin-DualMap.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"source": [
"The `DualMap` class accepts the same arguments as the normal `Map` class. Except for these: 'width', 'height', 'left', 'top', 'position'.\n",
"\n",
"In the following example we create a `DualMap`, add layer controls and then show the map. Try panning and zooming to check that both maps are syncronized."
"In the following example we create a `DualMap`, add layer controls and then show the map. Try panning and zooming to check that both maps are synchronized."
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions folium/features.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ class GeoJson(Layer):
popup: GeoJsonPopup, optional
Show a different popup for each feature by passing a GeoJsonPopup object.
marker: Circle, CircleMarker or Marker, optional
If your data contains Point geometry, you can format the markers by passing a Cirle,
If your data contains Point geometry, you can format the markers by passing a Circle,
CircleMarker or Marker object with your wanted options. The `style_function` and
`highlight_function` will also target the marker object you passed.
embed: bool, default True
Expand Down Expand Up @@ -723,9 +723,9 @@ class TopoJson(JSCSSMixin, Layer):

Examples
--------
>>> # Providing file that shall be embeded.
>>> # Providing file that shall be embedded.
>>> TopoJson(open('foo.json'), 'object.myobject')
>>> # Providing filename that shall not be embeded.
>>> # Providing filename that shall not be embedded.
>>> TopoJson('foo.json', 'object.myobject')
>>> # Providing dict.
>>> TopoJson(json.load(open('foo.json')), 'object.myobject')
Expand Down
2 changes: 1 addition & 1 deletion folium/plugins/fullscreen.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Fullscreen(JSCSSMixin, MacroElement):
change the title of the button when fullscreen is on,
default: 'Exit Full Screen'
force_separate_button : bool, default False
force seperate button to detach from zoom buttons,
force separate button to detach from zoom buttons,

See https://github.com/brunob/leaflet.fullscreen for more information.
"""
Expand Down
2 changes: 1 addition & 1 deletion folium/plugins/polyline_offset.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PolyLineOffset(JSCSSMixin, PolyLine):
tooltip: str or folium.Tooltip, optional
Display a text when hovering over the object.
offset: int, default 0
Relative pixel offset to draw a line parallel to an existant one,
Relative pixel offset to draw a line parallel to an existent one,
at a fixed distance.
**kwargs:
Polyline options. See their Github page for the
Expand Down