From adcf1057780463d3633a961a98b7a91171625c5b Mon Sep 17 00:00:00 2001 From: MasterofJOKers Date: Thu, 12 Mar 2015 15:54:48 +0100 Subject: [PATCH 1/2] [genPOI] fix generation of multiple players The same problem as in bd8f3577 is also present for players. The filters were given as iterator, but iterated through once per player. --- overviewer_core/aux_files/genPOI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index 993cbcf..f9d3d32 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -494,7 +494,7 @@ def main(): keyfunc = lambda x: x[4] sfilters = sorted(filters, key=keyfunc) for worldpath, worldpath_filters in itertools.groupby(sfilters, keyfunc): - handlePlayers(worldpath, worldpath_filters, markers) + handlePlayers(worldpath, list(worldpath_filters), markers) # add manual POIs # group filters by name of the render, because only filter functions for From 803d8d7933bbaf98b1a3140454a82c760f991f86 Mon Sep 17 00:00:00 2001 From: MasterofJOKers Date: Thu, 12 Mar 2015 15:56:48 +0100 Subject: [PATCH 2/2] [genPOI] sort list of imports Easier to see if an import is already there. --- overviewer_core/aux_files/genPOI.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index f9d3d32..c62e1be 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -14,16 +14,16 @@ markers.js holds a list of which markerSets are attached to each tileSet ''' -import os -import time -import logging -import json -import sys -import re -import urllib2 -import multiprocessing -import itertools import gzip +import itertools +import json +import logging +import multiprocessing +import os +import re +import sys +import time +import urllib2 from collections import defaultdict from multiprocessing import Pool