Merge pull request #1010 from dbauszus-glx/skip-theme

Skip themes with skip flag
GEOLYTIX · Nov 21, 2023 · bd49a07 · bd49a07
2 parents b3e97f6 + dab5321
commit bd49a07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/layer/decorate.mjs b/lib/layer/decorate.mjs
@@ -121,8 +121,18 @@ export default async layer => {
   // Layer style has multiple themes.
   if (layer.style?.themes) {
 
+    Object.keys(layer.style.themes).forEach(key => {
+
+      // Assign theme key as title if undefined.
+      layer.style.themes[key].title ??= key
+
+      if (layer.style.themes[key].skip) delete layer.style.themes[key]
+    })
+
     // Keep object theme.
-    layer.style.theme = typeof layer.style.theme === 'object' ? layer.style.theme
+    layer.style.theme = typeof layer.style.theme === 'object'
+
+      ? layer.style.theme
 
       // Assign theme from key [string], or first theme.
       : layer.style.themes[layer.style.theme || Object.keys(layer.style.themes)[0]];

diff --git a/lib/ui/layers/panels/style.mjs b/lib/ui/layers/panels/style.mjs
@@ -193,6 +193,7 @@ export default layer => {
 
   // Add theme control
   if (Object.keys(layer.style.themes || 0).length > 1) {
+
     content.push(mapp.utils.html`
       <div>${mapp.dictionary.layer_style_select_theme}</div>
         ${mapp.ui.elements.dropdown({