Skip to content

Bringing folium closer to Leaflet #246

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Bringing folium closer to Leaflet #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8c8fca
Fix tests
themiurgo Nov 13, 2015
fad0256
Renaming add_children -> add_child
themiurgo Nov 13, 2015
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
50 changes: 25 additions & 25 deletions examples/Features.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@
"pp = features.Popup(\"hello\")\n",
"ic = features.Icon(color='red')\n",
"\n",
"f.add_children(m)\n",
"mk.add_children(ic)\n",
"mk.add_children(pp)\n",
"m.add_children(mk)\n",
"f.add_child(m)\n",
"mk.add_child(ic)\n",
"mk.add_child(pp)\n",
"m.add_child(mk)\n",
"\n",
"f"
]
Expand Down Expand Up @@ -438,9 +438,9 @@
"mk = features.RegularPolygonMarker([0,0])\n",
"mk2 = features.RegularPolygonMarker([0,45])\n",
"\n",
"f.add_children(m)\n",
"m.add_children(mk)\n",
"m.add_children(mk2)\n",
"f.add_child(m)\n",
"m.add_child(mk)\n",
"m.add_child(mk2)\n",
"\n",
"f"
]
Expand Down Expand Up @@ -738,10 +738,10 @@
"mk = features.Marker([0,0])\n",
"p = features.Popup(\"Hello\")\n",
"v = features.Vega(data, width=\"100%\", height=\"100%\")\n",
"f.add_children(m)\n",
"mk.add_children(p)\n",
"p.add_children(v)\n",
"m.add_children(mk)\n",
"f.add_child(m)\n",
"mk.add_child(p)\n",
"p.add_child(v)\n",
"m.add_child(mk)\n",
"\n",
"f"
]
Expand Down Expand Up @@ -993,7 +993,7 @@
"\n",
"f = features.Figure()\n",
"v = features.Vega(data, height=40, width=600)\n",
"f.add_children(v)\n",
"f.add_child(v)\n",
"\n",
"f"
]
Expand Down Expand Up @@ -1455,10 +1455,10 @@
"\n",
"v2 = features.Vega(data, position='absolute', left=\"0%\", width=\"50%\", height=\"50%\", top='50%')\n",
"\n",
"f.add_children(m)\n",
"f.add_children(m2)\n",
"f.add_children(v)\n",
"f.add_children(v2)\n",
"f.add_child(m)\n",
"f.add_child(m2)\n",
"f.add_child(v)\n",
"f.add_child(v2)\n",
"\n",
"f"
]
Expand Down Expand Up @@ -2329,7 +2329,7 @@
" ],\n",
" }\n",
"m = features.Map([48.,5.], zoom_start=6)\n",
"m.add_children(features.GeoJson(data))\n",
"m.add_child(features.GeoJson(data))\n",
"m"
]
},
Expand Down Expand Up @@ -4076,10 +4076,10 @@
"for i in range(N):\n",
" mk = features.Marker([data[i][0],data[i][1]])\n",
" p = features.Popup(str(data[i][2]))\n",
" mk.add_children(p)\n",
" mc.add_children(mk)\n",
" mk.add_child(p)\n",
" mc.add_child(mk)\n",
"\n",
"m.add_children(mc)\n",
"m.add_child(mc)\n",
"m"
]
},
Expand Down Expand Up @@ -4251,8 +4251,8 @@
"d1 = f.add_subplot(1,2,1)\n",
"d2 = f.add_subplot(1,2,2)\n",
"\n",
"d1.add_children(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
"d2.add_children(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
"d1.add_child(features.Map([0,0], tiles='stamenwatercolor', zoom_start=1))\n",
"d2.add_child(features.Map([46,3], tiles='mapquestopen', zoom_start=5))\n",
"\n",
"f"
]
Expand Down Expand Up @@ -6092,9 +6092,9 @@
"m = features.Map([43,-100], zoom_start=4)\n",
"g = features.GeoJson(geojson_data)\n",
"\n",
"f.add_children(m)\n",
"m.add_children(g)\n",
"g.add_children(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
"f.add_child(m)\n",
"m.add_child(g)\n",
"g.add_child(features.GeoJsonStyle([3.0, 7.0, 8.0, 9.0, 9.0], 'YlGn', sd, key_on='feature.id'))\n",
"\n",
"f"
]
Expand Down
1 change: 0 additions & 1 deletion folium/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from .element import Element, Figure, JavascriptLink, CssLink, MacroElement
from .map import TileLayer, Icon


class WmsTileLayer(TileLayer):
def __init__(self, url, name=None,
format=None, layers=None, transparent=True,
Expand Down