@vcmap/viewshed 3.0.1 → 3.0.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.0.2
+
+- fixes bug where the tool was active for unsupported maps
+
 # v3.0.0
 
 - updates @vcmap/core and @vcmap/ui to 6.x
@@ -9,7 +13,7 @@
 
 - fix link to help document
 
-# v2.0.8
+# v2.0.9
 
 - add upload feedback
 

package/dist/index.js

@@ -1,9 +1,9 @@
 var Oe = Object.defineProperty;
 var Ie = (i, t, o) => t in i ? Oe(i, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[t] = o;
 var de = (i, t, o) => Ie(i, typeof t != "symbol" ? t + "" : t, o);
-import { VcsCameraPrimitive as Pe, VcsObject as Ae, VcsEvent as Y, AbstractInteraction as Re, EventType as K, Projection as H, SessionType as Ne, CesiumMap as G, startEditFeaturesSession as De, startEditGeometrySession as xe, VectorLayer as ke, wgs84Projection as Le, maxZIndex as Fe, markVolatile as je, Viewpoint as We, TransformationMode as Be, Category as Ue, moduleIdSymbol as $e } from "../../../assets/core.js";
+import { VcsCameraPrimitive as Pe, VcsObject as Ae, VcsEvent as Y, AbstractInteraction as Re, EventType as K, Projection as z, SessionType as Ne, CesiumMap as $, startEditFeaturesSession as De, startEditGeometrySession as xe, VectorLayer as ke, wgs84Projection as Le, maxZIndex as Fe, markVolatile as je, Viewpoint as We, TransformationMode as Be, Category as Ue, moduleIdSymbol as $e } from "../../../assets/core.js";
 import { Color as Z, Matrix4 as He, Transforms as ze, Primitive as ce, GeometryInstance as ue, SphereGeometry as Ge, ColorGeometryInstanceAttribute as he, PerInstanceColorAppearance as fe, SphereOutlineGeometry as Ke, Math as k, Cartesian3 as W, ShadowMap as Ye, Camera as Xe, HeightReference as Je } from "../../../assets/cesium.js";
-import { shallowRef as te, ref as U, nextTick as Ze, inject as me, computed as ve, reactive as q, watchEffect as qe, watch as z, onMounted as Qe, onUnmounted as et, resolveComponent as b, openBlock as M, createElementBlock as B, createBlock as D, withCtx as f, createTextVNode as F, toDisplayString as A, createCommentVNode as $, createVNode as m, createElementVNode as tt, Fragment as pe, renderList as we, mergeProps as it } from "../../../assets/vue.js";
+import { shallowRef as te, ref as U, nextTick as Ze, inject as me, computed as ve, reactive as q, watchEffect as qe, watch as G, onMounted as Qe, onUnmounted as et, resolveComponent as b, openBlock as M, createElementBlock as B, createBlock as D, withCtx as f, createTextVNode as F, toDisplayString as A, createCommentVNode as H, createVNode as m, createElementVNode as tt, Fragment as pe, renderList as we, mergeProps as it } from "../../../assets/vue.js";
 import { ol$Observable$unByKey as ot, Feature as st, ol$geom$Point as nt, ol$style$Style as at } from "../../../assets/ol.js";
 import { VcsTextField as rt, VcsSlider as lt, VcsLabel as _e, VcsFormSection as Ce, VcsSelect as Ee, VcsFormButton as dt, VcsFeatureTransforms as ct, VcsHelp as ut, makeEditorCollectionComponentClass as ht, WindowSlot as ft, ToolboxType as mt, createSupportedMapMappingFunction as vt, createListExportAction as pt, downloadText as wt, createListImportAction as gt, NotificationType as X, AbstractConfigEditor as _t } from "../../../assets/ui.js";
 import { VContainer as ye, VRow as Ve, VCol as be, VDivider as Ct, VColorPicker as Et } from "../../../assets/vuetify.js";
@@ -525,7 +525,7 @@ class xt extends Re {
     return this._positioned;
   }
   async pipe(t) {
-    return t.position && (this._position ? (this._viewshed.lookAt(H.mercatorToWgs84(t.position)), t.type & K.CLICK && (this.setActive(!1), this._finished.raiseEvent(null))) : (this._viewshed.position = H.mercatorToWgs84(t.position), t.type & K.CLICK && (this._position = !0, this._positioned.raiseEvent(null)))), t;
+    return t.position && (this._position ? (this._viewshed.lookAt(z.mercatorToWgs84(t.position)), t.type & K.CLICK && (this.setActive(!1), this._finished.raiseEvent(null))) : (this._viewshed.position = z.mercatorToWgs84(t.position), t.type & K.CLICK && (this._position = !0, this._positioned.raiseEvent(null)))), t;
   }
   destroy() {
     super.destroy(), this._finished.destroy(), this._positioned.destroy();
@@ -575,7 +575,7 @@ function Lt(i, t, o) {
     C(), l(), u(), e.value = null, a && o.clearSelection(), s.value = null, n.value = null;
   }
   function w(a) {
-    C(), u(), i.maps.activeMap instanceof G && (e.value = a, a.activate(i.maps.activeMap), C = i.maps.activeMap.shadowMapChanged.addEventListener((r) => {
+    C(), u(), i.maps.activeMap instanceof $ && (e.value = a, a.activate(i.maps.activeMap), C = i.maps.activeMap.shadowMapChanged.addEventListener((r) => {
       var _;
       r !== ((_ = e.value) == null ? void 0 : _.shadowMap) && h(!1);
     }));
@@ -621,7 +621,7 @@ function Lt(i, t, o) {
         l();
       });
       const T = (r = v.getGeometry()) == null ? void 0 : r.on("change", () => {
-        e.value ? e.value.position = H.mercatorToWgs84(
+        e.value ? e.value.position = z.mercatorToWgs84(
           /** @type {import("ol/geom").Point} */
           v.getGeometry().getCoordinates()
         ) : h();
@@ -666,8 +666,8 @@ function Lt(i, t, o) {
         ), e.value.heightOffset = a === P.ABSOLUTE ? 0 : ge;
       else if (n.value === y.EDIT) {
         const { position: r, heightOffset: _ } = e.value;
-        a === P.RELATIVE ? i.maps.activeMap.getHeightFromTerrain([H.wgs84ToMercator(r)]).then((v) => {
-          const E = H.mercatorToWgs84(v[0]);
+        a === P.RELATIVE ? i.maps.activeMap.getHeightFromTerrain([z.wgs84ToMercator(r)]).then((v) => {
+          const E = z.mercatorToWgs84(v[0]);
           e.value && (e.value.heightOffset = r[2] - E[2], e.value.position = E);
         }) : (e.value.position = [
           r[0],
@@ -700,9 +700,9 @@ function Lt(i, t, o) {
     changeHeightMode: L,
     async placeCurrentFeaturesOnTerrain() {
       var a, r;
-      if (e.value && ((a = c.value) == null ? void 0 : a.type) === Ne.EDIT_FEATURES && i.maps.activeMap instanceof G) {
+      if (e.value && ((a = c.value) == null ? void 0 : a.type) === Ne.EDIT_FEATURES && i.maps.activeMap instanceof $) {
         const v = (await i.maps.activeMap.getHeightFromTerrain([
-          H.wgs84ToMercator((r = e.value) == null ? void 0 : r.position)
+          z.wgs84ToMercator((r = e.value) == null ? void 0 : r.position)
         ]))[0][2] - e.value.position[2];
         c.value.translate(0, 0, v);
       }
@@ -793,7 +793,7 @@ const Se = (i, t) => {
     }
     qe(() => {
       e.value && s.value !== y.CREATE && S();
-    }), z(
+    }), G(
       e,
       () => {
         e.value && (C(), C = e.value.positionChanged.addEventListener(() => {
@@ -943,7 +943,7 @@ function Gt(i, t, o, e, s, n) {
         ]),
         _: 1
         /* STABLE */
-      })) : $("v-if", !0)
+      })) : H("v-if", !0)
     ])) : e.viewshedMode === e.ViewshedPluginModes.EDIT || e.viewshedMode === e.ViewshedPluginModes.MOVE ? (M(), D(w, {
       key: 1,
       "header-actions": e.headerActions,
@@ -1028,7 +1028,7 @@ function Gt(i, t, o, e, s, n) {
       ]),
       _: 1
       /* STABLE */
-    }, 8, ["header-actions"])) : $("v-if", !0),
+    }, 8, ["header-actions"])) : H("v-if", !0),
     m(g),
     m(h, { class: "px-1 py-0" }, {
       default: f(() => [
@@ -1201,7 +1201,7 @@ function Gt(i, t, o, e, s, n) {
                   },
                   1024
                   /* DYNAMIC_SLOTS */
-                )) : $("v-if", !0)
+                )) : H("v-if", !0)
               ]),
               _: 2
               /* DYNAMIC */
@@ -1215,7 +1215,7 @@ function Gt(i, t, o, e, s, n) {
       ]),
       _: 1
       /* STABLE */
-    })) : $("v-if", !0),
+    })) : H("v-if", !0),
     m(g),
     e.viewshedMode === e.ViewshedPluginModes.EDIT || e.viewshedMode === e.ViewshedPluginModes.MOVE ? (M(), B("div", Ht, [
       m(L, {
@@ -1253,10 +1253,10 @@ function Gt(i, t, o, e, s, n) {
         _: 1
         /* STABLE */
       })
-    ])) : $("v-if", !0)
+    ])) : H("v-if", !0)
   ]);
 }
