LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

genPOI: use more pythonic ways ...

Browse Source 
One should use isinstance instead of `type(A) ==` because of
inheritance.
There should be an exception if a list of `elif`s don't match.
Make Polyline not only accept tuples, but any iterable.
This commit is contained in:
Jamie Bliss
2015-02-23 21:14:17 +01:00
committed by MasterofJOKers
parent b08e34b064
commit 7229fcc3df
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overviewer_core/aux_files/genPOI.py
View File

@@ -299,19 +299,19 @@ def create_marker_from_filter_result(poi, result):
# Fill in the rest from result # Fill in the rest from result
if isinstance(result, basestring): if isinstance(result, basestring):
d.update(dict(text=result, hovertext=result)) d.update(dict(text=result, hovertext=result))
elif type(result) == tuple: elif isinstance(result, tuple):
d.update(dict(text=result[1], hovertext=result[0])) d.update(dict(text=result[1], hovertext=result[0]))
# Dict support to allow more flexible things in the future as well as polylines on the map. # Dict support to allow more flexible things in the future as well as polylines on the map.
elif type(result) == dict: elif isinstance(result, dict):
d['text'] = result['text'] d['text'] = result['text']
# Use custom hovertext if provided... # Use custom hovertext if provided...
if 'hovertext' in result and isinstance(result['hovertext'], basestring): if 'hovertext' in result:
d['hovertext'] = result['hovertext'] d['hovertext'] = unicode(result['hovertext'])
else: # ...otherwise default to display text. else: # ...otherwise default to display text.
d['hovertext'] = result['text'] d['hovertext'] = result['text']
if 'polyline' in result and type(result['polyline']) == tuple: #if type(result.get('polyline', '')) == tuple: if 'polyline' in result and hasattr(result['polyline'], '__iter__'):
d['polyline'] = [] d['polyline'] = []
for point in result['polyline']: for point in result['polyline']:
# This poor man's validation code almost definately needs improving. # This poor man's validation code almost definately needs improving.
@@ -324,6 +324,8 @@ def create_marker_from_filter_result(poi, result):
d["icon"] = result['icon'] d["icon"] = result['icon']
if "createInfoWindow" in result: if "createInfoWindow" in result:
d["createInfoWindow"] = result['createInfoWindow'] d["createInfoWindow"] = result['createInfoWindow']
else:
raise ValueError("got an %s as result for POI with id %s" % (type(result).__name__, poi['id']))
return d return d