@vcmap/ui 6.3.1 → 6.3.2

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-e52e6b43.js";
+export * from "./ui-a0e9dbf6.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-93e3a003.js";
+export * from "./vue-f6681844.js";

package/dist/assets/{vuetify-a61a435f.js → vuetify-08553f7d.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-a61a435f.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, unref as ot, Fragment as ie, isVNode as Rc, Comment as Nc, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, h as Gt, camelize as Ir, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onMounted as Ye, onDeactivated as _r, onActivated as Wc, 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-93e3a003.js";
+} await loadCss('./assets/vuetify-08553f7d.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, unref as ot, Fragment as ie, isVNode as Rc, Comment as Nc, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, h as Gt, camelize as Ir, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onMounted as Ye, onDeactivated as _r, onActivated as Wc, 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-f6681844.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-a61a435f.js";
+export * from "./vuetify-08553f7d.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.5",
-    "@vcmap/core": "^6.3.2",
+    "@vcmap/core": "^6.3.3",
     "ol": "^10.4.0",
     "vue": "~3.4.38",
     "vuetify": "~3.7.14"

package/src/actions/deepPickingAction.js

@@ -299,6 +299,9 @@ export function createDeepPickingAction(app, layer, collectFeatures, event) {
         app,
         features.filter((f) => featurePredicate(app, f)),
         event.position,
+        () => {
+          app.windowManager.remove(deepPickingWindowId);
+        },
       );
 
       if (app.windowManager.has(deepPickingWindowId)) {

package/src/featureInfo/abstractFeatureInfoView.d.ts

@@ -87,11 +87,12 @@ export function applyDoubleUnderscoreFilter(attributes: {
 /**
  * Filters attributes having an empty object as value
  * @param {Object<string, unknown>} attributes
+ * @param {boolean} removeAllEmpty - if true, will remove all empty attributes, otherwise only empty objects
  * @returns {Object}
  */
 export function applyEmptyAttributesFilter(attributes: {
     [x: string]: unknown;
-}): Object;
+}, removeAllEmpty?: boolean): Object;
 export default AbstractFeatureInfoView;
 export type FeatureInfoProps = {
     featureId: string;
@@ -111,6 +112,8 @@ export type FeatureInfoViewOptions = import("@vcmap/core").VcsObjectOptions & {
     attributeKeys?: string[];
     keyMapping?: Record<string, string>;
     valueMapping?: Record<string, string | Record<string, string>>;
+    mergeParentAttributes?: boolean;
+    removeNoDataAttributes?: boolean;
     tags?: Record<string, HTMLTagOptions>;
     window?: Pick<import("../manager/window/windowManager.js").WindowComponentOptions, 'state' | 'slot' | 'position'>;
 };
@@ -147,6 +150,14 @@ declare class AbstractFeatureInfoView extends VcsObject {
             [x: string]: string;
         };
     };
+    /**
+     * @type {boolean}
+     */
+    mergeParentAttributes: boolean;
+    /**
+     * @type {boolean}
+     */
+    removeNoDataAttributes: boolean;
     /**
      * @type {null|Object<string,HTMLTagOptions>}
      */

package/src/featureInfo/abstractFeatureInfoView.js

@@ -1,3 +1,4 @@
+import { parseBoolean } from '@vcsuite/parsers';
 import { renderTemplate, VcsObject } from '@vcmap/core';
 import { WindowSlot } from '../manager/window/windowManager.js';
 import { defaultTagOptions } from '../components/tables/VcsTable.vue';
@@ -22,12 +23,16 @@ import { defaultTagOptions } from '../components/tables/VcsTable.vue';
  *   attributeKeys?: string[],
  *   keyMapping?: Record<string,string>,
  *   valueMapping?: Record<string, string|Record<string,string>>,
+ *   mergeParentAttributes?: boolean,
+ *   removeNoDataAttributes?: boolean,
  *   tags?: Record<string, HTMLTagOptions>,
  *   window?: Pick<import("../manager/window/windowManager.js").WindowComponentOptions,'state'|'slot'|'position'>
  * }} FeatureInfoViewOptions
  * @property {Array<string>} [attributeKeys] - list of keys to filter attributes of selected feature
  * @property {Object<string,string>} [keyMapping] - object providing text replacements or i18n strings for attribute keys
  * @property {Object<string, string|Object<string,string>>} [valueMapping] - object providing text replacements or i18n strings for attribute values
