@vcmap/ui 6.0.3 → 6.0.5

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-76492ce7.js";
+export * from "./ui-a7b9fa52.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-a92df366.js";
+export * from "./vue-1e953f19.js";

package/dist/assets/{vuetify-3bf44235.js → vuetify-b07f3508.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-3bf44235.css');import { watch as X, onScopeDispose as tt, effectScope as Ul, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Ne, toRefs as Wt, capitalize as On, isVNode as Oc, Comment as Rc, unref as ot, warn as Ha, getCurrentInstance as Nc, ref as W, provide as Ae, inject as ye, defineComponent as Hc, camelize as Ir, h as jt, toRaw as Ee, createVNode as r, mergeProps as N, onBeforeUnmount as nt, readonly as Kl, onDeactivated as _r, onActivated as zc, onMounted as Ke, nextTick as Se, TransitionGroup as ql, Transition as Ht, isRef as _n, toRef as F, onBeforeMount as Xl, withDirectives as $e, resolveDirective as dt, vShow as xt, onUpdated as Wc, Text as jc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Uc, cloneVNode as Kc, createTextVNode as Pt, onUnmounted as qc, onBeforeUpdate as Xc, withModifiers as Pl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Tr } from "./vue-a92df366.js";
+} await loadCss('./assets/vuetify-b07f3508.css');import { watch as X, onScopeDispose as tt, effectScope as Ul, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Ne, toRefs as Wt, capitalize as On, isVNode as Oc, Comment as Rc, unref as ot, warn as Ha, getCurrentInstance as Nc, ref as W, provide as Ae, inject as ye, defineComponent as Hc, camelize as Ir, h as jt, toRaw as Ee, createVNode as r, mergeProps as N, onBeforeUnmount as nt, readonly as Kl, onDeactivated as _r, onActivated as zc, onMounted as Ke, nextTick as Se, TransitionGroup as ql, Transition as Ht, isRef as _n, toRef as F, onBeforeMount as Xl, withDirectives as $e, resolveDirective as dt, vShow as xt, onUpdated as Wc, Text as jc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Uc, cloneVNode as Kc, createTextVNode as Pt, onUnmounted as qc, onBeforeUpdate as Xc, withModifiers as Pl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Tr } from "./vue-1e953f19.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-3bf44235.js";
+export * from "./vuetify-b07f3508.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.0.3",
+  "version": "6.0.5",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -57,7 +57,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
-    "@vcmap/core": "^6.0.1",
+    "@vcmap/core": "^6.0.3",
     "ol": "^10.2.1",
     "vue": "~3.4.38",
     "vuetify": "^3.7.3"

package/plugins/@vcmap-show-case/plugin-editors/src/PluginEditors.vue

