@vcmap/ui 5.0.0-rc.23 → 5.0.0-rc.25

package/src/vcsUiApp.js

@@ -10,6 +10,7 @@ import {
   Viewpoint,
   volatileModuleId,
   VcsEvent,
+  getObjectFromClassRegistry,
 } from '@vcmap/core';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import {
@@ -18,24 +19,31 @@ import {
   serializePlugin,
   deserializePlugin,
 } from './pluginHelper.js';
-import ToolboxManager, { setupDefaultGroups } from './manager/toolbox/toolboxManager.js';
+import ToolboxManager, {
+  setupDefaultGroups,
+} from './manager/toolbox/toolboxManager.js';
 import WindowManager from './manager/window/windowManager.js';
 import NavbarManager from './manager/navbarManager.js';
 import { createContentTreeCollection } from './contentTree/contentTreeCollection.js';
 import { contentTreeClassRegistry } from './contentTree/contentTreeItem.js';
 import OverviewMap from './navigation/overviewMap.js';
 import I18nCollection from './i18n/i18nCollection.js';
-import CategoryManager from './manager/categoryManager/categoryManager.js';
+import CategoryManager from './manager/collectionManager/categoryManager.js';
 import ContextMenuManager from './manager/contextMenu/contextMenuManager.js';
-import FeatureInfo from './featureInfo/featureInfo.js';
+import FeatureInfo, {
+  featureInfoClassRegistry,
+} from './featureInfo/featureInfo.js';
 import UiConfig from './uiConfig.js';
 import { createEmptyState, getStateFromURL } from './state.js';
 import { version } from '../package.json';
 import Search from './search/search.js';
 import Notifier from './notifier/notifier.js';
+import AbstractFeatureInfoView from './featureInfo/abstractFeatureInfoView.js';
+import { createVueI18n, setupI18n } from './vuePlugins/i18n.js';
+import { callbackClassRegistry } from './callback/vcsCallback.js';
 
 /**
- * @typedef {import("@vcmap/core").VcsAppConfig} VcsUiAppConfig
+ * @typedef {import("@vcmap/core").VcsModuleConfig} VcsUiModuleConfig
  * @property {Array<Object>} [plugins]
  * @property {Array<ContentTreeItemOptions>} [contentTree]
  * @property {Array<UiConfigurationItem>} [uiConfig]
@@ -73,7 +81,6 @@ import Notifier from './notifier/notifier.js';
  * @api
  */
 
-
 /**
  * @interface VcsComponentManager
  * @template {Object} T - the component type
@@ -106,7 +113,9 @@ class VcsUiApp extends VcsApp {
    * Gets the version of the @vcmap/ui npm package
    * @returns {string}
    */
-  static getVersion() { return version; }
+  static getVersion() {
+    return version;
+  }
 
   constructor() {
     super();
@@ -138,17 +147,26 @@ class VcsUiApp extends VcsApp {
         this._contextMenuManager.removeOwner(plugin.name);
         this._search.removeOwner(plugin.name);
         if (plugin.i18n) {
-          this.i18n.addPluginMessages(plugin.name, plugin[moduleIdSymbol], plugin.i18n);
+          this.i18n.addPluginMessages(
+            plugin.name,
+            plugin[moduleIdSymbol],
+            plugin.i18n,
+          );
         }
         if (plugin.initialize) {
           let state;
           if (this._cachedAppState.moduleIds.includes(plugin[moduleIdSymbol])) {
-            state = this._cachedAppState.plugins.find(s => s.name === plugin.name);
+            state = this._cachedAppState.plugins.find(
+              (s) => s.name === plugin.name,
+            );
           }
           try {
             plugin.initialize(this, state?.state);
           } catch (e) {
-            getLogger().error(`Error in plugin ${plugin.name} initialize hook`, e);
+            getLogger().error(
+              `Error in plugin ${plugin.name} initialize hook`,
+              e,
+            );
           }
         }
       }),
@@ -164,10 +182,20 @@ class VcsUiApp extends VcsApp {
     ];
 
     /**
-     * @type {OverrideClassRegistry<ContentTreeItem>}
+     * @type {OverrideClassRegistry<VcsCallbackItem>}
      * @private
      */
-    this._contentTreeClassRegistry = new OverrideClassRegistry(contentTreeClassRegistry);
+    this._callbackClassRegistry = new OverrideClassRegistry(
+      callbackClassRegistry,
+    );
+
+    /**
+     * @type {import("@vcmap/core").OverrideClassRegistry<ContentTreeItem>}
+     * @private
+     */
+    this._contentTreeClassRegistry = new OverrideClassRegistry(
+      contentTreeClassRegistry,
+    );
 
     /**
      * @type {OverrideContentTreeCollection}
@@ -198,10 +226,24 @@ class VcsUiApp extends VcsApp {
      */
     this._uiConfig = new UiConfig(() => this.dynamicModuleId);
     /**
-     * @type {FeatureInfo}
+     * @type {import("@vcmap/core").OverrideClassRegistry<AbstractFeatureInfoView>}
      * @private
      */
-    this._featureInfo = new FeatureInfo(this);
+    this._featureInfoClassRegistry = new OverrideClassRegistry(
+      featureInfoClassRegistry,
+    );
+    /**
+     * @type {import("@vcmap/core").OverrideCollection<AbstractFeatureInfoView>}
+     * @private
+     */
+    this._featureInfo = makeOverrideCollection(
+      new FeatureInfo(this),
+      () => this.dynamicModuleId,
+      null,
+      (config) =>
+        getObjectFromClassRegistry(this._featureInfoClassRegistry, config),
+      AbstractFeatureInfoView,
+    );
 
     /**
      * @type {OverviewMap}
@@ -215,6 +257,19 @@ class VcsUiApp extends VcsApp {
      */
     this._i18n = new I18nCollection(() => this.dynamicModuleId);
 
+    /**
+     *
+     * @type {import("vue-i18n").VueI18n}
+     * @private
+     */
+    this._vueI18n = createVueI18n();
+    /**
+     *
+     * @type {function(): void}
+     * @private
+     */
+    this._vueI18nDestroy = setupI18n(this);
+
     /**
      * @type {CategoryManager}
      * @private
@@ -256,85 +311,137 @@ class VcsUiApp extends VcsApp {
    * @type {import("@vcmap/core").OverrideCollection<VcsPlugin>}
    * @readonly
    */
-  get plugins() { return this._plugins; }
+  get plugins() {
+    return this._plugins;
+  }
 
   /**
    * @type {OverrideContentTreeCollection}
    * @readonly
    */
-  get contentTree() { return this._contentTree; }
+  get contentTree() {
+    return this._contentTree;
+  }
 
   /**
-   * @type {OverrideClassRegistry<ContentTreeItem>}
+   * @type {import("@vcmap/core").OverrideClassRegistry<VcsCallback>}
    * @readonly
    */
-  get contentTreeClassRegistry() { return this._contentTreeClassRegistry; }
+  get callbackClassRegistry() {
+    return this._callbackClassRegistry;
+  }
+
+  /**
+   * @type {import("@vcmap/core").OverrideClassRegistry<ContentTreeItem>}
+   * @readonly
+   */
+  get contentTreeClassRegistry() {
+    return this._contentTreeClassRegistry;
+  }
+
+  /**
+   * @type {import("@vcmap/core").OverrideClassRegistry<AbstractFeatureInfoView>}
+   * @readonly
+   */
+  get featureInfoClassRegistry() {
+    return this._featureInfoClassRegistry;
+  }
 
   /**
    * @returns {ToolboxManager}
    * @readonly
    */
-  get toolboxManager() { return this._toolboxManager; }
+  get toolboxManager() {
+    return this._toolboxManager;
+  }
 
   /**
    * @returns {WindowManager}
    * @readonly
    */
-  get windowManager() { return this._windowManager; }
+  get windowManager() {
+    return this._windowManager;
+  }
 
   /**
    * @returns {NavbarManager}
    * @readonly
    */
-  get navbarManager() { return this._navbarManager; }
+  get navbarManager() {
+    return this._navbarManager;
+  }
 
   /**
    * @returns {FeatureInfo}
    * @readonly
    */
-  get featureInfo() { return this._featureInfo; }
+  get featureInfo() {
+    return this._featureInfo;
+  }
 
   /**
    * @type {OverviewMap}
    * @readonly
    */
-  get overviewMap() { return this._overviewMap; }
+  get overviewMap() {
+    return this._overviewMap;
+  }
 
   /**
    * @type {I18nCollection}
    * @readonly
    */
-  get i18n() { return this._i18n; }
+  get i18n() {
+    return this._i18n;
+  }
+
+  /**
+   * @returns {import("vue-i18n").VueI18n}
+   * @readonly
+   */
+  get vueI18n() {
+    return this._vueI18n;
+  }
 
   /**
    * @returns {CategoryManager}
    * @readonly
    */
-  get categoryManager() { return this._categoryManager; }
+  get categoryManager() {
+    return this._categoryManager;
+  }
 
   /**
    * @type {ContextMenuManager}
    * @readonly
    */
-  get contextMenuManager() { return this._contextMenuManager; }
+  get contextMenuManager() {
+    return this._contextMenuManager;
+  }
 
   /**
    * @type {Search}
    * @readonly
    */
-  get search() { return this._search; }
+  get search() {
+    return this._search;
+  }
 
   /**
    * @type {UiConfig}
    * @readonly
    */
-  get uiConfig() { return this._uiConfig; }
+  get uiConfig() {
+    return this._uiConfig;
+  }
 
   /**
    * @type {Notifier}
    * @readonly
    */
-  get notifier() { return this._notifier; }
+  get notifier() {
+    return this._notifier;
+  }
 
   /**
    * Get the state of the application. When passed the forUrl flag, only a minimal set of states shall be provided for a sharable link to the current state (to ensure
@@ -351,16 +458,21 @@ class VcsUiApp extends VcsApp {
 
     state.activeMap = this.maps.activeMap.name;
     const viewpoint = await this.maps.activeMap.getViewpoint();
-    state.activeViewpoint = viewpoint?.isValid?.() ? viewpoint.toJSON() : undefined;
+    state.activeViewpoint = viewpoint?.isValid?.()
+      ? viewpoint.toJSON()
+      : undefined;
     state.layers = [...this.layers]
-      .filter(l => l.isSupported(this.maps.activeMap) &&
-        l[moduleIdSymbol] !== defaultDynamicModuleId &&
-        l[moduleIdSymbol] !== volatileModuleId &&
-        (
-          ((l.active || l.loading) && !l.activeOnStartup) ||
-          (!l.active && l.activeOnStartup) ||
-          ((l.active || l.loading) && l.style !== l.defaultStyle && this.styles.has(l.style))
-        ))
+      .filter(
+        (l) =>
+          l.isSupported(this.maps.activeMap) &&
+          l[moduleIdSymbol] !== defaultDynamicModuleId &&
+          l[moduleIdSymbol] !== volatileModuleId &&
+          (((l.active || l.loading) && !l.activeOnStartup) ||
+            (!l.active && l.activeOnStartup) ||
+            ((l.active || l.loading) &&
+              l.style !== l.defaultStyle &&
+              this.styles.has(l.style))),
+      )
       .map((l) => {
         const layerState = {
           name: l.name,
@@ -378,11 +490,25 @@ class VcsUiApp extends VcsApp {
         return layerState;
       });
 
-    state.plugins = await Promise.all([...this.plugins]
-      .filter(p => p[moduleIdSymbol] !== defaultDynamicModuleId &&
-        p[moduleIdSymbol] !== volatileModuleId &&
-        typeof p.getState === 'function')
-      .map(async p => ({ name: p.name, state: await p.getState(forUrl) })));
+    const plugins = await Promise.all(
+      [...this.plugins]
+        .filter(
+          (p) =>
+            p[moduleIdSymbol] !== defaultDynamicModuleId &&
+            p[moduleIdSymbol] !== volatileModuleId &&
+            typeof p.getState === 'function',
+        )
+        .map(async (p) => {
+          try {
+            return { name: p.name, state: await p.getState(forUrl) };
+          } catch (e) {
+            getLogger().error(e);
+            return null;
+          }
+        }),
+    );
+
+    state.plugins = plugins.filter((p) => p);
 
     if (this.maps.activeMap instanceof ObliqueMap) {
       state.activeObliqueCollection = this.maps.activeMap.collection.name;
@@ -398,21 +524,23 @@ class VcsUiApp extends VcsApp {
   async _parseModule(module) {
     const { config } = module;
     if (Array.isArray(config.plugins)) {
-      const plugins = await Promise.all(config.plugins.map(async (pluginConfig) => {
-        const plugin = await loadPlugin(pluginConfig.name, pluginConfig);
-        if (!plugin) {
-          return null;
-        }
-        if (!isValidPackageName(plugin.name)) {
-          getLogger().warning(`plugin ${plugin.name} has no valid package name!`);
-        }
-        plugin[moduleIdSymbol] = module._id;
-        return plugin;
-      }));
+      const plugins = await Promise.all(
+        config.plugins.map(async (pluginConfig) => {
+          const plugin = await loadPlugin(pluginConfig.name, pluginConfig);
+          if (!plugin) {
+            return null;
+          }
+          if (!isValidPackageName(plugin.name)) {
+            getLogger().warning(
+              `plugin ${plugin.name} has no valid package name!`,
+            );
+          }
+          plugin[moduleIdSymbol] = module._id;
+          return plugin;
+        }),
+      );
 
-      plugins
-        .filter(p => p)
-        .map(p => this._plugins.override(p));
+      plugins.filter((p) => p).map((p) => this._plugins.override(p));
     }
     if (Array.isArray(config.i18n)) {
       await this.i18n.parseItems(config.i18n, module._id);
@@ -420,7 +548,7 @@ class VcsUiApp extends VcsApp {
     await super._parseModule(module);
     await this._contentTree.parseItems(config.contentTree, module._id);
     await this._uiConfig.parseItems(config.uiConfig, module._id);
-    await this._featureInfo.collection.parseItems(config.featureInfo, module._id);
+    await this._featureInfo.parseItems(config.featureInfo, module._id);
   }
 
   /**
@@ -440,30 +568,59 @@ class VcsUiApp extends VcsApp {
             layer.deactivate();
           }
 
-          if (layerState.styleName && this.styles.hasKey(layerState.styleName) && layer.setStyle) {
+          if (
+            layerState.styleName &&
+            this.styles.hasKey(layerState.styleName) &&
+            layer.setStyle
+          ) {
             layer.setStyle(this.styles.getByKey(layerState.styleName));
           }
         }
       });
-      if (this._cachedAppState.activeMap && this.maps.hasKey(this._cachedAppState.activeMap)) {
+      if (
+        this._cachedAppState.activeMap &&
+        this.maps.hasKey(this._cachedAppState.activeMap)
+      ) {
         await this.maps.setActiveMap(this._cachedAppState.activeMap);
       }
       if (
         this._cachedAppState.activeObliqueCollection &&
         this.maps.activeMap instanceof ObliqueMap &&
-        this.obliqueCollections.hasKey(this._cachedAppState.activeObliqueCollection)
+        this.obliqueCollections.hasKey(
+          this._cachedAppState.activeObliqueCollection,
+        )
       ) {
         await this.maps.activeMap.setCollection(
-          this.obliqueCollections.getByKey(this._cachedAppState.activeObliqueCollection),
-          this._cachedAppState.activeViewpoint,
+          this.obliqueCollections.getByKey(
+            this._cachedAppState.activeObliqueCollection,
+          ),
+          new Viewpoint(this._cachedAppState.activeViewpoint),
         );
       } else if (this._cachedAppState.activeViewpoint && this.maps.activeMap) {
-        await this.maps.activeMap.gotoViewpoint(new Viewpoint(this._cachedAppState.activeViewpoint));
+        await this.maps.activeMap.gotoViewpoint(
+          new Viewpoint(this._cachedAppState.activeViewpoint),
+        );
       }
-      this._cachedAppState.moduleIds.splice(this._cachedAppState.moduleIds.indexOf(module._id), 1);
+      this._cachedAppState.moduleIds.splice(
+        this._cachedAppState.moduleIds.indexOf(module._id),
+        1,
+      );
     }
   }
 
+  /**
+   * @param {string} moduleId
+   * @returns {VcsUiModuleConfig}
+   */
+  serializeModule(moduleId) {
+    const config = super.serializeModule(moduleId);
+    config.uiConfig = this._uiConfig.serializeModule(moduleId);
+    config.featureInfo = this._featureInfo.serializeModule(moduleId);
+    config.i18n = this._i18n.serializeModule(moduleId);
+    config.plugins = this._plugins.serializeModule(moduleId);
+    return config;
+  }
+
   /**
    * @param {string} moduleId
    * @returns {Promise<void>}
@@ -475,7 +632,7 @@ class VcsUiApp extends VcsApp {
       this._plugins.removeModule(moduleId),
       this._i18n.removeModule(moduleId),
       this._contentTree.removeModule(moduleId),
-      this._featureInfo.collection.removeModule(moduleId),
+      this._featureInfo.removeModule(moduleId),
       this._uiConfig.removeModule(moduleId),
     ]);
   }
@@ -490,13 +647,17 @@ class VcsUiApp extends VcsApp {
     this.categoryManager.destroy();
     this.contextMenuManager.destroy();
     this._overviewMap.destroy();
-    this._pluginListeners.forEach((cb) => { cb(); });
+    this._pluginListeners.forEach((cb) => {
+      cb();
+    });
     this._pluginListeners = [];
     destroyCollection(this._plugins);
     destroyCollection(this._contentTree);
     destroyCollection(this._i18n);
     destroyCollection(this._search);
+    this._vueI18nDestroy();
     this._contentTreeClassRegistry.destroy();
+    this._featureInfoClassRegistry.destroy();
     this._featureInfo.destroy();
     this._uiConfig.destroy();
     super.destroy();

package/src/vuePlugins/i18n.js

@@ -5,15 +5,14 @@ import { vcsAppSymbol } from '../pluginHelper.js';
 import de from '../i18n/de.js';
 import en from '../i18n/en.js';
 
-
 Vue.use(VueI18n);
 
 /**
  * creates a new VueI18n Instance.
- * @returns {VueI18n}
+ * @returns {import("vue-i18n").VueI18n}
  */
 export function createVueI18n() {
-  const i18n = new VueI18n({
+  return new VueI18n({
     locale: 'en',
     silentFallbackWarn: true,
     silentTranslationWarn: true,
@@ -23,48 +22,48 @@ export function createVueI18n() {
     },
     postTranslation: (val, key) => (typeof val === 'string' ? val : key),
   });
-  return i18n;
 }
 
 /**
- * sets the messages to the given I18n Instance;
- * @param {Object} messages
- * @param {VueI18n} i18n
+ * sets the messages to the app's I18n Instance;
+ * @param {VcsUiApp} app
  */
-function setI18n(messages, i18n) {
-  i18n.availableLocales.forEach((locale) => {
-    i18n.setLocaleMessage(locale, undefined);
-  });
-  Object.entries(messages).forEach(([locale, localeMessages]) => {
-    i18n.setLocaleMessage(locale, localeMessages);
+function setI18nMessages(app) {
+  app.vueI18n.availableLocales.forEach((locale) => {
+    app.vueI18n.setLocaleMessage(locale, undefined);
   });
+  Object.entries(app.i18n.getMergedMessages()).forEach(
+    ([locale, localeMessages]) => {
+      app.vueI18n.setLocaleMessage(locale, localeMessages);
+    },
+  );
 }
 
 /**
  * @param {VcsUiApp} app
- * @param {VueI18n} i18n
  * @returns {function():void} returns a destroy function
  */
-export function setupI18n(app, i18n) {
-  const defaultMessages = { en, de };
+export function setupI18n(app) {
+  const defaultMessages = { name: 'default', en, de };
   defaultMessages[i18nPluginSymbol] = vcsAppSymbol;
   app.i18n.add(defaultMessages);
 
-  setI18n(app.i18n.getMergedMessages(), i18n);
-  i18n.locale = app.locale;
+  setI18nMessages(app);
+  app.vueI18n.locale = app.locale;
   const destroyFunctions = [
     app.i18n.added.addEventListener(() => {
-      setI18n(app.i18n.getMergedMessages(), i18n);
+      setI18nMessages(app);
     }),
     app.i18n.removed.addEventListener(() => {
-      setI18n(app.i18n.getMergedMessages(), i18n);
+      setI18nMessages(app);
     }),
     app.localeChanged.addEventListener((locale) => {
-      i18n.locale = locale;
+      app.vueI18n.locale = locale;
     }),
   ];
   return function tearDownI18nSetup() {
-    destroyFunctions.forEach((destroy) => { destroy(); });
+    destroyFunctions.forEach((destroy) => {
+      destroy();
+    });
   };
 }
-

package/src/vuePlugins/vuetify.js

@@ -1,4 +1,3 @@
-import '@mdi/font/css/materialdesignicons.css';
 import Vue from 'vue';
 import Vuetify from 'vuetify/lib';
 import { genVariations } from 'vuetify/lib/services/theme/utils.js';
@@ -19,6 +18,9 @@ export const defaultPrimaryColor = {
  * @returns {import("vuetify").default}
  */
 export function createVuetify() {
+  const dark =
+    window.matchMedia?.('(prefers-color-scheme: dark)')?.matches ?? false;
+
   return new Vuetify({
     treeShake: false,
     defaultAssets: {
@@ -27,6 +29,7 @@ export function createVuetify() {
       },
     },
     theme: {
+      dark,
       options: {
         customProperties: true,
       },