@vcmap/ui 6.1.0-rc.7 → 6.1.0

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-43a20e18.js";
+export * from "./vuetify-4bc77ff7.js";

package/index.d.ts

@@ -39,10 +39,14 @@ export { default as ContentTreeItem } from "./src/contentTree/contentTreeItem.js
 export type * from "./src/contentTree/contentTreeItem.d.ts";
 export { default as GroupContentTreeItem } from "./src/contentTree/groupContentTreeItem.js";
 export type * from "./src/contentTree/groupContentTreeItem.d.ts";
+export { default as WMSGroupContentTreeItem } from "./src/contentTree/wmsGroupContentTreeItem.js";
+export type * from "./src/contentTree/wmsGroupContentTreeItem.d.ts";
 export { default as LayerGroupContentTreeItem } from "./src/contentTree/layerGroupContentTreeItem.js";
 export type * from "./src/contentTree/layerGroupContentTreeItem.d.ts";
 export { default as FlightContentTreeItem } from "./src/contentTree/flightContentTreeItem.js";
 export type * from "./src/contentTree/flightContentTreeItem.d.ts";
+export { default as LayerTree } from "./src/contentTree/LayerTree.vue";
+export type * from "./src/contentTree/LayerTree.vue.d.ts";
 export { default as NodeContentTreeItem } from "./src/contentTree/nodeContentTreeItem.js";
 export type * from "./src/contentTree/nodeContentTreeItem.d.ts";
 export { default as ObliqueCollectionContentTreeItem } from "./src/contentTree/obliqueCollectionContentTreeItem.js";
@@ -127,8 +131,6 @@ export { default as UiConfig } from "./src/uiConfig.js";
 export type * from "./src/uiConfig.d.ts";
 export { default as VcsUiApp } from "./src/vcsUiApp.js";
 export type * from "./src/vcsUiApp.d.ts";
-export { default as Icons } from "./src/components/icons/+all.js";
-export type * from "./src/components/icons/+all.d.ts";
 export { default as VcsButton } from "./src/components/buttons/VcsButton.vue";
 export type * from "./src/components/buttons/VcsButton.vue.d.ts";
 export { default as VcsToolButton } from "./src/components/buttons/VcsToolButton.vue";
@@ -139,6 +141,8 @@ export { default as VcsActionButtonList } from "./src/components/buttons/VcsActi
 export type * from "./src/components/buttons/VcsActionButtonList.vue.d.ts";
 export { default as VcsHelp } from "./src/components/notification/VcsHelp.vue";
 export type * from "./src/components/notification/VcsHelp.vue.d.ts";
+export { default as VcsHelpTooltip } from "./src/components/notification/VcsHelpTooltip.vue";
+export type * from "./src/components/notification/VcsHelpTooltip.vue.d.ts";
 export { default as VcsTable } from "./src/components/tables/VcsTable.vue";
 export type * from "./src/components/tables/VcsTable.vue.d.ts";
 export { default as VcsDataTable } from "./src/components/tables/VcsDataTable.vue";
@@ -205,6 +209,8 @@ export { default as VcsTreeviewSearchbar } from "./src/components/lists/VcsTreev
 export type * from "./src/components/lists/VcsTreeviewSearchbar.vue.d.ts";
 export { default as VcsBadge } from "./src/components/notification/VcsBadge.vue";
 export type * from "./src/components/notification/VcsBadge.vue.d.ts";
+export { default as StyleMenuWrapper } from "./src/components/style/StyleMenuWrapper.vue";
+export type * from "./src/components/style/StyleMenuWrapper.vue.d.ts";
 export { default as VcsFillSelector } from "./src/components/style/VcsFillSelector.vue";
 export type * from "./src/components/style/VcsFillSelector.vue.d.ts";
 export { default as VcsFillMenu } from "./src/components/style/VcsFillMenu.vue";
@@ -263,8 +269,10 @@ export { default as ResultItemComponent } from "./src/search/ResultItem.vue";
 export type * from "./src/search/ResultItem.vue.d.ts";
 export { default as ResultsComponent } from "./src/search/ResultsComponent.vue";
 export type * from "./src/search/ResultsComponent.vue.d.ts";