@@ -25,17 +25,17 @@
         const editors = plugin.getConfigEditors?.();
         if (editors?.length > 0) {
           const actions = editors
-            .map((e) => e.component)
-            .filter((c) => c)
-            .map((component, index) =>
+            .filter((e) => e.component)
+            .map((e, index) =>
               createToggleAction(
                 {
                   name: `editor-${index + 1}`,
+                  title: e.title,
                   icon: index < 9 ? `mdi-numeric-${index + 1}-box` : undefined,
                 },
                 {
                   id: `${plugin.name}-editor-${index}`,
-                  component,
+                  component: e.component,
                   parentId: name,
                   slot: WindowSlot.DYNAMIC_CHILD,
                   props: {
@@ -60,7 +60,8 @@
                   },
                   state: {
                     headerTitle:
-                      component.title ?? `${plugin.name} Editor ${index + 1}`,
+                      e.title ?? `${plugin.name} Editor ${index + 1}`,
+                    infoUrlCallback: e.infoUrlCallback,
                   },
                   position: {
                     width: 500,

package/plugins/package.json

@@ -21,7 +21,8 @@
     "@vcmap/search-nominatim": "^2.0.0",
     "@vcmap/create-link": "^2.0.0",
     "@vcmap/module-selector": "^2.0.0",
-    "@vcmap/line-of-sight": "^1.0.0"
+    "@vcmap/line-of-sight": "^1.0.0",
+    "@vcmap/layer-slider": "^2.0.0"
   },
   "optionalDependencies": {
     "@vcmap/planning": "^6.0.0"

package/src/actions/extentActions.js

@@ -97,6 +97,7 @@ export function createExtentFeatureAction(
       if (!this.active) {
         this.active = true;
         layer.activate();
+        const feature = layer.getFeatureById(featureId);
         layer.removeFeaturesById([featureId]);
         session = startCreateFeatureSession(app, layer, GeometryType.BBox);
         const listeners = [
@@ -112,6 +113,9 @@ export function createExtentFeatureAction(
                 extent: newExtent,
               });
               session.stop();
+            } else if (feature) {
+              // reset feature, if creation is canceled
+              layer.addFeatures([feature]);
             }
           }),
           session.stopped.addEventListener(() => {

package/src/application/VcsPositionDisplay.vue

@@ -17,6 +17,7 @@
         prefix="x:"
         :model-value="transformedPosition[0]"
         :fraction-digits="fractionDigits"
+        :number-format-options="{ useGrouping: false }"
         class="pa-0"
       />
       <VcsFormattedNumber
@@ -24,12 +25,14 @@
         prefix="y:"
         :model-value="transformedPosition[1]"
         :fraction-digits="fractionDigits"
+        :number-format-options="{ useGrouping: false }"
         class="pa-0"
       />
       <VcsFormattedNumber
         v-if="transformedPosition[2]"
         prefix="z:"
         :model-value="transformedPosition[2]"
+        :number-format-options="{ useGrouping: false }"
         class="pa-0"
       />
     </template>
@@ -42,8 +45,13 @@
           class="bg-primary"
         />
       </template>
-      <v-list selectable v-model:selected="selectedEPSG">
-        <v-list-item v-for="(item, i) in items" :key="i" :value="item.value">
+      <v-list selectable v-model:selected="selectedEPSG" mandatory>
+        <v-list-item
+          v-for="(item, i) in items"
+          :key="i"
+          :value="item.value"
+          color="primary"
+        >
           <v-list-item-title>{{ $st(item.text) }}</v-list-item-title>
         </v-list-item>
       </v-list>
@@ -109,7 +117,7 @@
         [defaultProjection.epsg]: defaultProjection,
         [wgs84Projection.epsg]: wgs84Projection,
       };
-      const selectedEPSG = ref([]);
+      const selectedEPSG = ref([defaultProjection.epsg]);
 
       function getProjectionItems() {
         return Object.keys(projections).map((epsg) => {

package/src/application/VcsPositionDisplay.vue.d.ts

@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{}, {
     };
     transformedPosition: import("vue").ComputedRef<import("ol/coordinate.js", { with: { "resolution-mode": "import" } }).Coordinate>;
     fractionDigits: import("vue").ComputedRef<2 | 6>;
-    selectedEPSG: import("vue").Ref<never[]>;
+    selectedEPSG: import("vue").Ref<string[]>;
     items: import("vue").Ref<{
         text: any;
         value: string;

package/src/components/form-output/VcsFormattedNumber.vue

@@ -40,7 +40,7 @@
   }
 </style>
 <script>
-  import { computed } from 'vue';
+  import { computed, inject } from 'vue';
   import { VTooltip } from 'vuetify/components';
   import { usePadding } from '../composables.js';
 
@@ -49,18 +49,26 @@
    * dot-seperated string with given amount of fractional digits (e.g. 12.345.678,90)
    * @param {string|number} value
    * @param {number} fractionDigits
+   * @param {string} [locale=navigator.language] can be used to set the locale, navigator.language is the default.
+   * @param {Intl.NumberFormatOptions} [options={}] can be used to provide options to the function
    * @returns {string|number}
    */
-  export function numberToLocaleString(value, fractionDigits) {
+  export function numberToLocaleString(
+    value,
+    fractionDigits,
+    locale = navigator.language,
+    options = {},
+  ) {
     // XXX todo maybe merge with dateTime helpers in core?
     const number = parseInt(value, 10);
     if (Number.isNaN(number)) {
       return number;
     }
 
-    return /** @type {number} */ value.toLocaleString(navigator.language, {
+    return /** @type {number} */ value.toLocaleString(locale, {
       minimumFractionDigits: fractionDigits,
       maximumFractionDigits: fractionDigits,
+      ...options,
     });
   }
 
@@ -84,6 +92,7 @@
    * @vue-prop {boolean} [disabled=false] - disabled by adding transparency to the label.
    * @vue-prop {string|SpecialUnits} [unit=undefined]
    * @vue-prop {number} [fractionDigits=undefined]
+   * @vue-prop {Intl.NumberFormatOptions} [numberFormatOptions=undefined] Intl.NumberFormatOptions
    * @vue-prop {number} modelValue
    * @vue-prop {string|number} prefix
    * @vue-prop {('bottom' | 'left' | 'top' | 'right')}  [tooltipPosition='right'] - Position of the tooltip.
@@ -107,6 +116,10 @@
         type: Number,
         default: 2,
       },
+      numberFormatOptions: {
+        type: Object,
+        default: undefined,
+      },
       modelValue: {
         type: Number,
         default: 0,
@@ -125,8 +138,14 @@
       },
     },
     setup(props, { attrs }) {
+      const app = inject('vcsApp');
       const formatted = computed(() =>
-        numberToLocaleString(props.modelValue, props.fractionDigits),
+        numberToLocaleString(
+          props.modelValue,
+          props.fractionDigits,
+          app.vueI18n.locale.value,
+          props.numberFormatOptions,
+        ),
       );
       const paddingProvided = usePadding(attrs);
       return {

package/src/components/form-output/VcsFormattedNumber.vue.d.ts

@@ -3,9 +3,11 @@
  * dot-seperated string with given amount of fractional digits (e.g. 12.345.678,90)
  * @param {string|number} value
  * @param {number} fractionDigits
+ * @param {string} [locale=navigator.language] can be used to set the locale, navigator.language is the default.
+ * @param {Intl.NumberFormatOptions} [options={}] can be used to provide options to the function
  * @returns {string|number}
  */
-export function numberToLocaleString(value: string | number, fractionDigits: number): string | number;
+export function numberToLocaleString(value: string | number, fractionDigits: number, locale?: string | undefined, options?: Intl.NumberFormatOptions | undefined): string | number;
 /**
  * *
  */
@@ -28,6 +30,10 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    numberFormatOptions: {
+        type: ObjectConstructor;
+        default: undefined;
+    };
     modelValue: {
         type: NumberConstructor;
         default: number;
@@ -65,6 +71,10 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
+    numberFormatOptions: {
+        type: ObjectConstructor;
+        default: undefined;
+    };
     modelValue: {
         type: NumberConstructor;
         default: number;
@@ -89,6 +99,7 @@ declare const _default: import("vue").DefineComponent<{
     tooltipPosition: string;
     unit: string;
     fractionDigits: number;
+    numberFormatOptions: Record<string, any>;
 }, {}>;
 export default _default;
 export namespace VcsFormattedNumber {

package/src/components/lists/VcsList.vue

@@ -113,7 +113,7 @@
     const selectAllAction = reactive({
       name: 'list.selectAll',
       tooltip: 'list.selectAll',
-      disabled: items.value.length - selected.value.length < 1,
+      disabled: computed(() => items.value.length - selected.value.length < 1),
       callback() {
         const currentSelection = [...selected.value];
         selected.value = items.value.filter((item) => !item.disabled);
@@ -126,10 +126,11 @@
         emit('update:modelValue', selected.value);
       },
     });
+
     const clearSelectionAction = reactive({
       name: 'list.clearSelection',
       tooltip: 'list.clearSelection',
-      disabled: selected.value.length < 1,
+      disabled: computed(() => selected.value.length < 1),
       callback() {
         [...selected.value].forEach((item) => {
           if (item.selectionChanged) {
@@ -141,16 +142,6 @@
       },
     });
 
-    watch(
-      [items, selected],
-      () => {
-        selectAllAction.disabled =
-          items.value.length - selected.value.length < 1;
-        clearSelectionAction.disabled = selected.value.length < 1;
-      },
-      { deep: false, immediate: true },
-    );
-
     return [selectAllAction, clearSelectionAction];
   }
 

package/src/components/style/VcsStrokeSelector.vue

@@ -81,7 +81,7 @@
           },
         }),
         updateColor(rgba) {
-          localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a];
+          localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a ?? 1];
         },
         cid,
       };

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

@@ -120,7 +120,11 @@
 
 <script>
   import { Math as CesiumMath, HeightReference } from '@vcmap-cesium/engine';
-  import { TransformationMode, placeGeometryOnSurface } from '@vcmap/core';
+  import {
+    SessionType,
+    TransformationMode,
+    placeGeometryOnSurface,
+  } from '@vcmap/core';
   import { VSheet, VContainer, VRow, VCol, VIcon } from 'vuetify/components';
   import { inject, ref, watch } from 'vue';
   import VcsButton from '../buttons/VcsButton.vue';
@@ -242,11 +246,17 @@
             }),
           );
 
-          const currentEditingFeatures =
-            manager.currentSession.value?.currentFeatures;
-          if (currentEditingFeatures) {
-            manager.currentSession.value?.setCurrentFeatures(
-              currentEditingFeatures,
+          if (
+            manager.currentEditSession.value?.type === SessionType.EDIT_FEATURES
+          ) {
+            manager.currentEditSession.value?.setFeatures(
+              manager.currentFeatures.value,
+            );
+          } else if (
+            manager.currentEditSession.value?.type === SessionType.EDIT_GEOMETRY
+          ) {
+            manager.currentEditSession.value.setFeature(
+              manager.currentFeatures.value[0],
             );
           }