-const Kt = /* @__PURE__ */ Se(jt, [["render", Gt]]), j = "@vcmap/viewshed", Yt = "3.0.1", Xt = "^6.0", se = {
+const Kt = /* @__PURE__ */ Se(jt, [["render", Gt]]), j = "@vcmap/viewshed", Yt = "3.0.2", Xt = "^6.0", se = {
   [p.CONE]: "$vcsViewshed",
   [p.THREESIXTY]: "$vcsViewshedCone"
 };
@@ -1299,11 +1299,11 @@ function Jt(i, t, o) {
       j
     ));
   }
-  const C = z(i.currentViewshed, (w) => {
+  const C = G(i.currentViewshed, (w) => {
     w && c();
-  }), u = z(i.currentIsPersisted, (w) => {
+  }), u = G(i.currentIsPersisted, (w) => {
     w && l();
-  }), h = z(i.mode, () => {
+  }), h = G(i.mode, () => {
     i.mode.value ? c() : t.windowManager.remove(n);
   });
   return {
@@ -1320,7 +1320,7 @@ function Zt(i, t, o, e) {
       currentIndex: 0,
       active: !1,
       background: !1,
-      disabled: !1,
+      disabled: !(i.maps.activeMap instanceof $),
       callback() {
         if (this.active)
           this.background && t.currentViewshed.value ? t.editViewshed(t.currentViewshed.value) : t.stop();
@@ -1344,9 +1344,9 @@ function Zt(i, t, o, e) {
         title: `viewshed.create.${p.THREESIXTY}`
       } : [])
     })
-  }, n = z(t.mode, (c) => {
+  }, n = G(t.mode, (c) => {
     c === y.VIEW ? (s.action.background = !0, s.action.active = !0) : c ? (s.action.background = !1, s.action.active = !0) : (s.action.background = !1, s.action.active = !1);
-  }), d = z(
+  }), d = G(
     t.currentViewshed,
     (c) => {
       c && (s.action.currentIndex = s.action.tools.findIndex(
@@ -1354,7 +1354,7 @@ function Zt(i, t, o, e) {
       ));
     }
   ), l = i.maps.mapActivated.addEventListener((c) => {
-    c instanceof G ? s.action.disabled = !1 : s.action.disabled = !0;
+    c instanceof $ ? s.action.disabled = !1 : s.action.disabled = !0;
   });
   return {
     destroy() {
@@ -1378,7 +1378,7 @@ class ne extends Ue {
     var e;
     if (
       /** @type {import("@vcmap/core").CesiumMap | undefined} */
-      (e = this._app) == null ? void 0 : e.maps.getByType(G.className)[0]
+      (e = this._app) == null ? void 0 : e.maps.getByType($.className)[0]
     )
       return new x(t);
     throw new Error("No CesiumMap available");
@@ -1410,7 +1410,7 @@ async function ei(i) {
   );
   e.addItemMapping({
     mappingFunction: vt(
-      [G.className],
+      [$.className],
       i.maps
     ),
     owner: j
@@ -1690,7 +1690,7 @@ function ii(i, t, o, e, s, n) {
         ]),
         _: 1
         /* STABLE */
-      })) : $("v-if", !0)
+      })) : H("v-if", !0)
     ]),
     _: 1
     /* STABLE */
