LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

genPOI: generate marker's internal name only once

Browse Source 
Why should it be duplicated anyway?
This commit is contained in:
MasterofJOKers
2014-07-30 21:58:03 +02:00
parent e2b6474b28
commit eccad401ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overviewer_core/aux_files/genPOI.py
View File

@@ -319,8 +319,8 @@ def main():
return 1 return 1
for f in render['markers']: for f in render['markers']:
markersets.add(((f['name'], f['filterFunction']), rset))
name = replaceBads(f['name']) + hex(hash(f['filterFunction']))[-4:] + "_" + hex(hash(rset))[-4:] name = replaceBads(f['name']) + hex(hash(f['filterFunction']))[-4:] + "_" + hex(hash(rset))[-4:]
markersets.add((name, (f['name'], f['filterFunction']), rset))
to_append = dict(groupName=name, to_append = dict(groupName=name,
displayName = f['name'], displayName = f['name'],
icon=f.get('icon', 'signpost_icon.png'), icon=f.get('icon', 'signpost_icon.png'),
@@ -341,12 +341,12 @@ def main():
logging.info("Done handling POIs") logging.info("Done handling POIs")
logging.info("Writing out javascript files") logging.info("Writing out javascript files")
markerSetDict = dict() markerSetDict = dict()
for (flter, rset) in markersets:
for (name, flter, rset) in markersets:
# generate a unique name for this markerset. it will not be user visible # generate a unique name for this markerset. it will not be user visible
filter_name = flter[0] filter_name = flter[0]
filter_function = flter[1] filter_function = flter[1]
name = replaceBads(filter_name) + hex(hash(filter_function))[-4:] + "_" + hex(hash(rset))[-4:]
markerSetDict[name] = dict(created=False, raw=[], name=filter_name) markerSetDict[name] = dict(created=False, raw=[], name=filter_name)
poi_sets = ['Entities', 'TileEntities', 'Players', 'Manual'] poi_sets = ['Entities', 'TileEntities', 'Players', 'Manual']
for poi in itertools.chain(rset._pois[n] for n in poi_sets): for poi in itertools.chain(rset._pois[n] for n in poi_sets):