+ * @property {boolean} [mergeParentAttributes] - if true, will merge attributes from parent features, if __PARENT_FEATURE is set on the feature. Child attributes will overwrite parent attributes in case of identical keys.
+ * @property {boolean} [removeNoDataAttributes] - if true, will remove all attributes with no data values
  * @property {Object<string,HTMLTagOptions>} [tags] - object with keys rendered as special html element. Value contains html options
  * @property {Pick<import("../manager/window/windowManager.js").WindowComponentOptions,'state'|'slot'|'position'>} [window] - state, slot, position can be set. Other options are predefined. headerTitle of window state can be a template string, e.g. "{{myAttribute}}" or ["{{layerName}}", " - ", "{{myAttribute}}"]
  */
@@ -238,14 +243,17 @@ export function applyDoubleUnderscoreFilter(attributes, keys = []) {
 /**
  * Filters attributes having an empty object as value
  * @param {Object<string, unknown>} attributes
+ * @param {boolean} removeAllEmpty - if true, will remove all empty attributes, otherwise only empty objects
  * @returns {Object}
  */
-export function applyEmptyAttributesFilter(attributes) {
+export function applyEmptyAttributesFilter(attributes, removeAllEmpty = false) {
   return Object.keys(attributes).reduce((obj, key) => {
     if (
-      attributes[key] !== null &&
-      typeof attributes[key] === 'object' &&
-      Object.keys(attributes[key]).length === 0
+      (attributes[key] !== null &&
+        typeof attributes[key] === 'object' &&
+        Object.keys(attributes[key]).length === 0) ||
+      (removeAllEmpty &&
+        (attributes[key] === undefined || attributes[key] === null))
     ) {
       return obj;
     }
@@ -278,6 +286,41 @@ function getWindowState(app, state, attributes) {
   };
 }
 
+/**
+ * Recursively searches for parent feature attributes, if __PARENT_FEATURE property is set. Parent feature is searched in the batchTable of the content of the given feature.
+ * @param {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature} feature
+ * @param {Array<object>} records - array of parent feature attributes
+ * @returns {Array<object>} record of parent feature ids and their attributes
+ */
+function getParentFeatureAttributes(feature, records = []) {
+  const parentId = feature.getProperty('__PARENT_FEATURE');
+  if (parentId !== 'null' && feature.content?.batchTable) {
+    for (let i = 0; i < feature.content.batchTable.featuresLength; i++) {
+      const batchTableFeature = feature.content.batchTable.getFeature(i);
+      if (batchTableFeature.getProperty('id') === parentId) {
+        records.push(batchTableFeature.getAttributes());
+        return getParentFeatureAttributes(batchTableFeature, records);
+      }
+    }
+  }
+  return records;
+}
+
+/**
+ * Merges two objects by preventing the overwriting of existing keys with undefined values.
+ * @param {Object} target
+ * @param {Object} source
+ * @returns {Object}
+ */
+function safeMerge(target, source) {
+  Object.entries(source).forEach(([key, value]) => {
+    if (value !== undefined || !(key in target)) {
+      target[key] = value;
+    }
+  });
+  return target;
+}
+
 /**
  * Abstract class to be extended by FeatureInfoView classes
  * Subclasses must always provide a component and may overwrite class methods.
@@ -300,6 +343,8 @@ class AbstractFeatureInfoView extends VcsObject {
       keyMapping: undefined,
       valueMapping: undefined,
       tags: undefined,
+      mergeParentAttributes: true,
+      removeNoDataAttributes: false,
       window: {},
     };
   }
@@ -323,6 +368,20 @@ class AbstractFeatureInfoView extends VcsObject {
      * @type {null|Object<string, string|Object<string,string>>}
      */
     this.valueMapping = options.valueMapping || defaultOptions.valueMapping;
+    /**
+     * @type {boolean}
+     */
+    this.mergeParentAttributes = parseBoolean(
+      options.mergeParentAttributes,
+      defaultOptions.mergeParentAttributes,
+    );
+    /**
+     * @type {boolean}
+     */
+    this.removeNoDataAttributes = parseBoolean(
+      options.removeNoDataAttributes,
+      defaultOptions.removeNoDataAttributes,
+    );
     /**
      * @type {null|Object<string,HTMLTagOptions>}
      */
@@ -360,9 +419,17 @@ class AbstractFeatureInfoView extends VcsObject {
    * @returns {Object}
    * @protected
    */
-  // eslint-disable-next-line class-methods-use-this
   _getAttributesFromFeature(feature) {
-    return feature?.getAttributes() || {};
+    const attributes = feature?.getAttributes() || {};
+    if (this.mergeParentAttributes) {
+      const parentAttributes = getParentFeatureAttributes(feature);
+      // Merge parent with child (child overwrites parent)
+      return [...parentAttributes, attributes].reduce(
+        (acc, source) => safeMerge(acc, source),
+        {},
+      );
+    }
+    return attributes;
   }
 
   /**
@@ -386,7 +453,7 @@ class AbstractFeatureInfoView extends VcsObject {
     }
     attributes = applyOlcsAttributeFilter(attributes, this.attributeKeys);
     attributes = applyDoubleUnderscoreFilter(attributes, this.attributeKeys);
-    return applyEmptyAttributesFilter(attributes);
+    return applyEmptyAttributesFilter(attributes, this.removeNoDataAttributes);
   }
 
   /**
@@ -463,6 +530,7 @@ class AbstractFeatureInfoView extends VcsObject {
    */
   toJSON() {
     const config = super.toJSON();
+    const defaultOptions = AbstractFeatureInfoView.getDefaultOptions();
     if (this.attributeKeys.length > 0) {
       config.attributeKeys = this.attributeKeys.slice(0);
     }
@@ -472,6 +540,12 @@ class AbstractFeatureInfoView extends VcsObject {
     if (this.valueMapping) {
       config.valueMapping = JSON.parse(JSON.stringify(this.valueMapping));
     }
+    if (this.mergeParentAttributes !== defaultOptions.mergeParentAttributes) {
+      config.mergeParentAttributes = this.mergeParentAttributes;
+    }
+    if (this.removeNoDataAttributes !== defaultOptions.removeNoDataAttributes) {
+      config.removeNoDataAttributes = this.removeNoDataAttributes;
+    }
     if (this.tags) {
       config.tags = JSON.parse(JSON.stringify(this.tags));
     }

package/src/featureInfo/featureInfo.d.ts

@@ -31,12 +31,13 @@ export function getFeatureInfoViewForFeature(app: import("../vcsUiApp.js").defau
  * @param {import("../vcsUiApp.js").default} app
  * @param {import("@vcmap/core").EventFeature[]} features
  * @param {import("ol/coordinate.js").Coordinate?} position
+ * @param {() => void} [close] function to close the window or selection
  * @returns {{
  *   groups: import("../components/lists/VcsGroupedList.vue").VcsListGroup,
  *   items: import("../components/lists/VcsGroupedList.vue").VcsGroupedListItem,
  * }}
  */
-export function getGroupedFeatureList(app: import("../vcsUiApp.js").default, features: import("@vcmap/core").EventFeature[], position?: import("ol/coordinate.js").Coordinate | null): {
+export function getGroupedFeatureList(app: import("../vcsUiApp.js").default, features: import("@vcmap/core").EventFeature[], position?: import("ol/coordinate.js").Coordinate | null, close?: (() => void) | undefined): {
     groups: import("../components/lists/VcsGroupedList.vue").VcsListGroup;
     items: import("../components/lists/VcsGroupedList.vue").VcsGroupedListItem;
 };

package/src/featureInfo/featureInfo.js

@@ -21,6 +21,8 @@ import {
   mercatorToCartesian,
   cartesianToMercator,
   CesiumMap,
+  panoramaFeature,
+  PanoramaMap,
 } from '@vcmap/core';
 import { getLogger as getLoggerByName } from '@vcsuite/logger';
 import {
@@ -187,12 +189,18 @@ export function getFeatureInfoViewForFeature(app, feature) {
  * @param {import("../vcsUiApp.js").default} app
  * @param {import("@vcmap/core").EventFeature[]} features
  * @param {import("ol/coordinate.js").Coordinate?} position
+ * @param {() => void} [close] function to close the window or selection
  * @returns {{
  *   groups: import("../components/lists/VcsGroupedList.vue").VcsListGroup,
  *   items: import("../components/lists/VcsGroupedList.vue").VcsGroupedListItem,
  * }}
  */
-export function getGroupedFeatureList(app, features, position = undefined) {
+export function getGroupedFeatureList(
+  app,
+  features,
+  position = undefined,
+  close = undefined,
+) {
   const groups = {};
   const items = features.map((f) => {
     let actions;
@@ -211,26 +219,62 @@ export function getGroupedFeatureList(app, features, position = undefined) {
         ),
       ];
     }
+
     /** @type {import("../components/lists/VcsListItemComponent.vue").VcsListItem} */
-    const listItem = reactive({
-      name: oFeature.getId(),
-      title:
-        attributes?.[titlePropName] ||
-        attributes?.title ||
-        attributes?.name ||
-        oFeature.getId(),
-      disabled: !getFeatureInfoViewForFeature(app, oFeature),
-      selectionChanged: (value) => {
-        if (value) {
-          app.featureInfo
-            .selectFeature(oFeature, position)
-            .catch((e) => getLogger().error(e));
-        } else {
-          app.featureInfo.clearFeature();
-        }
-      },
-      actions,
-    });
+    let listItem;
+
+    if (oFeature[panoramaFeature]) {
+      listItem = reactive({
+        name: oFeature.getId(),
+        title:
+          attributes?.[titlePropName] ||
+          attributes?.title ||
+          attributes?.name ||
+          oFeature.getId(),
+        clickedCallbacks: [
+          async () => {
+            close?.();
+            const { dataset, name, time } = oFeature[panoramaFeature];
+            const panoramaImage = await dataset.createPanoramaImage(name, time);
+            if (app.maps.activeMap instanceof PanoramaMap) {
+              app.maps.activeMap.setCurrentImage(panoramaImage);
+            } else {
+              const firstPanoramaMap = app.maps.getByType(
+                PanoramaMap.className,
+              )[0];
+              if (firstPanoramaMap) {
+                await app.maps.activatePanoramaMap(
+                  firstPanoramaMap,
+                  panoramaImage,
+                );
+              }
+            }
+          },
+        ],
+        actions,
+      });
+    } else {
+      listItem = reactive({
+        name: oFeature.getId(),
+        title:
+          attributes?.[titlePropName] ||
+          attributes?.title ||
+          attributes?.name ||
+          oFeature.getId(),
+        disabled: !getFeatureInfoViewForFeature(app, oFeature),
+        selectionChanged: (value) => {
+          if (value) {
+            app.featureInfo
+              .selectFeature(oFeature, position)
+              .catch((e) => getLogger().error(e));
+          } else {
+            app.featureInfo.clearFeature();
+          }
+        },
+        actions,
+      });
+    }
+
     if (layerName) {
       if (!groups[layerName]) {
         const title = layer?.properties?.title;
@@ -240,6 +284,7 @@ export function getGroupedFeatureList(app, features, position = undefined) {
     }
     return listItem;
   });
+
   return { groups: Object.values(groups), items };
 }
 
@@ -813,6 +858,7 @@ class FeatureInfo extends Collection {
       this._app,
       features,
       position,
+      () => this.clearCluster(),
     );
 
     this._clusterWindowId = id;