fix #2034, fix tile debug rendering

mapbox · Feb 5, 2016 · d73ac0f · d73ac0f
1 parent 614bebe
commit d73ac0f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/js/render/draw_debug.js b/js/render/draw_debug.js
@@ -5,20 +5,20 @@ var browser = require('../util/browser');
 
 module.exports = drawDebug;
 
-function drawDebug(painter, coords) {
+function drawDebug(painter, source, coords) {
     if (painter.isOpaquePass) return;
     if (!painter.options.debug) return;
 
     for (var i = 0; i < coords.length; i++) {
-        drawDebugTile(painter, coords[i]);
+        drawDebugTile(painter, source, coords[i]);
     }
 }
 
-function drawDebugTile(painter, coord) {
+function drawDebugTile(painter, source, coord) {
     var gl = painter.gl;
 
     var shader = painter.debugShader;
-    gl.switchShader(shader, painter.calculatePosMatrix(coord));
+    gl.switchShader(shader, painter.calculatePosMatrix(coord, source.maxzoom));
 
     // draw bounding rectangle
     gl.bindBuffer(gl.ARRAY_BUFFER, painter.debugBuffer);

diff --git a/js/render/painter.js b/js/render/painter.js
@@ -299,7 +299,9 @@ Painter.prototype.renderPass = function(options) {
             this.renderLayer(this, source, layer, coords);
         }
 
-        draw.debug(this, coords);
+        if (source) {
+            draw.debug(this, source, coords);
+        }
     }
 };