Merge pull request #5 from python-visualization/master

Update branch

Author: fullonic

.travis.yml

@@ -28,11 +28,13 @@ matrix:
   allow_failures:
   - name: latest-branca
     env: PY=3.7
+  - name: linkcheck
+    env: PY=3.7
 
 before_install:
   # Install miniconda and create TEST env.
   - |
-    wget http://bit.ly/miniconda -O miniconda.sh
+    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
     bash miniconda.sh -b -p $HOME/miniconda
     export PATH="$HOME/miniconda/bin:$PATH"
     conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
@@ -86,7 +88,7 @@ script:
       conda install doctr
       cp examples/Quickstart.ipynb docs/quickstart.ipynb
       pushd docs
-      make clean html linkcheck
+      make clean html
       popd
       if [[ -z "$TRAVIS_TAG" ]]; then 
         python -m doctr deploy --build-tags --key-path github_deploy_key_python_visualization_folium.enc --built-docs docs/_build/html/ dev
@@ -97,6 +99,11 @@ script:
     fi
 
 
+  - if [[ $TRAVIS_JOB_NAME == 'linkcheck' ]]; then
+      cp examples/Quickstart.ipynb docs/quickstart.ipynb ;
+      pushd docs && make clean html linkcheck && popd ;
+    fi
+
 deploy:
   skip_cleanup: true
   provider: pypi

CHANGES.txt

@@ -1,3 +1,10 @@
+0.9.1
+~~~~~
+
+Bug fixes
+
+- Fix geojson identifier (conengmo #1155)
+
 0.9.0
 ~~~~~
 

README.rst

@@ -1,4 +1,4 @@
-|PyPI| |Travis| |Gitter| |DOI|
+|PyPI| |Travis| |Gitter| |DOI| |binder|
 
 .. |PyPI| image:: https://img.shields.io/pypi/v/folium.svg
     :target: https://pypi.org/project/folium
@@ -15,6 +15,9 @@
 .. |DOI| image:: https://zenodo.org/badge/18669/python-visualization/folium.svg
    :target: https://zenodo.org/badge/latestdoi/18669/python-visualization/folium
    :alt: DOI
+   
+.. |binder| image:: https://mybinder.org/badge_logo.svg
+ :target: https://mybinder.org/v2/gh/python-visualization/folium/master?filepath=examples
 
 folium
 ======

docs/flask.rst

@@ -0,0 +1,9 @@
+Using folium with flask
+=======================
+
+A very common use case is to use folium with in a flask app.
+The trick is to return folium's HTML representation.
+Here is an example on how to d that:
+
+
+.. literalinclude:: ../examples/flask_example.py

docs/index.rst

@@ -33,5 +33,6 @@ Contents
 
    installing
    quickstart.ipynb
+   flask
    modules
    plugins

environment.yml

@@ -0,0 +1,22 @@
+name: examples
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - altair
+  - branca
+  - cartopy
+  - fiona
+  - folium
+  - geographiclib
+  - geopandas
+  - gpxpy
+  - ipython
+  - matplotlib
+  - mplleaflet
+  - numpy
+  - owslib
+  - pandas
+  - scipy
+  - shapely
+  - vincent

examples/CheckZorder.ipynb

@@ -9,7 +9,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0.5.0+27.g2d457b0.dirty\n"
+      "0.8.3+55.g0433f90.dirty\n"
      ]
     }
    ],
