From e575df6df03d9a8c25c60969ba79bab1defee798 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 3 Sep 2013 17:52:49 -0600 Subject: [PATCH] Canvas renderer updates for new extent structure --- src/ol/renderer/canvas/canvasimagelayerrenderer.js | 4 ++-- src/ol/renderer/canvas/canvastilelayerrenderer.js | 4 ++-- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index d2d4a11590..e3cd41ce23 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -113,8 +113,8 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame = 1); goog.vec.Mat4.translate( transform, - (imageExtent[0] - viewCenter[0]) / imageResolution, - (viewCenter[1] - imageExtent[3]) / imageResolution, + (imageExtent[0][0] - viewCenter[0]) / imageResolution, + (viewCenter[1] - imageExtent[1][1]) / imageResolution, 0); this.updateAttributions(frameState.attributions, image.getAttributions()); diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 52d0c14213..9b5993e5cb 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -348,8 +348,8 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame = for (tileCoordKey in tilesToDraw) { tile = tilesToDraw[tileCoordKey]; tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent); - x = (tileExtent[0] - origin[0]) / tileResolution; - y = (origin[1] - tileExtent[3]) / tileResolution; + x = (tileExtent[0][0] - origin[0]) / tileResolution; + y = (origin[1] - tileExtent[1][1]) / tileResolution; width = scale * tileSize[0]; height = scale * tileSize[1]; tileState = tile.getState(); diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index eeb1b3cad7..1c203cf7b7 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -477,10 +477,10 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame = tilesToRender[key] = tileCoord; } else if (idle) { tileExtent = tileGrid.getTileCoordExtent(tileCoord); - tileExtent[0] -= tileGutter; - tileExtent[1] += tileGutter; - tileExtent[2] -= tileGutter; - tileExtent[3] += tileGutter; + tileExtent[0][0] -= tileGutter; + tileExtent[1][0] += tileGutter; + tileExtent[0][1] -= tileGutter; + tileExtent[1][1] += tileGutter; tileHasFeatures = false; for (i = 0; i < numTypes; ++i) { type = types[i];