Merge pull request #1479 from twpayne/vector-api-draw-order
[vector-api] Draw vector features in the order polygons, lines, images
This commit is contained in:
@@ -1300,12 +1300,13 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ =
|
||||
*/
|
||||
ol.render.canvas.ReplayGroup.prototype.replay_ =
|
||||
function(zs, context, extent, transform, renderGeometryFunction) {
|
||||
var i, ii, replays, replayType, replay, result;
|
||||
var i, ii, j, jj, replays, replayType, replay, result;
|
||||
for (i = 0, ii = zs.length; i < ii; ++i) {
|
||||
replays = this.replaysByZIndex_[zs[i].toString()];
|
||||
for (replayType in replays) {
|
||||
replay = replays[replayType];
|
||||
if (ol.extent.intersects(extent, replay.getExtent())) {
|
||||
for (j = 0, jj = ol.render.REPLAY_ORDER.length; j < jj; ++j) {
|
||||
replay = replays[ol.render.REPLAY_ORDER[j]];
|
||||
if (goog.isDef(replay) &&
|
||||
ol.extent.intersects(extent, replay.getExtent())) {
|
||||
result = replay.replay(
|
||||
context, transform, renderGeometryFunction);
|
||||
if (result) {
|
||||
|
||||
@@ -14,6 +14,16 @@ ol.render.ReplayType = {
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @const {Array.<ol.render.ReplayType>}
|
||||
*/
|
||||
ol.render.REPLAY_ORDER = [
|
||||
ol.render.ReplayType.POLYGON,
|
||||
ol.render.ReplayType.LINE_STRING,
|
||||
ol.render.ReplayType.IMAGE
|
||||
];
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @interface
|
||||
|
||||
Reference in New Issue
Block a user