-export { createMapButtonAction, createToggleAction, createOverviewMapAction, createModalAction, createLinkAction, createGoToViewpointAction, createZoomToFeatureAction, searchComponentId } from "./src/actions/actionHelper.js";
+export { callSafeAction, createMapButtonAction, createToggleAction, createOverviewMapAction, createModalAction, createLinkAction, createGoToViewpointAction, createZoomToFeatureAction, searchComponentId } from "./src/actions/actionHelper.js";
 export type * from "./src/actions/actionHelper.d.ts";
+export { createDeepPickingAction, deepPickingWindowId } from "./src/actions/deepPickingAction.js";
+export type * from "./src/actions/deepPickingAction.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";
@@ -281,8 +289,6 @@ export { default as ContentTreeCollection, createContentTreeCollection, defaultC
 export type * from "./src/contentTree/contentTreeCollection.d.ts";
 export { default as LayerContentTreeItem, setViewpointAction, getStateFromLayer } from "./src/contentTree/layerContentTreeItem.js";
 export type * from "./src/contentTree/layerContentTreeItem.d.ts";
-export { default as LayerTree, openStateMapSymbol } from "./src/contentTree/LayerTree.vue";
-export type * from "./src/contentTree/LayerTree.vue.d.ts";
 export { default as WindowManager, WindowSlot, WindowPositions, posToPixel, windowPositionFromOptions } from "./src/manager/window/windowManager.js";
 export type * from "./src/manager/window/windowManager.d.ts";
 export { WindowAlignment, getFittedWindowPositionOptions, getFittedWindowPositionOptionsFromMapEvent, getTargetSize, getWindowPositionOptions, getWindowPositionOptionsFromMapEvent, posToNumber, posToPercent, optionsFromWindowPosition, updateWindowPosition, clipToTargetSize, moveWindow, applyParentPosition, getPositionAppliedOnTarget } from "./src/manager/window/windowHelper.js";
@@ -327,6 +333,8 @@ export { getStateFromURL, createEmptyState, setStateToUrl } from "./src/state.js
 export type * from "./src/state.d.ts";
 export { default as Notifier, NotificationType } from "./src/notifier/notifier.js";
 export type * from "./src/notifier/notifier.d.ts";
+export { default as Icons, getColoredMapIcon } from "./src/components/icons/+all.js";
+export type * from "./src/components/icons/+all.d.ts";
 export { default as VcsActionList, validateAction, validateActions } from "./src/components/lists/VcsActionList.vue";
 export type * from "./src/components/lists/VcsActionList.vue.d.ts";
 export { default as VcsVectorStyleComponent, VectorStyleMenus } from "./src/components/style/VcsVectorStyleComponent.vue";

package/index.js

@@ -3,6 +3,7 @@ import './src/styles/main.scss';
 
 export { default as StyleSelector } from './src/actions/StyleSelector.vue';
 export {
+  callSafeAction,
   createMapButtonAction,
   createToggleAction,
   createOverviewMapAction,
@@ -12,6 +13,10 @@ export {
   createZoomToFeatureAction,
   searchComponentId,
 } from './src/actions/actionHelper.js';
+export {
+  createDeepPickingAction,
+  deepPickingWindowId,
+} from './src/actions/deepPickingAction.js';
 export { parseAndSanitizeMarkdown } from './src/components/form-output/markdownHelper.js';
 export { renderTemplate } from '@vcmap/core';
 export {
@@ -83,6 +88,7 @@ export {
 } from './src/contentTree/contentTreeCollection.js';
 export { default as ContentTreeItem } from './src/contentTree/contentTreeItem.js';
 export { default as GroupContentTreeItem } from './src/contentTree/groupContentTreeItem.js';
+export { default as WMSGroupContentTreeItem } from './src/contentTree/wmsGroupContentTreeItem.js';
 export {
   default as LayerContentTreeItem,
   setViewpointAction,
@@ -90,10 +96,7 @@ export {
 } from './src/contentTree/layerContentTreeItem.js';
 export { default as LayerGroupContentTreeItem } from './src/contentTree/layerGroupContentTreeItem.js';
 export { default as FlightContentTreeItem } from './src/contentTree/flightContentTreeItem.js';
-export {
-  default as LayerTree,
-  openStateMapSymbol,
-} from './src/contentTree/LayerTree.vue';
+export { default as LayerTree } from './src/contentTree/LayerTree.vue';
 export { default as NodeContentTreeItem } from './src/contentTree/nodeContentTreeItem.js';
 export { default as ObliqueCollectionContentTreeItem } from './src/contentTree/obliqueCollectionContentTreeItem.js';
 export { default as SubContentTreeItem } from './src/contentTree/subContentTreeItem.js';
@@ -264,13 +267,17 @@ export {
   default as Notifier,
   NotificationType,
 } from './src/notifier/notifier.js';
-export { default as Icons } from './src/components/icons/+all.js';
+export {
+  default as Icons,
+  getColoredMapIcon,
+} from './src/components/icons/+all.js';
 
 export { default as VcsButton } from './src/components/buttons/VcsButton.vue';
 export { default as VcsToolButton } from './src/components/buttons/VcsToolButton.vue';
 export { default as VcsFormButton } from './src/components/buttons/VcsFormButton.vue';
 export { default as VcsActionButtonList } from './src/components/buttons/VcsActionButtonList.vue';
 export { default as VcsHelp } from './src/components/notification/VcsHelp.vue';
+export { default as VcsHelpTooltip } from './src/components/notification/VcsHelpTooltip.vue';
 export { default as VcsTable } from './src/components/tables/VcsTable.vue';
 export { default as VcsDataTable } from './src/components/tables/VcsDataTable.vue';
 export { default as VcsLabel } from './src/components/form-inputs-controls/VcsLabel.vue';
@@ -307,6 +314,7 @@ export { default as VcsTreeviewSearchbar } from './src/components/lists/VcsTreev
 export { default as VcsBadge } from './src/components/notification/VcsBadge.vue';
 export { default as VcsDefaultLogo } from './src/logo.svg';
 export { default as VcsDefaultMobileLogo } from './src/logo-mobile.svg';
+export { default as StyleMenuWrapper } from './src/components/style/StyleMenuWrapper.vue';
 export { default as VcsFillSelector } from './src/components/style/VcsFillSelector.vue';
 export { default as VcsFillMenu } from './src/components/style/VcsFillMenu.vue';
 export { default as VcsStrokeSelector } from './src/components/style/VcsStrokeSelector.vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.1.0-rc.7",
+  "version": "6.1.0",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -48,26 +48,26 @@
     "@vcsuite/check": "^2.1.0",
     "@vcsuite/logger": "^1.0.1",
     "@vcsuite/parsers": "^2.0.1",
-    "dompurify": "^3.1.6",
+    "dompurify": "^3.2.4",
     "fast-deep-equal": "^3.1.3",
-    "marked": "^15.0.0",
+    "marked": "^15.0.7",
     "semver": "^7.6.3",
-    "uuid": "^11.0.0",
+    "uuid": "^11.1.0",
     "vue-i18n": "^9.13.1"
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
-    "@vcmap/core": "^6.1.0-rc.6",
+    "@vcmap/core": "^6.1.1",
     "ol": "^10.4.0",
     "vue": "~3.4.38",
-    "vuetify": "^3.7.12"
+    "vuetify": "^3.7.14"
   },
   "overrides": {
     "esbuild": "^0.25.0"
   },
   "devDependencies": {
     "@histoire/plugin-vue": "^0.17.17",
-    "@vcmap/rollup-plugin-vcs-ol": "^1.0.2",
+    "@vcmap/rollup-plugin-vcs-ol": "^1.0.5",
     "@vcsuite/eslint-config": "^3.0.5",
     "@vitejs/plugin-vue": "^5.1.4",
     "@vitest/coverage-v8": "^2.1.3",
@@ -88,7 +88,8 @@
     "vite": "^5.4.9",
     "vite-plugin-vuetify": "^2.0.4",
     "vitest": "^2.1.3",
-    "vue-tsc": "^2.1.6"
+    "vue-tsc": "^2.1.6",
+    "nock": "^14.0.1"
   },
   "stylelint": {
     "extends": "stylelint-config-standard",

package/plugins/@vcmap-show-case/vector-properties-example/src/LayerSettings.vue

@@ -0,0 +1,39 @@
+<script setup>
+  import { computed, inject, ref } from 'vue';
+  import { VcsFormSection, VcsCheckbox } from '@vcmap/ui';
+  import { VContainer, VRow, VCol } from 'vuetify/components';
+  import { name } from '../package.json';
+  import { getBalloonFeatureInfo } from './lib.js';
+
+  const vcsApp = inject('vcsApp');
+  const plugin = vcsApp.plugins.getByKey(name);
+
+  const { layer } = plugin;
+  const featureInfo = getBalloonFeatureInfo(vcsApp);
+  const hasBallon = ref(layer.properties.featureInfo === featureInfo.name);
+  const useBallon = computed({
+    get: () => hasBallon.value,
+    set: (value) => {
+      if (value) {
+        layer.properties.featureInfo = featureInfo.name;
+      } else {
+        layer.properties.featureInfo = undefined;
+      }
+      hasBallon.value = layer.properties.featureInfo === featureInfo.name;
+    },
+  });
+</script>
+
+<template>
+  <vcs-form-section heading="Layer Settings" expandable>
+    <v-container class="pa-2">
+      <v-row no-gutters>
+        <v-col>
+          <vcs-checkbox v-model="useBallon" label="Ballon Feature Info" />
+        </v-col>
+      </v-row>
+    </v-container>
+  </vcs-form-section>
+</template>
+
+<style scoped lang="scss"></style>

package/plugins/@vcmap-show-case/vector-properties-example/src/VectorPropertiesExample.vue

@@ -50,6 +50,7 @@
       :expandable="expandable"
       :show-reset="showReset"
     />
+    <layer-settings />
   </v-sheet>
 </template>
 
@@ -76,10 +77,12 @@
   import { name } from '../package.json';
   import GeometrySettings from './GeometrySettings.vue';
   import TerrainSettings from './TerrainSettings.vue';
+  import LayerSettings from './LayerSettings.vue';
 
   export default {
     name: 'VectorPropertiesExample',
     components: {
+      LayerSettings,
       TerrainSettings,
       GeometrySettings,
       VcsVectorPropertiesComponent,

package/plugins/@vcmap-show-case/vector-properties-example/src/lib.js

@@ -16,6 +16,7 @@ import {
   Polygon,
 } from 'ol/geom';
 import { Stroke, Style, Text as OLText } from 'ol/style';
+import { BalloonFeatureInfoView } from '@vcmap/ui';
 
 function layoutHelper(feature, layout = 'XYZ') {
   if (layout !== 'XYZ') {
@@ -292,3 +293,15 @@ export function getTiltedLineStringFeature(layout) {
   layoutHelper(feature, layout);
   return feature;
 }
+
+let balloonFeatureInfo;
+export function getBalloonFeatureInfo(app) {
+  if (!balloonFeatureInfo) {
+    balloonFeatureInfo = new BalloonFeatureInfoView({
+      title: 'Vector Properties Example',
+      attributeKeys: ['featureId'],
+    });
+    app.featureInfo.add(balloonFeatureInfo);
+  }
+  return balloonFeatureInfo;
+}

package/plugins/@vcmap-show-case/window-tester/src/WindowExample.vue

@@ -12,6 +12,9 @@
     <VcsFormButton @click="toggleClass()" :active="showTestClass" class="pa-1">
       Change Static2 TestClass
     </VcsFormButton>
+    <vcs-form-button @click="logStates"
+      >Log Current window states</vcs-form-button
+    >
   </div>
 </template>
 <style></style>
@@ -218,6 +221,12 @@
             app.windowManager.add(windowComponentOptions, owner);
           }
         },
+        logStates() {
+          app.windowManager.componentIds.forEach((id) => {
+            console.log(app.windowManager.get(id));
+            console.log(app.windowManager.getCachedPosition(id));
+          });
+        },
         examples: exampleWindows.map((item) => item.id),
       };
     },

package/plugins/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@vcmap/print": "^2.0.0",
+    "@vcmap/print": "^3.0.0",
     "@vcmap/walk": "^2.0.0",
     "@vcmap/clipping-tool": "^2.0.0",
     "@vcmap/transparent-terrain": "^2.0.0",
     "@vcmap/height-profile": "^2.0.0",
     "@vcmap/flight": "^2.0.0",
-    "@vcmap/swipe-tool": "^2.0.0",
+    "@vcmap/swipe-tool": "^3.0.0",
     "@vcmap/export": "^2.0.0",
     "@vcmap/viewshed": "^3.0.0",
-    "@vcmap/measurement": "^2.0.0",
+    "@vcmap/measurement": "^3.0.0",
     "@vcmap/multi-view": "^2.0.0",
     "@vcmap/draw": "^3.0.0",
     "@vcmap/shadow": "^3.0.0",
@@ -19,11 +19,13 @@
     "@vcmap/link-button": "^2.0.0",
     "@vcmap/cesium-filters": "^2.0.0",
     "@vcmap/search-nominatim": "^2.0.0",
-    "@vcmap/create-link": "^2.0.0",
+    "@vcmap/create-link": "^3.0.0",
     "@vcmap/module-selector": "^2.0.0",
     "@vcmap/line-of-sight": "^1.0.0",
     "@vcmap/layer-slider": "^2.0.0",
-    "@vcmap/vcs-solar-balloon": "^2.0.0"
+    "@vcmap/vcs-solar-balloon": "^2.0.0",
+    "@vcmap/list-view": "^1.0.0",
+    "@vcmap/pointcloud-settings": "^1.0.0"
   },
   "optionalDependencies": {
     "@vcmap/planning": "^6.0.0"

package/src/actions/actionHelper.d.ts

@@ -107,6 +107,12 @@ export function getViewpointFromFeature(feature: import("ol").Feature): Viewpoin
  * @returns {VcsAction|null} returns null if the feature does not have a geometry with a valid extent
  */
 export function createZoomToFeatureAction(actionOptions: ActionOptions, feature: import("ol").Feature, mapCollection: import("@vcmap/core").MapCollection): VcsAction | null;
+/**
+ * Calls the callback of an action and handles potential error.
+ * @param {VcsAction} action
+ * @param {PointerEvent} [p]
+ */
+export function callSafeAction(action: VcsAction, p?: PointerEvent | undefined): void;
 export const searchComponentId: "searchId";
 export type ActionOptions = Omit<VcsAction, 'callback'>;
 export type ActionCallback = (p?: PointerEvent) => (void | Promise<void>);

package/src/actions/actionHelper.js

@@ -1,5 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { check, maybe, oneOf, optional } from '@vcsuite/check';
+import { getLogger } from '@vcsuite/logger';
 import {
   Collection,
   Extent,
@@ -498,3 +499,24 @@ export function createZoomToFeatureAction(
     },
   };
 }
+
+/**
+ * Calls the callback of an action and handles potential error.
+ * @param {VcsAction} action
+ * @param {PointerEvent} [p]
+ */
+export function callSafeAction(action, p) {
+  const logError = (e) =>
+    getLogger(action.name).error(
+      `Error while calling the ${action.title ?? action.name} callback:`,
+      e,
+    );
+  try {
+    const optPromise = action.callback(p);
+    if (optPromise instanceof Promise) {
+      optPromise.catch(logError);
+    }
+  } catch (e) {
+    logError(e);
+  }
+}

package/src/actions/deepPickingAction.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @param {import("@vcmap/ui").VcsUiApp} app
+ * @returns {{ layer: import("@vcmap/core").VectorLayer, destroy: () => void }}
+ */
+export function setupDeepPickingLayer(app: import("@vcmap/ui").VcsUiApp): {
+    layer: import("@vcmap/core").VectorLayer;
+    destroy: () => void;
+};
+/**
+ * @param {import("../vcsUiApp.js").default} app
+ * @param {import("@vcmap/core").VectorLayer} layer
+ * @param {(event: import("@vcmap/core").InteractionEvent) => Promise<import("@vcmap/core").EventFeature[]>} collectFeatures
+ * @param {import("@vcmap/core").InteractionEvent} event
+ * @returns {import("./actionHelper.js").VcsAction}
+ */
+export function createDeepPickingAction(app: import("../vcsUiApp.js").default, layer: import("@vcmap/core").VectorLayer, collectFeatures: (event: import("@vcmap/core").InteractionEvent) => Promise<import("@vcmap/core").EventFeature[]>, event: import("@vcmap/core").InteractionEvent): import("./actionHelper.js").VcsAction;
+/**
+ * This adds deep picking action to the context menu, if not disabled in uiConfig
+ * @param {import("../vcsUiApp.js").default} app
+ * @returns {() => void}
+ */
+export function setupDeepPicking(app: import("../vcsUiApp.js").default): () => void;
+export const deepPickingWindowId: "deep-picking-window";