@vcmap/ui 6.2.0-rc.1 → 6.2.0-rc.3

package/src/contentTree/contentTreeCollection.js

@@ -75,13 +75,13 @@ class ContentTreeCollection extends IndexedCollection {
         'contentTreeActiveOnStartup',
       );
       if (
-        contentTreeActiveOnStartup?.value &&
+        contentTreeActiveOnStartup?.value != null &&
         contentTreeActiveOnStartup[moduleIdSymbol] !== this._app.dynamicModuleId
       ) {
         const action = this._app.navbarManager.get(
           defaultContentTreeComponentId,
         )?.action;
-        if (action && !action.active) {
+        if (action && action.active !== contentTreeActiveOnStartup.value) {
           action.callback();
         }
       }

package/src/contentTree/contentTreeItem.d.ts

@@ -272,11 +272,11 @@ declare class ContentTreeItem {
     /**
      * @param {(string|HTMLCanvasElement|HTMLImageElement)=} icon
      */
-    set icon(icon: string | HTMLImageElement | HTMLCanvasElement | undefined);
+    set icon(icon: string | HTMLCanvasElement | HTMLImageElement | undefined);
     /**
      * @type {string|HTMLCanvasElement|HTMLImageElement|undefined}
      */
-    get icon(): string | HTMLImageElement | HTMLCanvasElement | undefined;
+    get icon(): string | HTMLCanvasElement | HTMLImageElement | undefined;
     /**
      * @param {number} weight
      */

package/src/contentTree/wmsGroupContentTreeItem.js

@@ -522,6 +522,10 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
           this._layer.url,
           this._layer.parameters,
         );
+        // check if the layer still exists, it can happen that the layer was removed while fetching the capabilities.
+        if (!this._layer) {
+          return;
+        }
         this._availableWMSEntries = availableWMSEntries.filter((wmsEntry) => {
           return this._allowedWMSLayers
             ? this._allowedWMSLayers.includes(wmsEntry.name)
@@ -558,9 +562,12 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
         this._setState();
         this._setLegend();
       } catch (e) {
-        this._layer.deactivate();
-        this.visible = false;
-        this._invalid = true;
+        // if the layer is not there it has been removed while fetching the capabilities.
+        if (this._layer) {
+          this._layer.deactivate();
+          this.visible = false;
+          this._invalid = true;
+        }
         getLogger(this.className).error(
           `An error occured while fetching the ${this._layerName} capabilities:`,
           e,

package/src/featureInfo/featureInfo.js

@@ -229,10 +229,7 @@ export function getGroupedFeatureList(app, features, position = undefined) {
     if (layerName) {
       if (!groups[layerName]) {
         const title = app.layers.getByKey(layerName)?.properties?.title;
-        groups[layerName] = {
-          name: layerName,
-          title: title || layerName,
-        };
+        groups[layerName] = { name: layerName, title: title || layerName };
       }
       listItem.group = layerName;
     }
@@ -265,10 +262,7 @@ export function createFeatureInfoSession(app) {
     stopped.destroy();
   };
 
-  return {
-    stopped,
-    stop,
-  };
+  return { stopped, stop };
 }
 
 /**
@@ -307,11 +301,7 @@ function setupFeatureInfoTool(app) {
     }
     if (!app.toolboxManager.has('featureInfo')) {
       app.toolboxManager.add(
-        {
-          id: 'featureInfo',
-          type: ToolboxType.SINGLE,
-          action,
-        },
+        { id: 'featureInfo', type: ToolboxType.SINGLE, action },
         vcsAppSymbol,
         { desktop: true, tablet: true, mobile: true },
       );
@@ -743,11 +733,7 @@ class FeatureInfo extends Collection {
         }
       }
       this._app.windowManager.add(
-        {
-          id: this._windowId,
-          ...windowComponentOptions,
-          props,
-        },
+        { id: this._windowId, ...windowComponentOptions, props },
         vcsAppSymbol,
       );
 
@@ -821,13 +807,8 @@ class FeatureInfo extends Collection {
       {
         id,
         component: ClusterFeatureComponent,
-        props: reactive({
-          items,
-          groups,
-        }),
-        state: {
-          headerTitle: 'featureInfo.cluster.headerTitle',
-        },
+        props: reactive({ items, groups }),
+        state: { headerTitle: 'featureInfo.cluster.headerTitle' },
         slot: WindowSlot.DYNAMIC_LEFT,
       },
       vcsAppSymbol,

package/src/featureInfo/iframeWmsFeatureInfoView.d.ts

@@ -7,6 +7,8 @@ export type IframeWmsFeatureInfoViewOptions = import("./abstractFeatureInfoView.
  * @typedef {import("./abstractFeatureInfoView.js").FeatureInfoViewOptions & { infoFormat: string, title?: string }} IframeWmsFeatureInfoViewOptions
  * @property {string} infoFormat - Specifies the response format of WMS GetFeatureInfo
  * @property {string} [title] - optional title for the <iframe>
+ * @property {string} [sandbox] - optional sandbox attribute for the <iframe>
+ * @property {boolean} [disableSandbox] - optional flag to disable the sandbox attribute for the <iframe>
  */
 /**
  * @class
@@ -26,6 +28,14 @@ declare class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
      * @type {string|undefined}
      */
     title: string | undefined;
+    /**
+     * @type {string}
+     */
+    sandbox: string;
+    /**
+     * @type {boolean}
+     */
+    disableSandbox: boolean;
     /**
      * Gets feature info from WMS GetFeatureInfo in html/text format
      * @param {import("./featureInfo.js").FeatureInfoEvent} featureInfo

package/src/featureInfo/iframeWmsFeatureInfoView.js

@@ -6,6 +6,8 @@ import IframeComponent from './IframeComponent.vue';
  * @typedef {import("./abstractFeatureInfoView.js").FeatureInfoViewOptions & { infoFormat: string, title?: string }} IframeWmsFeatureInfoViewOptions
  * @property {string} infoFormat - Specifies the response format of WMS GetFeatureInfo
  * @property {string} [title] - optional title for the <iframe>
+ * @property {string} [sandbox] - optional sandbox attribute for the <iframe>
+ * @property {boolean} [disableSandbox] - optional flag to disable the sandbox attribute for the <iframe>
  */
 
 /**
@@ -35,6 +37,39 @@ class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
      * @type {string|undefined}
      */
     this.title = options.title || undefined;
+    /**
+     * @type {string}
+     */
+    this.sandbox = options.sandbox || '';
+    /**
+     * @type {boolean}
+     */
+    this.disableSandbox = options.disableSandbox || false;
+  }
+
+  /**
+   * @param {import("../vcsUiApp.js").default} app
+   * @param {import("./featureInfo.js").FeatureInfoEvent} featureInfo
+   * @param {import("@vcmap/core").Layer} layer
+   * @returns {import("../manager/window/windowManager.js").WindowComponentOptions}
+   */
+  getWindowComponentOptions(app, featureInfo, layer) {
+    const componentOptions = super.getWindowComponentOptions(
+      app,
+      featureInfo,
+      layer,
+    );
+    const resolution = app.maps.activeMap.getCurrentResolution(
+      featureInfo.position,
+    );
+    componentOptions.props.src =
+      layer.featureProvider.wmsSource.getFeatureInfoUrl(
+        featureInfo.position,
+        resolution,
+        getOlProj('EPSG:3857'),
+        { INFO_FORMAT: this.infoFormat },
+      );
+    return componentOptions;
   }
 
   /**
@@ -52,6 +87,7 @@ class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
         { INFO_FORMAT: this.infoFormat },
       ),
       title: this.title,
+      ...(!this.disableSandbox && { sandbox: this.sandbox }),
     };
   }
 
@@ -66,6 +102,12 @@ class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
     if (this.title) {
       config.title = this.title;
     }
+    if (this.sandbox) {
+      config.sandbox = this.sandbox;
+    }
+    if (this.disableSandbox) {
+      config.disableSandbox = this.disableSandbox;
+    }
     return config;
   }
 }

package/src/i18n/de.d.ts

@@ -114,6 +114,7 @@ declare namespace messages {
             let CesiumMap: string;
             let OpenlayersMap: string;
             let ObliqueMap: string;
+            let PanoramaMap: string;
         }
         namespace menu {
             let tooltip: string;
@@ -205,8 +206,11 @@ declare namespace messages {
         export let pin: string;
         export let close: string;
         export let add: string;
+        let _new: string;
+        export { _new as new };
         export let apply: string;
         export let cancel: string;
+        export let addToMyWorkspace: string;
         export namespace _import {
             let submit: string;
             let fileDrop: string;
@@ -289,6 +293,12 @@ declare namespace messages {
             let _export: string;
             export { _export as export };
             export let exportPath: string;
+            export namespace record {
+                let standard: string;
+                let high: string;
+                let inProgress: string;
+                let success: string;
+            }
         }
         export namespace splashScreen {
             let name_3: string;
@@ -374,6 +384,12 @@ declare namespace messages {
             export let modifyHeader: string;
             export let modifyInfo: string;
             export let styleHeader: string;
+            export namespace position {
+                let x_1: string;
+                export { x_1 as x };
+                export let y: string;
+                export let z: string;
+            }
             export namespace snapping {
                 let title_14: string;
                 export { title_14 as title };
@@ -453,9 +469,10 @@ declare namespace messages {
             let title_16: string;
             export { title_16 as title };
             export namespace level {
-                let low: string;
-                let medium: string;
-                let high: string;
+                export let low: string;
+                export let medium: string;
+                let high_1: string;
+                export { high_1 as high };
             }
         }
         export namespace theme {
@@ -561,10 +578,11 @@ declare namespace messages {
         }
     }
     export namespace notification {
-        let error: string;
-        let warning: string;
-        let information: string;
-        let success: string;
+        export let error: string;
+        export let warning: string;
+        export let information: string;
+        let success_1: string;
+        export { success_1 as success };
     }
     export namespace datePicker {
         let today: string;

package/src/i18n/de.js

@@ -14,6 +14,7 @@ const messages = {
       CesiumMap: '3D-Karte',
       OpenlayersMap: '2D-Karte',
       ObliqueMap: 'Schrägluftbildkarte',
+      PanoramaMap: 'Panoramabildkarte',
     },
     menu: {
       tooltip: 'Menü',
@@ -93,8 +94,10 @@ const messages = {
     pin: 'Fenster andocken',
     close: 'Fenster schließen',
     add: 'Hinzufügen',
+    new: 'Neu',
     apply: 'Anwenden',
     cancel: 'Abbrechen',
+    addToMyWorkspace: 'Zu Mein Arbeitsbereich hinzufügen',
     import: {
       submit: 'Importieren',
       fileDrop: 'Dateien hierher ziehen',
@@ -172,6 +175,12 @@ const messages = {
       zoom: 'Auf Ausdehnung zoomen',
       export: 'Flug exportieren',
       exportPath: 'Flugpfad exportieren',
+      record: {
+        standard: 'Flug mit Standardauflösung aufzeichnen',
+        high: 'Flug mit hoher Auflösung aufzeichnen',
+        inProgress: 'Aufzeichnung läuft',
+        success: 'Aufzeichnung erfolgreich, der Download startet in Kürze',
+      },
     },
     splashScreen: {
       name: 'Splash Screen',
@@ -245,6 +254,11 @@ const messages = {
       modifyInfo:
         'Klicke die Symbole in der Überschrift um die selektierten Geometrien zu editieren.',
       styleHeader: 'Stil',
+      position: {
+        x: 'Position X',
+        y: 'Position Y',
+        z: 'Position Z',
+      },
       snapping: {
         title: 'Fang',
         help: 'Durch STRG gedrückt halten lässt sich der Fang temporär unterdrücken.',

package/src/i18n/en.d.ts

@@ -114,6 +114,7 @@ declare namespace messages {
             let CesiumMap: string;
             let OpenlayersMap: string;
             let ObliqueMap: string;
+            let PanoramaMap: string;
         }
         namespace menu {
             let tooltip: string;
@@ -205,8 +206,11 @@ declare namespace messages {
         export let pin: string;
         export let close: string;
         export let add: string;
+        let _new: string;
+        export { _new as new };
         export let apply: string;
         export let cancel: string;
+        export let addToMyWorkspace: string;
         export namespace _import {
             let submit: string;
             let fileDrop: string;
@@ -289,6 +293,12 @@ declare namespace messages {
             let _export: string;
             export { _export as export };
             export let exportPath: string;
+            export namespace record {
+                let standard: string;
+                let high: string;
+                let inProgress: string;
+                let success: string;
+            }
         }
         export namespace splashScreen {
             let name_3: string;
@@ -374,6 +384,12 @@ declare namespace messages {
             export let modifyHeader: string;
             export let modifyInfo: string;
             export let styleHeader: string;
+            export namespace position {
+                let x_1: string;
+                export { x_1 as x };
+                export let y: string;
+                export let z: string;
+            }
             export namespace snapping {
                 let title_14: string;
                 export { title_14 as title };
@@ -453,9 +469,10 @@ declare namespace messages {
             let title_16: string;
             export { title_16 as title };
             export namespace level {
-                let low: string;
-                let medium: string;
-                let high: string;
+                export let low: string;
+                export let medium: string;
+                let high_1: string;
+                export { high_1 as high };
             }
         }
         export namespace theme {
@@ -561,10 +578,11 @@ declare namespace messages {
         }
     }
     export namespace notification {
-        let error: string;
-        let warning: string;
-        let information: string;
-        let success: string;
+        export let error: string;
+        export let warning: string;
+        export let information: string;
+        let success_1: string;
+        export { success_1 as success };
     }
     export namespace datePicker {
         let today: string;

package/src/i18n/en.js

@@ -14,6 +14,7 @@ const messages = {
       CesiumMap: '3D map',
       OpenlayersMap: '2D map',
       ObliqueMap: 'Oblique imagery map',
+      PanoramaMap: 'Panorama imagery map',
     },
     menu: {
       tooltip: 'Menu',
@@ -93,8 +94,10 @@ const messages = {
     pin: 'Dock window',
     close: 'Close window',
     add: 'Add',
+    new: 'New',
     apply: 'Apply',
     cancel: 'Cancel',
+    addToMyWorkspace: 'Add to My Workspace',
     import: {
       submit: 'Import',
       fileDrop: 'Drop files here',
@@ -172,6 +175,12 @@ const messages = {
       zoom: 'Zoom to extent',
       export: 'Export flight',
       exportPath: 'Export flight path',
+      record: {
+        standard: 'Record standard resolution flight',
+        high: 'Record high resolution flight',
+        inProgress: 'Recording in progress',
+        success: 'Recording successful, the download will start shortly',
+      },
     },
     splashScreen: {
       name: 'Splash Screen',
@@ -245,6 +254,11 @@ const messages = {
       modifyInfo:
         'For modifying the selected feature(s), click on one of the icons in the header above.',
       styleHeader: 'Style',
+      position: {
+        x: 'Position X',
+        y: 'Position Y',
+        z: 'Position Z',
+      },
       snapping: {
         title: 'Snapping',
         help: 'Snapping can be temporarily disabled by holding the CTRL key.',

package/src/legend/VcsLegend.vue

@@ -2,10 +2,11 @@
   <v-sheet class="overflow-y-auto vcs-legend">
     <v-expansion-panels
       variant="accordion"
+      flat
       multiple
       v-if="entries.length > 0"
       v-model="panels"
-      class="rounded-0"
+      class="rounded-0 legend-panels"
     >
       <vcs-expansion-panel
         v-for="(entry, i) in entries"
@@ -142,4 +143,7 @@
     background-color: rgb(var(--v-theme-base-lighten-2));
     z-index: 1;
   }
+  .legend-panels .vcs-expansion-panel:not(:last-child) {
+    border-bottom: 1px solid rgb(var(--v-theme-base-lighten-2));
+  }
 </style>