From 86268bcf588d2f8e931fae6c417f9a2b7864c5e1 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 31 Jul 2014 11:29:35 +0200 Subject: [PATCH] Rename olx.FrameState#skippedFeatureUids_ skippedFeatureUids To let the ol.Map#skippedFeatureUids_ property to be renamed by the compiler. --- externs/olx.js | 2 +- src/ol/map.js | 2 +- src/ol/renderer/canvas/canvasimagelayerrenderer.js | 2 +- src/ol/renderer/canvas/canvasvectorlayerrenderer.js | 4 ++-- src/ol/renderer/dom/domimagelayerrenderer.js | 2 +- src/ol/renderer/webgl/webglimagelayerrenderer.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/externs/olx.js b/externs/olx.js index 1d948c4f9d..8ada72db1a 100644 --- a/externs/olx.js +++ b/externs/olx.js @@ -5131,7 +5131,7 @@ olx.View.fitGeometryOptions.prototype.maxZoom; * pixelToCoordinateMatrix: goog.vec.Mat4.Number, * postRenderFunctions: Array., * size: ol.Size, - * skippedFeatureUids_: Object., + * skippedFeatureUids: Object., * tileQueue: ol.TileQueue, * time: number, * usedTiles: Object.>, diff --git a/src/ol/map.js b/src/ol/map.js index 9c78679da8..1d47c533cb 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -1216,7 +1216,7 @@ ol.Map.prototype.renderFrame_ = function(time) { pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_, postRenderFunctions: [], size: size, - skippedFeatureUids_: this.skippedFeatureUids_, + skippedFeatureUids: this.skippedFeatureUids_, tileQueue: this.tileQueue_, time: time, usedTiles: {}, diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index b03f771ec5..221437b514 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -53,7 +53,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.viewState.resolution; var rotation = frameState.viewState.rotation; - var skippedFeatureUids = frameState.skippedFeatureUids_; + var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( extent, resolution, rotation, coordinate, skippedFeatureUids, /** diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index a2a1b2706b..faebd6bc7e 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -96,7 +96,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = replayContext.globalAlpha = layerState.opacity; replayGroup.replay( replayContext, frameState.extent, frameState.pixelRatio, transform, - frameState.viewState.rotation, frameState.skippedFeatureUids_); + frameState.viewState.rotation, frameState.skippedFeatureUids); if (replayContext != context) { this.dispatchRenderEvent(replayContext, frameState, transform); @@ -122,7 +122,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = var rotation = frameState.viewState.rotation; var layer = this.getLayer(); return this.replayGroup_.forEachGeometryAtPixel(extent, resolution, - rotation, coordinate, frameState.skippedFeatureUids_, + rotation, coordinate, frameState.skippedFeatureUids, /** * @param {ol.geom.Geometry} geometry Geometry. * @param {Object} data Data. diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index 5300e5e361..9b67145bab 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -58,7 +58,7 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.viewState.resolution; var rotation = frameState.viewState.rotation; - var skippedFeatureUids = frameState.skippedFeatureUids_; + var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( extent, resolution, rotation, coordinate, skippedFeatureUids, /** diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 37976f8d3b..b0c90ebde3 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -84,7 +84,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel = var extent = frameState.extent; var resolution = frameState.viewState.resolution; var rotation = frameState.viewState.rotation; - var skippedFeatureUids = frameState.skippedFeatureUids_; + var skippedFeatureUids = frameState.skippedFeatureUids; return source.forEachFeatureAtPixel( extent, resolution, rotation, coordinate, skippedFeatureUids,