Skip to content

Commit

Permalink
limit wait time for baselayer (elastic#14047)
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasneirynck committed Oct 4, 2017
1 parent 6819311 commit 25d82a4
Showing 1 changed file with 36 additions and 4 deletions.
40 changes: 36 additions & 4 deletions src/ui/public/vis_maps/maps_renderbot.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,46 @@ module.exports = function MapsRenderbotFactory(Private, $injector, serviceSettin
}
};
}

_doRenderComplete() {
_doRenderCompleteWhenBaseLayerIsLoaded(resolve, endTime) {
if (this._paramsDirty || this._dataDirty || this._baseLayerDirty) {
return;
if (Date.now() <= endTime) {
setTimeout(() => {
this._doRenderCompleteWhenBaseLayerIsLoaded(resolve, endTime);
}, 10);
} else {
//wait time exceeded. If the baselayer cannot load, we will still fire a render-complete.
//This is because slow or unstable network connections cause tiles to get dropped.
//It is unfortunate that tiles get dropped, but we should not drop the render-complete because of it.
resolve();
}
} else {
resolve();
}
this.$el.trigger('renderComplete');
}


_doRenderComplete() {
const msAllowedForBaseLayerToLoad = 10000;
const resolve = () => {
this.$el.trigger('renderComplete');
};
this._doRenderCompleteWhenBaseLayerIsLoaded(resolve, Date.now() + msAllowedForBaseLayerToLoad);
}














}

function addSpatialFilter(agg, filterName, filterData) {
Expand Down

0 comments on commit 25d82a4

Please sign in to comment.