@vcmap/ui 6.1.3 → 6.1.5

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-5ef524db.js";
+export * from "./ui-1641b3cc.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-ece669b0.js";
+export * from "./vue-4c430de5.js";

package/dist/assets/{vuetify-da3c1834.js → vuetify-42302ee6.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-da3c1834.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, isVNode as Rc, Comment as Nc, unref as ot, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, camelize as Ir, h as Gt, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onDeactivated as _r, onActivated as Wc, onMounted as Ye, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-ece669b0.js";
+} await loadCss('./assets/vuetify-42302ee6.css');import { watch as Q, onScopeDispose as Ze, effectScope as Zl, shallowRef as K, Fragment as ie, reactive as it, computed as b, watchEffect as Fe, toRefs as Yt, capitalize as Nn, isVNode as Rc, Comment as Nc, unref as ot, warn as ja, getCurrentInstance as Hc, ref as j, provide as De, inject as ye, defineComponent as zc, camelize as Ir, h as Gt, toRaw as Be, createVNode as r, mergeProps as O, onBeforeUnmount as Qe, readonly as Ql, onDeactivated as _r, onActivated as Wc, onMounted as Ye, nextTick as we, TransitionGroup as Jl, Transition as jt, isRef as Tn, toRef as $, onBeforeMount as ra, withDirectives as $e, resolveDirective as gt, vShow as Ct, onUpdated as jc, Text as Uc, resolveDynamicComponent as Yc, markRaw as Gc, Teleport as Kc, cloneVNode as qc, createTextVNode as Tt, onUnmounted as Tr, onBeforeUpdate as Xc, withModifiers as Tl, toDisplayString as Zc, vModelText as Qc, resolveComponent as Jc, render as Ar } from "./vue-4c430de5.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-da3c1834.js";
+export * from "./vuetify-42302ee6.js";

package/dist/index.html

@@ -103,10 +103,6 @@
         <div id="loading-content"></div>
       </div>
     </div>
-    <script type="module">
-      import { initAppFromAppConfig } from './assets/ui.js';
-
-      initAppFromAppConfig('#app', 'app.config.json');
-    </script>
+    <script src="./assets/start.js" type="module"></script>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/ui",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "author": "Virtual City Systems",
   "license": "MIT",
   "scripts": {
@@ -57,7 +57,7 @@
   },
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
-    "@vcmap/core": "^6.1.3",
+    "@vcmap/core": "^6.1.5",
     "ol": "^10.4.0",
     "vue": "~3.4.38",
     "vuetify": "^3.7.14"

package/src/actions/deepPickingAction.js

@@ -132,21 +132,15 @@ function getFeaturesFromOlMap(map, pixel, hitTolerance, drill) {
  * Retrieves features from a Cesium scene at a given window position.
  * @param {import("@vcmap-cesium/engine").Scene} scene
  * @param {import("@vcmap-cesium/engine").Ray} ray
- * @param {number} hitTolerance
  * @param {number} drill
  * @returns {Promise<{ features: import("@vcmap/core").EventFeature[], minZ: number }>}
  */
-async function getFeaturesFromScene(scene, ray, hitTolerance, drill) {
+async function getFeaturesFromScene(scene, ray, drill) {
   const { depthTestAgainstTerrain } = scene.globe;
   scene.globe.depthTestAgainstTerrain = false;
 
   let minZ = 0;
-  const objects = await scene.drillPickFromRay(
-    ray,
-    drill,
-    undefined,
-    hitTolerance,
-  );
+  const objects = await scene.drillPickFromRay(ray, drill);
 
   scene.globe.depthTestAgainstTerrain = depthTestAgainstTerrain;
 
@@ -213,12 +207,7 @@ async function getDeepPickingFeatures(
     );
     const ray = new Ray(origin, direction);
 
-    ({ features, minZ } = await getFeaturesFromScene(
-      scene,
-      ray,
-      hitTolerance,
-      drillLimit,
-    ));
+    ({ features, minZ } = await getFeaturesFromScene(scene, ray, drillLimit));
   }
 
   if (

package/src/components/style/VcsFillSelector.vue

@@ -34,7 +34,8 @@
       return {
         rgbaObject: useColorObject(() => localValue.value?.color),
         updateColor(rgba) {
-          localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a];
+          // Ensures alpha is not null, e.g. when the color is set by the user by pastying a color code.
+          localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a ?? 1];
         },
       };
     },

package/src/components/style/VcsStrokeSelector.vue

@@ -49,7 +49,7 @@
    * @vue-prop {import("ol/style/Stroke").Options} [modelValue] - The Stroke Options
    */
   export default {
-    name: 'VcsFillSelector',
+    name: 'VcsStrokeSelector',
     components: {
       VSheet,
       VColorPicker,
@@ -81,6 +81,7 @@
           },
         }),
         updateColor(rgba) {
+          // Ensures alpha is not null, e.g. when the color is set by the user by pastying a color code.
           localValue.value.color = [rgba.r, rgba.g, rgba.b, rgba.a ?? 1];
         },
         cid,

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

@@ -474,7 +474,7 @@
   </VcsFormSection>
 </template>
 <script>
-  import { computed } from 'vue';
+  import { computed, toRaw } from 'vue';
   import { VContainer, VRow, VCol, VDivider } from 'vuetify/components';
   import { VectorProperties } from '@vcmap/core';
   import {
@@ -744,7 +744,7 @@
                 title: 'components.style.reset',
                 icon: '$vcsReturn',
                 callback: () => {
-                  localValue.value = props.valueDefault;
+                  localValue.value = structuredClone(toRaw(props.valueDefault));
                 },
               },
             ]

package/src/contentTree/wmsGroupContentTreeItem.js

@@ -537,6 +537,7 @@ class WMSGroupContentTreeItem extends VcsObjectContentTreeItem {
         });
         childItems.forEach((childItem) => {
           this._app.contentTree.add(childItem);
+          childItem.disabled = this.disabled;
           this._listeners.push(
             childItem.clickedEvent.addEventListener(() => {
               this._handleChildClickedEvent(childItem);

package/src/navigation/MapNavigation.vue

@@ -347,10 +347,9 @@
       const { action: locatorAction, destroy: destroyLocator } =
         createLocatorAction(app);
 
-      const showLocatorButton = ref(true);
-      if (app.uiConfig.getByKey('showLocator')?.value === false) {
-        showLocatorButton.value = false;
-      }
+      const showLocatorButton = computed(() => {
+        return app.uiConfig.config.showLocator ?? true;
+      });
 
       const overviewMapListeners = [
         app.overviewMap.map.layerCollection.added.addEventListener(() => {

package/src/navigation/MapNavigation.vue.d.ts

@@ -78,7 +78,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         disabled?: boolean | undefined;
     };
     showOverviewButton: import("vue").Ref<boolean>;
-    showLocatorButton: import("vue").Ref<boolean>;
+    showLocatorButton: import("vue").ComputedRef<boolean>;
     hideRotationButton: import("vue").ComputedRef<boolean | undefined>;
     homeAction: any;
     rotationAction: any;

package/src/vuePlugins/vuetify.js

@@ -278,6 +278,7 @@ export function createVcsVuetify(i18n) {
       },
       VTooltip: {
         openOnHover: allowTooltip,
+        maxWidth: 480,
       },
     },
     defaultAssets: {