@vcmap/ui 6.0.0-rc.8 → 6.0.0

package/src/components/vector-properties/VcsVectorPropertiesComponent.vue

@@ -10,9 +10,17 @@
       <template v-if="show3DProperties">
         <v-row v-if="visibleProperties.has('altitudeMode')" no-gutters>
           <v-col>
-            <VcsLabel :html-for="`${cid}-vp-altitude-mode`">{{
-              $t('components.vectorProperties.altitudeMode')
-            }}</VcsLabel>
+            <VcsLabel :html-for="`${cid}-vp-altitude-mode`"
+              >{{ $t('components.vectorProperties.altitudeMode') }}
+              <template #help>
+                <ul>
+                  <li v-for="mode in availableAltitudeModes" :key="mode.value">
+                    {{ $t(mode.title) }}:
+                    {{ $t(`components.vectorProperties.help.${mode.value}`) }}
+                  </li>
+                </ul>
+              </template>
+            </VcsLabel>
           </v-col>
           <v-col>
             <VcsSelect
@@ -564,10 +572,26 @@
         type: Array,
         default: () => vectorProperties,
       },
+      altitudeModes: {
+        type: Array,
+        default: () => [
+          'absolute',
+          'relativeToGround',
+          'relativeToTerrain',
+          'relativeTo3DTiles',
+          'clampToGround',
+          'clampToTerrain',
+          'clampTo3DTiles',
+        ],
+      },
       show3DProperties: {
         type: Boolean,
         default: true,
       },
