Entertain the compiler

This commit is contained in:
Andreas Hocevar
2017-10-23 11:38:53 +02:00
parent dfa3cbf4e2
commit 4a73754b93
4 changed files with 12 additions and 5 deletions

View File

@@ -389,8 +389,15 @@ ol.render.canvas.Replay.prototype.renderDeclutter_ = function(declutterGroup) {
if (declutterGroup && declutterGroup.length > 5) {
var groupCount = declutterGroup[4];
if (groupCount == 1 || groupCount == declutterGroup.length - 5) {
if (!this.declutterTree.collides(this.declutterTree.toBBox(declutterGroup))) {
this.declutterTree.insert(declutterGroup.slice(0, 4));
/** @type {ol.RBushEntry} */
var box = {
minX: /** @type {number} */ (declutterGroup[0]),
minY: /** @type {number} */ (declutterGroup[1]),
maxX: /** @type {number} */ (declutterGroup[2]),
maxY: /** @type {number} */ (declutterGroup[3])
};
if (!this.declutterTree.collides(box)) {
this.declutterTree.insert(box);
var drawImage = ol.render.canvas.drawImage;
for (var j = 5, jj = declutterGroup.length; j < jj; ++j) {
if (declutterGroup[j]) {

View File

@@ -29,7 +29,7 @@ ol.renderer.canvas.VectorLayer = function(vectorLayer) {
* @private
*/
this.declutterTree_ = vectorLayer.getDeclutter() ?
ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']) : null;
ol.ext.rbush(9) : null;
/**
* @private

View File

@@ -38,7 +38,7 @@ ol.renderer.canvas.VectorTileLayer = function(layer) {
* Declutter tree.
* @private
*/
this.declutterTree_ = layer.getDeclutter() ? ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']) : null;
this.declutterTree_ = layer.getDeclutter() ? ol.ext.rbush(9) : null;
/**
* @private

View File

@@ -60,7 +60,7 @@ ol.source.ImageVector = function(options) {
* Declutter tree.
* @private
*/
this.declutterTree_ = ol.ext.rbush(9, ['[0]', '[1]', '[2]', '[3]']);
this.declutterTree_ = ol.ext.rbush(9);
/**
* @private