npm - @vcmap/ui - Versions diffs - 5.2.0 → 5.2.1 - Mend

@vcmap/ui 5.2.0 → 5.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/config/www.config.json +16 -0
package/dist/assets/cesium.js +1 -1
package/dist/assets/{core.627882.js → core.a8552c.js} +2 -2
package/dist/assets/core.js +1 -1
package/dist/assets/index-8783569c.js +1 -0
package/dist/assets/ol.js +1 -1
package/dist/assets/{ui.895896.js → ui.aebd62.js} +3348 -3273
package/dist/assets/ui.js +1 -1
package/dist/assets/vue.js +2 -2
package/dist/assets/{vuetify.1621f3.js → vuetify.c8459d.js} +1 -1
package/dist/assets/vuetify.js +2 -2
package/dist/index.html +1 -1
package/index.d.ts +6 -2
package/index.js +6 -1
package/package.json +1 -1
package/plugins/package.json +7 -3
package/src/featureInfo/IframeComponent.vue +55 -0
package/src/featureInfo/IframeComponent.vue.d.ts +25 -0
package/src/featureInfo/featureInfo.js +5 -0
package/src/featureInfo/iframeFeatureInfoView.js +1 -20
package/src/featureInfo/iframeWmsFeatureInfoView.d.ts +41 -0
package/src/featureInfo/iframeWmsFeatureInfoView.js +73 -0
package/src/manager/window/windowManager.js +4 -0
package/src/vcsUiApp.js +5 -1
package/dist/assets/index-76acacac.js +0 -1
/package/dist/assets/{cesium.9e39f4.js → cesium.1b488a.js} +0 -0
/package/dist/assets/{ol.fe8c0e.js → ol.7488a7.js} +0 -0
/package/dist/assets/{ui.895896.css → ui.aebd62.css} +0 -0
/package/dist/assets/{vue.4b3319.js → vue.df3538.js} +0 -0
/package/dist/assets/{vuetify.1621f3.css → vuetify.c8459d.css} +0 -0

package/dist/assets/ui.js CHANGED Viewed

	@@ -1 +1 @@
1	- export * from "./ui.~~895896~~.js";
1	+ export * from "./ui.aebd62.js";

package/dist/assets/vue.js CHANGED Viewed

@@ -1,5 +1,5 @@
-export * from "./vue.4b3319.js";
-import { default as f } from "./vue.4b3319.js";
+export * from "./vue.df3538.js";
+import { default as f } from "./vue.df3538.js";
 export {
   f as default
 };

package/dist/assets/{vuetify.1621f3.js → vuetify.c8459d.js} RENAMED Viewed

