@vcmap/ui 6.0.1 → 6.0.3

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-339b3d7f.js";
+export * from "./ui-76492ce7.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-31395141.js";
+export * from "./vue-a92df366.js";

package/dist/assets/{vuetify-521222b6.js → vuetify-3bf44235.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-521222b6.css');import { watch as X, onScopeDispose as tt, effectScope as Ul, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Ne, toRefs as Wt, capitalize as On, isVNode as Oc, Comment as Rc, unref as ot, warn as Ha, getCurrentInstance as Nc, ref as W, provide as Ae, inject as ye, defineComponent as Hc, camelize as Ir, h as jt, toRaw as Ee, createVNode as r, mergeProps as N, onBeforeUnmount as nt, readonly as Kl, onDeactivated as _r, onActivated as zc, onMounted as Ke, nextTick as Se, TransitionGroup as ql, Transition as Ht, isRef as _n, toRef as F, onBeforeMount as Xl, withDirectives as $e, resolveDirective as dt, vShow as xt, onUpdated as Wc, Text as jc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Uc, cloneVNode as Kc, createTextVNode as Pt, onUnmounted as qc, onBeforeUpdate as Xc, withModifiers as Pl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Tr } from "./vue-31395141.js";
+} await loadCss('./assets/vuetify-3bf44235.css');import { watch as X, onScopeDispose as tt, effectScope as Ul, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Ne, toRefs as Wt, capitalize as On, isVNode as Oc, Comment as Rc, unref as ot, warn as Ha, getCurrentInstance as Nc, ref as W, provide as Ae, inject as ye, defineComponent as Hc, camelize as Ir, h as jt, toRaw as Ee, createVNode as r, mergeProps as N, onBeforeUnmount as nt, readonly as Kl, onDeactivated as _r, onActivated as zc, onMounted as Ke, nextTick as Se, TransitionGroup as ql, Transition as Ht, isRef as _n, toRef as F, onBeforeMount as Xl, withDirectives as $e, resolveDirective as dt, vShow as xt, onUpdated as Wc, Text as jc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Uc, cloneVNode as Kc, createTextVNode as Pt, onUnmounted as qc, onBeforeUpdate as Xc, withModifiers as Pl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Tr } from "./vue-a92df366.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-521222b6.js";
+export * from "./vuetify-3bf44235.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -47,7 +47,7 @@
     "@intlify/core-base": "^9.13.1",
     "@vcsuite/check": "^2.1.0",
     "@vcsuite/logger": "^1.0.1",
-    "@vcsuite/parsers": "^2.0.0",
+    "@vcsuite/parsers": "^2.0.1",
     "dompurify": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
     "marked": "^14.0.0",
@@ -57,7 +57,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
-    "@vcmap/core": "^6.0.0",
+    "@vcmap/core": "^6.0.1",
     "ol": "^10.2.1",
     "vue": "~3.4.38",
     "vuetify": "^3.7.3"

package/plugins/package.json

