From c648c1df8a41220809e9b9c86935421ce621bec4 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Tue, 25 Jun 2013 14:26:09 -0400 Subject: [PATCH] drawer: don't leak drawLevel into global namespace This code is still under-tested and documented but no longer relies on `drawLevel` being leaked into the global namespace where `updateLevel` to find it. See #145 --- src/drawer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/drawer.js b/src/drawer.js index 86c1db90..cd110561 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -527,7 +527,9 @@ function updateViewport( drawer ) { lowestLevel = Math.min( lowestLevel, highestLevel ); //TODO + var drawLevel; // FIXME: drawLevel should have a more explanatory name for ( level = highestLevel; level >= lowestLevel; level-- ) { + drawLevel = false; //Avoid calculations for draw if we have already drawn this renderPixelRatioC = drawer.viewport.deltaPixelsFromPoints( @@ -572,6 +574,7 @@ function updateViewport( drawer ) { best = updateLevel( drawer, haveDrawn, + drawLevel, level, levelOpacity, levelVisibility, @@ -601,7 +604,7 @@ function updateViewport( drawer ) { } -function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, viewportTL, viewportBR, currentTime, best ){ +function updateLevel( drawer, haveDrawn, drawLevel, level, levelOpacity, levelVisibility, viewportTL, viewportBR, currentTime, best ){ var x, y, tileTL,