@vcmap/ui 5.0.0-rc.26 → 5.0.0-rc.28

package/src/contentTree/contentTreeCollection.js

@@ -4,7 +4,6 @@ import {
   makeOverrideCollection,
   getObjectFromClassRegistry,
 } from '@vcmap/core';
-import { v4 as uuid } from 'uuid';
 import { computed, ref } from 'vue';
 import ContentTreeItem from './contentTreeItem.js';
 import { vcsAppSymbol } from '../pluginHelper.js';
@@ -71,7 +70,13 @@ class ContentTreeCollection extends IndexedCollection {
           this._weightListeners.get(child.name)();
           this._weightListeners.delete(child.name);
         }
+        if (this._subTreeListeners.has(child.name)) {
+          this._subTreeListeners.get(child.name)();
+          this._subTreeListeners.delete(child.name);
+          this._subTreeViewItems.value.delete(child.name);
+        }
       }),
+      this.moved.addEventListener(recreateTree),
     ];
     /**
      * This is the default content tree.
@@ -89,10 +94,10 @@ class ContentTreeCollection extends IndexedCollection {
     this._subTreeViewItems = ref(new Map());
     /**
      * The subtree content action button destroy handlers
-     * @type {Array<function():void>}
+     * @type {Map<string, function():void>}
      * @private
      */
