@realsee/dnalogel 2.27.3 → 2.27.4-1

package/libs/components/AreaLabel/LabelItem.js

@@ -0,0 +1,125 @@
+import { SvelteComponent as v, init as p, safe_not_equal as h, append_styles as z, element as d, text as k, space as y, attr as u, set_style as l, toggle_class as g, insert as q, append as b, listen as w, set_data as x, noop as _, detach as C, is_function as I } from "../../vendor/svelte/internal/index.js";
+import { ROOM_LABEL_BG as L } from "./Assets/roomLabelBg.js";
+function B(t) {
+  z(t, "svelte-qxepni", ".room-label-item.svelte-qxepni{position:absolute;font-size:0.5rem;z-index:0;transform:none;cursor:pointer;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;color:#fff}.room-label-item__text.svelte-qxepni{position:absolute;left:0;top:-4rem;transform:translate(-50%, 0);display:flex;justify-content:center;align-items:center;height:1.25rem;min-width:2rem;padding:0 0.375rem;pointer-events:all;background-size:100% 100%;background-repeat:no-repeat;white-space:nowrap}.room-label-item__bar.svelte-qxepni{position:absolute;top:-2.75rem;height:3rem;width:0.0625rem;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0))}.wide.svelte-qxepni{font-size:0.625rem}");
+}
+function O(t) {
+  let e, i, r, f, a, m, c;
+  return {
+    c() {
+      e = d("div"), i = d("span"), r = k(
+        /*content*/
+        t[0]
+      ), f = y(), a = d("div"), u(i, "class", "room-label-item__text svelte-qxepni"), l(i, "background-image", "url(" + L + ")"), g(
+        i,
+        "wide",
+        /*content*/
+        t[0].length > 3
+      ), u(a, "class", "room-label-item__bar svelte-qxepni"), u(e, "class", "room-label-item svelte-qxepni"), l(
+        e,
+        "z-index",
+        /*zIndex*/
+        t[2]
+      ), l(
+        e,
+        "transform",
+        /*transform*/
+        t[3]
+      ), l(
+        e,
+        "opacity",
+        /*opacity*/
+        t[1]
+      ), l(
+        e,
+        "visibility",
+        /*visibility*/
+        t[5]
+      );
+    },
+    m(s, o) {
+      q(s, e, o), b(e, i), b(i, r), b(e, f), b(e, a), m || (c = w(i, "click", function() {
+        I(
+          /*onClick*/
+          t[4]
+        ) && t[4].apply(this, arguments);
+      }), m = !0);
+    },
+    p(s, [o]) {
+      t = s, o & /*content*/
+      1 && x(
+        r,
+        /*content*/
+        t[0]
+      ), o & /*content*/
+      1 && g(
+        i,
+        "wide",
+        /*content*/
+        t[0].length > 3
+      ), o & /*zIndex*/
+      4 && l(
+        e,
+        "z-index",
+        /*zIndex*/
+        t[2]
+      ), o & /*transform*/
+      8 && l(
+        e,
+        "transform",
+        /*transform*/
+        t[3]
+      ), o & /*opacity*/
+      2 && l(
+        e,
+        "opacity",
+        /*opacity*/
+        t[1]
+      ), o & /*visibility*/
+      32 && l(
+        e,
+        "visibility",
+        /*visibility*/
+        t[5]
+      );
+    },
+    i: _,
+    o: _,
+    d(s) {
+      s && C(e), m = !1, c();
+    }
+  };
+}
+function j(t, e, i) {
+  let r, { content: f } = e, { visible: a } = e, { opacity: m = 1 } = e, { zIndex: c = 0 } = e, { transform: s } = e, { onClick: o = () => {
+  } } = e;
+  return t.$$set = (n) => {
+    "content" in n && i(0, f = n.content), "visible" in n && i(6, a = n.visible), "opacity" in n && i(1, m = n.opacity), "zIndex" in n && i(2, c = n.zIndex), "transform" in n && i(3, s = n.transform), "onClick" in n && i(4, o = n.onClick);
+  }, t.$$.update = () => {
+    t.$$.dirty & /*visible*/
+    64 && i(5, r = a ? "visible" : "hidden");
+  }, [f, m, c, s, o, r, a];
+}
+class G extends v {
+  constructor(e) {
+    super(), p(
+      this,
+      e,
+      j,
+      O,
+      h,
+      {
+        content: 0,
+        visible: 6,
+        opacity: 1,
+        zIndex: 2,
+        transform: 3,
+        onClick: 4
+      },
+      B
+    );
+  }
+}
+export {
+  G as LabelItem
+};