@@ -28,10 +28,10 @@
     {
      "data": {
       "text/html": [
-       "<div style=\"width:100%;\"><div style=\"position:relative;width:100%;height:0;padding-bottom:60%;\"><iframe src=\"data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+CjxoZWFkPiAgICAKICAgIDxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04IiAvPgogICAgPHNjcmlwdD5MX1BSRUZFUl9DQU5WQVMgPSBmYWxzZTsgTF9OT19UT1VDSCA9IGZhbHNlOyBMX0RJU0FCTEVfM0QgPSBmYWxzZTs8L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS4yLjAvZGlzdC9sZWFmbGV0LmpzIj48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2FqYXguZ29vZ2xlYXBpcy5jb20vYWpheC9saWJzL2pxdWVyeS8xLjExLjEvanF1ZXJ5Lm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvanMvYm9vdHN0cmFwLm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvTGVhZmxldC5hd2Vzb21lLW1hcmtlcnMvMi4wLjIvbGVhZmxldC5hd2Vzb21lLW1hcmtlcnMuanMiPjwvc2NyaXB0PgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS4yLjAvZGlzdC9sZWFmbGV0LmNzcyIgLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvY3NzL2Jvb3RzdHJhcC5taW4uY3NzIiAvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC8zLjIuMC9jc3MvYm9vdHN0cmFwLXRoZW1lLm1pbi5jc3MiIC8+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vbWF4Y2RuLmJvb3RzdHJhcGNkbi5jb20vZm9udC1hd2Vzb21lLzQuNi4zL2Nzcy9mb250LWF3ZXNvbWUubWluLmNzcyIgLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvTGVhZmxldC5hd2Vzb21lLW1hcmtlcnMvMi4wLjIvbGVhZmxldC5hd2Vzb21lLW1hcmtlcnMuY3NzIiAvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL3Jhd2dpdC5jb20vcHl0aG9uLXZpc3VhbGl6YXRpb24vZm9saXVtL21hc3Rlci9mb2xpdW0vdGVtcGxhdGVzL2xlYWZsZXQuYXdlc29tZS5yb3RhdGUuY3NzIiAvPgogICAgPHN0eWxlPmh0bWwsIGJvZHkge3dpZHRoOiAxMDAlO2hlaWdodDogMTAwJTttYXJnaW46IDA7cGFkZGluZzogMDt9PC9zdHlsZT4KICAgIDxzdHlsZT4jbWFwIHtwb3NpdGlvbjphYnNvbHV0ZTt0b3A6MDtib3R0b206MDtyaWdodDowO2xlZnQ6MDt9PC9zdHlsZT4KICAgIAogICAgICAgICAgICA8c3R5bGU+ICNtYXBfYTBkYWY2MTFhZmI2NDkxYzg4YWU4MWI5OWFmZTQzOGEgewogICAgICAgICAgICAgICAgcG9zaXRpb24gOiByZWxhdGl2ZTsKICAgICAgICAgICAgICAgIHdpZHRoIDogMTAwLjAlOwogICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDAuMCU7CiAgICAgICAgICAgICAgICBsZWZ0OiAwLjAlOwogICAgICAgICAgICAgICAgdG9wOiAwLjAlOwogICAgICAgICAgICAgICAgfQogICAgICAgICAgICA8L3N0eWxlPgogICAgICAgIAo8L2hlYWQ+Cjxib2R5PiAgICAKICAgIAogICAgICAgICAgICA8ZGl2IGNsYXNzPSJmb2xpdW0tbWFwIiBpZD0ibWFwX2EwZGFmNjExYWZiNjQ5MWM4OGFlODFiOTlhZmU0MzhhIiA+PC9kaXY+CiAgICAgICAgCjwvYm9keT4KPHNjcmlwdD4gICAgCiAgICAKCiAgICAgICAgICAgIAogICAgICAgICAgICAgICAgdmFyIGJvdW5kcyA9IG51bGw7CiAgICAgICAgICAgIAoKICAgICAgICAgICAgdmFyIG1hcF9hMGRhZjYxMWFmYjY0OTFjODhhZTgxYjk5YWZlNDM4YSA9IEwubWFwKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ21hcF9hMGRhZjYxMWFmYjY0OTFjODhhZTgxYjk5YWZlNDM4YScsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7Y2VudGVyOiBbNDEsLTcwXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHpvb206IDUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhCb3VuZHM6IGJvdW5kcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxheWVyczogW10sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3b3JsZENvcHlKdW1wOiBmYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNyczogTC5DUlMuRVBTRzM4NTcKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgIAogICAgICAgIAogICAgCiAgICAgICAgICAgIHZhciB0aWxlX2xheWVyXzk0OGY2YTk0ZjYwOTRhNTVhMTQ1Mzc3YzMxN2FkMzk4ID0gTC50aWxlTGF5ZXIoCiAgICAgICAgICAgICAgICAnaHR0cDovL3tzfS5nb29nbGUuY29tL3Z0L2x5cnM9cyZ4PXt4fSZ5PXt5fSZ6PXt6fScsCiAgICAgICAgICAgICAgICB7CiAgImF0dHJpYnV0aW9uIjogImdvb2dsZSIsCiAgImRldGVjdFJldGluYSI6IGZhbHNlLAogICJtYXhab29tIjogMjAsCiAgIm1pblpvb20iOiAxLAogICJub1dyYXAiOiBmYWxzZSwKICAic3ViZG9tYWlucyI6IFsKICAgICJtdDAiLAogICAgIm10MSIsCiAgICAibXQyIiwKICAgICJtdDMiCiAgXQp9CiAgICAgICAgICAgICAgICApLmFkZFRvKG1hcF9hMGRhZjYxMWFmYjY0OTFjODhhZTgxYjk5YWZlNDM4YSk7CiAgICAgICAgCiAgICAKICAgICAgICAgICAgdmFyIHRpbGVfbGF5ZXJfMjhhMmJhZmJmZmUwNDZhNjk1OTIzZmYxMTRlYmFmMTUgPSBMLnRpbGVMYXllcigKICAgICAgICAgICAgICAgICdodHRwOi8ve3N9Lmdvb2dsZS5jb20vdnQvbHlycz1tJng9e3h9Jnk9e3l9Jno9e3p9JywKICAgICAgICAgICAgICAgIHsKICAiYXR0cmlidXRpb24iOiAiZ29vZ2xlIiwKICAiZGV0ZWN0UmV0aW5hIjogZmFsc2UsCiAgIm1heFpvb20iOiAyMCwKICAibWluWm9vbSI6IDEsCiAgIm5vV3JhcCI6IGZhbHNlLAogICJzdWJkb21haW5zIjogWwogICAgIm10MCIsCiAgICAibXQxIiwKICAgICJtdDIiLAogICAgIm10MyIKICBdCn0KICAgICAgICAgICAgICAgICkuYWRkVG8obWFwX2EwZGFmNjExYWZiNjQ5MWM4OGFlODFiOTlhZmU0MzhhKTsKICAgICAgICAKICAgIAogICAgICAgICAgICB2YXIgbWFjcm9fZWxlbWVudF8zNWIwMjM2NWY2MWI0NGNhOGU1YTFhYTkxYjcxMjA0NyA9IEwudGlsZUxheWVyLndtcygKICAgICAgICAgICAgICAgICdodHRwczovL2RlbW8uYm91bmRsZXNzZ2VvLmNvbS9nZW9zZXJ2ZXIvb3dzPycsCiAgICAgICAgICAgICAgICB7CiAgImF0dHJpYnV0aW9uIjogIiIsCiAgImNycyI6IG51bGwsCiAgImZvcm1hdCI6ICJpbWFnZS9wbmciLAogICJsYXllcnMiOiAibmFzYTpibHVlbWFyYmxlIiwKICAic3R5bGVzIjogIiIsCiAgInRyYW5zcGFyZW50IjogZmFsc2UsCiAgInVwcGVyY2FzZSI6IGZhbHNlLAogICJ2ZXJzaW9uIjogIjEuMS4xIgp9CiAgICAgICAgICAgICAgICApLmFkZFRvKG1hcF9hMGRhZjYxMWFmYjY0OTFjODhhZTgxYjk5YWZlNDM4YSk7CgogICAgICAgIAogICAgCiAgICAgICAgICAgIHZhciBtYWNyb19lbGVtZW50X2Q3NjA2ZTQ3NDdlZjQ2NDlhNzBlOWI0OGNjNDI2NTY1ID0gTC50aWxlTGF5ZXIud21zKAogICAgICAgICAgICAgICAgJ2h0dHA6Ly9tZXNvbmV0LmFncm9uLmlhc3RhdGUuZWR1L2NnaS1iaW4vd21zL25leHJhZC9uMHIuY2dpJywKICAgICAgICAgICAgICAgIHsKICAiYXR0cmlidXRpb24iOiAiV2VhdGhlciBkYXRhIFx1MDBhOSAyMDEyIElFTSBOZXhyYWQiLAogICJjcnMiOiBudWxsLAogICJmb3JtYXQiOiAiaW1hZ2UvcG5nIiwKICAibGF5ZXJzIjogIm5leHJhZC1uMHItOTAwOTEzIiwKICAic3R5bGVzIjogIiIsCiAgInRyYW5zcGFyZW50IjogdHJ1ZSwKICAidXBwZXJjYXNlIjogZmFsc2UsCiAgInZlcnNpb24iOiAiMS4xLjEiCn0KICAgICAgICAgICAgICAgICkuYWRkVG8obWFwX2EwZGFmNjExYWZiNjQ5MWM4OGFlODFiOTlhZmU0MzhhKTsKCiAgICAgICAgCiAgICAKICAgICAgICAgICAgdmFyIGxheWVyX2NvbnRyb2xfNDVmYjNiYWFiNjA5NDA1YmE2NTZlYjRlYmRkOGQyYmIgPSB7CiAgICAgICAgICAgICAgICBiYXNlX2xheWVycyA6IHsgImdvb2dsZSBtYXBzIiA6IHRpbGVfbGF5ZXJfOTQ4ZjZhOTRmNjA5NGE1NWExNDUzNzdjMzE3YWQzOTgsImdvb2dsZSBzdHJlZXQgdmlldyIgOiB0aWxlX2xheWVyXzI4YTJiYWZiZmZlMDQ2YTY5NTkyM2ZmMTE0ZWJhZjE1LCJibHVlbWFyYmxlIiA6IG1hY3JvX2VsZW1lbnRfMzViMDIzNjVmNjFiNDRjYThlNWExYWE5MWI3MTIwNDcsIH0sCiAgICAgICAgICAgICAgICBvdmVybGF5cyA6IHsgInRlc3QiIDogbWFjcm9fZWxlbWVudF9kNzYwNmU0NzQ3ZWY0NjQ5YTcwZTliNDhjYzQyNjU2NSwgfQogICAgICAgICAgICAgICAgfTsKICAgICAgICAgICAgTC5jb250cm9sLmxheWVycygKICAgICAgICAgICAgICAgIGxheWVyX2NvbnRyb2xfNDVmYjNiYWFiNjA5NDA1YmE2NTZlYjRlYmRkOGQyYmIuYmFzZV9sYXllcnMsCiAgICAgICAgICAgICAgICBsYXllcl9jb250cm9sXzQ1ZmIzYmFhYjYwOTQwNWJhNjU2ZWI0ZWJkZDhkMmJiLm92ZXJsYXlzLAogICAgICAgICAgICAgICAge3Bvc2l0aW9uOiAndG9wcmlnaHQnLAogICAgICAgICAgICAgICAgIGNvbGxhcHNlZDogdHJ1ZSwKICAgICAgICAgICAgICAgICBhdXRvWkluZGV4OiB0cnVlCiAgICAgICAgICAgICAgICB9KS5hZGRUbyhtYXBfYTBkYWY2MTFhZmI2NDkxYzg4YWU4MWI5OWFmZTQzOGEpOwogICAgICAgIAo8L3NjcmlwdD4=\" style=\"position:absolute;width:100%;height:100%;left:0;top:0;border:none !important;\" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe></div></div>"
+       "<div style=\"width:100%;\"><div style=\"position:relative;width:100%;height:0;padding-bottom:60%;\"><iframe src=\"data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+CjxoZWFkPiAgICAKICAgIDxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04IiAvPgogICAgCiAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICAgTF9OT19UT1VDSCA9IGZhbHNlOwogICAgICAgICAgICBMX0RJU0FCTEVfM0QgPSBmYWxzZTsKICAgICAgICA8L3NjcmlwdD4KICAgIAogICAgPHNjcmlwdCBzcmM9Imh0dHBzOi8vY2RuLmpzZGVsaXZyLm5ldC9ucG0vbGVhZmxldEAxLjUuMC9kaXN0L2xlYWZsZXQuanMiPjwvc2NyaXB0PgogICAgPHNjcmlwdCBzcmM9Imh0dHBzOi8vY29kZS5qcXVlcnkuY29tL2pxdWVyeS0xLjEyLjQubWluLmpzIj48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC8zLjIuMC9qcy9ib290c3RyYXAubWluLmpzIj48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9MZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy8yLjAuMi9sZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy5qcyI+PC9zY3JpcHQ+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vY2RuLmpzZGVsaXZyLm5ldC9ucG0vbGVhZmxldEAxLjUuMC9kaXN0L2xlYWZsZXQuY3NzIi8+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vbWF4Y2RuLmJvb3RzdHJhcGNkbi5jb20vYm9vdHN0cmFwLzMuMi4wL2Nzcy9ib290c3RyYXAubWluLmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC8zLjIuMC9jc3MvYm9vdHN0cmFwLXRoZW1lLm1pbi5jc3MiLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9mb250LWF3ZXNvbWUvNC42LjMvY3NzL2ZvbnQtYXdlc29tZS5taW4uY3NzIi8+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vY2RuanMuY2xvdWRmbGFyZS5jb20vYWpheC9saWJzL0xlYWZsZXQuYXdlc29tZS1tYXJrZXJzLzIuMC4yL2xlYWZsZXQuYXdlc29tZS1tYXJrZXJzLmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL3Jhd2Nkbi5naXRoYWNrLmNvbS9weXRob24tdmlzdWFsaXphdGlvbi9mb2xpdW0vbWFzdGVyL2ZvbGl1bS90ZW1wbGF0ZXMvbGVhZmxldC5hd2Vzb21lLnJvdGF0ZS5jc3MiLz4KICAgIDxzdHlsZT5odG1sLCBib2R5IHt3aWR0aDogMTAwJTtoZWlnaHQ6IDEwMCU7bWFyZ2luOiAwO3BhZGRpbmc6IDA7fTwvc3R5bGU+CiAgICA8c3R5bGU+I21hcCB7cG9zaXRpb246YWJzb2x1dGU7dG9wOjA7Ym90dG9tOjA7cmlnaHQ6MDtsZWZ0OjA7fTwvc3R5bGU+CiAgICAKICAgICAgICAgICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwKICAgICAgICAgICAgICAgIGluaXRpYWwtc2NhbGU9MS4wLCBtYXhpbXVtLXNjYWxlPTEuMCwgdXNlci1zY2FsYWJsZT1ubyIgLz4KICAgICAgICAgICAgPHN0eWxlPgogICAgICAgICAgICAgICAgI21hcF80MDliOTE5YjdiMGI0YjdmYjA3M2Q4MGY2MWM2OGY3MiB7CiAgICAgICAgICAgICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgICAgICAgICAgICAgICAgIHdpZHRoOiAxMDAuMCU7CiAgICAgICAgICAgICAgICAgICAgaGVpZ2h0OiAxMDAuMCU7CiAgICAgICAgICAgICAgICAgICAgbGVmdDogMC4wJTsKICAgICAgICAgICAgICAgICAgICB0b3A6IDAuMCU7CiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIDwvc3R5bGU+CiAgICAgICAgCjwvaGVhZD4KPGJvZHk+ICAgIAogICAgCiAgICAgICAgICAgIDxkaXYgY2xhc3M9ImZvbGl1bS1tYXAiIGlkPSJtYXBfNDA5YjkxOWI3YjBiNGI3ZmIwNzNkODBmNjFjNjhmNzIiID48L2Rpdj4KICAgICAgICAKPC9ib2R5Pgo8c2NyaXB0PiAgICAKICAgIAogICAgICAgICAgICB2YXIgbWFwXzQwOWI5MTliN2IwYjRiN2ZiMDczZDgwZjYxYzY4ZjcyID0gTC5tYXAoCiAgICAgICAgICAgICAgICAibWFwXzQwOWI5MTliN2IwYjRiN2ZiMDczZDgwZjYxYzY4ZjcyIiwKICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICBjZW50ZXI6IFs0MS4wLCAtNzAuMF0sCiAgICAgICAgICAgICAgICAgICAgY3JzOiBMLkNSUy5FUFNHMzg1NywKICAgICAgICAgICAgICAgICAgICB6b29tOiA1LAogICAgICAgICAgICAgICAgICAgIHpvb21Db250cm9sOiB0cnVlLAogICAgICAgICAgICAgICAgICAgIHByZWZlckNhbnZhczogZmFsc2UsCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICk7CgogICAgICAgICAgICAKCiAgICAgICAgCiAgICAKICAgICAgICAgICAgdmFyIHRpbGVfbGF5ZXJfMTUwOTU3OTAwMWJmNDFjN2IxMDgwODMxZjdjZWY2ZjUgPSBMLnRpbGVMYXllcigKICAgICAgICAgICAgICAgICJodHRwOi8ve3N9Lmdvb2dsZS5jb20vdnQvbHlycz1zXHUwMDI2eD17eH1cdTAwMjZ5PXt5fVx1MDAyNno9e3p9IiwKICAgICAgICAgICAgICAgIHsiYXR0cmlidXRpb24iOiAiZ29vZ2xlIiwgImRldGVjdFJldGluYSI6IGZhbHNlLCAibWF4TmF0aXZlWm9vbSI6IDIwLCAibWF4Wm9vbSI6IDIwLCAibWluWm9vbSI6IDAsICJub1dyYXAiOiBmYWxzZSwgIm9wYWNpdHkiOiAxLCAic3ViZG9tYWlucyI6IFsibXQwIiwgIm10MSIsICJtdDIiLCAibXQzIl0sICJ0bXMiOiBmYWxzZX0KICAgICAgICAgICAgKS5hZGRUbyhtYXBfNDA5YjkxOWI3YjBiNGI3ZmIwNzNkODBmNjFjNjhmNzIpOwogICAgICAgIAogICAgCiAgICAgICAgICAgIHZhciB0aWxlX2xheWVyXzZmMjAwZmQxMTMwZDRiNGVhZTY2MjQxZjJlODA3M2RmID0gTC50aWxlTGF5ZXIoCiAgICAgICAgICAgICAgICAiaHR0cDovL3tzfS5nb29nbGUuY29tL3Z0L2x5cnM9bVx1MDAyNng9e3h9XHUwMDI2eT17eX1cdTAwMjZ6PXt6fSIsCiAgICAgICAgICAgICAgICB7ImF0dHJpYnV0aW9uIjogImdvb2dsZSIsICJkZXRlY3RSZXRpbmEiOiBmYWxzZSwgIm1heE5hdGl2ZVpvb20iOiAyMCwgIm1heFpvb20iOiAyMCwgIm1pblpvb20iOiAwLCAibm9XcmFwIjogZmFsc2UsICJvcGFjaXR5IjogMSwgInN1YmRvbWFpbnMiOiBbIm10MCIsICJtdDEiLCAibXQyIiwgIm10MyJdLCAidG1zIjogZmFsc2V9CiAgICAgICAgICAgICkuYWRkVG8obWFwXzQwOWI5MTliN2IwYjRiN2ZiMDczZDgwZjYxYzY4ZjcyKTsKICAgICAgICAKICAgIAogICAgICAgICAgICB2YXIgbWFjcm9fZWxlbWVudF9kNDAzNGVjYzNkMDA0OWE0ODFhM2E0MTU0NzcwOGNhNSA9IEwudGlsZUxheWVyLndtcygKICAgICAgICAgICAgICAgICJodHRwOi8vbWVzb25ldC5hZ3Jvbi5pYXN0YXRlLmVkdS9jZ2ktYmluL3dtcy9uZXhyYWQvbjByLmNnaSIsCiAgICAgICAgICAgICAgICB7ImF0dHJpYnV0aW9uIjogIldlYXRoZXIgZGF0YSBcdTAwYTkgMjAxMiBJRU0gTmV4cmFkIiwgImZvcm1hdCI6ICJpbWFnZS9wbmciLCAibGF5ZXJzIjogIm5leHJhZC1uMHItOTAwOTEzIiwgInN0eWxlcyI6ICIiLCAidHJhbnNwYXJlbnQiOiB0cnVlLCAidmVyc2lvbiI6ICIxLjEuMSJ9CiAgICAgICAgICAgICkuYWRkVG8obWFwXzQwOWI5MTliN2IwYjRiN2ZiMDczZDgwZjYxYzY4ZjcyKTsKICAgICAgICAKICAgIAogICAgICAgICAgICB2YXIgbGF5ZXJfY29udHJvbF8xNGM5Y2VmMWM2Zjg0OTEyYTA4MDdmNDhmYzg1MWM5MyA9IHsKICAgICAgICAgICAgICAgIGJhc2VfbGF5ZXJzIDogewogICAgICAgICAgICAgICAgICAgICJnb29nbGUgbWFwcyIgOiB0aWxlX2xheWVyXzE1MDk1NzkwMDFiZjQxYzdiMTA4MDgzMWY3Y2VmNmY1LAogICAgICAgICAgICAgICAgICAgICJnb29nbGUgc3RyZWV0IHZpZXciIDogdGlsZV9sYXllcl82ZjIwMGZkMTEzMGQ0YjRlYWU2NjI0MWYyZTgwNzNkZiwKICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICBvdmVybGF5cyA6ICB7CiAgICAgICAgICAgICAgICAgICAgInRlc3QiIDogbWFjcm9fZWxlbWVudF9kNDAzNGVjYzNkMDA0OWE0ODFhM2E0MTU0NzcwOGNhNSwKICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgIH07CiAgICAgICAgICAgIEwuY29udHJvbC5sYXllcnMoCiAgICAgICAgICAgICAgICBsYXllcl9jb250cm9sXzE0YzljZWYxYzZmODQ5MTJhMDgwN2Y0OGZjODUxYzkzLmJhc2VfbGF5ZXJzLAogICAgICAgICAgICAgICAgbGF5ZXJfY29udHJvbF8xNGM5Y2VmMWM2Zjg0OTEyYTA4MDdmNDhmYzg1MWM5My5vdmVybGF5cywKICAgICAgICAgICAgICAgIHsiYXV0b1pJbmRleCI6IHRydWUsICJjb2xsYXBzZWQiOiB0cnVlLCAicG9zaXRpb24iOiAidG9wcmlnaHQifQogICAgICAgICAgICApLmFkZFRvKG1hcF80MDliOTE5YjdiMGI0YjdmYjA3M2Q4MGY2MWM2OGY3Mik7CiAgICAgICAgICAgIHRpbGVfbGF5ZXJfNmYyMDBmZDExMzBkNGI0ZWFlNjYyNDFmMmU4MDczZGYucmVtb3ZlKCk7CiAgICAgICAgICAgIHRpbGVfbGF5ZXJfMTUwOTU3OTAwMWJmNDFjN2IxMDgwODMxZjdjZWY2ZjUucmVtb3ZlKCk7CiAgICAgICAgCjwvc2NyaXB0Pg==\" style=\"position:absolute;width:100%;height:100%;left:0;top:0;border:none !important;\" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe></div></div>"
       ],
       "text/plain": [
-       "<folium.folium.Map at 0x7f5c615500f0>"
+       "<folium.folium.Map at 0x7fba259a03c8>"
       ]
      },
      "execution_count": 2,
@@ -65,16 +65,6 @@
     "\n",
     "\n",
     "folium.raster_layers.WmsTileLayer(\n",
-    "    url='https://demo.boundlessgeo.com/geoserver/ows?',\n",
-    "    layers='nasa:bluemarble',\n",
-    "    name='bluemarble',\n",
-    "    fmt='image/png',\n",
-    "    overlay=False,\n",
-    "    control=True,\n",
-    ").add_to(m)\n",
-    "\n",
-    "\n",
-    "folium.raster_layers.WmsTileLayer(\n",
     "    url='http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi',\n",
     "    name='test',\n",
     "    fmt='image/png',\n",
@@ -109,7 +99,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.2"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

examples/Colormaps.ipynb

@@ -0,0 +1,19 @@
+language,coordinates,consonants,vowels
+Turkish,"(39.8667, 32.8667)",25,8
+Korean,"(37.5, 128.0)",21,11
+Tiwi,"(-11.6308, 130.94899999999998)",22,4
+Liberia Kpelle,"(6.92048, -9.96128)",22,12
+Tulu,"(12.8114, 75.2651)",24,13
+Mapudungun,"(-38.7392, -71.277)",20,6
+Kiowa,"(34.9403, -98.9042)",22,20
+Japanese,"(35.0, 135.0)",15,5
+Yoruba,"(7.15345, 3.67225)",18,11
+Finnish,"(64.7628, 25.5577)",17,8
+Hawaiian,"(19.6297, -155.43)",8,5
+Hungarian,"(46.9068585714, 19.6555271429)",26,14
+Georgian,"(41.850396999999994, 43.78613)",28,6
+Amharic,"(11.708182, 39.543456)",30,7
+Sandawe,"(-5.26918, 35.4808)",47,7
+Tlingit,"(59.4447, -135.29)",43,5
+Lakota,"(46.3699, -103.95)",28,8
+Yucatec Maya,"(18.7757, -88.9567)",20,10