+      is2DFeature: {
+        type: Boolean,
+        default: false,
+      },
       showDividers: {
         type: Boolean,
         default: true,
@@ -597,7 +621,7 @@
       });
 
       const availableAltitudeModes = computed(() => {
-        const altitudeModes = [
+        return [
           {
             value: 'clampToGround',
             title: 'components.vectorProperties.clampToGround',
@@ -613,27 +637,23 @@
           {
             value: 'absolute',
             title: 'components.vectorProperties.absolute',
-          },
-        ];
-
-        if (visibleProperties.value.has('heightAboveGround')) {
-          altitudeModes.push(
-            {
-              value: 'relativeToGround',
-              title: 'components.vectorProperties.relativeToGround',
-            },
-            {
-              value: 'relativeToTerrain',
-              title: 'components.vectorProperties.relativeToTerrain',
+            props: {
+              disabled: props.is2DFeature,
             },
-            {
-              value: 'relativeTo3DTiles',
-              title: 'components.vectorProperties.relativeTo3DTiles',
-            },
-          );
-        }
-
-        return altitudeModes;
+          },
+          {
+            value: 'relativeToGround',
+            title: 'components.vectorProperties.relativeToGround',
+          },
+          {
+            value: 'relativeToTerrain',
+            title: 'components.vectorProperties.relativeToTerrain',
+          },
+          {
+            value: 'relativeTo3DTiles',
+            title: 'components.vectorProperties.relativeTo3DTiles',
+          },
+        ].filter((item) => props.altitudeModes.includes(item.value));
       });
 
       const availableClassificationTypes = [

package/src/components/vector-properties/VcsVectorPropertiesComponent.vue.d.ts

@@ -20,10 +20,18 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => string[];
     };
+    altitudeModes: {
+        type: ArrayConstructor;
+        default: () => string[];
+    };
     show3DProperties: {
         type: BooleanConstructor;
         default: boolean;
     };
+    is2DFeature: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     showDividers: {
         type: BooleanConstructor;
         default: boolean;
@@ -226,10 +234,17 @@ declare const _default: import("vue").DefineComponent<{
         callback: () => void;
     }[]>;
     visibleProperties: import("vue").ComputedRef<Set<unknown>>;
-    availableAltitudeModes: import("vue").ComputedRef<{
+    availableAltitudeModes: import("vue").ComputedRef<({
         value: string;
         title: string;
-    }[]>;
+        props?: undefined;
+    } | {
+        value: string;
+        title: string;
+        props: {
+            disabled: boolean;
+        };
+    })[]>;
     availableClassificationTypes: {
         value: string;
         title: string;
@@ -258,10 +273,18 @@ declare const _default: import("vue").DefineComponent<{
         type: ArrayConstructor;
         default: () => string[];
     };
+    altitudeModes: {
+        type: ArrayConstructor;
+        default: () => string[];
+    };
     show3DProperties: {
         type: BooleanConstructor;
         default: boolean;
     };
+    is2DFeature: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     showDividers: {
         type: BooleanConstructor;
         default: boolean;
@@ -285,7 +308,9 @@ declare const _default: import("vue").DefineComponent<{
     properties: unknown[];
     expandable: boolean;
     startOpen: boolean;
+    altitudeModes: unknown[];
     show3DProperties: boolean;
+    is2DFeature: boolean;
     showDividers: boolean;
     showReset: boolean;
 }, {}>;

package/src/components/viewpoint/VcsViewpointComponent.vue

@@ -9,7 +9,7 @@
       <v-container class="py-0 px-1">
         <v-row no-gutters v-if="!hideName">
           <v-col cols="6">
-            <VcsLabel :html-for="`${cid}-name`" dense required>
+            <VcsLabel :html-for="`${cid}-name`" required>
               {{ $t('components.viewpoint.name') }}
             </VcsLabel>
           </v-col>
@@ -24,7 +24,7 @@
         </v-row>
         <v-row no-gutters v-if="!hideTitle">
           <v-col cols="6">
-            <VcsLabel :html-for="`${cid}-title`" dense>
+            <VcsLabel :html-for="`${cid}-title`">
               {{ $t('components.viewpoint.title') }}
             </VcsLabel>
           </v-col>
@@ -69,7 +69,7 @@
         <template v-if="!isCesiumMap">
           <v-row no-gutters>
             <v-col cols="6">
-              <VcsLabel html-for="groundPosition" dense>
+              <VcsLabel html-for="groundPosition">
                 {{ $t('components.viewpoint.groundPosition') }}
               </VcsLabel>
             </v-col>
@@ -85,7 +85,7 @@
         <template v-else>
           <v-row no-gutters>
             <v-col cols="6">
-              <VcsLabel html-for="cameraPosition" dense>
+              <VcsLabel html-for="cameraPosition">
                 {{ $t('components.viewpoint.cameraPosition') }}
               </VcsLabel>
             </v-col>
@@ -100,7 +100,7 @@
         <template v-if="!isCesiumMap">
           <v-row no-gutters>
             <v-col>
-              <VcsLabel :html-for="`${cid}-distance`" dense>
+              <VcsLabel :html-for="`${cid}-distance`">
                 {{ $t('components.viewpoint.distance') }}
               </VcsLabel>
             </v-col>
@@ -127,7 +127,7 @@
           <div v-for="key in ['heading', 'pitch', 'roll']" :key="key">
             <v-row no-gutters>
               <v-col cols="9">
-                <VcsLabel :html-for="`${cid}-${key}`" dense>
+                <VcsLabel :html-for="`${cid}-${key}`">
                   {{ $st(`components.viewpoint.${key}`) }}
                 </VcsLabel>
               </v-col>

package/src/contentTree/contentTreeCollection.js

@@ -69,6 +69,12 @@ class ContentTreeCollection extends IndexedCollection {
           this._subTreeListeners.delete(subTree.name);
         }
       });
+      if (this._app.uiConfig.getByKey('contentTreeActiveOnStartup')?.value) {
+        const action = this._app.navbarManager.get('Content')?.action;
+        if (action && !action.active) {
+          action.callback();
+        }
+      }
     };
 
     /**
@@ -181,7 +187,12 @@ class ContentTreeCollection extends IndexedCollection {
       app.windowManager,
       vcsAppSymbol,
     );
-
+    if (
+      id === 'Content' &&
+      this._app.uiConfig.getByKey('contentTreeActiveOnStartup')?.value
+    ) {
+      action.callback();
+    }
     this._app.navbarManager.add(
       { id, action, weight: subTreeViewItem[subTreeItemWeight] },
       vcsAppSymbol,

package/src/contentTree/obliqueCollectionContentTreeItem.js

@@ -151,7 +151,12 @@ class ObliqueCollectionContentTreeItem extends VcsObjectContentTreeItem {
       if (this.state === StateActionState.INACTIVE) {
         this.state = StateActionState.LOADING;
         await map.setCollection(this._collection, vp);
-        executeCallbacks(this._app, this._onActivate);
+        if (map.collection === this._collection) {
+          executeCallbacks(this._app, this._onActivate);
+        } else {
+          // failed to activate collection
+          this.state = StateActionState.INACTIVE;
+        }
       } else if (this.state === StateActionState.ACTIVE) {
         this.state = StateActionState.INACTIVE;
         await map.setCollection(defaultCollection, vp);

package/src/featureInfo/abstractFeatureInfoView.d.ts

@@ -75,6 +75,15 @@ export function applyAttributeFilter(attributes: {
 export function applyOlcsAttributeFilter(attributes: {
     [x: string]: unknown;
 }, keys?: Array<string>): Object;
+/**
+ * Filters all __ attributes (from vc-converter tilesets) not provided as keys
+ * @param {Object<string, unknown>} attributes
+ * @param {Array<string>} keys
+ * @returns {Object}
+ */
+export function applyDoubleUnderscoreFilter(attributes: {
+    [x: string]: unknown;
+}, keys?: Array<string>): Object;
 /**
  * Filters attributes having an empty object as value
  * @param {Object<string, unknown>} attributes

package/src/featureInfo/abstractFeatureInfoView.js

@@ -221,6 +221,21 @@ export function applyOlcsAttributeFilter(attributes, keys = []) {
     }, {});
 }
 
+/**
+ * Filters all __ attributes (from vc-converter tilesets) not provided as keys
+ * @param {Object<string, unknown>} attributes
+ * @param {Array<string>} keys
+ * @returns {Object}
+ */
+export function applyDoubleUnderscoreFilter(attributes, keys = []) {
+  return Object.keys(attributes)
+    .filter((key) => keys.includes(key) || !/^__/.test(key))
+    .reduce((obj, key) => {
+      obj[key] = attributes[key];
+      return obj;
+    }, {});
+}
+
 /**
  * Filters attributes having an empty object as value
  * @param {Object<string, unknown>} attributes
@@ -348,7 +363,7 @@ class AbstractFeatureInfoView extends VcsObject {
    */
   // eslint-disable-next-line class-methods-use-this
   _getAttributesFromFeature(feature) {
-    return feature?.getProperty('attributes') || {};
+    return feature?.getAttributes() || {};
   }
 
   /**
@@ -371,6 +386,7 @@ class AbstractFeatureInfoView extends VcsObject {
       applyKeyMapping(attributes, this.keyMapping);
     }
     attributes = applyOlcsAttributeFilter(attributes, this.attributeKeys);
+    attributes = applyDoubleUnderscoreFilter(attributes, this.attributeKeys);
     return applyEmptyAttributesFilter(attributes);
   }
 
@@ -430,15 +446,16 @@ class AbstractFeatureInfoView extends VcsObject {
    * @returns {import("../manager/window/windowManager.js").WindowComponentOptions}
    */
   getWindowComponentOptions(app, featureInfo, layer) {
+    const props = this.getProperties(featureInfo, layer);
     return {
       state: getWindowState(app, this.window.state, {
-        ...this.getAttributes(featureInfo.feature),
+        ...props.attributes,
         layerName: layer.properties?.title || layer.name,
       }),
       slot: this.window.slot ?? WindowSlot.DYNAMIC_RIGHT,
       component: this.component,
       position: this.window.position,
-      props: this.getProperties(featureInfo, layer),
+      props,
     };
   }
 

package/src/i18n/de.d.ts

@@ -124,23 +124,27 @@ declare namespace messages {
         namespace search {
             let placeholder: string;
         }
-        namespace infoAction {
+        namespace helpAction {
             let title_1: string;
             export { title_1 as title };
         }
-        namespace viewpointAction {
+        namespace infoAction {
             let title_2: string;
             export { title_2 as title };
         }
-        namespace styleAction {
+        namespace viewpointAction {
             let title_3: string;
             export { title_3 as title };
         }
-        namespace layerExtentAction {
-            export let name: string;
+        namespace styleAction {
             let title_4: string;
             export { title_4 as title };
         }
+        namespace layerExtentAction {
+            export let name: string;
+            let title_5: string;
+            export { title_5 as title };
+        }
     }
     export namespace navigation {
         let obliqueLeftTooltip: string;
@@ -150,16 +154,27 @@ declare namespace messages {
         let pitchTooltip: string;
         let overviewMapTooltip: string;
         let homeButton: string;
+        namespace compass {
+            let alignEast: string;
+            let alignNorth: string;
+            let alignSouth: string;
+            let alignWest: string;
+        }
         namespace locator {
             let errorAccess: string;
             let errorCurrentPosition: string;
             let errorConnection: string;
             let errorPosition: string;
         }
+        namespace obliqueFallback {
+            export let message: string;
+            let title_6: string;
+            export { title_6 as title };
+        }
     }
     export namespace categoryManager {
-        let title_5: string;
-        export { title_5 as title };
+        let title_7: string;
+        export { title_7 as title };
         let tooltip_2: string;
         export { tooltip_2 as tooltip };
     }
@@ -236,8 +251,8 @@ declare namespace messages {
             export let general: string;
             let name_1: string;
             export { name_1 as name };
-            let title_6: string;
-            export { title_6 as title };
+            let title_8: string;
+            export { title_8 as title };
             export let titlePlaceholder: string;
             export let interpolation: string;
             export let duration: string;
@@ -270,8 +285,8 @@ declare namespace messages {
         export namespace viewpoint {
             let name_4: string;
             export { name_4 as name };
-            let title_7: string;
-            export { title_7 as title };
+            let title_9: string;
+            export { title_9 as title };
             let titlePlaceholder_1: string;
             export { titlePlaceholder_1 as titlePlaceholder };
             export let groundPosition: string;
@@ -296,8 +311,8 @@ declare namespace messages {
             let outOfRange: string;
         }
         export namespace extent {
-            let title_8: string;
-            export { title_8 as title };
+            let title_10: string;
+            export { title_10 as title };
             export let projection: string;
             export let min: string;
             export let max: string;
@@ -311,6 +326,18 @@ declare namespace messages {
             export let translate: string;
             export let toggle: string;
         }
+        export namespace projection_1 {
+            let title_11: string;
+            export { title_11 as title };
+            export let epsg: string;
+            export let proj4: string;
+            export let proj4Tooltip: string;
+            export let alias: string;
+            export let epsgIoRequestFailed: string;
+            export let invalidEpsg: string;
+            export let invalidProj4: string;
+        }
+        export { projection_1 as projection };
         export namespace editor {
             let translate_1: string;
             export { translate_1 as translate };
@@ -363,6 +390,23 @@ declare namespace messages {
             export let extrudedHeight: string;
             export let skirt: string;
             export let modelScale: string;
+            export namespace help_1 {
+                let clampToGround_1: string;
+                export { clampToGround_1 as clampToGround };
+                let clampToTerrain_1: string;
+                export { clampToTerrain_1 as clampToTerrain };
+                let clampTo3DTiles_1: string;
+                export { clampTo3DTiles_1 as clampTo3DTiles };
+                let absolute_1: string;
+                export { absolute_1 as absolute };
+                let relativeToGround_1: string;
+                export { relativeToGround_1 as relativeToGround };
+                let relativeToTerrain_1: string;
+                export { relativeToTerrain_1 as relativeToTerrain };
+                let relativeTo3DTiles_1: string;
+                export { relativeTo3DTiles_1 as relativeTo3DTiles };
+            }
+            export { help_1 as help };
         }
         export namespace validation {
             let allowedRange: string;
@@ -371,14 +415,14 @@ declare namespace messages {
         }
     }
     export namespace settings {
-        let title_9: string;
-        export { title_9 as title };
+        let title_12: string;
+        export { title_12 as title };
         let tooltip_3: string;
         export { tooltip_3 as tooltip };
         export let languageSelector: string;
         export namespace displayQuality {
-            let title_10: string;
-            export { title_10 as title };
+            let title_13: string;
+            export { title_13 as title };
             export namespace level {
                 let low: string;
                 let medium: string;
@@ -386,26 +430,26 @@ declare namespace messages {
             }
         }
         export namespace theme {
-            let title_11: string;
-            export { title_11 as title };
+            let title_14: string;
+            export { title_14 as title };
             export let dark: string;
             export let light: string;
         }
     }
-    export namespace help_1 {
-        let title_12: string;
-        export { title_12 as title };
+    export namespace help_2 {
+        let title_15: string;
+        export { title_15 as title };
         let tooltip_4: string;
         export { tooltip_4 as tooltip };
     }
-    export { help_1 as help };
+    export { help_2 as help };
     export namespace featureInfo {
         let activateToolTitle: string;
         let deactivateToolTitle: string;
     }
     export namespace legend {
-        let title_13: string;
-        export { title_13 as title };
+        let title_16: string;
+        export { title_16 as title };
         let tooltip_5: string;
         export { tooltip_5 as tooltip };
         let empty_2: string;
@@ -414,8 +458,8 @@ declare namespace messages {
         export let defaultLabelText: string;
     }
     export namespace search_1 {
-        let title_14: string;
-        export { title_14 as title };
+        let title_17: string;
+        export { title_17 as title };
         let tooltip_6: string;
         export { tooltip_6 as tooltip };
         export let select: string;
@@ -426,38 +470,48 @@ declare namespace messages {
     }
     export { search_1 as search };
     export namespace toolbox {
+        let title_18: string;
+        export { title_18 as title };
         let flight_1: string;
         export { flight_1 as flight };
         export let miscellaneous: string;
     }
     export namespace footer {
-        let title_15: string;
-        export { title_15 as title };
+        let title_19: string;
+        export { title_19 as title };
         export namespace attributions {
-            let title_16: string;
-            export { title_16 as title };
+            let title_20: string;
+            export { title_20 as title };
             let tooltip_7: string;
             export { tooltip_7 as tooltip };
             let empty_3: string;
             export { empty_3 as empty };
         }
         export namespace imprint {
-            let title_17: string;
-            export { title_17 as title };
+            let title_21: string;
+            export { title_21 as title };
             let tooltip_8: string;
             export { tooltip_8 as tooltip };
         }
         export namespace dataProtection {
-            let title_18: string;
-            export { title_18 as title };
+            let title_22: string;
+            export { title_22 as title };
             let tooltip_9: string;
             export { tooltip_9 as tooltip };
         }
         export namespace positionDisplay {
-            let title_19: string;
-            export { title_19 as title };
-            let projection_1: string;
-            export { projection_1 as projection };
+            let title_23: string;
+            export { title_23 as title };
+            let projection_2: string;
+            export { projection_2 as projection };
+        }
+        export namespace oblique {
+            let template: string;
+            let north: string;
+            let east: string;
+            let south: string;
+            let west: string;
+            let nadir: string;
         }
     }
     export namespace notification {