package/libs/components/AreaLabel/LabelItem.svelte.d.ts

@@ -0,0 +1 @@
+export { SvelteComponentTyped as default } from 'svelte/internal';

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -1,18 +1,18 @@
-var S = Object.defineProperty, A = Object.defineProperties;
-var P = Object.getOwnPropertyDescriptors;
-var w = Object.getOwnPropertySymbols;
-var E = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
-var m = (d, n, t) => n in d ? S(d, n, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[n] = t, c = (d, n) => {
-  for (var t in n || (n = {}))
-    E.call(n, t) && m(d, t, n[t]);
-  if (w)
-    for (var t of w(n))
-      C.call(n, t) && m(d, t, n[t]);
+var A = Object.defineProperty, P = Object.defineProperties;
+var E = Object.getOwnPropertyDescriptors;
+var g = Object.getOwnPropertySymbols;
+var C = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var m = (d, r, t) => r in d ? A(d, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[r] = t, c = (d, r) => {
+  for (var t in r || (r = {}))
+    C.call(r, t) && m(d, t, r[t]);
+  if (g)
+    for (var t of g(r))
+      I.call(r, t) && m(d, t, r[t]);
   return d;
-}, v = (d, n) => A(d, P(n));
-var o = (d, n, t) => (m(d, typeof n != "symbol" ? n + "" : n, t), t);
-var u = (d, n, t) => new Promise((e, i) => {
-  var r = (a) => {
+}, v = (d, r) => P(d, E(r));
+var o = (d, r, t) => (m(d, typeof r != "symbol" ? r + "" : r, t), t);
+var u = (d, r, t) => new Promise((e, i) => {
+  var n = (a) => {
     try {
       s(t.next(a));
     } catch (l) {
@@ -24,21 +24,21 @@ var u = (d, n, t) => new Promise((e, i) => {
     } catch (l) {
       i(l);
     }
-  }, s = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(r, h);
-  s((t = t.apply(d, n)).next());
+  }, s = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(n, h);
+  s((t = t.apply(d, r)).next());
 });
-import * as I from "three";
+import * as w from "three";
 import { to as y } from "../../shared-utils/to.js";
 import { equal as F } from "../../shared-utils/equal.js";
 import { Main as x } from "../Components/Main.js";
-import { formatData as g } from "../utils/formatData.js";
+import { formatData as b } from "../utils/formatData.js";
 import { CAMERA_IMAGE as M } from "../Assets/camera.js";
 import { omit as _ } from "../../shared-utils/filter.js";
 import { FLOOR_PLAN_ATTACHED_TO as L } from "../constant.js";
 import { Controller as O } from "../../base/BasePluginWithData.js";
 import { getPxmm as D, getAttachedY as T } from "../../shared-utils/getPxmm.js";
 import { checkShowState as k, correctFiveState as H } from "../utils/correctFiveState.js";
-import { changeModelCanvasOpacity as b } from "../../shared-utils/changeModelCanvasOpacity.js";
+import { changeModelCanvasOpacity as S } from "../../shared-utils/changeModelCanvasOpacity.js";
 import { FloorplanErrorType as f, SHOW_ANIME_DURATION as R } from "../utils/constant.js";
 import "../../shared-utils/isTruelyObject.js";
 import "../../vendor/svelte/internal/index.js";
@@ -90,11 +90,11 @@ import "../../shared-utils/absoluteUrl.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
 function G(d) {
-  const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
+  const { latitude: r, longitude: t } = d, e = Math.abs(r - Math.PI / 2) > 5 * Math.PI / 180, i = t > 5 * (Math.PI / 180) && t < 355 * (Math.PI / 180);
   return e || i;
 }
 function W(d) {
-  const { latitude: n, longitude: t } = d, e = Math.abs(n - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
+  const { latitude: r, longitude: t } = d, e = Math.abs(r - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
 class Jt extends O {
@@ -160,7 +160,7 @@ class Jt extends O {
     o(this, "updateSize", () => {
       if (!this.data || !k(this.five, this.showState) || !this.container || !this.wrapper)
         return;
-      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, r = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, s = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * s), l = Math.ceil(r * s);
+      const { min: t, max: e } = this.data.bounding, i = e.x - t.x, n = e.y - t.y, h = this.state.config.attachedTo ? { attachedTo: this.state.config.attachedTo } : void 0, s = D(this.five, this.wrapper, this.floorIndex, h), a = Math.ceil(i * s), l = Math.ceil(n * s);
       this.size.width === a && this.size.height === l || (this.container.style.width = a + "px", this.container.style.height = l + "px", this.size = { width: a, height: l });
     });
     o(this, "highlight", (t) => {
@@ -170,9 +170,9 @@ class Jt extends O {
       this.highlightData = {}, this.render();
     });
     o(this, "_disable", (t) => {
-      var i, r, h;
+      var i, n, h;
       const { userAction: e } = t;
-      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, f.BreakOffByDisable), this.showPromise = void 0, (r = this.app) == null || r.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
+      this.hooks.emit("disable", { userAction: e }), (i = this.showRejection) == null || i.call(this, f.BreakOffByDisable), this.showPromise = void 0, (n = this.app) == null || n.$destroy(), this.app = void 0, (h = this.container) == null || h.remove(), this.removeEventListener();
     });
     o(this, "_enable", (t) => {
       const { userAction: e } = t;
@@ -194,7 +194,7 @@ class Jt extends O {
         immediately: !1,
         isAutoShow: !1,
         userAction: !0
-      }, i = c(c({}, e), t), r = () => u(this, null, function* () {
+      }, i = c(c({}, e), t), n = () => u(this, null, function* () {
         this.hooks.emit("show", { userAction: i.userAction, auto: i.isAutoShow });
         let s = !1, a;
         this.showRejection = (p) => {
@@ -207,10 +207,10 @@ class Jt extends O {
           throw a ? new Error(a) : new Error(f.UnknownError);
         this.updateSize(), this.updatePosition(), this.floorIndex = i.floorIndex, this.five.model.show(this.floorIndex);
       });
-      return this.isHiddenByHideFunc = !1, this.showPromise = r().then(() => {
+      return this.isHiddenByHideFunc = !1, this.showPromise = n().then(() => {
         this.showPromise = void 0, this.showRejection = void 0;
         const s = i.modelOpacity, a = i.immediately ? 0 : R;
-        b(this.five, s, a), this.render(a), this.hooks.emit("showAnimationEnded", {
+        S(this.five, s, a), this.render(a), this.hooks.emit("showAnimationEnded", {
           auto: i.isAutoShow,
           userAction: i.userAction
         });
@@ -220,13 +220,13 @@ class Jt extends O {
       }), this.showPromise;
     }));
     o(this, "_hide", (t) => {
-      var r;
-      (r = this.showRejection) == null || r.call(this, f.BreakOffByHide), this.showPromise = void 0;
+      var n;
+      (n = this.showRejection) == null || n.call(this, f.BreakOffByHide), this.showPromise = void 0;
       const i = c(c({}, {
         userAction: !0,
         isAutoHide: !1
       }), t);
-      b(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
+      S(this.five, 1, 0), this.hooks.emit("hide", { auto: i.isAutoHide, userAction: i.userAction }), this.render();
     });
     o(this, "handleClick", () => {
       if (!this.state.visible)
@@ -236,12 +236,13 @@ class Jt extends O {
     });
     /** modelLoaded 之后自动执行 append container 操作  */
     o(this, "onFiveModelLoaded", () => {
-      if (this.state.enabled === !1 || this.wrapper || !this.selector)
+      const e = this.five.model.bounding.getCenter(new w.Vector3());
+      if (this.showState.offset = e, this.state.enabled === !1 || this.wrapper || !this.selector)
         return;
-      const t = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
-      if (!t)
+      const i = this.selector instanceof Element ? this.selector : document.querySelector(this.selector);
+      if (!i)
         throw new Error("不正确的父容器选择器");
-      this.wrapper = t, t.append(this.container);
+      this.wrapper = i, i.append(this.container);
     });
     /** 更改模型时，自动隐藏户型图 */
     o(this, "onFiveModeChange", (t) => {
@@ -292,7 +293,7 @@ class Jt extends O {
       mode: "Mapview",
       longitude: 0,
       latitude: Math.PI / 2,
-      fov: 90
+      fov: 80
     };
     const i = {
       northDesc: "北",
@@ -312,7 +313,7 @@ class Jt extends O {
       adaptiveRoomLabelVisibleEnable: !0,
       getRoomAreaText: (s) => (s / 1e6).toFixed(1) + "㎡",
       getRuleDistanceText: (s) => s.toString()
-    }, r = e ? _(e, ["selector", "scale"]) : {}, h = c(c({}, i), r);
+    }, n = e ? _(e, ["selector", "scale"]) : {}, h = c(c({}, i), n);
     this.state = {
       enabled: !0,
       visible: !1,
@@ -321,13 +322,13 @@ class Jt extends O {
   }
   load(t, e, i = !0) {
     return u(this, null, function* () {
-      function r(p) {
+      function n(p) {
         return Object.prototype.hasOwnProperty.apply(p, ["version"]);
       }
       const h = t;
       h && !h.version && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
-      const s = JSON.parse(JSON.stringify(t)), a = r(s) ? s.data : s, l = this.data;
-      this.data = yield g(a), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
+      const s = JSON.parse(JSON.stringify(t)), a = n(s) ? s.data : s, l = this.data;
+      this.data = yield b(a), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, l), e && this.updateState(e, i), this.render();
     });
   }
   /** 把插件的渲染DOM插入到对应的容器中去 */
@@ -351,9 +352,9 @@ class Jt extends O {
   }
   /** 更改插件 State */
   setState(t, e = {}) {
-    const i = this.state, r = e.userAction !== void 0 ? e.userAction : !0;
-    if (this.updateState(t, r), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: r }) : this._disable({ userAction: r })), t.visible !== void 0 && i.visible !== t.visible) {
-      const h = { userAction: r };
+    const i = this.state, n = e.userAction !== void 0 ? e.userAction : !0;
+    if (this.updateState(t, n), t.enabled !== void 0 && i.enabled !== t.enabled && (t.enabled ? this._enable({ userAction: n }) : this._disable({ userAction: n })), t.visible !== void 0 && i.visible !== t.visible) {
+      const h = { userAction: n };
       t.visible ? this._show(h) : this._hide(h);
     }
   }
@@ -363,20 +364,20 @@ class Jt extends O {
   /** 更新户型图位置 */
   updatePosition() {
     var s;
-    const t = T(this.five, this.floorIndex, this.state.config.attachedTo), e = (s = this.five.model) == null ? void 0 : s.bounding.getCenter(new I.Vector3()).setY(t);
+    const t = T(this.five, this.floorIndex, this.state.config.attachedTo), e = (s = this.five.model) == null ? void 0 : s.bounding.getCenter(new w.Vector3()).setY(t);
     if (!e)
       return;
-    const i = e.clone().project(this.five.camera), r = (i.x + 1) / 2, h = -(i.y - 1) / 2;
-    this.container.style.left = r * 100 + "%", this.container.style.top = h * 100 + "%";
+    const i = e.clone().project(this.five.camera), n = (i.x + 1) / 2, h = -(i.y - 1) / 2;
+    this.container.style.left = n * 100 + "%", this.container.style.top = h * 100 + "%";
   }
   formatData(t) {
     return u(this, null, function* () {
-      return yield g(t.data);
+      return yield b(t.data);
     });
   }
   updateState(t, e) {
-    const i = this.state, r = t.config ? c(c({}, i.config), t.config) : i.config;
-    this.state = v(c(c({}, this.state), t), { config: r }), !F(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
+    const i = this.state, n = t.config ? c(c({}, i.config), t.config) : i.config;
+    this.state = v(c(c({}, this.state), t), { config: n }), !F(this.state, i, { deep: !0 }) && this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: e });
   }
   /** 如果用户是通过 selector 设置父容器，需要在 modelLoaded 之后把 container 自动放到父容器里
    *

package/libs/floorplan/utils/correctFiveState.d.ts

@@ -1,9 +1,11 @@
+import type * as THREE from 'three';
 import type { Five, Mode } from '@realsee/five';
 export interface ShowState {
     latitude: number;
     longitude: number;
     fov: number;
     mode: Mode;
+    offset?: THREE.Vector3;
 }
 /** 判断当前状态是否可以展示户型图 */
 export declare function checkShowState(five: Five, showState: ShowState): boolean;

package/libs/floorplan/utils/correctFiveState.js

@@ -1,41 +1,41 @@
-var m = (t, r, e) => new Promise((d, a) => {
-  var i = (o) => {
+var c = (e, r, o) => new Promise((d, a) => {
+  var i = (t) => {
     try {
-      u(e.next(o));
-    } catch (c) {
-      a(c);
+      u(o.next(t));
+    } catch (f) {
+      a(f);
     }
-  }, n = (o) => {
+  }, n = (t) => {
     try {
-      u(e.throw(o));
-    } catch (c) {
-      a(c);
+      u(o.throw(t));
+    } catch (f) {
+      a(f);
     }
-  }, u = (o) => o.done ? d(o.value) : Promise.resolve(o.value).then(i, n);
-  u((e = e.apply(t, r)).next());
+  }, u = (t) => t.done ? d(t.value) : Promise.resolve(t.value).then(i, n);
+  u((o = o.apply(e, r)).next());
 });
-import { to as f } from "../../shared-utils/to.js";
-import { FloorplanErrorType as l } from "./constant.js";
+import { to as l } from "../../shared-utils/to.js";
+import { FloorplanErrorType as m } from "./constant.js";
 import { nearlyEqual as s } from "../../shared-utils/nearlyEqual.js";
 import { changeMode as p } from "../../shared-utils/five/changeMode.js";
-function g(t, r) {
-  if (t.currentMode !== r.mode)
+function g(e, r) {
+  if (e.currentMode !== r.mode)
     return !1;
-  const { latitude: e, longitude: d, fov: a } = r, { latitude: i, longitude: n } = t.getCurrentState(), u = t.camera.fov;
-  return !(!s(e, i, 2) || !s(d, n, 2) || a !== u);
+  const { latitude: o, longitude: d, fov: a, offset: i } = r, { latitude: n, longitude: u, offset: t } = e.getCurrentState(), f = e.camera.fov;
+  return !(!s(o, n, 2) || !s(d, u, 2) || i !== void 0 && i.distanceTo(t) > 0.01 || a !== f);
 }
-function F(t, r, e = !0) {
-  return m(this, null, function* () {
-    if (g(t, r) === !0)
+function y(e, r, o = !0) {
+  return c(this, null, function* () {
+    if (g(e, r) === !0)
       return;
-    const a = t.getCurrentState();
+    const a = e.getCurrentState();
     if (a.mode !== r.mode) {
-      const [M] = yield f(p(t, [r.mode, r, void 0, e]));
+      const [M] = yield l(p(e, [r.mode, r, void 0, o]));
       if (M)
-        throw new Error(l.ChangeModeError);
+        throw new Error(m.ChangeModeError);
       return;
     }
-    const { latitude: i, longitude: n, fov: u } = a, o = Math.min(
+    const { latitude: i, longitude: n, fov: u } = a, t = Math.min(
       1e3,
       Math.max(
         200,
@@ -43,12 +43,12 @@ function F(t, r, e = !0) {
         (n > Math.PI ? 2 * Math.PI - n : n) * 500,
         Math.abs(u - r.fov) * 10
       )
-    ), [c] = yield f(t.updateCamera(r, o, e));
-    if (c)
-      throw new Error(l.UpdateCameraError);
+    ), [f] = yield l(e.updateCamera(r, t, o));
+    if (f)
+      throw new Error(m.UpdateCameraError);
   });
 }
 export {
   g as checkShowState,
-  F as correctFiveState
+  y as correctFiveState
 };

package/libs/index.d.ts

@@ -22,4 +22,5 @@ export * from './PanoTagPlugin';
 export * from './Object3DHelperPlugin';
 export * from './PanoVideoPlugin';
 export * from './PipelinePlugin';
+export * from './AreaMakerPlugin';
 export * as Util from './shared-utils';