@@ -13,7 +13,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify.1621f3.css');import v from "./vue.4b3319.js";
+} await loadCss('./assets/vuetify.c8459d.css');import v from "./vue.df3538.js";
 const Ne = v.extend().extend({
   name: "themeable",
   provide() {

package/dist/assets/vuetify.js CHANGED Viewed

@@ -1,5 +1,5 @@
-export * from "./vuetify.1621f3.js";
-import { default as f } from "./vuetify.1621f3.js";
+export * from "./vuetify.c8459d.js";
+import { default as f } from "./vuetify.c8459d.js";
 export {
   f as default
 };

package/dist/index.html CHANGED Viewed

@@ -95,7 +95,7 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="./assets/index-76acacac.js"></script>
+    <script type="module" crossorigin src="./assets/index-8783569c.js"></script>
   </head>
   <body style="height: 100vh; margin: 0;">
     <noscript>

package/index.d.ts CHANGED Viewed

@@ -1,7 +1,5 @@
 export { default as StyleSelector } from "./src/actions/StyleSelector.vue";
 export type * from "./src/actions/StyleSelector.vue.d.ts";
-export { parseAndSanitizeMarkdown } from "./src/application/markdownHelper.js";
-export type * from "./src/application/markdownHelper.d.ts";
 export { default as ActivateLayersCallback } from "./src/callback/activateLayersCallback.js";
 export type * from "./src/callback/activateLayersCallback.d.ts";
 export { default as DeactivateLayersCallback } from "./src/callback/deactivateLayersCallback.js";
@@ -76,8 +74,12 @@ export { default as BalloonComponent } from "./src/featureInfo/BalloonComponent.
 export type * from "./src/featureInfo/BalloonComponent.vue.d.ts";
 export { default as AddressBalloonComponent } from "./src/featureInfo/AddressBalloonComponent.vue";
 export type * from "./src/featureInfo/AddressBalloonComponent.vue.d.ts";
+export { default as IframeComponent } from "./src/featureInfo/IframeComponent.vue";
+export type * from "./src/featureInfo/IframeComponent.vue.d.ts";
 export { default as IframeFeatureInfoView } from "./src/featureInfo/iframeFeatureInfoView.js";
 export type * from "./src/featureInfo/iframeFeatureInfoView.d.ts";
+export { default as IframeWmsFeatureInfoView } from "./src/featureInfo/iframeWmsFeatureInfoView.js";
+export type * from "./src/featureInfo/iframeWmsFeatureInfoView.d.ts";
 export { default as TableFeatureInfoView } from "./src/featureInfo/tableFeatureInfoView.js";
 export type * from "./src/featureInfo/tableFeatureInfoView.d.ts";
 export { default as MarkdownFeatureInfoView } from "./src/featureInfo/markdownFeatureInfoView.js";
@@ -206,6 +208,8 @@ export { default as ImportComponent } from "./src/components/import/ImportCompon
 export type * from "./src/components/import/ImportComponent.vue.d.ts";
 export { createMapButtonAction, createToggleAction, createOverviewMapAction, createModalAction, createLinkAction, createGoToViewpointAction, createZoomToFeatureAction } from "./src/actions/actionHelper.js";
 export type * from "./src/actions/actionHelper.d.ts";
+export { parseAndSanitizeMarkdown, replaceAttributes } from "./src/application/markdownHelper.js";
+export type * from "./src/application/markdownHelper.d.ts";
 export { createStateRefAction, StateActionState } from "./src/actions/stateRefAction.js";
 export type * from "./src/actions/stateRefAction.d.ts";
 export { createLayerToggleAction, createZoomToExtentAction, createExtentFeatureAction, setupExtentComponentActions } from "./src/actions/extentActions.js";

package/index.js CHANGED Viewed

@@ -11,7 +11,10 @@ export {
   createGoToViewpointAction,
   createZoomToFeatureAction,
 } from './src/actions/actionHelper.js';
-export { parseAndSanitizeMarkdown } from './src/application/markdownHelper.js';
+export {
+  parseAndSanitizeMarkdown,
+  replaceAttributes,
+} from './src/application/markdownHelper.js';
 export {
   createStateRefAction,
   StateActionState,
@@ -164,7 +167,9 @@ export {
 } from './src/featureInfo/balloonHelper.js';
 export { default as BalloonComponent } from './src/featureInfo/BalloonComponent.vue';
 export { default as AddressBalloonComponent } from './src/featureInfo/AddressBalloonComponent.vue';
+export { default as IframeComponent } from './src/featureInfo/IframeComponent.vue';
 export { default as IframeFeatureInfoView } from './src/featureInfo/iframeFeatureInfoView.js';
+export { default as IframeWmsFeatureInfoView } from './src/featureInfo/iframeWmsFeatureInfoView.js';
 export { default as TableFeatureInfoView } from './src/featureInfo/tableFeatureInfoView.js';
 export { default as MarkdownFeatureInfoView } from './src/featureInfo/markdownFeatureInfoView.js';
 export { default as MarkdownBalloonFeatureInfoView } from './src/featureInfo/markdownBalloonFeatureInfoView.js';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {

package/plugins/package.json CHANGED Viewed

@@ -7,13 +7,17 @@
     "@vcmap/draw": "^2.0.0",
     "@vcmap/create-link": "^1.0.1",
     "@vcmap/search-nominatim": "^1.0.1",
-    "@vcmap/multi-view": "^1.0.1",
+    "@vcmap/multi-view": "^1.1.0",
     "@vcmap/cesium-filters": "^1.0.1",
     "@vcmap/viewshed": "^2.0.1",
     "@vcmap/measurement": "^1.0.2",
-    "@vcmap/flight": "^1.0.1"
+    "@vcmap/flight": "^1.1.0",
+    "@vcmap/transparent-terrain": "^1.0.1",
+    "@vcmap/search-coordinate": "^1.0.0",
+    "@vcmap/clipping-tool": "^1.0.0",
+    "@vcmap/height-profile": "^1.0.0"
   },
   "optionalDependencies": {
-    "@vcmap/planning": "^5.0.1"
+    "@vcmap/planning": "^5.1.0"
   }
 }

package/src/featureInfo/IframeComponent.vue ADDED Viewed

@@ -0,0 +1,55 @@
+<template>
+  <iframe :src="src" :title="title" :style="{ height, width }" />
+</template>
+<script>
+  import { inject } from 'vue';
+  import {
+    getTargetSize,
+    posToNumber,
+  } from '../manager/window/windowHelper.js';
+  /**
+   * @description An iframe component
+   * @vue-prop {string} src - Specifies the address of the document to embed in the <iframe>
+   * @vue-prop {string} [title] - optional title for the <iframe>
+   */
+  export default {
+    name: 'IframeComponent',
+    props: {
+      src: {
+        type: String,
+        required: true,
+      },
+      title: {
+        type: String,
+        default: undefined,
+      },
+    },
+    setup(props, { attrs }) {
+      const app = inject('vcsApp');
+      let { height, width } = app.windowManager.get(
+        attrs['window-state'].id,
+      ).position;
+      // set iframe size to absolute px values
+      if (app.maps.target) {
+        const targetSize = getTargetSize(app.maps.target);
+        const heightNumber = posToNumber(height, 'height', targetSize);
+        if (heightNumber) {
+          height = `${heightNumber - 36}px`; // 32px header height + 4px margin
+        }
+        const widthNumber = posToNumber(width, 'width', targetSize);
+        if (widthNumber) {
+          width = `${widthNumber}px`;
+        }
+      }
+      return {
+        height,
+        width,
+      };
+    },
+  };
+</script>
+<style scoped></style>

package/src/featureInfo/IframeComponent.vue.d.ts ADDED Viewed

@@ -0,0 +1,25 @@
+declare const _default: import("vue").DefineComponent<{
+    src: {
+        type: StringConstructor;
+        required: true;
+    };
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+}, {
+    height: any;
+    width: any;
+}, {}, {}, {}, import("vue/types/v3-component-options.js").ComponentOptionsMixin, import("vue/types/v3-component-options.js").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{
+    src: {
+        type: StringConstructor;
+        required: true;
+    };
+    title: {
+        type: StringConstructor;
+        default: undefined;
+    };
+}>>, {
+    title: string;
+}>;
+export default _default;

package/src/featureInfo/featureInfo.js CHANGED Viewed

@@ -34,6 +34,7 @@ import MarkdownFeatureInfoView from './markdownFeatureInfoView.js';
 import { getDefaultPrimaryColor } from '../vuePlugins/vuetify.js';
 import { ToolboxType } from '../manager/toolbox/toolboxManager.js';
 import MarkdownBalloonFeatureInfoView from './markdownBalloonFeatureInfoView.js';
+import IframeWmsFeatureInfoView from './iframeWmsFeatureInfoView.js';
 /** @typedef {import("ol").Feature|import("@vcmap-cesium/engine").Cesium3DTileFeature|import("@vcmap-cesium/engine").Cesium3DTilePointFeature|import("@vcmap-cesium/engine").Entity} FeatureType */
@@ -512,6 +513,10 @@ featureInfoClassRegistry.registerClass(
   IframeFeatureInfoView.className,
   IframeFeatureInfoView,
 );
+featureInfoClassRegistry.registerClass(
+  IframeWmsFeatureInfoView.className,
+  IframeWmsFeatureInfoView,
+);
 featureInfoClassRegistry.registerClass(
   BalloonFeatureInfoView.className,
   BalloonFeatureInfoView,

package/src/featureInfo/iframeFeatureInfoView.js CHANGED Viewed

@@ -1,24 +1,5 @@
 import AbstractFeatureInfoView from './abstractFeatureInfoView.js';
-/**
- * @description An iframe component
- * @vue-prop {string} src - Specifies the address of the document to embed in the <iframe>
- * @vue-prop {string} [title] - optional title for the <iframe>
- */
-const IframeComponent = {
-  name: 'IframeComponent',
-  props: {
-    src: {
-      type: String,
-      required: true,
-    },
-    title: {
-      type: String,
-      default: undefined,
-    },
-  },
-  template: '<iframe :src="src" :title="title" />',
-};
+import IframeComponent from './IframeComponent.vue';
 /**
  * @typedef {import("./abstractFeatureInfoView.js").FeatureInfoViewOptions & { src: string, title?: string }} IframeFeatureInfoViewOptions

package/src/featureInfo/iframeWmsFeatureInfoView.d.ts ADDED Viewed

@@ -0,0 +1,41 @@
+export default IframeWmsFeatureInfoView;
+export type IframeWmsFeatureInfoViewOptions = import("./abstractFeatureInfoView.js").FeatureInfoViewOptions & {
+    infoFormat: string;
+    title?: string;
+};
+/**
+ * @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>
+ */
+/**
+ * @class
+ * @description An iframe view.
+ * @extends {AbstractFeatureInfoView}
+ */
+declare class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
+    /**
+     * @param {IframeWmsFeatureInfoViewOptions} options
+     */
+    constructor(options: IframeWmsFeatureInfoViewOptions);
+    /**
+     * @type {string}
+     */
+    infoFormat: string;
+    /**
+     * @type {string|undefined}
+     */
+    title: string | undefined;
+    /**
+     * Gets feature info from WMS GetFeatureInfo in html/text format
+     * @param {import("./featureInfo.js").FeatureInfoEvent} featureInfo
+     * @param {import("@vcmap/core").WMSLayer} layer
+     * @returns {import("./iframeFeatureInfoView.js").IframeFeatureInfoViewProps}
+     */
+    getProperties(featureInfo: import("./featureInfo.js").FeatureInfoEvent, layer: import("@vcmap/core").WMSLayer): import("./iframeFeatureInfoView.js").IframeFeatureInfoViewProps;
+    /**
+     * @returns {IframeWmsFeatureInfoViewOptions}
+     */
+    toJSON(): IframeWmsFeatureInfoViewOptions;
+}
+import AbstractFeatureInfoView from './abstractFeatureInfoView.js';

package/src/featureInfo/iframeWmsFeatureInfoView.js ADDED Viewed

@@ -0,0 +1,73 @@
+import { get as getOlProj } from 'ol/proj.js';
+import AbstractFeatureInfoView from './abstractFeatureInfoView.js';
+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>
+ */
+/**
+ * @class
+ * @description An iframe view.
+ * @extends {AbstractFeatureInfoView}
+ */
+class IframeWmsFeatureInfoView extends AbstractFeatureInfoView {
+  /**
+   * @type {string}
+   */
+  static get className() {
+    return 'IframeWmsFeatureInfoView';
+  }
+  /**
+   * @param {IframeWmsFeatureInfoViewOptions} options
+   */
+  constructor(options) {
+    super(options, IframeComponent);
+    /**
+     * @type {string}
+     */
+    this.infoFormat = options.infoFormat || 'text/html';
+    /**
+     * @type {string|undefined}
+     */
+    this.title = options.title || undefined;
+  }
+  /**
+   * Gets feature info from WMS GetFeatureInfo in html/text format
+   * @param {import("./featureInfo.js").FeatureInfoEvent} featureInfo
+   * @param {import("@vcmap/core").WMSLayer} layer
+   * @returns {import("./iframeFeatureInfoView.js").IframeFeatureInfoViewProps}
+   */
+  getProperties(featureInfo, layer) {
+    return {
+      src: layer.featureProvider.wmsSource.getFeatureInfoUrl(
+        featureInfo.position,
+        1,
+        getOlProj('EPSG:3857'),
+        { INFO_FORMAT: this.infoFormat },
+      ),
+      title: this.title,
+    };
+  }
+  /**
+   * @returns {IframeWmsFeatureInfoViewOptions}
+   */
+  toJSON() {
+    const config = super.toJSON();
+    if (this.infoFormat) {
+      config.infoFormat = this.infoFormat;
+    }
+    if (this.title) {
+      config.title = this.title;
+    }
+    return config;
+  }
+}
+export default IframeWmsFeatureInfoView;

package/src/manager/window/windowManager.js CHANGED Viewed

@@ -155,6 +155,10 @@ export function posToPixel(pos) {
   if (typeof pos === 'number') {
     return `${pos}px`;
   }
+  // if a string with just a number, add a px example: "220"
+  if (/^\d+$/.test(pos)) {
+    return `${pos}px`;
+  }
   return pos;
 }

package/src/vcsUiApp.js CHANGED Viewed

@@ -557,7 +557,11 @@ class VcsUiApp extends VcsApp {
         )
         .map(async (p) => {
           try {
-            return { name: p.name, state: await p.getState(forUrl) };
+            const pluginState = await p.getState(forUrl);
+            if (Object.keys(pluginState).length > 0) {
+              return { name: p.name, state: pluginState };
+            }
+            return null;
           } catch (e) {
             getLogger().error(e);
             return null;

package/dist/assets/index-76acacac.js DELETED Viewed

	@@ -1 +0,0 @@
1	- import{initAppFromAppConfig as p}from"./ui.895896.js";p("#app","app.config.json");

/package/dist/assets/{cesium.9e39f4.js → cesium.1b488a.js} RENAMED Viewed

File without changes

/package/dist/assets/{ol.fe8c0e.js → ol.7488a7.js} RENAMED Viewed

File without changes

/package/dist/assets/{ui.895896.css → ui.aebd62.css} RENAMED Viewed

File without changes

/package/dist/assets/{vue.4b3319.js → vue.df3538.js} RENAMED Viewed

File without changes

/package/dist/assets/{vuetify.1621f3.css → vuetify.c8459d.css} RENAMED Viewed

File without changes