@vcmap/ui 6.0.11 → 6.0.13

package/dist/assets/ui.js

@@ -1 +1 @@
-export * from "./ui-f56287eb.js";
+export * from "./ui-1785b87a.js";

package/dist/assets/vue.js

@@ -1 +1 @@
-export * from "./vue-41556557.js";
+export * from "./vue-13dade86.js";

package/dist/assets/{vuetify-03bc5f58.js → vuetify-73c966ed.js}

@@ -10,7 +10,7 @@ function loadCss(href) {
     elem.onerror = reject;
     document.head.appendChild(elem);
   });
-} await loadCss('./assets/vuetify-03bc5f58.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-41556557.js";
+} await loadCss('./assets/vuetify-73c966ed.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-13dade86.js";
 function rt(e, n) {
   let t;
   function a() {

package/dist/assets/vuetify.js

@@ -1 +1 @@
-export * from "./vuetify-03bc5f58.js";
+export * from "./vuetify-73c966ed.js";

package/package.json

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

package/src/state.d.ts

@@ -4,14 +4,16 @@
 export function createEmptyState(): AppState;
 /**
  * @param {UrlViewpointState} state
+ * @param {string} moduleId
  * @returns {import("@vcmap/core").ViewpointOptions|null}
  */
-export function parseUrlProjectedViewpointState(state: UrlViewpointState): import("@vcmap/core").ViewpointOptions | null;
+export function parseUrlProjectedViewpointState(state: UrlViewpointState, moduleId: string): import("@vcmap/core").ViewpointOptions | null;
 /**
  * @param {UrlExtentState} state
+ * @param {string} moduleId
  * @returns {import("@vcmap/core").ViewpointOptions|null}
  */
-export function parseUrlExtentState(state: UrlExtentState): import("@vcmap/core").ViewpointOptions | null;
+export function parseUrlExtentState(state: UrlExtentState, moduleId: string): import("@vcmap/core").ViewpointOptions | null;
 /**
  * @param {(URL)=} url
  * @returns {AppState}

package/src/state.js

@@ -61,7 +61,7 @@ import {
 
 /**
  * @typedef {AppState} CachedAppState
- * @property {() => import("@vcmap/core").Viewpoint?} [getViewpoint]
+ * @property {(string) => import("@vcmap/core").Viewpoint?} [getViewpoint]
  */
 
 /**
@@ -104,66 +104,87 @@ function parseUrlViewpointState(state) {
     roll: state[5],
   });
 
-  return vp.isValid() ? vp.toJSON() : null;
+  if (vp.isValid()) {
+    return vp.toJSON();
+  } else {
+    getLogger('StateManagement').warning(
+      'The provided viewpoint options are not valid. Viewpoint will be ignored.',
+    );
+    return null;
+  }
 }
 
 /**
  * @param {UrlViewpointState} state
+ * @param {string} moduleId
  * @returns {import("@vcmap/core").ViewpointOptions|null}
  */
-export function parseUrlProjectedViewpointState(state) {
+export function parseUrlProjectedViewpointState(state, moduleId) {
   const projection = getDefaultProjection();
   const projectionCode = parseInt(projection.epsg.split(':')[1], 10);
 
-  let cameraPosition = state[0];
-  let groundPosition = state[1];
-  if (state[6] && state[6] === projectionCode) {
-    if (cameraPosition) {
+  if (state[6] === projectionCode) {
+    let cameraPosition;
+    let groundPosition;
+    if (state[0]) {
       // (cameraPosition instanceof Coordinate)
       cameraPosition = Projection.transform(
         wgs84Projection,
         projection,
-        cameraPosition,
+        state[0],
       );
     }
-    if (groundPosition) {
+    if (state[1]) {
       groundPosition = Projection.transform(
         wgs84Projection,
         projection,
-        groundPosition,
+        state[1],
       );
     }
+    return parseUrlViewpointState([
+      cameraPosition,
+      groundPosition,
+      ...state.slice(2),
+    ]);
+  } else {
+    getLogger('StateManagement').warning(
+      `The provided viewpoint epsg code (${state[6]}) does not equal epsg code (${projectionCode}) of module '${moduleId}' and therefore can not be handled. Camera and ground position will be ignored.`,
+    );
+    return null;
   }
-
-  const vp = new Viewpoint({
-    cameraPosition: cameraPosition ?? undefined,
-    groundPosition: groundPosition ?? undefined,
-    distance: state[2] > 0 ? state[2] : undefined,
-    heading: state[3],
-    pitch: state[4],
-    roll: state[5],
-  });
-  vp.animate = false;
-  return vp.isValid() ? vp.toJSON() : null;
 }
 
 /**
  * @param {UrlExtentState} state
+ * @param {string} moduleId
  * @returns {import("@vcmap/core").ViewpointOptions|null}
  */
-export function parseUrlExtentState(state) {
+export function parseUrlExtentState(state, moduleId) {
   const projection = getDefaultProjection();
   const projectionCode = parseInt(projection.epsg.split(':')[1], 10);
   const extentOptions = { coordinates: state[0] };
-  if (projectionCode === state[1]) {
+  if (!state[1]) {
+    extentOptions.projection = wgs84Projection;
+  } else if (state[1] && state[1] === projectionCode) {
     extentOptions.projection = projection;
   } else {
-    extentOptions.projection = wgs84Projection;
+    getLogger('StateManagement').warning(
+      `The provided extent epsg code (${state[6]}) does not equal epsg code (${projectionCode}) of module '${moduleId}' and therefore can not be handled. The provided extent will be ignored.`,
+    );
+    return null;
   }
   const extent = new Extent(extentOptions);
-  const vp = Viewpoint.createViewpointFromExtent(extent);
-  vp.animate = false;
-  return vp.isValid() ? vp.toJSON() : null;
+
+  if (extent.isValid()) {
+    const vp = Viewpoint.createViewpointFromExtent(extent);
+    vp.animate = false;
+    return vp.toJSON();
+  } else {
+    getLogger('StateManagement').warning(
+      'The provided extent options are not valid. Extent will be ignored.',
+    );
+    return null;
+  }
 }
 
 /**
@@ -215,10 +236,12 @@ function writeUrlPluginState(state) {
 function parseUrlAppState(urlState) {
   const state = createEmptyState();
   if (Array.isArray(urlState[0])) {
-    if (urlState[0][0].length === 4) {
-      state.getViewpoint = () => parseUrlExtentState(urlState[0]);
-    } else if (urlState[0].length === 7) {
-      state.getViewpoint = () => parseUrlProjectedViewpointState(urlState[0]);
+    if (Array.isArray(urlState[0][0]) && urlState[0][0].length === 4) {
+      state.getViewpoint = (moduleId) =>
+        parseUrlExtentState(urlState[0], moduleId);
+    } else if (urlState[0][6]) {
+      state.getViewpoint = (moduleId) =>
+        parseUrlProjectedViewpointState(urlState[0], moduleId);
     } else {
       state.activeViewpoint = parseUrlViewpointState(urlState[0]);
     }

package/src/vcsUiApp.js

@@ -687,18 +687,14 @@ class VcsUiApp extends VcsApp {
           this.obliqueCollections.getByKey(
             this._cachedAppState.activeObliqueCollection,
           ),
-          new Viewpoint(this._cachedAppState.activeViewpoint),
         );
-      } else if (this._cachedAppState.activeViewpoint && this.maps.activeMap) {
-        await this.maps.activeMap.gotoViewpoint(
-          new Viewpoint(this._cachedAppState.activeViewpoint),
-        );
-      } else if (
-        typeof this._cachedAppState.getViewpoint === 'function' &&
-        this.maps.activeMap
-      ) {
-        await this.maps.activeMap.gotoViewpoint(
-          new Viewpoint(this._cachedAppState.getViewpoint()),
+      }
+      const viewpointOptions =
+        this._cachedAppState.activeViewpoint ??
+        this._cachedAppState.getViewpoint?.(module._id);
+      if (viewpointOptions) {
+        await this.maps.activeMap?.gotoViewpoint(
+          new Viewpoint(viewpointOptions),
         );
       }
       this._cachedAppState.moduleIds.splice(