From d43abba154776adda130f79c35a0e204eb7e8c44 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 19 Jan 2013 15:44:58 +0100 Subject: [PATCH] Use stricter types in private methods, operate on array directly --- src/ol/tilequeue.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ol/tilequeue.js b/src/ol/tilequeue.js index 18cf82e453..baf61b1e06 100644 --- a/src/ol/tilequeue.js +++ b/src/ol/tilequeue.js @@ -1,7 +1,6 @@ goog.provide('ol.TilePriorityFunction'); goog.provide('ol.TileQueue'); -goog.require('goog.array'); goog.require('goog.events'); goog.require('goog.events.EventType'); goog.require('ol.Coordinate'); @@ -77,7 +76,7 @@ ol.TileQueue.DROP = Infinity; * FIXME empty description for jsdoc */ ol.TileQueue.prototype.clear = function() { - goog.array.clear(this.heap_); + this.heap_.length = 0; this.queuedTileKeys_ = {}; }; @@ -85,17 +84,14 @@ ol.TileQueue.prototype.clear = function() { /** * Remove and return the highest-priority tile. O(logn). * @private - * @return {ol.Tile|undefined} Tile. + * @return {ol.Tile} Tile. */ ol.TileQueue.prototype.dequeue_ = function() { var heap = this.heap_; - var count = heap.length; - if (count <= 0) { - return undefined; - } + goog.asserts.assert(heap.length > 0); var tile = /** @type {ol.Tile} */ (heap[0][1]); - if (count == 1) { - goog.array.clear(heap); + if (heap.length == 1) { + heap.length = 0; } else { heap[0] = heap.pop(); this.siftUp_(0);