@@ -1,31 +1,29 @@
 {
   "dependencies": {
-    "@vcmap/print": "https://github.com/virtualcitySYSTEMS/map-print.git#main",
-    "@vcmap/walk": "https://github.com/virtualcitySYSTEMS/map-walk.git#main",
-    "@vcmap/clipping-tool": "https://github.com/virtualcitySYSTEMS/map-clipping-tool.git#main",
-    "@vcmap/transparent-terrain": "https://github.com/virtualcitySYSTEMS/map-transparent-terrain.git#main",
-    "@vcmap/height-profile": "https://github.com/virtualcitySYSTEMS/map-heightprofile.git#main",
-    "@vcmap/flight": "https://github.com/virtualcitySYSTEMS/map-flight.git#main",
-    "@vcmap/swipe-tool": "https://github.com/virtualcitySYSTEMS/map-swipe-tool.git#main",
-    "@vcmap/export": "https://github.com/virtualcitySYSTEMS/map-export.git#main",
-    "@vcmap/viewshed": "https://github.com/virtualcitySYSTEMS/map-viewshed.git#main",
-    "@vcmap/measurement": "^2.0.0-rc.2",
-    "@vcmap/multi-view": "https://github.com/virtualcitySYSTEMS/map-multi-view.git#main",
-    "@vcmap/draw": "https://github.com/virtualcitySYSTEMS/map-draw.git#main",
-    "@vcmap/shadow": "https://github.com/virtualcitySYSTEMS/map-shadow.git#main",
-    "@vcmap/search-wfs": "https://github.com/virtualcitySYSTEMS/map-search-wfs.git#main",
-    "@vcmap/search-esri": "https://github.com/virtualcitySYSTEMS/map-search-esri.git#main",
-    "@vcmap/search-coordinate": "https://github.com/virtualcitySYSTEMS/map-search-coordinate.git#main",
-    "@vcmap/link-button": "https://github.com/virtualcitySYSTEMS/map-link-button.git#main",
-    "@vcmap/cesium-filters": "https://github.com/virtualcitySYSTEMS/map-cesium-filters.git#main",
-    "@vcmap/search-nominatim": "https://github.com/virtualcitySYSTEMS/map-search-nominatim.git#main",
-    "@vcmap/create-link": "https://github.com/virtualcitySYSTEMS/map-create-link.git#main",
-    "@vcmap/module-selector": "^2.0.0"
+    "@vcmap/print": "^2.0.0",
+    "@vcmap/walk": "^2.0.0",
+    "@vcmap/clipping-tool": "^2.0.0",
+    "@vcmap/transparent-terrain": "^2.0.0",
+    "@vcmap/height-profile": "^2.0.0",
+    "@vcmap/flight": "^2.0.0",
+    "@vcmap/swipe-tool": "^2.0.0",
+    "@vcmap/export": "^2.0.0",
+    "@vcmap/viewshed": "^3.0.0",
+    "@vcmap/measurement": "^2.0.0",
+    "@vcmap/multi-view": "^2.0.0",
+    "@vcmap/draw": "^3.0.0",
+    "@vcmap/shadow": "^3.0.0",
+    "@vcmap/search-wfs": "^2.0.0",
+    "@vcmap/search-esri": "^2.0.0",
+    "@vcmap/search-coordinate": "^2.0.0",
+    "@vcmap/link-button": "^2.0.0",
+    "@vcmap/cesium-filters": "^2.0.0",
+    "@vcmap/search-nominatim": "^2.0.0",
+    "@vcmap/create-link": "^2.0.0",
+    "@vcmap/module-selector": "^2.0.0",
+    "@vcmap/line-of-sight": "^1.0.0"
   },
   "optionalDependencies": {
-    "@vcmap/dynamic-layer": "git+ssh://git@gitlab.virtualcitysystems.de/vcsuite/npm/vcmap/dynamic-layer.git#feature-idra-catalogue",
-    "@vcmap/line-of-sight": "git+ssh://git@gitlab.virtualcitysystems.de/vcsuite/npm/vcmap/line-of-sight.git#feature-v1",
-    "@vcmap/planning": "^6.0.0-rc.2",
-    "@vcmap/solar-revenue": "^2.0.0-rc.1"
+    "@vcmap/planning": "^6.0.0"
   }
 }

package/src/application/VcsApp.vue

