@realsee/dnalogel 3.64.20 → 3.64.21-dev.3

package/libs/floorplan/Components/RoomMaterials/RoomTriangle.js

@@ -0,0 +1,103 @@
+import { SvelteComponent as d, init as m, safe_not_equal as v, svg_element as u, attr as n, insert as z, noop as l, detach as f } from "../../../vendor/svelte/internal/index.js";
+import { pathD as r } from "../../utils/formatPosition.js";
+function g(i) {
+  let e;
+  return {
+    c() {
+      e = u("path"), n(
+        e,
+        "d",
+        /*mergedPath*/
+        i[0]
+      ), n(e, "fill", "#969696"), n(e, "stroke", "#969696"), n(e, "stroke-width", "1"), n(e, "fill-rule", "evenodd");
+    },
+    m(o, t) {
+      z(o, e, t);
+    },
+    p: l,
+    i: l,
+    o: l,
+    d(o) {
+      o && f(e);
+    }
+  };
+}
+function p(i, e, o) {
+  let { dimension: t } = e;
+  const x = r(
+    [
+      {
+        x: t.vertical[1].x,
+        y: t.vertical[1].y - 53
+      },
+      {
+        x: t.vertical[1].x - 60,
+        y: t.vertical[1].y - 124
+      },
+      {
+        x: t.vertical[1].x + 60,
+        y: t.vertical[1].y - 124
+      }
+    ],
+    { needZ: !0 }
+  ), y = r(
+    [
+      {
+        x: t.vertical[0].x,
+        y: t.vertical[0].y + 53
+      },
+      {
+        x: t.vertical[0].x - 60,
+        y: t.vertical[0].y + 124
+      },
+      {
+        x: t.vertical[0].x + 60,
+        y: t.vertical[0].y + 124
+      }
+    ],
+    { needZ: !0 }
+  ), s = r(
+    [
+      {
+        x: t.horizontal[0].x + 53,
+        y: t.horizontal[0].y
+      },
+      {
+        x: t.horizontal[0].x + 124,
+        y: t.horizontal[0].y + 60
+      },
+      {
+        x: t.horizontal[0].x + 124,
+        y: t.horizontal[0].y - 60
+      }
+    ],
+    { needZ: !0 }
+  ), h = r(
+    [
+      {
+        x: t.horizontal[1].x - 53,
+        y: t.horizontal[1].y
+      },
+      {
+        x: t.horizontal[1].x - 124,
+        y: t.horizontal[1].y + 60
+      },
+      {
+        x: t.horizontal[1].x - 124,
+        y: t.horizontal[1].y - 60
+      }
+    ],
+    { needZ: !0 }
+  ), a = `${x} ${y} ${s} ${h}`;
+  return console.log("绘制三角形：", a), i.$$set = (c) => {
+    "dimension" in c && o(1, t = c.dimension);
+  }, [a, t];
+}
+class _ extends d {
+  constructor(e) {
+    super(), m(this, e, p, g, v, { dimension: 1 });
+  }
+}
+export {
+  _ as RoomTriangle
+};

package/libs/floorplan/Components/RoomMaterials/RoomTriangle.svelte.d.ts

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

package/libs/floorplan/MapviewFloorplanPlugin/Controller.js