-    this._subTreeListeners = [];
+    this._subTreeListeners = new Map();
     /**
      * @type {boolean}
      * @private
@@ -105,7 +110,7 @@ class ContentTreeCollection extends IndexedCollection {
    */
   _clearSubTrees() {
     this._subTreeViewItems.value.clear();
-    this._subTreeListeners.forEach((cb) => {
+    [...this._subTreeListeners.values()].forEach((cb) => {
       cb();
     });
   }
@@ -118,7 +123,7 @@ class ContentTreeCollection extends IndexedCollection {
    */
   _createSubtreeActionButton(subTreeViewItem, slot = WindowSlot.STATIC) {
     // TODO make configurable?
-    const id = uuid();
+    const id = subTreeViewItem.name;
     const app = this._app;
     const { action, destroy } = createToggleAction(
       // TODO icon & title are not reactive
@@ -157,7 +162,6 @@ class ContentTreeCollection extends IndexedCollection {
    * @private
    */
   _setTreeView() {
-    this._clearSubTrees();
     /** @type {Map<string, ParentTreeViewItem>} */
     const baseTreeMap = new Map();
     [...this._array]
@@ -209,9 +213,14 @@ class ContentTreeCollection extends IndexedCollection {
       ...topLevelItems.filter((i) => i[subTreeSymbol]),
     ];
 
-    this._subTreeListeners = subTrees.map((subTree) =>
-      this._createSubtreeActionButton(subTree),
-    );
+    subTrees.forEach((subTree) => {
+      if (!this._app.navbarManager.has(subTree.name)) {
+        this._subTreeListeners.set(
+          subTree.name,
+          this._createSubtreeActionButton(subTree),
+        );
+      }
+    });
   }
 
   /**
@@ -224,8 +233,8 @@ class ContentTreeCollection extends IndexedCollection {
   }
 
   /**
-   * All ids of the currently managed subtrees. Ids are not persisted and will change if
-   * the trees get recalculated. The first ID is always the default tree. Other ids are subtree ids.
+   * All ids of the currently managed subtrees.
+   * The first ID is always the default tree. Other ids are subtree ids.
    * Order of ids is dependent on their position in the collection and weight.
    * @type {Array<string>}
    * @readonly

package/src/i18n/de.js

@@ -9,7 +9,7 @@ const messages = {
       tooltip: 'Menü',
     },
     share: {
-      tooltip: 'Den aktuellen Kartenausschnitt teilen.',
+      tooltip: 'Aktuellen Kartenausschnitt teilen',
     },
   },
   content: {
@@ -22,24 +22,24 @@ const messages = {
       title: 'Weitere Informationen',
     },
     viewpointAction: {
-      title: 'Springe zur Ansicht',
+      title: 'Zur Ansicht springen',
     },
     styleAction: {
-      title: 'Öffne Stil Auswahl',
+      title: 'Stilauswahl öffnen',
     },
     layerExtentAction: {
-      name: 'Ebenenausdehnung',
+      name: 'Auf Ebene zoomen',
       title: 'Auf Ebenenausdehnung zoomen',
     },
   },
   navigation: {
-    obliqueLeftTooltip: 'Schrägluftbild nach links drehen',
-    obliqueRightTooltip: 'Schrägluftbild nach rechts drehen',
+    obliqueLeftTooltip: 'Ansicht nach links drehen',
+    obliqueRightTooltip: 'Ansicht nach rechts drehen',
     zoomInTooltip: 'Hineinzoomen',
     zoomOutTooltip: 'Herauszoomen',
     pitchTooltip: 'Kameraneigung: {0}°',
     overviewMapTooltip: 'Übersichtskarte',
-    homeButton: 'Springe zur Startansicht',
+    homeButton: 'Zur Startansicht springen',
   },
   categoryManager: {
     title: 'Mein Arbeitsbereich',
@@ -50,10 +50,10 @@ const messages = {
     empty: 'Es gibt noch keine Einträge.',
   },
   components: {
-    pin: 'Fenster andocken.',
-    close: 'Fenster schließen.',
+    pin: 'Fenster andocken',
+    close: 'Fenster schließen',
     vcsFormSection: {
-      help: 'Hilfe anzeigen.',
+      help: 'Hilfe anzeigen',
     },
     vcsTable: {
       key: 'Name',
@@ -68,6 +68,40 @@ const messages = {
       noDataPlaceholder: 'Keine Daten verfügbar',
       noResultsPlaceholder: 'Keine übereinstimmenden Einträge gefunden',
     },
+    style: {
+      fill: 'Füll Stil',
+      stroke: 'Linien Stil',
+      reset: 'Zurücksetzen',
+      lineWidth: 'Linienbreite',
+      type: 'Typ',
+      points: 'Points',
+      radius: 'Radius',
+      radius2: 'Radius2',
+      angle: 'Winkel',
+      rotation: 'Rotation',
+      scale: 'Skalierung',
+      opacity: 'Deckkraft',
+      image: 'Punkt Stil',
+      icon: 'Icon',
+      presets: 'Vorlagen',
+      shape: 'Form',
+      circle: 'Kreis',
+      square: 'Quadrat',
+      rectangle: 'Rechteck',
+      triangle: 'Dreieck',
+      star: 'Stern',
+      cross: 'Kreuz',
+      x: 'X',
+      custom: 'Benutzerdefiniert',
+      bold: 'Fett',
+      italic: 'Kursiv',
+      text: 'Text',
+      enterText: 'Text hier eingeben',
+      allowedRange: 'Erlaubter Wertebereich',
+      notValid: 'Eingabe nicht gültig',
+      required: 'Eingabe ist erforderlich',
+      offset: 'Versatz',
+    },
   },
   settings: {
     title: 'Einstellungen',
@@ -80,8 +114,8 @@ const messages = {
     },
   },
   featureInfo: {
-    activateToolTitle: 'Informationstool aktivieren',
-    deactivateToolTitle: 'Informationstool deaktivieren',
+    activateToolTitle: 'Informationswerkzeug aktivieren',
+    deactivateToolTitle: 'Informationswerkzeug deaktivieren',
   },
   legend: {
     title: 'Legende',
@@ -93,10 +127,10 @@ const messages = {
   search: {
     title: 'Suche',
     tooltip: 'Suche',
-    select: 'Suchergebnis selektieren',
-    placeholder: 'Suche nach Straße, Adresse, Ort, POI',
+    select: 'Suchergebnis auswählen',
+    placeholder: 'Suche nach Adresse oder Ort/Sehenswürdigkeit',
     zoomToFeatureAction: 'Auf Ergebnis zoomen',
-    zoomToAll: 'Zu allen Ergebnissen zoomen',
+    zoomToAll: 'Auf alle Ergebnisse zoomen',
   },
   toolbox: {
     flight: 'Flug',
@@ -105,8 +139,8 @@ const messages = {
   footer: {
     title: 'Fußzeile',
     attributions: {
-      title: 'Attribution',
-      tooltip: 'Öffne Attribution Fenster',
+      title: 'Attributionen',
+      tooltip: 'Öffne Attributionsfenster',
     },
   },
   notification: {

package/src/i18n/en.js

@@ -1,15 +1,15 @@
 const messages = {
   navbar: {
     maps: {
-      CesiumMap: 'Activate 3D map',
-      OpenlayersMap: 'Activate 2D map',
-      ObliqueMap: 'Activate Oblique map',
+      CesiumMap: 'Enable 3D view',
+      OpenlayersMap: 'Enable 2D view',
+      ObliqueMap: 'Enable oblique view',
     },
     menu: {
       tooltip: 'Menu',
     },
     share: {
-      tooltip: 'Share current view of the map.',
+      tooltip: 'Share current view of the map',
     },
   },
   content: {
@@ -19,27 +19,27 @@ const messages = {
       placeholder: 'Search elements',
     },
     infoAction: {
-      title: 'Info',
+      title: 'Further informationen',
     },
     viewpointAction: {
       title: 'Go to viewpoint',
     },
     styleAction: {
-      title: 'Open Style selector',
+      title: 'Open style selector',
     },
     layerExtentAction: {
-      name: 'Layer extent',
-      title: 'Jump to layer extent',
+      name: 'Zoom to extent',
+      title: 'Zoom to layer extent',
     },
   },
   navigation: {
-    obliqueLeftTooltip: 'Rotate view left',
-    obliqueRightTooltip: 'Rotate view right',
+    obliqueLeftTooltip: 'Rotate view to left',
+    obliqueRightTooltip: 'Rotate view to right',
     zoomInTooltip: 'Zoom in',
     zoomOutTooltip: 'Zoom out',
     pitchTooltip: 'Camera pitch: {0}°',
-    overviewMapTooltip: 'Overview Map',
-    homeButton: 'Go to starting view',
+    overviewMapTooltip: 'Show overview map',
+    homeButton: 'Go to home view',
   },
   categoryManager: {
     title: 'My Workspace',
@@ -50,28 +50,62 @@ const messages = {
     empty: 'There are no entries yet.',
   },
   components: {
-    pin: 'Pin window.',
-    close: 'Close window.',
+    pin: 'Dock window',
+    close: 'Close window',
     vcsFormSection: {
-      help: 'Show help.',
+      help: 'Show help',
     },
     vcsTable: {
       key: 'Name',
       value: 'Value',
     },
     vcsDataTable: {
-      searchbarPlaceholder: 'Name, Value, ...',
+      searchbarPlaceholder: 'Name, value, ...',
       itemsPerPage: 'per page',
       ofItems: 'of',
       nextPage: 'Next page',
-      formerPage: 'Former page',
+      formerPage: 'Previous page',
       noDataPlaceholder: 'No data available',
       noResultsPlaceholder: 'No matching records found',
     },
+    style: {
+      fill: 'Fill',
+      stroke: 'Stroke',
+      reset: 'Reset',
+      lineWidth: 'Line width',
+      type: 'Type',
+      points: 'Points',
+      radius: 'Radius',
+      radius2: 'Radius2',
+      angle: 'Angle',
+      rotation: 'Rotation',
+      scale: 'Scale',
+      opacity: 'Opacity',
+      image: 'Point style',
+      icon: 'Icon',
+      shape: 'Shape',
+      presets: 'Presets',
+      circle: 'Circle',
+      square: 'Square',
+      rectangle: 'Rectangle',
+      triangle: 'Triangle',
+      star: 'Star',
+      cross: 'Cross',
+      x: 'X',
+      custom: 'Custom',
+      bold: 'Bold',
+      italic: 'Italic',
+      text: 'Text',
+      enterText: 'Enter text here',
+      allowedRange: 'Allowed value range',
+      notValid: 'Input not valid',
+      required: 'Input is required',
+      offset: 'Offset',
+    },
   },
   settings: {
     title: 'Settings',
-    tooltip: 'Settings',
+    tooltip: 'Configure settings',
     languageSelector: 'Language',
     theme: {
       title: 'Color theme',
@@ -80,8 +114,8 @@ const messages = {
     },
   },
   featureInfo: {
-    activateToolTitle: 'Activate Infotool',
-    deactivateToolTitle: 'Deactivate Infotool',
+    activateToolTitle: 'Enable Info Tool',
+    deactivateToolTitle: 'Disable Info Tool',
   },
   legend: {
     title: 'Legend',
@@ -94,7 +128,7 @@ const messages = {
     title: 'Search',
     tooltip: 'Search',
     select: 'Select result item',
-    placeholder: 'Search for Street, Address, Landmark, POI',
+    placeholder: 'Search for address or landmark/point of interest',
     zoomToFeatureAction: 'Zoom to result',
     zoomToAll: 'Zoom to all',
   },
@@ -106,7 +140,7 @@ const messages = {
     title: 'Footer',
     attributions: {
       title: 'Attributions',
-      tooltip: 'Open Attributions Window',
+      tooltip: 'Open attributions window',
     },
   },
   notification: {

package/src/legend/vcsLegend.vue

@@ -108,13 +108,15 @@
       };
 
       /**
-       * Sets all entry panels open
        * @type {import("vue").ComputedRef<number[]>}
        */
-      const panels = computed(() => {
-        return [...Array(props.entries.length).keys()].filter(
-          (p, idx) => !!props.entries[idx].open,
-        );
+      const panels = computed({
+        get() {
+          return [...Array(props.entries.length).keys()].filter(
+            (p, idx) => !!props.entries[idx].open,
+          );
+        },
+        set() {},
       });
 
       return {

package/src/manager/collectionManager/CollectionComponent.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-expansion-panel @change="active = !active">
+  <v-expansion-panel>
     <v-expansion-panel-header hide-actions class="px-2">
       <template #default="{ open }">
         <div class="d-flex justify-space-between">
@@ -9,13 +9,17 @@
             </v-icon>
             {{ $t(title) }}
           </div>
-          <VcsActionButtonList v-if="actions?.length > 0" :actions="actions" />
+          <VcsActionButtonList
+            v-if="actions?.length > 0"
+            :actions="actions"
+            :overflow-count="overflowCount"
+          />
         </div>
       </template>
     </v-expansion-panel-header>
     <v-expansion-panel-content class="pb-1">
       <vcs-list
-        :items="items.slice(0, 10)"
+        :items="items.slice(0, limit)"
         :draggable="draggable"
         :selectable="selectable"
         :single-select="singleSelect"
@@ -23,7 +27,7 @@
         :show-title="false"
         @item-moved="move"
       />
-      <v-sheet v-if="items.length > 10" class="ma-2 pl-2">
+      <v-sheet v-if="items.length > limit" class="ma-2 pl-2">
         <VcsButton @click="openCollectionComponentList">
           {{ $t('collectionManager.more') }}
         </VcsButton>
@@ -36,7 +40,7 @@
 </template>
 
 <script>
-  import { inject, ref } from 'vue';
+  import { inject } from 'vue';
   import {
     VIcon,
     VExpansionPanel,
@@ -44,13 +48,14 @@
     VExpansionPanelContent,
     VSheet,
   } from 'vuetify/lib';
-  import { IndexedCollection } from '@vcmap/core';
   import VcsList from '../../components/lists/VcsList.vue';
   import VcsActionButtonList from '../../components/buttons/VcsActionButtonList.vue';
   import VcsButton from '../../components/buttons/VcsButton.vue';
   import { vcsAppSymbol } from '../../pluginHelper.js';
   import { WindowSlot } from '../window/windowManager.js';
-  import CollectionComponentList from './CollectionComponentList.vue';
+  import CollectionComponentList, {
+    moveItem,
+  } from './CollectionComponentList.vue';
 
   /**
    * Renders the first ten items of a collectionComponent in a List. Uses CollectionComponentList to render more items.
@@ -76,7 +81,6 @@
        */
       const collectionComponent = inject('collectionComponent');
       const windowId = `${collectionComponent.id}-list`;
-      const active = ref(false);
 
       return {
         title: collectionComponent.title,
@@ -85,19 +89,12 @@
         draggable: collectionComponent.draggable,
         selectable: collectionComponent.selectable,
         singleSelect: collectionComponent.singleSelect,
+        overflowCount: collectionComponent.overflowCount,
+        limit: collectionComponent.limit,
         actions: collectionComponent.getActions(),
         move({ item, targetIndex }) {
-          if (collectionComponent.collection instanceof IndexedCollection) {
-            const collectionItem = collectionComponent.collection.getByKey(
-              item.name,
-            );
-            collectionComponent.collection.moveTo(
-              collectionItem,
-              targetIndex, // collectionItemOffset.value for paginated lists?
-            );
-          }
+          moveItem(collectionComponent, item, targetIndex);
         },
-        active,
         openCollectionComponentList() {
           if (app.windowManager.has(windowId)) {
             setTimeout(() => {

package/src/manager/collectionManager/CollectionComponentList.vue

@@ -15,6 +15,27 @@
   import { IndexedCollection } from '@vcmap/core';
   import VcsList from '../../components/lists/VcsList.vue';
 
+  /**
+   * Moves an item to a new position.
+   * New position is derived from a target item in the collection.
+   * This ensures correct movement, if rendered list is only a subset of the collection.
+   * @param {CollectionComponent} collectionComponent
+   * @param {VcsListItem} item
+   * @param {number} targetIndex
+   */
+  export function moveItem(collectionComponent, item, targetIndex) {
+    const { collection } = collectionComponent;
+    if (collection instanceof IndexedCollection) {
+      const collectionItem = collection.getByKey(item.name);
+      const keyProperty = collection.uniqueKey;
+      const targetItem = collectionComponent.items.value[targetIndex];
+      const targetIndexCol = [...collection].findIndex(
+        (i) => i[keyProperty] === targetItem[keyProperty],
+      );
+      collection.moveTo(collectionItem, targetIndexCol);
+    }
+  }
+
   /**
    * Renders the items of a CollectionComponent in a List.
    * The collectionComponent must be passed via {@link https://vuejs.org/api/composition-api-dependency-injection.html |provide }.
@@ -44,15 +65,7 @@
         selectable: collectionComponent.selectable,
         singleSelect: collectionComponent.singleSelect,
         move({ item, targetIndex }) {
-          if (collectionComponent.collection instanceof IndexedCollection) {
-            const collectionItem = collectionComponent.collection.getByKey(
-              item.id,
-            );
-            collectionComponent.collection.moveTo(
-              collectionItem,
-              targetIndex, // collectionItemOffset.value for paginated lists?
-            );
-          }
+          moveItem(collectionComponent, item, targetIndex);
         },
       };
     },

package/src/manager/collectionManager/CollectionManager.vue

@@ -4,6 +4,7 @@
       accordion
       multiple
       v-if="componentIds.length > 0"
+      v-model="panels"
       class="rounded-0"
     >
       <collection-component-provider
@@ -16,7 +17,7 @@
 </template>
 
 <script>
-  import { inject, ref } from 'vue';
+  import { computed, inject, ref } from 'vue';
   import { VExpansionPanels, VContainer } from 'vuetify/lib';
   import CollectionComponentProvider from './CollectionComponentProvider.vue';
 
@@ -35,8 +36,26 @@
       const collectionManager = inject('collectionManager');
       const componentIds = ref(collectionManager.componentIds);
 
+      /**
+       * @type {WritableComputedRef<number[]>}
+       */
+      const panels = computed({
+        get() {
+          return [...Array(componentIds.value.length).keys()].filter(
+            (p, idx) =>
+              !!collectionManager.get(componentIds.value[idx]).open.value,
+          );
+        },
+        set(value) {
+          componentIds.value.forEach((id, idx) => {
+            collectionManager.get(id).open.value = value.includes(idx);
+          });
+        },
+      });
+
       return {
         componentIds,
+        panels,
       };
     },
   };

package/src/manager/collectionManager/collectionComponent.js

@@ -2,6 +2,7 @@ import { IndexedCollection, isOverrideCollection } from '@vcmap/core';
 import { getLogger } from '@vcsuite/logger';
 import { v4 as uuidv4 } from 'uuid';
 import { computed, ref } from 'vue';
+import { parseNumber } from '@vcsuite/parsers';
 import { validateAction } from '../../components/lists/VcsActionList.vue';
 import { sortByWeight } from '../buttonManager.js';
 
@@ -12,6 +13,8 @@ import { sortByWeight } from '../buttonManager.js';
  * @property {boolean} [draggable] - only supported for IndexedCollections
  * @property {boolean} [selectable]
  * @property {boolean} [singleSelect]
+ * @property {number} [overflowCount=2] - number of header action buttons rendered until overflow
+ * @property {number} [limit=10] - limit number of items in rendered list (more items are rendered in extra window)
  */
 
 /**
@@ -53,6 +56,20 @@ class CollectionComponent {
      * @type {import("vue").Ref<string>}
      */
     this.title = ref(options.title);
+    /**
+     * @type {import("vue").Ref<boolean>}
+     */
+    this.open = ref(false);
+    /**
+     *
+     * @type {import("vue").Ref<number>}
+     */
+    this.overflowCount = ref(parseNumber(options.overflowCount, 2));
+    /**
+     *
+     * @type {import("vue").Ref<number>}
+     */
+    this.limit = ref(parseNumber(options.limit, 10));
     /**
      * @type {import("vue").Ref<boolean>}
      * @private

package/src/manager/window/WindowComponent.vue

@@ -91,7 +91,8 @@
       const isDockedLeft = computed(() => {
         return (
           props.slotWindow === WindowSlot.STATIC ||
-          props.slotWindow === WindowSlot.DYNAMIC_LEFT
+          props.slotWindow === WindowSlot.DYNAMIC_LEFT ||
+          props.slotWindow === WindowSlot.DYNAMIC_CHILD
         );
       });
       const isDockedRight = computed(

package/src/manager/window/WindowManager.vue

@@ -60,7 +60,7 @@
   import WindowComponent from './WindowComponent.vue';
   import WindowComponentHeader from './WindowComponentHeader.vue';
   import {
-    applyPositionOnTarget,
+    getPositionAppliedOnTarget,
     getTargetSize,
     moveWindow,
   } from './windowHelper.js';
@@ -98,6 +98,23 @@
       const isOnTop = (id) => {
         return windowManager.get(id)?.zIndex.value === componentIds.length - 1;
       };
+      /**
+       * @param {WindowComponent} windowComponent
+       * @returns {WindowPosition|null}
+       */
+      const getPosition = (windowComponent) => {
+        if (!windowComponent) {
+          return null;
+        }
+        const parentComponent =
+          !windowComponent?.state?.dockable &&
+          windowManager.get(windowComponent.parentId);
+        return getPositionAppliedOnTarget(
+          windowComponent?.position,
+          targetSize.value,
+          getPosition(parentComponent),
+        );
+      };
       /**
        * @param {string} id
        * @returns {import("vue").ComputedRef<Object>}
@@ -105,15 +122,10 @@
       const getStyles = (id) =>
         computed(() => {
           const windowComponent = windowManager.get(id);
-          const state = windowComponent?.state;
-          const position = applyPositionOnTarget(
-            windowComponent?.position,
-            targetSize.value,
-          );
           return {
             zIndex: windowComponent.zIndex.value,
-            ...position,
-            ...(state.styles || {}),
+            ...getPosition(windowComponent),
+            ...(windowComponent?.state?.styles || {}),
           };
         });
       /**
@@ -129,7 +141,9 @@
        * @param {{dx: number, dy: number}} translation
        */
       const move = (id, translation) => {
-        moveWindow(id, translation, windowManager, targetSize.value);
+        const windowComponent = windowManager.get(id);
+        const position = getPosition(windowComponent);
+        moveWindow(id, translation, windowManager, targetSize.value, position);
       };
 
       const componentIdRef = ref(componentIds);