ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename skippedFeaturesHash to skippedFeatureUids

Browse Source
This commit is contained in:
Éric Lemoine
2014-03-20 13:29:30 +01:00
parent 71484d9a53
commit c4b654b26c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externs/oli.js
+1 -1
View File
@@ -93,7 +93,7 @@ oli.FrameState.prototype.size;
/** @type {Object.<string, boolean>} */ /** @type {Object.<string, boolean>} */
oli.FrameState.prototype.skippedFeaturesHash_; oli.FrameState.prototype.skippedFeatureUids_;
/** @type {ol.TileQueue} */ /** @type {ol.TileQueue} */
src/ol/map.js
+6 -6
View File
@@ -375,7 +375,7 @@ ol.Map = function(options) {
* @type {Object.<string, boolean>} * @type {Object.<string, boolean>}
* @private * @private
*/ */
this.skippedFeaturesHash_ = {}; this.skippedFeatureUids_ = {};
goog.events.listen( goog.events.listen(
this, ol.Object.getChangeEventType(ol.MapProperty.LAYERGROUP), this, ol.Object.getChangeEventType(ol.MapProperty.LAYERGROUP),
@@ -830,8 +830,8 @@ ol.Map.prototype.getSkippedFeatures = function() {
* @return {Object} Feature uids. * @return {Object} Feature uids.
* @todo stability experimental * @todo stability experimental
*/ */
ol.Map.prototype.getSkippedFeaturesHash = function() { ol.Map.prototype.getSkippedFeatureUids = function() {
return this.skippedFeaturesHash_; return this.skippedFeatureUids_;
}; };
@@ -938,14 +938,14 @@ ol.Map.prototype.handleSizeChanged_ = function() {
* @private * @private
*/ */
ol.Map.prototype.handleSkippedFeaturesChange_ = function() { ol.Map.prototype.handleSkippedFeaturesChange_ = function() {
this.skippedFeaturesHash_ = {}; this.skippedFeatureUids_ = {};
this.skippedFeatures_.forEach( this.skippedFeatures_.forEach(
/** /**
* @param {ol.Feature} feature Feature. * @param {ol.Feature} feature Feature.
* @this {ol.Map} * @this {ol.Map}
*/ */
function(feature) { function(feature) {
this.skippedFeaturesHash_[goog.getUid(feature).toString()] = true; this.skippedFeatureUids_[goog.getUid(feature).toString()] = true;
}, this); }, this);
this.render(); this.render();
}; };
@@ -1236,7 +1236,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_, pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_,
postRenderFunctions: [], postRenderFunctions: [],
size: size, size: size,
skippedFeaturesHash_: this.skippedFeaturesHash_, skippedFeatureUids_: this.skippedFeatureUids_,
tileQueue: this.tileQueue_, tileQueue: this.tileQueue_,
time: time, time: time,
usedTiles: {}, usedTiles: {},
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+2 -2
View File
@@ -98,7 +98,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
replayContext.globalAlpha = layerState.opacity; replayContext.globalAlpha = layerState.opacity;
replayGroup.replay( replayGroup.replay(
replayContext, frameState.extent, frameState.pixelRatio, transform, replayContext, frameState.extent, frameState.pixelRatio, transform,
frameState.view2DState.rotation, frameState.skippedFeaturesHash_); frameState.view2DState.rotation, frameState.skippedFeatureUids_);
if (replayContext != context) { if (replayContext != context) {
this.dispatchRenderEvent(replayContext, frameState, transform); this.dispatchRenderEvent(replayContext, frameState, transform);
@@ -124,7 +124,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
var rotation = frameState.view2DState.rotation; var rotation = frameState.view2DState.rotation;
var layer = this.getLayer(); var layer = this.getLayer();
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution, return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
rotation, coordinate, frameState.skippedFeaturesHash_, rotation, coordinate, frameState.skippedFeatureUids_,
/** /**
* @param {ol.geom.Geometry} geometry Geometry. * @param {ol.geom.Geometry} geometry Geometry.
* @param {Object} data Data. * @param {Object} data Data.