reset to collapsible when no uncollapsible sources

This commit is contained in:
mike-000
2020-09-28 14:05:23 +01:00
committed by GitHub
parent eee837bc70
commit 09a1dd43c6
+6 -6
View File
@@ -175,6 +175,7 @@ class Attribution extends Control {
*/ */
const visibleAttributions = []; const visibleAttributions = [];
let collapsible = true;
const layerStatesArray = frameState.layerStatesArray; const layerStatesArray = frameState.layerStatesArray;
for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) { for (let i = 0, ii = layerStatesArray.length; i < ii; ++i) {
const layerState = layerStatesArray[i]; const layerState = layerStatesArray[i];
@@ -197,12 +198,8 @@ class Attribution extends Control {
continue; continue;
} }
if ( collapsible =
!this.overrideCollapsible_ && collapsible && source.getAttributionsCollapsible() !== false;
source.getAttributionsCollapsible() === false
) {
this.setCollapsible(false);
}
if (Array.isArray(attributions)) { if (Array.isArray(attributions)) {
for (let j = 0, jj = attributions.length; j < jj; ++j) { for (let j = 0, jj = attributions.length; j < jj; ++j) {
@@ -218,6 +215,9 @@ class Attribution extends Control {
} }
} }
} }
if (!this.overrideCollapsible_) {
this.setCollapsible(collapsible);
}
return visibleAttributions; return visibleAttributions;
} }