Skip to content

popups allow unicode #95

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

Merged
merged 3 commits into from
Mar 31, 2015
Merged

popups allow unicode #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
545315a
Popups allow unicode.
apatil Mar 12, 2015
99f5d15
Merged master
apatil Mar 31, 2015
12335bd
Added back commit message for https
apatil Mar 31, 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
2 changes: 2 additions & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
0.1.4.dev
~~~~~~~~~
- Popups allow unicode. @apatil
- Support for https protocol. @apatil
- Custom popup width. @ocefpaf
- Support multiPolyLine. @scari
- Added max and min zoom keywords. @Paradoxeuh


Bug Fixes

- Remove margins from leaflet-tiles (Fixes #64). @lennart0901
Expand Down
19 changes: 17 additions & 2 deletions folium/folium.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
from folium import utilities
from folium.six import text_type, binary_type, iteritems

import sys


ENV = Environment(loader=PackageLoader('folium', 'templates'))

Expand Down Expand Up @@ -616,10 +618,21 @@ def _popup_render(self, popup=None, mk_name=None, count=None,
if not popup_on:
return 'var no_pop = null;'
else:
if isinstance(popup, str):
if sys.version_info >= (3,0):
utype, stype = str, bytes
else:
utype, stype = unicode, str

if isinstance(popup, (utype, stype)):
popup_temp = self.env.get_template('simple_popup.js')
Copy link
Member

@ocefpaf ocefpaf Mar 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use

isinstance(popup, (str, unicode))

instead.

if isinstance(popup, utype):
popup_txt = popup.encode('ascii', 'xmlcharrefreplace')
Copy link
Member

@ocefpaf ocefpaf Mar 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loved it!

else:
popup_txt = popup
if sys.version_info >= (3,0):
popup_txt = popup_txt.decode()
return popup_temp.render({'pop_name': mk_name + str(count),
'pop_txt': json.dumps(popup),
'pop_txt': json.dumps(str(popup_txt)),
Copy link
Member

@ocefpaf ocefpaf Mar 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@apatil I am on the fence here. I am not sure if the call to str is necessary, but it does not hurt... What is your argument?

Copy link
Contributor Author

@apatil apatil Mar 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting type errors in python3 without it. The encode('ascii', ...) produces a bytes object, which json.dumps doesn't like.

Copy link
Member

@ocefpaf ocefpaf Mar 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

str it is then.

'width': width})
elif isinstance(popup, tuple):
#Update template with JS libs
Expand Down Expand Up @@ -653,6 +666,8 @@ def _popup_render(self, popup=None, mk_name=None, count=None,
'max_width': max_width,
'json_out': json_out,
'vega_id': vega_id})
else:
raise TypeError("Unrecognized popup type: {!r}".format(popup))

@iter_obj('geojson')
def geo_json(self, geo_path=None, geo_str=None, data_out='data.json',
Expand Down