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

Avoid goog.getUid() with empty skippedFeaturesHash

Browse Source
This commit is contained in:
Andreas Hocevar
2015-11-10 18:44:29 +01:00
parent a020251f69
commit b29b969cfe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/render/canvas/canvasreplay.js
View File

@@ -246,6 +246,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
goog.asserts.assert(pixelCoordinates === this.pixelCoordinates_, goog.asserts.assert(pixelCoordinates === this.pixelCoordinates_,
'pixelCoordinates should be the same as this.pixelCoordinates_'); 'pixelCoordinates should be the same as this.pixelCoordinates_');
} }
var skipFeatures = !goog.object.isEmpty(skippedFeaturesHash);
var i = 0; // instruction index var i = 0; // instruction index
var ii = instructions.length; // end of instructions var ii = instructions.length; // end of instructions
var d = 0; // data index var d = 0; // data index
@@ -259,8 +260,8 @@ ol.render.canvas.Replay.prototype.replay_ = function(
switch (type) { switch (type) {
case ol.render.canvas.Instruction.BEGIN_GEOMETRY: case ol.render.canvas.Instruction.BEGIN_GEOMETRY:
feature = /** @type {ol.Feature|ol.render.Feature} */ (instruction[1]); feature = /** @type {ol.Feature|ol.render.Feature} */ (instruction[1]);
var featureUid = goog.getUid(feature).toString(); if ((skipFeatures &&
if (skippedFeaturesHash[featureUid] !== undefined || skippedFeaturesHash[goog.getUid(feature).toString()]) ||
!feature.getGeometry()) { !feature.getGeometry()) {
i = /** @type {number} */ (instruction[2]); i = /** @type {number} */ (instruction[2]);
} else if (opt_hitExtent !== undefined && !ol.extent.intersects( } else if (opt_hitExtent !== undefined && !ol.extent.intersects(