@@ -392,9 +392,9 @@
    * @returns {WatchStopHandle}
    */
   function setupSplashScreen(app, splashScreenRef) {
-    function setupSplashScreenAction() {
+    function setupSplashScreenAction(moduleId) {
       const { splashScreen } = app.uiConfig.config;
-      if (splashScreen) {
+      if (splashScreen && moduleId !== app.dynamicModuleId) {
         splashScreenRef.value = true;
       }
       if (splashScreen && splashScreen.menuEntry) {
@@ -422,7 +422,7 @@
         if (app.navbarManager.has('splashScreenToggle')) {
           app.navbarManager.remove('splashScreenToggle');
         }
-        setupSplashScreenAction();
+        setupSplashScreenAction(item[moduleIdSymbol]);
       }
     });
     const removeRemovedListener = app.uiConfig.removed.addEventListener(
@@ -758,7 +758,7 @@
         'hideSettings',
       );
       const stopCustomScreen = setupCustomScreen(app);
-      const splashScreenRef = ref(true);
+      const splashScreenRef = ref(false);
       const stopSplashScreen = setupSplashScreen(app, splashScreenRef);
       setupHelpButton(app);
       const destroyMyWorkspace = setupUIConfigDependency(

package/src/components/form-inputs-controls/VcsSelect.vue

@@ -168,7 +168,7 @@
         default: false,
       },
       modelValue: {
-        type: [Array, String, Boolean, Number],
+        type: [Array, String, Boolean, Number, Object],
         default(rawProps) {
           if (rawProps.multiple) {
             return [];

package/src/components/form-inputs-controls/VcsSelect.vue.d.ts

@@ -4,7 +4,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     modelValue: {
-        type: (BooleanConstructor | StringConstructor | NumberConstructor | ArrayConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor | ObjectConstructor | ArrayConstructor)[];
         default(rawProps: any): never[] | null;
     };
     tooltip: {
@@ -34,7 +34,7 @@ declare const _default: import("vue").DefineComponent<{
         default: boolean;
     };
     modelValue: {
-        type: (BooleanConstructor | StringConstructor | NumberConstructor | ArrayConstructor)[];
+        type: (BooleanConstructor | StringConstructor | NumberConstructor | ObjectConstructor | ArrayConstructor)[];
         default(rawProps: any): never[] | null;
     };
     tooltip: {
@@ -52,7 +52,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
-    modelValue: string | number | boolean | unknown[];
+    modelValue: string | number | boolean | Record<string, any> | unknown[];
     multiple: boolean;
     tooltip: string;
     tooltipPosition: string;

package/src/components/tables/VcsDataTable.vue

@@ -49,6 +49,7 @@
         #header.data-table-select="{ allSelected, selectAll, someSelected }"
       >
         <VcsCheckbox
+          v-if="$attrs.selectStrategy !== 'single'"
           :indeterminate="someSelected && !allSelected"
           indeterminate-icon="mdi-minus-circle"
           false-icon="mdi-circle-outline"
@@ -239,13 +240,13 @@
       /**
        * @param {any} value
        * @param {string|undefined} filter
-       * @param {TableItem} item
+       * @param {Record<string,unknown>} item
        * @returns {boolean}
        */
-      const handleFilter = (value, filter, item) => {
+      const handleFilterInternal = (value, filter, item) => {
         if (filter) {
           const q = filter.toLocaleLowerCase();
-          return Object.values(item.raw).some((i) => {
+          return Object.values(item).some((i) => {
             if (i) {
               const content = i.toString();
               const translated = vm.$st(content);
@@ -260,6 +261,16 @@
         return true;
       };
 
+      /**
+       * @param {any} value
+       * @param {string|undefined} filter
+       * @param {TableItem} item
+       * @returns {boolean}
+       */
+      const handleFilter = (value, filter, item) => {
+        return handleFilterInternal(value, filter, item.raw);
+      };
+
       /**
        * Syncs disabled and isSelectable (or custom item-selectable key) on items
        * @type {ComputedRef<Array<Object>>}
@@ -286,7 +297,7 @@
        */
       const filteredItems = computed(() =>
         props.items.filter((item) =>
-          handleFilter(item.value, search.value, item),
+          handleFilterInternal(item.value, search.value, item),
         ),
       );
       const numberOfItems = computed(() => {

package/src/components/viewpoint/VcsViewpointComponent.vue

@@ -197,6 +197,8 @@
   function updateLocalValueFromViewpoint(localValue, viewpoint) {
     const options = viewpoint.toJSON();
     options.name = localValue.value.name;
+    options.animate = localValue.value.animate;
+    options.duration = localValue.value.duration;
     if (localValue.value.properties) {
       options.properties = toRaw(localValue.value.properties);
     }

package/src/contentTree/contentTreeCollection.js

@@ -3,6 +3,7 @@ import {
   IndexedCollection,
   makeOverrideCollection,
   getObjectFromClassRegistry,
+  moduleIdSymbol,
 } from '@vcmap/core';
 import { computed, ref } from 'vue';
 import ContentTreeItem from './contentTreeItem.js';
@@ -69,7 +70,13 @@ class ContentTreeCollection extends IndexedCollection {
           this._subTreeListeners.delete(subTree.name);
         }
       });
-      if (this._app.uiConfig.getByKey('contentTreeActiveOnStartup')?.value) {
+      const contentTreeActiveOnStartup = this._app.uiConfig.getByKey(
+        'contentTreeActiveOnStartup',
+      );
+      if (
+        contentTreeActiveOnStartup?.value &&
+        contentTreeActiveOnStartup[moduleIdSymbol] !== this._app.dynamicModuleId
+      ) {
         const action = this._app.navbarManager.get('Content')?.action;
         if (action && !action.active) {
           action.callback();

package/src/i18n/en.js

@@ -32,7 +32,7 @@ const messages = {
       title: 'Open help',
     },
     infoAction: {
-      title: 'Further informationen',
+      title: 'Further information',
     },
     viewpointAction: {
       title: 'Go to viewpoint',

package/src/init.js

@@ -23,9 +23,10 @@ export const VcsUiAppConfigPattern = {
   maps: optional([VcsObjectPattern]),
   styles: optional([VcsObjectPattern]),
   viewpoints: optional([VcsObjectPattern]),
-  startingViewpointName: optional(String),
-  startingMapName: optional(String),
-  projection: optional(Object),
+  startingObliqueCollectionName: maybe(String),
+  startingViewpointName: maybe(String),
+  startingMapName: maybe(String),
+  projection: maybe(Object),
   categories: optional([{ name: String, items: [Object] }]),
   obliqueCollections: optional([VcsObjectPattern]),
   plugins: optional([Object]),

package/src/navigation/MapNavigation.vue

@@ -270,24 +270,6 @@
         app.overviewMap.map.layerCollection.size > 0,
       );
 
-      const handleOverviewMapActiveOnStartup = (item) => {
-        if (
-          item &&
-          item.name === 'overviewMapActiveOnStartup' &&
-          showOverviewButton.value &&
-          item.value &&
-          !overviewAction.active
-        ) {
-          overviewAction.callback();
-        }
-      };
-      handleOverviewMapActiveOnStartup(
-        app.uiConfig.getByKey('overviewMapActiveOnStartup'),
-      );
-      const uiConfigListener = app.uiConfig.added.addEventListener(
-        handleOverviewMapActiveOnStartup,
-      );
-
       // Locator
       const { action: locatorAction, destroy: destroyLocator } =
         createLocatorAction(app);
@@ -325,7 +307,6 @@
       const { action: homeAction, destroy: homeDestroy } = setupHomeButton(app);
 
       onUnmounted(() => {
-        uiConfigListener();
         if (overviewDestroy) {
           overviewDestroy();
         }

package/src/navigation/overviewMap.d.ts

@@ -111,6 +111,7 @@ declare class OverviewMap {
      * @private
      */
     private _collectionListeners;
+    _uiConfigWatcher: import("vue").WatchStopHandle;
     /**
      * @type {boolean}
      */

package/src/navigation/overviewMap.js

@@ -20,6 +20,7 @@ import { Math as CesiumMath, Color, Cartographic } from '@vcmap-cesium/engine';
 import { unByKey } from 'ol/Observable.js';
 import VectorSource from 'ol/source/Vector.js';
 import { Icon } from 'ol/style.js';
+import { watch } from 'vue';
 import { WindowSlot } from '../manager/window/windowManager.js';
 import OverviewMapClickedInteraction from './overviewMapClickedInteraction.js';
 import {
@@ -256,6 +257,20 @@ class OverviewMap {
         this._updatePrimaryColor.bind(this),
       ),
     ];
+
+    this._uiConfigWatcher = watch(
+      () => [
+        this._app.uiConfig.config.hideMapNavigation,
+        this._app.uiConfig.config.overviewMapActiveOnStartup,
+      ],
+      async ([hide, activeOnStartup]) => {
+        if (activeOnStartup && !hide && !this._active) {
+          await this.activate();
+        } else if (hide && this._active) {
+          await this.deactivate();
+        }
+      },
+    );
   }
 
   /**
@@ -632,6 +647,7 @@ class OverviewMap {
     this._clearListeners();
     this._collectionListeners.forEach((cb) => cb());
     this._collectionListeners = [];
+    this._uiConfigWatcher();
     if (this._mapPointerListener) {
       this._mapPointerListener();
       this._mapPointerListener = null;