Pass renderGeometryFunction to ol.render.canvas.ReplayGroup
This commit is contained in:
@@ -99,8 +99,11 @@ ol.render.canvas.Replay.prototype.appendFlatCoordinates =
|
|||||||
/**
|
/**
|
||||||
* @param {CanvasRenderingContext2D} context Context.
|
* @param {CanvasRenderingContext2D} context Context.
|
||||||
* @param {goog.vec.Mat4.AnyType} transform Transform.
|
* @param {goog.vec.Mat4.AnyType} transform Transform.
|
||||||
|
* @param {function(ol.geom.Geometry): boolean|undefined} renderGeometryFunction
|
||||||
|
* Render geometry function.
|
||||||
*/
|
*/
|
||||||
ol.render.canvas.Replay.prototype.draw = function(context, transform) {
|
ol.render.canvas.Replay.prototype.draw =
|
||||||
|
function(context, transform, renderGeometryFunction) {
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var pixelCoordinates;
|
var pixelCoordinates;
|
||||||
if (ol.vec.Mat4.equal2D(transform, this.renderedTransform_)) {
|
if (ol.vec.Mat4.equal2D(transform, this.renderedTransform_)) {
|
||||||
@@ -737,9 +740,11 @@ ol.render.canvas.ReplayGroup = function() {
|
|||||||
* @param {CanvasRenderingContext2D} context Context.
|
* @param {CanvasRenderingContext2D} context Context.
|
||||||
* @param {ol.Extent} extent Extent.
|
* @param {ol.Extent} extent Extent.
|
||||||
* @param {goog.vec.Mat4.AnyType} transform Transform.
|
* @param {goog.vec.Mat4.AnyType} transform Transform.
|
||||||
|
* @param {function(ol.geom.Geometry): boolean|undefined} renderGeometryFunction
|
||||||
|
* Render geometry function.
|
||||||
*/
|
*/
|
||||||
ol.render.canvas.ReplayGroup.prototype.draw =
|
ol.render.canvas.ReplayGroup.prototype.draw =
|
||||||
function(context, extent, transform) {
|
function(context, extent, transform, renderGeometryFunction) {
|
||||||
/** @type {Array.<number>} */
|
/** @type {Array.<number>} */
|
||||||
var zs = goog.array.map(goog.object.getKeys(this.replayesByZIndex_), Number);
|
var zs = goog.array.map(goog.object.getKeys(this.replayesByZIndex_), Number);
|
||||||
goog.array.sort(zs);
|
goog.array.sort(zs);
|
||||||
@@ -750,7 +755,7 @@ ol.render.canvas.ReplayGroup.prototype.draw =
|
|||||||
for (replayType in replayes) {
|
for (replayType in replayes) {
|
||||||
var replay = replayes[replayType];
|
var replay = replayes[replayType];
|
||||||
if (ol.extent.intersects(extent, replay.getExtent())) {
|
if (ol.extent.intersects(extent, replay.getExtent())) {
|
||||||
replay.draw(context, transform);
|
replay.draw(context, transform, renderGeometryFunction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,8 +59,11 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
|
|||||||
|
|
||||||
var replayGroup = this.replayGroup_;
|
var replayGroup = this.replayGroup_;
|
||||||
if (!goog.isNull(replayGroup)) {
|
if (!goog.isNull(replayGroup)) {
|
||||||
|
var vectorLayer = this.getVectorLayer();
|
||||||
|
var renderGeometryFunction = vectorLayer.getRenderGeometryFunction();
|
||||||
context.globalAlpha = layerState.opacity;
|
context.globalAlpha = layerState.opacity;
|
||||||
replayGroup.draw(context, frameState.extent, transform);
|
replayGroup.draw(
|
||||||
|
context, frameState.extent, transform, renderGeometryFunction);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.dispatchPostComposeEvent(context, frameState, transform);
|
this.dispatchPostComposeEvent(context, frameState, transform);
|
||||||
|
|||||||
Reference in New Issue
Block a user