@vcmap/ui 6.1.0 → 6.1.2

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-2fd6f47d.js";
+export * from "./ui-e9b620ea.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-71fd14e8.js";
+export * from "./vue-139e9a39.js";

package/dist/assets/{vuetify-4bc77ff7.js → vuetify-43eef70b.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-4bc77ff7.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, isVNode as Rc, Comment as Nc, unref as ot, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, camelize as Ir, h as Gt, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onDeactivated as _r, onActivated as Wc, onMounted as Ye, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-71fd14e8.js";
+} await loadCss('./assets/vuetify-43eef70b.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, isVNode as Rc, Comment as Nc, unref as ot, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, camelize as Ir, h as Gt, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onDeactivated as _r, onActivated as Wc, onMounted as Ye, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-139e9a39.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-4bc77ff7.js";
+export * from "./vuetify-43eef70b.js";

package/index.d.ts

@@ -345,7 +345,7 @@ export { getProvidedFlightInstance, setupFlightAnchorEditingListener } from "./s
 export type * from "./src/components/flight/composables.d.ts";
 export { default as VcsFeatureEditingWindow, EditorTransformationIcons, getAllowedEditorTransformationModes } from "./src/components/vector-properties/VcsFeatureEditingWindow.vue";
 export type * from "./src/components/vector-properties/VcsFeatureEditingWindow.vue.d.ts";
-export { LegendType, StyleRowType, getLegendEntries } from "./src/legend/legendHelper.js";
+export { legendSymbol, LegendType, StyleRowType, getLegendEntries } from "./src/legend/legendHelper.js";
 export type * from "./src/legend/legendHelper.d.ts";
 
 declare module 'vue' {

package/index.js

@@ -362,6 +362,7 @@ export * from './src/components/attrsHelpers.js';
 export * from './src/components/modelHelper.js';
 export * from './src/components/composables.js';
 export {
+  legendSymbol,
   LegendType,
   StyleRowType,
   getLegendEntries,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -57,7 +57,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
-    "@vcmap/core": "^6.1.1",
+    "@vcmap/core": "^6.1.3",
     "ol": "^10.4.0",
     "vue": "~3.4.38",
     "vuetify": "^3.7.14"
@@ -73,6 +73,7 @@
     "@vitest/coverage-v8": "^2.1.3",
     "@vue/test-utils": "^2.4.6",
     "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-vuetify": "^2.4.0",
     "histoire": "^0.17.17",
     "jest-canvas-mock": "^2.5.2",
@@ -80,6 +81,7 @@
     "jsdoc-plugin-intersection": "^1.0.4",
     "jsdoc-plugin-typescript": "^2.2.1",
     "jsdom": "^25.0.1",
+    "nock": "^14.0.1",
     "resize-observer-polyfill": "1.5.1",
     "rollup-plugin-strip-pragma": "^1.0.0",
     "sass": "^1.80.2",
@@ -88,8 +90,7 @@
     "vite": "^5.4.9",
     "vite-plugin-vuetify": "^2.0.4",
     "vitest": "^2.1.3",
-    "vue-tsc": "^2.1.6",
-    "nock": "^14.0.1"
+    "vue-tsc": "^2.1.6"
   },
   "stylelint": {
     "extends": "stylelint-config-standard",
@@ -108,7 +109,8 @@
     "root": true,
     "extends": [
       "@vcsuite/eslint-config/vue",
-      "plugin:vuetify/base"
+      "plugin:vuetify/base",
+      "plugin:promise/recommended"
     ],
     "settings": {
       "import/resolver": {
@@ -124,7 +126,13 @@
     },
     "rules": {
       "vue/no-v-model-argument": "off",
-      "jsdoc/check-tag-names": "off"
+      "jsdoc/check-tag-names": "off",
+      "promise/always-return": [
+        "error",
+        {
+          "ignoreLastCallback": true
+        }
+      ]
     }
   },
   "eslintIgnore": [

package/plugins/package.json

@@ -25,7 +25,9 @@
     "@vcmap/layer-slider": "^2.0.0",
     "@vcmap/vcs-solar-balloon": "^2.0.0",
     "@vcmap/list-view": "^1.0.0",
-    "@vcmap/pointcloud-settings": "^1.0.0"
+    "@vcmap/pointcloud-settings": "^1.0.0",
+    "@vcmap/gamepad": "^1.0.0",
+    "@vcmap/sensorthings": "^1.0.0"
   },
   "optionalDependencies": {
     "@vcmap/planning": "^6.0.0"

package/src/actions/actionHelper.js

@@ -234,9 +234,15 @@ export function createOverviewMapAction(
   );
 
   const listeners = [
-    windowManager.added.addEventListener(async ({ id }) => {
+    windowManager.added.addEventListener(({ id }) => {
       if (id === windowComponent.id) {
-        await overviewMap.activate();
+        overviewMap.activate().catch((e) => {
+          getLogger('createOverviewMapAction').error(
+            'failed to activate overview map',
+            e,
+          );
+          windowManager.remove(windowComponent.id);
+        });
       }
     }),
     windowManager.removed.addEventListener(({ id }) => {

package/src/actions/deepPickingAction.js

@@ -21,6 +21,7 @@ import { Point, LineString } from 'ol/geom.js';
 import { Icon } from 'ol/style.js';
 import { Cartesian3, Ray } from '@vcmap-cesium/engine';
 import { watch } from 'vue';
+import { getLogger } from '@vcsuite/logger';
 import { getColorByKey } from '../vuePlugins/vuetify.js';
 import ClusterFeatureComponent from '../featureInfo/ClusterFeatureComponent.vue';
 import { WindowSlot } from '../manager/window/windowManager.js';
@@ -54,7 +55,11 @@ export function setupDeepPickingLayer(app) {
   });
   markVolatile(layer);
   app.layers.add(layer);
-  layer.activate();
+  layer.activate().catch(() => {
+    getLogger('deepPickingAction').error(
+      'Could not activate deep picking layer',
+    );
+  });
 
   const style = new VectorStyleItem({
     image: {

package/src/actions/extentActions.js

@@ -20,6 +20,7 @@ import { fromExtent } from 'ol/geom/Polygon.js';
 import { createOrUpdateFromCoordinates } from 'ol/extent.js';
 import { Polygon } from 'ol/geom.js';
 import { unByKey } from 'ol/Observable.js';
+import { getLogger } from '@vcsuite/logger';
 
 /**
  * @param {import("@src/vcsUiApp.js").default} app
@@ -52,9 +53,12 @@ export function createLayerToggleAction(layer, disabled) {
     icon: '$vcsEye',
     active: false,
     disabled,
-    async callback() {
+    callback() {
       if (!this.active) {
-        await layer.activate();
+        layer.activate().catch(() => {
+          getLogger('extentActions').warn('Failed to activate layer');
+          this.title = 'components.extent.show';
+        });
         this.title = 'components.extent.hide';
       } else {
         layer.deactivate();
@@ -96,7 +100,11 @@ export function createExtentFeatureAction(
     callback() {
       if (!this.active) {
         this.active = true;
-        layer.activate();
+        layer.activate().catch(() => {
+          getLogger('extentActions').warn('Failed to activate layer');
+          session?.stop();
+          this.active = false;
+        });
         const feature = layer.getFeatureById(featureId);
         layer.removeFeaturesById([featureId]);
         session = startCreateFeatureSession(app, layer, GeometryType.BBox);
@@ -176,7 +184,7 @@ function setupTranslateAction(
     title: 'components.extent.translate',
     icon: 'mdi-axis-arrow',
     active: false,
-    async callback() {
+    callback() {
       if (session) {
         session.stop();
       } else {
@@ -189,7 +197,10 @@ function setupTranslateAction(
               suspendFeatureUpdate.value = false;
             });
           });
-          await layer.activate();
+          layer.activate().catch(() => {
+            getLogger('extentActions').warn('Failed to activate layer');
+            session?.stop();
+          });
           session = startEditFeaturesSession(app, layer);
           session.stopped.addEventListener(() => {
             action.active = false;
@@ -246,7 +257,10 @@ function setupVertexAction(
               suspendFeatureUpdate.value = false;
             });
           });
-          await layer.activate();
+          layer.activate().catch(() => {
+            getLogger('extentActions').warn('Failed to activate layer');
+            session?.stop();
+          });
           session = startEditGeometrySession(app, layer);
           session.stopped.addEventListener(() => {
             action.active = false;

package/src/actions/flightActions.js

@@ -1,5 +1,6 @@
 import { reactive } from 'vue';
 import { check, maybe, ofEnum } from '@vcsuite/check';
+import { getLogger } from '@vcsuite/logger';
 import {
   createFlightVisualization,
   exportFlightAsGeoJson,
@@ -378,7 +379,10 @@ export async function createFlightVisualizationAction(
       if (this.active) {
         flightVis.deactivate();
       } else {
-        await flightVis.activate();
+        flightVis.activate().catch(() => {
+          getLogger('flightActions').warn('Failed to activate layer');
+          this.active = false;
+        });
       }
       this.active = !this.active;
     },

package/src/application/VcsApp.vue

@@ -90,7 +90,11 @@
     isMobileLandscape,
   } from '../vuePlugins/vuetify.js';
   import VcsLegend from '../legend/VcsLegend.vue';
-  import { getLegendEntries } from '../legend/legendHelper.js';
+  import {
+    getLayerLegend,
+    getLegendEntries,
+    getStyleLegend,
+  } from '../legend/legendHelper.js';
   import VcsAttributionsFooter from './VcsAttributionsFooter.vue';
   import VcsObliqueFooter from './VcsObliqueFooter.vue';
   import VcsTextPageFooter from './VcsTextPageFooter.vue';
@@ -280,9 +284,32 @@
         );
       }
     };
+
+    /**
+     * Handles legend button and window.
+     * Adds a button, if legend definitions are available or removes legend otherwise.
+     */
+    const handleLegend = () => {
+      const layersWithLegend = [...app.layers].filter((layer) =>
+        getLayerLegend(layer),
+      );
+      const stylesWithLegend = [...app.styles].filter((style) =>
+        getStyleLegend(style),
+      );
+      if (layersWithLegend < 1 && stylesWithLegend < 1) {
+        app.navbarManager.remove(legendComponentId);
+        app.windowManager.remove(legendComponentId);
+      } else {
+        addLegend();
+      }
+    };
+
     const { xs } = useDisplay();
     let currentEntryLength = entries.length;
     const watchEntries = watch(entries, (newValue) => {
+      if (newValue.length > currentEntryLength) {
+        handleLegend();
+      }
       if (
         app.uiConfig.config.openLegendOnAdd &&
         newValue.length > currentEntryLength &&
@@ -309,34 +336,16 @@
       currentEntryLength = newValue.length;
     });
 
-    /**
-     * Handles legend button and window.
-     * Adds a button, if legend definitions are available or removes legend otherwise.
-     */
-    const handleLegend = () => {
-      const layersWithLegend = [...app.layers].filter(
-        (layer) => layer.style?.properties?.legend ?? layer.properties?.legend,
-      );
-      const stylesWithLegend = [...app.styles].filter(
-        (style) => style?.properties?.legend,
-      );
-      if (layersWithLegend < 1 && stylesWithLegend < 1) {
-        app.navbarManager.remove(legendComponentId);
-        app.windowManager.remove(legendComponentId);
-      } else {
-        addLegend();
-      }
-    };
     handleLegend();
 
     const listeners = [
       app.layers.added.addEventListener((layer) => {
-        if (layer.style?.properties?.legend ?? layer.properties?.legend) {
+        if (getLayerLegend(layer)) {
           addLegend();
         }
       }),
       app.styles.added.addEventListener((style) => {
-        if (style?.properties?.legend) {
+        if (getStyleLegend(style)) {
           addLegend();
         }
       }),

package/src/callback/activateLayersCallback.js

@@ -1,3 +1,4 @@
+import { getLogger } from '@vcsuite/logger';
 import VcsCallback, { callbackClassRegistry } from './vcsCallback.js';
 
 /**
@@ -34,7 +35,14 @@ class ActivateLayersCallback extends VcsCallback {
     this._layerNames
       .map((n) => this._app.layers.getByKey(n))
       .filter((l) => l)
-      .forEach((l) => l.activate());
+      .forEach((l) =>
+        l.activate().catch((e) => {
+          getLogger('ActivateLayersCallback').error(
+            `Could not activate layer: ${l.name}`,
+            e,
+          );
+        }),
+      );
   }
 
   /**

package/src/callback/addModuleCallback.js

@@ -36,8 +36,9 @@ class AddModuleCallback extends VcsCallback {
     createModuleFromObjectOrUrl(this._module)
       .then((module) => {
         if (module) {
-          this._app.addModule(module);
+          return this._app.addModule(module);
         }
+        return undefined;
       })
       .catch((e) => {
         getLogger('addModuleCallback').error('Error adding module', e);

package/src/components/lists/VcsTreeview.vue

@@ -33,6 +33,7 @@
 <script>
   import { watch } from 'vue';
   import { useDisplay } from 'vuetify';
+  import { getLogger } from '@vcsuite/logger';
   import {
     useProxiedAtomicModel,
     useProxiedComplexModel,
@@ -144,7 +145,15 @@
         itemClicked(item, event) {
           if (item?.clickable) {
             if (item?.clicked && !item?.disabled) {
-              item.clicked(event);
+              const p = item.clicked(event);
+              if (p instanceof Promise) {
+                p.catch((e) => {
+                  getLogger('VcsTreeview.vue').error(
+                    `Tree view item failed to click ${item.name}`,
+                    e,
+                  );
+                });
+              }
             }
           } else if (
             (props.openOnClick ?? false) !== false &&

package/src/contentTree/layerGroupContentTreeItem.js

@@ -1,3 +1,4 @@
+import { getLogger } from '@vcsuite/logger';
 import { parseBoolean } from '@vcsuite/parsers';
 import ContentTreeItem, {
   contentTreeClassRegistry,
@@ -184,7 +185,16 @@ class LayerGroupContentTreeItem extends ContentTreeItem {
     const layers = this._layers;
     const activate = layers.some((l) => !(l.active || l.loading));
     if (activate) {
-      await Promise.all(layers.map((l) => l.activate()));
+      await Promise.all(
+        layers.map((l) =>
+          l.activate().catch((e) => {
+            getLogger('LayerGroupContentTreeItem').error(
+              `Could not activate layer ${l.name}`,
+              e,
+            );
+          }),
+        ),
+      );
       executeCallbacks(this._app, this._onActivate);
     } else {
       layers.forEach((l) => {

package/src/contentTree/wmsChildContentTreeItem.d.ts

@@ -6,7 +6,7 @@ export type WMSChildItemOptions = import("./contentTreeItem.js").ContentTreeItem
  * @typedef {import("./contentTreeItem.js").ContentTreeItemOptions &
  * { wmsEntry:import("./wmsGroupContentTreeItem.js").WMSEntry }} WMSChildItemOptions
  * @property {import("./wmsGroupContentTreeItem.js").WMSEntry} wmsEntry - the wmsEntry
- * @property {boolean} showStyleSelector - show the style selector
+ * @property {boolean} hideStyleSelector - hides the style selector
  */
 /**
  * A WMS child layer. Toggles this child in the parent WMS layer.

package/src/contentTree/wmsChildContentTreeItem.js

@@ -13,7 +13,7 @@ import { vcsAppSymbol } from '../pluginHelper.js';
  * @typedef {import("./contentTreeItem.js").ContentTreeItemOptions &
  * { wmsEntry:import("./wmsGroupContentTreeItem.js").WMSEntry }} WMSChildItemOptions
  * @property {import("./wmsGroupContentTreeItem.js").WMSEntry} wmsEntry - the wmsEntry
- * @property {boolean} showStyleSelector - show the style selector
+ * @property {boolean} hideStyleSelector - hides the style selector
  */
 
 /**
@@ -71,7 +71,7 @@ class WmsChildContentTreeItem extends ContentTreeItem {
     this._destroyStyleAction = () => {};
 
     this._setExtentAction(this._wmsEntry.extent);
-    if (options.showStyleSelector) {
+    if (!options.hideStyleSelector) {
       this._setStyleAction();
     }
   }

package/src/contentTree/wmsGroupContentTreeItem.d.ts

@@ -2,8 +2,8 @@ export default WMSGroupContentTreeItem;
 export type WMSGroupContentTreeItemOptions = import('./contentTreeItem.js').ContentTreeItemOptions & {
     layerName: string;
     showWhenNotSupported?: boolean;
-    exclusiveLayers?: boolean;
-    editableStyle?: boolean;
+    setWMSLayersExclusive?: boolean;
+    hideStyleSelector?: boolean;
     allowedWMSLayers?: string[];
 };
 export type WMSStyleEntry = {
@@ -21,11 +21,11 @@ export type WMSEntry = {
 };
 /**
  * @typedef {import('./contentTreeItem.js').ContentTreeItemOptions &
- * { layerName: string, showWhenNotSupported?: boolean, exclusiveLayers?:boolean, editableStyle?:boolean, allowedWMSLayers?:string[]}} WMSGroupContentTreeItemOptions
+ * { layerName: string, showWhenNotSupported?: boolean, setWMSLayersExclusive?:boolean, hideStyleSelector?:boolean, allowedWMSLayers?:string[]}} WMSGroupContentTreeItemOptions
  * @property {boolean} showWhenNotSupported - optional flag to show the item even if it is not supported by the activeMap.
  * @property {string} layerName - The name of the WMSLayer to show the children of.
  * @property {boolean} [setWMSLayersExclusive=false] - Whether the WMSlayers are mutually exclusive.
- * @property {boolean} [showStyleSelector=true] - Whether the layer style can be selected. Will add a StyleSelector action to compatible items if the Layer has more than one style.
+ * @property {boolean} [hideStyleSelector=false] - Whether the layer style can be selected. Will add a StyleSelector action to compatible items if the Layer has more than one style.
  * @property {string[]} allowedWMSLayers - The list of layers to be shown, other available layers will not be shown.
  */
 /**
@@ -75,7 +75,7 @@ declare class WMSGroupContentTreeItem extends VcsObjectContentTreeItem<import(".
      * @type {boolean}
      * @private
      */
-    private _showStyleSelector;
+    private _hideStyleSelector;
     /**
      * @type {boolean}
      * @private

package/src/contentTree/wmsGroupContentTreeItem.js

@@ -8,6 +8,7 @@ import { StateActionState } from '../actions/stateRefAction.js';
 import { contentTreeClassRegistry } from './contentTreeItem.js';
 import WmsChildContentTreeItem from './wmsChildContentTreeItem.js';
 import VcsObjectContentTreeItem from './vcsObjectContentTreeItem.js';
+import { legendSymbol } from '../legend/legendHelper.js';
 
 /**
  * @param {string} rawUrl
@@ -87,21 +88,21 @@ async function getWMSEntries(rawUrl, parameters) {
  * @param {import("../vcsUiApp.js").default} app
  * @param {WMSEntry} wmsEntry
  * @param {string} parentName
- * @param {boolean} showStyleSelector
+ * @param {boolean} hideStyleSelector
  * @returns {WmsChildContentTreeItem}
  */
 function createWMSChildContentTreeItem(
   app,
   wmsEntry,
   parentName,
-  showStyleSelector,
+  hideStyleSelector,
 ) {
   const childItem = new WmsChildContentTreeItem(
     {
       name: `${parentName}.${wmsEntry.name.replaceAll('.', '_')}`,
       wmsEntry,
       title: wmsEntry.title,
-      showStyleSelector,
+      hideStyleSelector,
     },
     app,
   );
@@ -111,11 +112,11 @@ function createWMSChildContentTreeItem(
 
 /**
  * @typedef {import('./contentTreeItem.js').ContentTreeItemOptions &
- * { layerName: string, showWhenNotSupported?: boolean, exclusiveLayers?:boolean, editableStyle?:boolean, allowedWMSLayers?:string[]}} WMSGroupContentTreeItemOptions
+ * { layerName: string, showWhenNotSupported?: boolean, setWMSLayersExclusive?:boolean, hideStyleSelector?:boolean, allowedWMSLayers?:string[]}} WMSGroupContentTreeItemOptions
  * @property {boolean} showWhenNotSupported - optional flag to show the item even if it is not supported by the activeMap.
  * @property {string} layerName - The name of the WMSLayer to show the children of.
  * @property {boolean} [setWMSLayersExclusive=false] - Whether the WMSlayers are mutually exclusive.
- * @property {boolean} [showStyleSelector=true] - Whether the layer style can be selected. Will add a StyleSelector action to compatible items if the Layer has more than one style.
+ * @property {boolean} [hideStyleSelector=false] - Whether the layer style can be selected. Will add a StyleSelector action to compatible items if the Layer has more than one style.
  * @property {string[]} allowedWMSLayers - The list of layers to be shown, other available layers will not be shown.
  */
 
@@ -185,7 +186,7 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
      * @type {boolean}
      * @private
      */
-    this._showStyleSelector = parseBoolean(options.showStyleSelector, true);
+    this._hideStyleSelector = parseBoolean(options.hideStyleSelector, false);
 
     this.state = this._setWMSLayersExclusive
       ? StateActionState.NONE
@@ -327,9 +328,9 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
         .flat()
         .filter((l) => l);
       if (legend.length > 0) {
-        this._layer.properties.legend = legend;
+        this._layer[legendSymbol] = legend;
       } else {
-        this._layer.properties.legend = undefined;
+        delete this._layer[legendSymbol];
       }
     }
     this._pauseStateChangedListener = true;
@@ -531,7 +532,7 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
             this._app,
             wmsEntry,
             this.name,
-            this._showStyleSelector,
+            this._hideStyleSelector,
           );
         });
         childItems.forEach((childItem) => {
@@ -594,8 +595,8 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
     if (this._setWMSLayersExclusive) {
       config.setWMSLayersExclusive = this._setWMSLayersExclusive;
     }
-    if (!this._showStyleSelector) {
-      config.showStyleSelector = this._showStyleSelector;
+    if (this._hideStyleSelector) {
+      config.hideStyleSelector = this._hideStyleSelector;
     }
     if (this._allowedWMSLayers?.length > 0) {
       config.allowedWMSLayers = this._allowedWMSLayers;

package/src/featureInfo/featureInfo.js

@@ -613,7 +613,9 @@ class FeatureInfo extends Collection {
       });
       markVolatile(this._scratchLayer);
       this._app.layers.add(this._scratchLayer);
-      this._scratchLayer.activate();
+      this._scratchLayer.activate().catch((e) => {
+        getLogger('FeatureInfo').error('Failed to activate scratch layer', e);
+      });
     }
   }
 

package/src/legend/legendHelper.d.ts

@@ -62,6 +62,16 @@ export function getImageSrcFromShape(image: import("ol/style/Image.js").Options)
  * @property {boolean} [open=true] - panel state of entry
  * @property {Array<LegendItem>} legend - legend properties
  */
+/**
+ * @param {import("@vcmap/core").StyleItem|undefined} style
+ * @returns {Array<LegendItem>|undefined}
+ */
+export function getStyleLegend(style: import("@vcmap/core").StyleItem | undefined): Array<LegendItem> | undefined;
+/**
+ * @param {import("@vcmap/core").Layer|undefined} layer
+ * @returns {Array<LegendItem>|undefined}
+ */
+export function getLayerLegend(layer: import("@vcmap/core").Layer | undefined): Array<LegendItem> | undefined;
 /**
  *
  * @param {import("../vcsUiApp.js").default} app
@@ -71,6 +81,11 @@ export function getLegendEntries(app: import("../vcsUiApp.js").default): {
     entries: import("vue").UnwrapRef<Array<LegendEntry>>;
     destroy: () => void;
 };
+/**
+ * Symbol set a volatile legend property on a layer or style
+ * @type {symbol}
+ */
+export const legendSymbol: symbol;
 /**
  * *
  */

package/src/legend/legendHelper.js

@@ -1,6 +1,12 @@
 import { getShapeFromOptions } from '@vcmap/core';
 import { reactive } from 'vue';
 
+/**
+ * Symbol set a volatile legend property on a layer or style
+ * @type {symbol}
+ */
+export const legendSymbol = Symbol('legend');
+
 /**
  * @enum {string}
  * @property {string} Image - an image
@@ -109,6 +115,26 @@ export function getImageSrcFromShape(image) {
  * @property {Array<LegendItem>} legend - legend properties
  */
 
+/**
+ * @param {import("@vcmap/core").StyleItem|undefined} style
+ * @returns {Array<LegendItem>|undefined}
+ */
+export function getStyleLegend(style) {
+  return style?.[legendSymbol] ?? style?.properties?.legend;
+}
+
+/**
+ * @param {import("@vcmap/core").Layer|undefined} layer
+ * @returns {Array<LegendItem>|undefined}
+ */
+export function getLayerLegend(layer) {
+  return (
+    getStyleLegend(layer?.style) ??
+    layer?.[legendSymbol] ??
+    layer?.properties?.legend
+  );
+}
+
 /**
  *
  * @param {import("../vcsUiApp.js").default} app
@@ -149,8 +175,7 @@ export function getLegendEntries(app) {
     if (layer.active && layer.isSupported(app.maps.activeMap)) {
       const key = layer.name;
       const title = layer.properties.title || layer.name;
-      const legend =
-        layer.style?.properties?.legend ?? layer.properties?.legend;
+      const legend = getLayerLegend(layer);
       if (legend) {
         const legendEntry = { key, title, legend, open: true };
         entries.unshift(legendEntry);
@@ -186,7 +211,7 @@ export function getLegendEntries(app) {
     const uniqueVectorClusterGroups = [...new Set(vectorClusterGroups)];
     uniqueVectorClusterGroups.forEach((groupName) => {
       const group = app.vectorClusterGroups.getByKey(groupName);
-      if (group?.properties?.legend) {
+      if (group?.[legendSymbol] ?? group?.properties?.legend) {
         const title = group.properties.title || group.name;
         const { legend } = group.properties;
         if (!entries.some(({ key }) => key === group.name)) {