Merge pull request #2473 from fredj/2472
Rename olx.FrameState#skippedFeatureUids_ skippedFeatureUids
This commit is contained in:
+1
-1
@@ -5131,7 +5131,7 @@ olx.View.fitGeometryOptions.prototype.maxZoom;
|
|||||||
* pixelToCoordinateMatrix: goog.vec.Mat4.Number,
|
* pixelToCoordinateMatrix: goog.vec.Mat4.Number,
|
||||||
* postRenderFunctions: Array.<ol.PostRenderFunction>,
|
* postRenderFunctions: Array.<ol.PostRenderFunction>,
|
||||||
* size: ol.Size,
|
* size: ol.Size,
|
||||||
* skippedFeatureUids_: Object.<string, boolean>,
|
* skippedFeatureUids: Object.<string, boolean>,
|
||||||
* tileQueue: ol.TileQueue,
|
* tileQueue: ol.TileQueue,
|
||||||
* time: number,
|
* time: number,
|
||||||
* usedTiles: Object.<string, Object.<string, ol.TileRange>>,
|
* usedTiles: Object.<string, Object.<string, ol.TileRange>>,
|
||||||
|
|||||||
+1
-1
@@ -1216,7 +1216,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
|
|||||||
pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_,
|
pixelToCoordinateMatrix: this.pixelToCoordinateMatrix_,
|
||||||
postRenderFunctions: [],
|
postRenderFunctions: [],
|
||||||
size: size,
|
size: size,
|
||||||
skippedFeatureUids_: this.skippedFeatureUids_,
|
skippedFeatureUids: this.skippedFeatureUids_,
|
||||||
tileQueue: this.tileQueue_,
|
tileQueue: this.tileQueue_,
|
||||||
time: time,
|
time: time,
|
||||||
usedTiles: {},
|
usedTiles: {},
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
|
|||||||
var extent = frameState.extent;
|
var extent = frameState.extent;
|
||||||
var resolution = frameState.viewState.resolution;
|
var resolution = frameState.viewState.resolution;
|
||||||
var rotation = frameState.viewState.rotation;
|
var rotation = frameState.viewState.rotation;
|
||||||
var skippedFeatureUids = frameState.skippedFeatureUids_;
|
var skippedFeatureUids = frameState.skippedFeatureUids;
|
||||||
return source.forEachFeatureAtPixel(
|
return source.forEachFeatureAtPixel(
|
||||||
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -96,7 +96,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.viewState.rotation, frameState.skippedFeatureUids_);
|
frameState.viewState.rotation, frameState.skippedFeatureUids);
|
||||||
|
|
||||||
if (replayContext != context) {
|
if (replayContext != context) {
|
||||||
this.dispatchRenderEvent(replayContext, frameState, transform);
|
this.dispatchRenderEvent(replayContext, frameState, transform);
|
||||||
@@ -122,7 +122,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
|
|||||||
var rotation = frameState.viewState.rotation;
|
var rotation = frameState.viewState.rotation;
|
||||||
var layer = this.getLayer();
|
var layer = this.getLayer();
|
||||||
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
|
return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
|
||||||
rotation, coordinate, frameState.skippedFeatureUids_,
|
rotation, coordinate, frameState.skippedFeatureUids,
|
||||||
/**
|
/**
|
||||||
* @param {ol.geom.Geometry} geometry Geometry.
|
* @param {ol.geom.Geometry} geometry Geometry.
|
||||||
* @param {Object} data Data.
|
* @param {Object} data Data.
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
|
|||||||
var extent = frameState.extent;
|
var extent = frameState.extent;
|
||||||
var resolution = frameState.viewState.resolution;
|
var resolution = frameState.viewState.resolution;
|
||||||
var rotation = frameState.viewState.rotation;
|
var rotation = frameState.viewState.rotation;
|
||||||
var skippedFeatureUids = frameState.skippedFeatureUids_;
|
var skippedFeatureUids = frameState.skippedFeatureUids;
|
||||||
return source.forEachFeatureAtPixel(
|
return source.forEachFeatureAtPixel(
|
||||||
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
|
|||||||
var extent = frameState.extent;
|
var extent = frameState.extent;
|
||||||
var resolution = frameState.viewState.resolution;
|
var resolution = frameState.viewState.resolution;
|
||||||
var rotation = frameState.viewState.rotation;
|
var rotation = frameState.viewState.rotation;
|
||||||
var skippedFeatureUids = frameState.skippedFeatureUids_;
|
var skippedFeatureUids = frameState.skippedFeatureUids;
|
||||||
return source.forEachFeatureAtPixel(
|
return source.forEachFeatureAtPixel(
|
||||||
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
extent, resolution, rotation, coordinate, skippedFeatureUids,
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user