@@ -1738,7 +1738,7 @@ function ui(i) {
         d.collectionComponent
       ), { activeMap: C } = s.maps;
       function u(g) {
-        if (n != null && n.m && n.cv && g instanceof G) {
+        if (n != null && n.m && n.cv && g instanceof $) {
           n.cv.properties.title && delete n.cv.properties.title;
           const V = new x(n.cv);
           n.m === y.VIEW ? t.viewViewshed(V) : t.editViewshed(V);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/viewshed",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Tool to simulate a \"viewer\" and their field of vision from a certain standpoint in the map. It allows the user to see which areas and buildings can or can't be seen from a specific standpoint, regarding different viewing distances, viewers' sizes and orientations.Th",
   "type": "module",
   "main": "src/index.js",
@@ -49,7 +49,7 @@
   "peerDependencies": {
     "@vcmap-cesium/engine": "^11.0.2",
     "@vcmap/core": "^6.0.0",
-    "@vcmap/ui": "^6.0.1",
+    "@vcmap/ui": "^6.0.2",
     "ol": "^10.2.1",
     "vue": "~3.4.38",
     "vuetify": "^3.7.3"

package/src/util/toolboxHelper.js

@@ -28,7 +28,7 @@ function createViewshedToolbox(app, manager, name, tools) {
       currentIndex: 0,
       active: false,
       background: false,
-      disabled: false,
+      disabled: !(app.maps.activeMap instanceof CesiumMap),
       callback() {
         if (this.active) {
           if (this.background && manager.currentViewshed.value) {