Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a935b3e
test making popup always on
jwhendy Nov 23, 2017
6e49163
argument for default open; attempt at an if statement
jwhendy Nov 23, 2017
872e597
extra brace
jwhendy Nov 23, 2017
ee4747f
trying autoClose option to keep all open
jwhendy Nov 23, 2017
43f4831
second attempt at autoClose
jwhendy Nov 23, 2017
165b3f3
trying if statement on autoClose
jwhendy Nov 23, 2017
7166568
missed a brace
jwhendy Nov 23, 2017
598f73f
options are one dictionary, not separate
jwhendy Nov 23, 2017
ed1cfa7
added closeOnClick option as well
jwhendy Nov 23, 2017
53bf936
Note issue-726 solution in Marker documentation and add example (#771)
jpeacock29 Nov 27, 2017
106d829
Set min_zoom default to Leaflet value (0 i.o. 1) (#791)
Conengmo Dec 7, 2017
cd672b7
changed option to render on load from default_open to show
jwhendy Dec 10, 2017
5c0598c
added sticky option and split out leaflet options
jwhendy Dec 10, 2017
5cf1699
goofed a curly brace
jwhendy Dec 10, 2017
b03b81e
Tilesets native zoom (#792)
Conengmo Dec 16, 2017
ccefca0
Added gallery links (#794)
Conengmo Dec 16, 2017
5739244
Link to stable and newest docs (#800)
Conengmo Dec 18, 2017
9e2ee74
Untoggle overlays and additional base layers (#772)
Conengmo Jan 23, 2018
461479e
max_native_zoom missing in test
Apr 14, 2018
4bdcb85
Merge pull request #844 from Conengmo/repair-test
Conengmo Apr 14, 2018
065f6f3
Add 'BeautifyMarker' icon type as plugin. Rework from PR #776. (#819)
JeremyBYU Apr 25, 2018
764cd65
fix notebook for hide-overlays (#815)
ocefpaf May 6, 2018
b14aa41
Moves templates to class attributes (#807) (#811)
psarka May 6, 2018
97ab7e0
Method to keep objects in front (#840)
Conengmo May 7, 2018
0452902
Only set wind markers if heading is set (#824)
gaqzi May 7, 2018
a37653d
More explicit checks in choropleth (#797)
Conengmo May 7, 2018
c228c26
Fix conda install instructions (#862)
ocefpaf May 8, 2018
52f15ee
test making popup always on
jwhendy Nov 23, 2017
ddf4eb2
argument for default open; attempt at an if statement
jwhendy Nov 23, 2017
6c973de
extra brace
jwhendy Nov 23, 2017
2ec7cd6
trying autoClose option to keep all open
jwhendy Nov 23, 2017
3b32b20
second attempt at autoClose
jwhendy Nov 23, 2017
7e7075e
trying if statement on autoClose
jwhendy Nov 23, 2017
5ab0009
missed a brace
jwhendy Nov 23, 2017
1f01036
options are one dictionary, not separate
jwhendy Nov 23, 2017
e8c37cf
added closeOnClick option as well
jwhendy Nov 23, 2017
c387e33
changed option to render on load from default_open to show
jwhendy Dec 10, 2017
62b4612
added sticky option and split out leaflet options
jwhendy Dec 10, 2017
927949a
goofed a curly brace
jwhendy Dec 10, 2017
7c98694
merged master updates, added tests for sticky/show popup args, update…
jwhendy May 13, 2018
c58aa5d
remote tip behind. grrr
jwhendy May 13, 2018
f0c1935
fixed some whitespace
jwhendy May 13, 2018
eaca585
moved changelog entry, refined test, fixed whitespace
jwhendy May 15, 2018
a78ed4e
added openPopup() back
jwhendy May 15, 2018
f45005d
Blank lines in tests
Conengmo May 15, 2018
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
4 changes: 4 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
0.6.0
~~~~~

- `Popup` accepts new arguments `show` (render open on page load) and `sticky` (popups
only close when explicitly clicked) (jwhendy #778)
- Added leaflet-search plugin (ghandic #759)
- Improved Vector Layers docs, notebooks, and optional arguments (ocefpaf #731)
- Implemented `export=False/True` option to the Draw plugin layer for saving
Expand All @@ -9,6 +11,8 @@
- Added `tooltip` support to `Marker`s (ocefpaf #724)
- Added `tooltip` support to all vector layers (ocefpaf #722)
- Added `TimeSliderChoropleth` plugin (halfdanrump #736)
- Added `show` parameter to choose which overlays to show on opening (conengmo #772)
- Added BeautifyIcon Plugin (arthuralvim and jeremybyu #819)

API changes

Expand Down
22 changes: 16 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ folium
Python Data, Leaflet.js Maps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

`folium` builds on the data wrangling strengths of the Python ecosystem
and the mapping strengths of the Leaflet.js library.
Manipulate your data in Python,
then visualize it in on a Leaflet map via `folium`.
`folium` builds on the data wrangling strengths of the Python ecosystem and the
mapping strengths of the Leaflet.js library. Manipulate your data in Python,
then visualize it in a Leaflet map via `folium`.

Installation
------------
Expand All @@ -31,17 +30,28 @@ or

.. code:: bash

$ conda install folium
$ conda install -c conda-forge folium

Documentation
-------------

http://python-visualization.github.io/folium/docs-v0.5.0/

The documentation for the development version can be found here:
http://python-visualization.github.io/folium/docs-master/

Note that the documentation on Read the Docs is for the deprecated version
0.2.0.

Gallery
-------

http://python-visualization.github.io/folium/docs-master/
There are two galleries of Jupyter notebooks with examples, which you can see
using Jupyter's nbviewer:

http://nbviewer.jupyter.org/github/python-visualization/folium/tree/master/examples/

https://nbviewer.jupyter.org/github/python-visualization/folium_contrib/tree/master/notebooks/


.. |folium| image:: http://python-visualization.github.io/folium/docs-master/_images/folium_logo.jpg
592 changes: 532 additions & 60 deletions examples/Colormaps.ipynb

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions examples/Features.ipynb

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions examples/GeoJSON_and_choropleth.ipynb

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions examples/GeodedeticImageOverlay.ipynb

Large diffs are not rendered by default.

35 changes: 22 additions & 13 deletions examples/Highlight_Function.ipynb

Large diffs are not rendered by default.

109 changes: 84 additions & 25 deletions examples/Plugins.ipynb

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions examples/Quickstart.ipynb

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions examples/TimeSliderChoropleth.ipynb

Large diffs are not rendered by default.

Loading