From c4b654b26c55b9d9afa3254155c4eff9f6339fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 20 Mar 2014 13:29:30 +0100 Subject: [PATCH] Rename skippedFeaturesHash to skippedFeatureUids --- externs/oli.js | 2 +- src/ol/map.js | 12 ++++++------ src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/externs/oli.js b/externs/oli.js index 36d3f19097..30945f1a70 100644 --- a/externs/oli.js +++ b/externs/oli.js @@ -93,7 +93,7 @@ oli.FrameState.prototype.size; /** @type {Object.} */ -oli.FrameState.prototype.skippedFeaturesHash_; +oli.FrameState.prototype.skippedFeatureUids_; /** @type {ol.TileQueue} */ diff --git a/src/ol/map.js b/src/ol/map.js index a9d24ec2ea..f0206605ec 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -375,7 +375,7 @@ ol.Map = function(options) { * @type {Object.} * @private */ - this.skippedFeaturesHash_ = {}; + this.skippedFeatureUids_ = {}; goog.events.listen( this, ol.Object.getChangeEventType(ol.MapProperty.LAYERGROUP), @@ -830,8 +830,8 @@ ol.Map.prototype.getSkippedFeatures = function() { * @return {Object} Feature uids. * @todo stability experimental */ -ol.Map.prototype.getSkippedFeaturesHash = function() { - return this.skippedFeaturesHash_; +ol.Map.prototype.getSkippedFeatureUids = function() { + return this.skippedFeatureUids_; }; @@ -938,14 +938,14 @@ ol.Map.prototype.handleSizeChanged_ = function() { * @private */ ol.Map.prototype.handleSkippedFeaturesChange_ = function() { - this.skippedFeaturesHash_ = {}; + this.skippedFeatureUids_ = {}; this.skippedFeatures_.forEach( /** * @param {ol.Feature} feature Feature. * @this {ol.Map} */ function(feature) { - this.skippedFeaturesHash_[goog.getUid(feature).toString()] = true; + this.skippedFeatureUids_[goog.getUid(feature).toString()] = true; }, this); this.render(); }; @@ -1236,7 +1236,7 @@ ol.Map.prototype.renderFrame_ = function(time) { pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_, postRenderFunctions: [], size: size, - skippedFeaturesHash_: this.skippedFeaturesHash_, + skippedFeatureUids_: this.skippedFeatureUids_, tileQueue: this.tileQueue_, time: time, usedTiles: {}, diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 98cb70b2f9..37eeaffe8d 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -98,7 +98,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = replayContext.globalAlpha = layerState.opacity; replayGroup.replay( replayContext, frameState.extent, frameState.pixelRatio, transform, - frameState.view2DState.rotation, frameState.skippedFeaturesHash_); + frameState.view2DState.rotation, frameState.skippedFeatureUids_); if (replayContext != context) { this.dispatchRenderEvent(replayContext, frameState, transform); @@ -124,7 +124,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = var rotation = frameState.view2DState.rotation; var layer = this.getLayer(); return this.replayGroup_.forEachGeometryAtPixel(extent, resolution, - rotation, coordinate, frameState.skippedFeaturesHash_, + rotation, coordinate, frameState.skippedFeatureUids_, /** * @param {ol.geom.Geometry} geometry Geometry. * @param {Object} data Data.