From 3f18ce7fd387a4f60db5863cfa4f759eaf34edff Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 19 Apr 2022 00:57:36 +0200 Subject: [PATCH] Fix: presets will now also show if the layer doesn't have a name and is shown --- UI/BigComponents/AddNewMarker.ts | 2 +- UI/BigComponents/SimpleAddUI.ts | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/UI/BigComponents/AddNewMarker.ts b/UI/BigComponents/AddNewMarker.ts index 9bd89e3f53..479098beab 100644 --- a/UI/BigComponents/AddNewMarker.ts +++ b/UI/BigComponents/AddNewMarker.ts @@ -14,7 +14,7 @@ export default class AddNewMarker extends Combine { let last = undefined; for (const filteredLayer of filteredLayers) { const layer = filteredLayer.layerDef; - if(layer.name === undefined){ + if(layer.name === undefined && !filteredLayer.isDisplayed.data){ continue } for (const preset of filteredLayer.layerDef.presets) { diff --git a/UI/BigComponents/SimpleAddUI.ts b/UI/BigComponents/SimpleAddUI.ts index 2e8371a0a9..5bc1d17009 100644 --- a/UI/BigComponents/SimpleAddUI.ts +++ b/UI/BigComponents/SimpleAddUI.ts @@ -208,15 +208,20 @@ export default class SimpleAddUI extends Toggle { const allButtons = []; for (const layer of state.filteredLayers.data) { - if (layer.isDisplayed.data === false && !state.featureSwitchFilter.data) { - // The layer is not displayed and we cannot enable the layer control -> we skip - continue; + if (layer.isDisplayed.data === false) { + // The layer is not displayed... + if(!state.featureSwitchFilter.data){ + // ...and we cannot enable the layer control -> we skip, as these presets can never be shown anyway + continue; + } + + if (layer.layerDef.name === undefined) { + // this layer can never be toggled on in any case, so we skip the presets + continue; + } } - if (layer.layerDef.name === undefined) { - // this is a parlty hidden layer - continue; - } + const presets = layer.layerDef.presets; for (const preset of presets) {