From 4c2a0d2053c46da87916b3d31d0b99cb801defe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 5 Dec 2014 12:14:15 +0100 Subject: [PATCH] Remove unused code in the canvas replay code --- src/ol/render/canvas/canvasreplay.js | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index bb13f67ea4..f258184250 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -461,13 +461,11 @@ ol.render.canvas.Replay.prototype.replay_ = function( * @param {goog.vec.Mat4.Number} transform Transform. * @param {number} viewRotation View rotation. * @param {Object} skippedFeaturesHash Ids of features to skip - * @return {T|undefined} Callback result. - * @template T */ ol.render.canvas.Replay.prototype.replay = function( context, pixelRatio, transform, viewRotation, skippedFeaturesHash) { var instructions = this.instructions; - return this.replay_(context, pixelRatio, transform, viewRotation, + this.replay_(context, pixelRatio, transform, viewRotation, skippedFeaturesHash, instructions, undefined); }; @@ -1863,15 +1861,13 @@ ol.render.canvas.ReplayGroup = function(tolerance, maxExtent, resolution) { * @param {goog.vec.Mat4.Number} transform Transform. * @param {number} viewRotation View rotation. * @param {Object} skippedFeaturesHash Ids of features to skip - * @return {T|undefined} Callback result. - * @template T */ ol.render.canvas.ReplayGroup.prototype.replay = function(context, extent, pixelRatio, transform, viewRotation, skippedFeaturesHash) { /** @type {Array.} */ var zs = goog.array.map(goog.object.getKeys(this.replaysByZIndex_), Number); goog.array.sort(zs); - return this.replay_(zs, context, extent, pixelRatio, transform, + this.replay_(zs, context, extent, pixelRatio, transform, viewRotation, skippedFeaturesHash); }; @@ -1920,8 +1916,6 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function( * @param {goog.vec.Mat4.Number} transform Transform. * @param {number} viewRotation View rotation. * @param {Object} skippedFeaturesHash Ids of features to skip - * @return {T|undefined} Callback result. - * @template T */ ol.render.canvas.ReplayGroup.prototype.replay_ = function( zs, context, extent, pixelRatio, transform, viewRotation, @@ -1951,17 +1945,13 @@ ol.render.canvas.ReplayGroup.prototype.replay_ = function( replay = replays[ol.render.REPLAY_ORDER[j]]; if (goog.isDef(replay) && ol.extent.intersects(extent, replay.getExtent())) { - result = replay.replay(context, pixelRatio, transform, viewRotation, + replay.replay(context, pixelRatio, transform, viewRotation, skippedFeaturesHash); - if (result) { - return result; - } } } } context.restore(); - return undefined; };