@@ -76,6 +76,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -144,7 +145,7 @@ function Z(l) {
   const { latitude: h, longitude: t } = l, e = Math.abs(h - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Ke extends G {
+class Qe extends G {
   constructor(t, e) {
     var n, d;
     super(t);
@@ -378,7 +379,7 @@ class Ke extends G {
       getRoomDimensionText: (p, u) => (p / 1e3).toFixed(1) + "m × " + (u / 1e3).toFixed(1) + "m",
       getRuleDistanceText: (p) => p.toString()
     }, s = e ? F(e, ["selector", "scale"]) : {}, a = m(m({}, i.missingFloorConfig), s.missingFloorConfig), r = g(m(m({}, i), s), { missingFloorConfig: a });
-    this.state = { enabled: !0, visible: !1, config: r }, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener(), console.log("baseConfig: ", i);
+    this.state = { enabled: !0, visible: !1, config: r }, this.initContainer(), Y(t).then(this.onFiveModelLoaded), t.once("dispose", this.dispose), this.addEventListener();
   }
   load(t, e, i = !0) {
     return f(this, null, function* () {
@@ -388,7 +389,7 @@ class Ke extends G {
       const a = t;
       a && q(a.version) && console.warn("传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数");
       const r = JSON.parse(JSON.stringify(t)), n = s(r) ? r.data : r, d = this.data;
-      this.data = yield A(n), console.log(this.data), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, d), e && this.updateState(e, i), this.render();
+      this.data = yield A(n), this.hooks.emit("dataLoaded", this.data), this.hooks.emit("dataChange", this.data, d), e && this.updateState(e, i), this.render();
     });
   }
   loadItems(t) {
@@ -503,5 +504,5 @@ class Ke extends G {
   }
 }
 export {
-  Ke as Controller
+  Qe as Controller
 };

package/libs/floorplan/MapviewFloorplanPlugin/index.js

@@ -26,6 +26,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -107,8 +108,8 @@ import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const mr = (o, r) => new t(o, r);
+const er = (o, r) => new t(o, r);
 export {
-  mr as MapviewFloorplanPlugin,
-  mr as default
+  er as MapviewFloorplanPlugin,
+  er as default
 };

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -74,6 +74,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -142,7 +143,7 @@ function z(d) {
   const { latitude: s, longitude: t } = d, e = Math.abs(s - Math.PI / 2) < 10 * Math.PI / 180, i = t < 30 * (Math.PI / 180) || t > 330 * (Math.PI / 180);
   return e && i;
 }
-class Ne extends T {
+class Ue extends T {
   constructor(t, e) {
     var a, p, c;
     super(t);
@@ -476,5 +477,5 @@ class Ne extends T {
   }
 }
 export {
-  Ne as Controller
+  Ue as Controller
 };

package/libs/floorplan/ModelFloorplanPlugin/index.js

@@ -24,6 +24,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -106,8 +107,8 @@ import "../utils/constant.js";
 import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const ir = (o, r) => new t(o, r);
+const mr = (o, r) => new t(o, r);
 export {
-  ir as ModelFloorplanPlugin,
-  ir as default
+  mr as ModelFloorplanPlugin,
+  mr as default
 };

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -72,6 +72,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -132,7 +133,7 @@ import "../../shared-utils/five/getRaycasterByNdcPosition.js";
 import "../../shared-utils/three/PointSelector/utils/contents.js";
 import "../../Sculpt/utils/three/rayOnLine.js";
 import "@realsee/five";
-class Di extends M {
+class Oi extends M {
   constructor(t, i) {
     var h, l;
     super(t);
@@ -406,5 +407,5 @@ class Di extends M {
   }
 }
 export {
-  Di as Controller
+  Oi as Controller
 };

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -24,6 +24,7 @@ import "../utils/formatPosition.js";
 import "../Components/RoomMaterials/RoomMaterial_0.js";
 import "../Components/RoomMaterials/RoomMaterial_1.js";
 import "../Components/RoomMaterials/RoomMaterial_2.js";
+import "../Components/RoomMaterials/RoomTriangle.js";
 import "../Components/RoomHighlight/RoomHighlight.js";
 import "../Components/RoomHighlight/Room.js";
 import "../Components/MissingFloor.js";
@@ -104,8 +105,8 @@ import "../../shared-utils/nearlyEqual.js";
 import "../../shared-utils/to.js";
 import "../../shared-utils/getPxmm.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const tr = (o, r) => new t(o, r);
+const pr = (o, r) => new t(o, r);
 export {
-  tr as TopviewFloorplanPlugin,
-  tr as default
+  pr as TopviewFloorplanPlugin,
+  pr as default
 };

package/libs/floorplan/typings/floorplanData.d.ts

@@ -84,6 +84,8 @@ export interface FloorplanRoomItem {
         width: number;
         /** 房间高度 */
         height: number;
+        vertical: Record<'x' | 'y', number>[];
+        horizontal: Record<'x' | 'y', number>[];
     };
 }
 /** 户型图标尺 */

package/libs/floorplan/utils/formatData.js

@@ -1,25 +1,25 @@
-var p = (o, e, r) => new Promise((l, n) => {
+var c = (o, e, r) => new Promise((l, n) => {
   var t = (i) => {
     try {
       s(r.next(i));
-    } catch (c) {
-      n(c);
+    } catch (p) {
+      n(p);
     }
   }, m = (i) => {
     try {
       s(r.throw(i));
-    } catch (c) {
-      n(c);
+    } catch (p) {
+      n(p);
     }
   }, s = (i) => i.done ? l(i.value) : Promise.resolve(i.value).then(t, m);
   s((r = r.apply(o, e)).next());
 });
-import { FLOORPLAN_EXTRA_OBJECT_IMAGE as f } from "../Assets/floorplanExtraObject.js";
-import { getFloorIndexFromModelPosition as u, modelPosition2FloorplanPosition as a, floorplanPosition2ImagePosition as _ } from "./formatPosition.js";
+import { FLOORPLAN_EXTRA_OBJECT_IMAGE as u } from "../Assets/floorplanExtraObject.js";
+import { getFloorIndexFromModelPosition as f, modelPosition2FloorplanPosition as a, floorplanPosition2ImagePosition as _ } from "./formatPosition.js";
 function g(o) {
-  return p(this, null, function* () {
+  return c(this, null, function* () {
     const e = new Headers({ "Content-Type": "text/plain" }), r = function(n) {
-      return p(this, null, function* () {
+      return c(this, null, function* () {
         const t = {
           index: n.index,
           url: n.url,
@@ -36,7 +36,6 @@ function g(o) {
   });
 }
 function I(o) {
-  console.log("formatRoom 户型图数据 ", o);
   const e = {
     id: o.id,
     size: o.size,
@@ -53,7 +52,7 @@ function I(o) {
   };
   return o.dimension && Object.assign(e, { dimension: o.dimension }), e;
 }
-function x(o) {
+function d(o) {
   return {
     floorName: o.floor_name,
     floorIndex: o.floor_index,
@@ -61,7 +60,7 @@ function x(o) {
     rules: o.rules
   };
 }
-function d(o) {
+function x(o) {
   return {
     index: o.index,
     floorIndex: o.floor_index,
@@ -80,25 +79,25 @@ function v(o) {
   };
 }
 function P(o) {
-  return p(this, null, function* () {
-    const e = yield g(o.outlines), r = o.computed_data.bounding, l = o.computed_data.floor_datas.map(x), n = o.computed_data.entrance ? v(o.computed_data.entrance) : null;
+  return c(this, null, function* () {
+    const e = yield g(o.outlines), r = o.computed_data.bounding, l = o.computed_data.floor_datas.map(d), n = o.computed_data.entrance ? v(o.computed_data.entrance) : null;
     return {
       outlines: e,
       entrance: n,
       bounding: r,
       floorDatas: l,
-      observers: o.computed_data.observers.map(d)
+      observers: o.computed_data.observers.map(x)
     };
   });
 }
 function y(o, e, r) {
   return o.map((n) => {
     const t = n.position, m = n.icon ? n.icon : {
-      url: f,
+      url: u,
       width: 45,
       height: 48
-    }, s = u(t, e), i = a(t, r), c = _(i, r);
-    return { floorIndex: s, icon: m, id: n.id, position: i, positionInImage: c };
+    }, s = f(t, e), i = a(t, r), p = _(i, r);
+    return { floorIndex: s, icon: m, id: n.id, position: i, positionInImage: p };
   });
 }
 export {