From 752a2acd110a0ab55254a46588e89522eabe7505 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:12:34 +0100 Subject: [PATCH 1/2] Use toString() instead of + '' --- src/ol/source/vectorsource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 818868ae6b..4f0154ed09 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -85,7 +85,7 @@ ol.source.Vector.prototype.addFeature = function(feature) { * @protected */ ol.source.Vector.prototype.addFeatureInternal = function(feature) { - var featureKey = goog.getUid(feature) + ''; + var featureKey = goog.getUid(feature).toString(); goog.asserts.assert(!(featureKey in this.featureChangeKeys_)); this.featureChangeKeys_[featureKey] = goog.events.listen(feature, goog.events.EventType.CHANGE, this.handleFeatureChange_, false, this); @@ -329,7 +329,7 @@ ol.source.Vector.prototype.removeFeature = function(feature) { * @protected */ ol.source.Vector.prototype.removeFeatureInternal = function(feature) { - var featureKey = goog.getUid(feature) + ''; + var featureKey = goog.getUid(feature).toString(); goog.asserts.assert(featureKey in this.featureChangeKeys_); goog.events.unlistenByKey(this.featureChangeKeys_[featureKey]); delete this.featureChangeKeys_[featureKey]; From 310d0dc792131e657df16650613815957e1845d4 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 2 Jan 2014 22:13:37 +0100 Subject: [PATCH 2/2] Rename replayes to replays --- src/ol/render/canvas/canvasreplay.js | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 9b69bb1c55..24ccbd2a48 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1202,7 +1202,7 @@ ol.render.canvas.ReplayGroup = function(pixelRatio, tolerance) { * @type {Object.>} */ - this.replayesByZIndex_ = {}; + this.replaysByZIndex_ = {}; /** * @type {HTMLCanvasElement} @@ -1240,7 +1240,7 @@ ol.render.canvas.ReplayGroup = function(pixelRatio, tolerance) { ol.render.canvas.ReplayGroup.prototype.replay = function(context, extent, transform, renderGeometryFunction) { /** @type {Array.} */ - var zs = goog.array.map(goog.object.getKeys(this.replayesByZIndex_), Number); + var zs = goog.array.map(goog.object.getKeys(this.replaysByZIndex_), Number); goog.array.sort(zs); return this.replay_( zs, context, extent, transform, renderGeometryFunction); @@ -1263,11 +1263,11 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(context, extent, ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function(zs, context, extent, transform, renderGeometryFunction, geometryCallback) { - var i, ii, replayes, replayType, replay, result; + var i, ii, replays, replayType, replay, result; for (i = 0, ii = zs.length; i < ii; ++i) { - replayes = this.replayesByZIndex_[zs[i].toString()]; - for (replayType in replayes) { - replay = replayes[replayType]; + replays = this.replaysByZIndex_[zs[i].toString()]; + for (replayType in replays) { + replay = replays[replayType]; if (ol.extent.intersects(extent, replay.getExtent())) { result = replay.replayHitDetection( context, transform, renderGeometryFunction, geometryCallback); @@ -1294,11 +1294,11 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = */ ol.render.canvas.ReplayGroup.prototype.replay_ = function(zs, context, extent, transform, renderGeometryFunction) { - var i, ii, replayes, replayType, replay, result; + var i, ii, replays, replayType, replay, result; for (i = 0, ii = zs.length; i < ii; ++i) { - replayes = this.replayesByZIndex_[zs[i].toString()]; - for (replayType in replayes) { - replay = replayes[replayType]; + replays = this.replaysByZIndex_[zs[i].toString()]; + for (replayType in replays) { + replay = replays[replayType]; if (ol.extent.intersects(extent, replay.getExtent())) { result = replay.replay( context, transform, renderGeometryFunction); @@ -1333,7 +1333,7 @@ ol.render.canvas.ReplayGroup.prototype.forEachGeometryAtCoordinate = function( -coordinate[0], -coordinate[1]); /** @type {Array.} */ - var zs = goog.array.map(goog.object.getKeys(this.replayesByZIndex_), Number); + var zs = goog.array.map(goog.object.getKeys(this.replaysByZIndex_), Number); goog.array.sort(zs, function(a, b) { return b - a; }); var context = this.hitDetectionContext_; @@ -1364,11 +1364,11 @@ ol.render.canvas.ReplayGroup.prototype.forEachGeometryAtCoordinate = function( */ ol.render.canvas.ReplayGroup.prototype.finish = function() { var zKey; - for (zKey in this.replayesByZIndex_) { - var replayes = this.replayesByZIndex_[zKey]; + for (zKey in this.replaysByZIndex_) { + var replays = this.replaysByZIndex_[zKey]; var replayKey; - for (replayKey in replayes) { - replayes[replayKey].finish(); + for (replayKey in replays) { + replays[replayKey].finish(); } } }; @@ -1380,17 +1380,17 @@ ol.render.canvas.ReplayGroup.prototype.finish = function() { ol.render.canvas.ReplayGroup.prototype.getReplay = function(zIndex, replayType) { var zIndexKey = goog.isDef(zIndex) ? zIndex.toString() : '0'; - var replayes = this.replayesByZIndex_[zIndexKey]; - if (!goog.isDef(replayes)) { - replayes = {}; - this.replayesByZIndex_[zIndexKey] = replayes; + var replays = this.replaysByZIndex_[zIndexKey]; + if (!goog.isDef(replays)) { + replays = {}; + this.replaysByZIndex_[zIndexKey] = replays; } - var replay = replayes[replayType]; + var replay = replays[replayType]; if (!goog.isDef(replay)) { var constructor = ol.render.canvas.BATCH_CONSTRUCTORS_[replayType]; goog.asserts.assert(goog.isDef(constructor)); replay = new constructor(this.pixelRatio_, this.tolerance_); - replayes[replayType] = replay; + replays[replayType] = replay; } return replay; }; @@ -1400,7 +1400,7 @@ ol.render.canvas.ReplayGroup.prototype.getReplay = * @inheritDoc */ ol.render.canvas.ReplayGroup.prototype.isEmpty = function() { - return goog.object.isEmpty(this.replayesByZIndex_); + return goog.object.isEmpty(this.replaysByZIndex_); };