LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Allow unicode to be returned from a genPOI filter function

Browse Source
This commit is contained in:
Andrew Chin
2013-01-18 21:59:08 -05:00
parent da14102012
commit a5ee1b68ba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/aux_files/genPOI.py
View File

@@ -201,7 +201,7 @@ def main():
for poi in rset._pois['Entities']: for poi in rset._pois['Entities']:
result = filter_function(poi) result = filter_function(poi)
if result: if result:
if type(result) == str: if isinstance(result, basestring):
d = dict(x=poi['Pos'][0], y=poi['Pos'][1], z=poi['Pos'][2], text=result, hovertext=result) d = dict(x=poi['Pos'][0], y=poi['Pos'][1], z=poi['Pos'][2], text=result, hovertext=result)
elif type(result) == tuple: elif type(result) == tuple:
d = dict(x=poi['Pos'][0], y=poi['Pos'][1], z=poi['Pos'][2], text=result[1], hovertext=result[0]) d = dict(x=poi['Pos'][0], y=poi['Pos'][1], z=poi['Pos'][2], text=result[1], hovertext=result[0])
@@ -213,7 +213,7 @@ def main():
for poi in rset._pois['TileEntities']: for poi in rset._pois['TileEntities']:
result = filter_function(poi) result = filter_function(poi)
if result: if result:
if type(result) == str: if isinstance(result, basestring):
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result)
elif type(result) == tuple: elif type(result) == tuple:
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0]) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0])
@@ -225,7 +225,7 @@ def main():
for poi in rset._pois['Players']: for poi in rset._pois['Players']:
result = filter_function(poi) result = filter_function(poi)
if result: if result:
if type(result) == str: if isinstance(result, basestring):
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result)
elif type(result) == tuple: elif type(result) == tuple:
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0]) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0])
@@ -237,7 +237,7 @@ def main():
for poi in rset._pois['Manual']: for poi in rset._pois['Manual']:
result = filter_function(poi) result = filter_function(poi)
if result: if result:
if type(result) == str: if isinstance(result, basestring):
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, hovertext=result)
elif type(result) == tuple: elif type(result) == tuple:
d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0]) d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result[1], hovertext=result[0])