From 2d25d74bd774fedbb86da2c1d2a3f92b0bd4ba8b Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Mon, 18 Apr 2011 20:16:06 -0400 Subject: [PATCH] moved quadtree preprocessing out of RenderNode, fixes issue #326 --- overviewer.py | 7 ++++++- rendernode.py | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/overviewer.py b/overviewer.py index 925d241..115644f 100755 --- a/overviewer.py +++ b/overviewer.py @@ -227,8 +227,12 @@ def main(): else: qtree = quadtree.QuadtreeGen(w, destdir, rendermode=rendermode, **qtree_args) q.append(qtree) + + # do quadtree-level preprocessing + for qtree in q: + qtree.go(options.procs) - #create the distributed render + # create the distributed render r = rendernode.RenderNode(q) # write out the map and web assets @@ -238,6 +242,7 @@ def main(): # render the tiles! r.go(options.procs) + # finish up the map m.finalize() diff --git a/rendernode.py b/rendernode.py index d762b73..9dce5cc 100644 --- a/rendernode.py +++ b/rendernode.py @@ -149,7 +149,6 @@ class RenderNode(object): total += 4**q.p if q.p > max_p: max_p = q.p - q.go(procs) self.max_p = max_p # Render the highest level of tiles from the chunks results = collections.deque()