@collabdt/core 0.0.42 → 0.0.43

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/AddDxf.js

@@ -2,61 +2,50 @@ import * as THREE from "three";
 import * as OBC from "@thatopen/components";
 import { DXFManager } from "../../../DXFLoader";
 import { GizmoController } from "../../../../utils/GizmoController";
+const DEFAULT_SCALE = 1e-3;
 class AddDxf {
   constructor(bimComponents, world) {
-    this._dxfManager = null;
     this._loadedDxfs = /* @__PURE__ */ new Map();
     this.onDxfLoaded = new OBC.Event();
     this.onDxfTransformed = new OBC.Event();
-    this._bimComponents = bimComponents;
     this._world = world;
     this._dxfManager = bimComponents.get(DXFManager);
   }
   async loadDxf(file, id, options) {
+    var _a, _b;
     if (!this._dxfManager) {
       console.error("DXFManager not available in BIM components");
       return null;
     }
+    const fileUrl = URL.createObjectURL(file);
     try {
-      const fileUrl = URL.createObjectURL(file);
-      this._dxfManager.scale = options.scale || 1e-3;
-      this._dxfManager.rotation = options.rotation || 0;
-      const dxfGroup = await this._dxfManager.load(
-        fileUrl,
-        id,
-        file.name,
-        {
-          x: options.position.x,
-          y: options.position.z,
-          // Y and Z swapped for DXF coordinate system
-          z: -options.position.y
-        }
-      );
-      if (!dxfGroup) {
-        console.error("Failed to load DXF file");
-        URL.revokeObjectURL(fileUrl);
-        return null;
-      }
-      dxfGroup.position.copy(options.position);
-      let gizmoController;
-      if (options.enableGizmo) {
-        gizmoController = this.setupGizmo(dxfGroup, id);
-      }
+      const group = await this._dxfManager.parse(fileUrl);
+      const scale = (_a = options.scale) != null ? _a : DEFAULT_SCALE;
+      const rotation = (_b = options.rotation) != null ? _b : 0;
+      group.name = id;
+      group.position.copy(options.position);
+      group.scale.setScalar(scale);
+      group.rotation.y = THREE.MathUtils.degToRad(rotation);
+      this._world.scene.three.add(group);
       const dxfInfo = {
         id,
         name: file.name,
         file,
-        group: dxfGroup,
+        group,
         position: options.position.clone(),
-        scale: options.scale || 1e-3,
-        rotation: options.rotation || 0,
-        gizmoController
+        scale,
+        rotation,
+        fileUrl
       };
+      if (options.enableGizmo) {
+        dxfInfo.gizmoController = this.setupGizmo(group, id);
+      }
       this._loadedDxfs.set(id, dxfInfo);
       this.onDxfLoaded.trigger(dxfInfo);
       return dxfInfo;
     } catch (error) {
       console.error("Error loading DXF file:", error);
+      URL.revokeObjectURL(fileUrl);
       return null;
     }
   }
@@ -64,7 +53,7 @@ class AddDxf {
     const dxfInfo = this._loadedDxfs.get(id);
     if (!dxfInfo) return false;
     dxfInfo.scale = scale;
-    dxfInfo.group.scale.set(scale, scale, scale);
+    dxfInfo.group.scale.setScalar(scale);
     this.onDxfTransformed.trigger(dxfInfo);
     return true;
   }
@@ -72,7 +61,7 @@ class AddDxf {
     const dxfInfo = this._loadedDxfs.get(id);
     if (!dxfInfo) return false;
     dxfInfo.rotation = rotation;
-    dxfInfo.group.rotation.z = THREE.MathUtils.degToRad(rotation);
+    dxfInfo.group.rotation.y = THREE.MathUtils.degToRad(rotation);
     this.onDxfTransformed.trigger(dxfInfo);
     return true;
   }
@@ -90,32 +79,33 @@ class AddDxf {
     if (enable && !dxfInfo.gizmoController) {
       dxfInfo.gizmoController = this.setupGizmo(dxfInfo.group, id);
       return true;
-    } else if (!enable && dxfInfo.gizmoController) {
+    }
+    if (!enable && dxfInfo.gizmoController) {
       dxfInfo.gizmoController.dispose();
       dxfInfo.gizmoController = void 0;
       return true;
     }
     return false;
   }
+  setGizmoMode(id, mode) {
+    var _a, _b;
+    (_b = (_a = this._loadedDxfs.get(id)) == null ? void 0 : _a.gizmoController) == null ? void 0 : _b.setMode(mode);
+  }
   confirmPlacement(id) {
+    var _a;
     const dxfInfo = this._loadedDxfs.get(id);
     if (!dxfInfo) return false;
-    if (dxfInfo.gizmoController) {
-      dxfInfo.gizmoController.dispose();
-      dxfInfo.gizmoController = void 0;
-    }
-    if (this._dxfManager) {
-      this._dxfManager.removeTransformControls(dxfInfo.name);
-    }
+    (_a = dxfInfo.gizmoController) == null ? void 0 : _a.dispose();
+    dxfInfo.gizmoController = void 0;
     return true;
   }
   removeDxf(id) {
+    var _a;
     const dxfInfo = this._loadedDxfs.get(id);
     if (!dxfInfo) return false;
     this._world.scene.three.remove(dxfInfo.group);
-    if (dxfInfo.gizmoController) {
-      dxfInfo.gizmoController.dispose();
-    }
+    (_a = dxfInfo.gizmoController) == null ? void 0 : _a.dispose();
+    URL.revokeObjectURL(dxfInfo.fileUrl);
     this._loadedDxfs.delete(id);
     return true;
   }
@@ -127,15 +117,17 @@ class AddDxf {
   }
   setupGizmo(group, dxfId) {
     const gizmoController = new GizmoController(this._world);
-    const notifyTransform = () => {
+    const endEditing = () => {
       const dxfInfo = this._loadedDxfs.get(dxfId);
-      if (dxfInfo) {
-        dxfInfo.position.copy(group.position);
-        this.onDxfTransformed.trigger(dxfInfo);
-      }
+      if (!dxfInfo) return;
+      dxfInfo.position.copy(group.position);
+      dxfInfo.scale = group.scale.x;
+      dxfInfo.rotation = THREE.MathUtils.radToDeg(group.rotation.y);
+      dxfInfo.gizmoController = void 0;
+      this.onDxfTransformed.trigger(dxfInfo);
     };
-    gizmoController.onAccept = notifyTransform;
-    gizmoController.onCancel = notifyTransform;
+    gizmoController.onAccept = endEditing;
+    gizmoController.onCancel = endEditing;
     gizmoController.setMode("translate");
     gizmoController.attach(group);
     return gizmoController;
@@ -143,18 +135,12 @@ class AddDxf {
   static isDxfFile(file) {
     return file.name.toLowerCase().endsWith(".dxf");
   }
-  static validateDxfFile(file) {
-    if (!this.isDxfFile(file)) {
-      return { valid: false, error: "File is not a DXF file" };
-    }
-    return { valid: true };
-  }
   dispose() {
+    var _a;
     for (const dxfInfo of this._loadedDxfs.values()) {
       this._world.scene.three.remove(dxfInfo.group);
-      if (dxfInfo.gizmoController) {
-        dxfInfo.gizmoController.dispose();
-      }
+      (_a = dxfInfo.gizmoController) == null ? void 0 : _a.dispose();
+      URL.revokeObjectURL(dxfInfo.fileUrl);
     }
     this._loadedDxfs.clear();
   }

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/AddDxf.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/AddDxf.ts"],"sourcesContent":["import * as THREE from 'three'\r\nimport * as OBC from '@thatopen/components'\r\nimport { DXFManager } from '../../../DXFLoader'\r\nimport { GizmoController } from '../../../../utils/GizmoController'\r\n\r\nexport interface DxfInfo {\r\n  id: string\r\n  name: string\r\n  file: File\r\n  group: THREE.Group\r\n  position: THREE.Vector3\r\n  scale: number\r\n  rotation: number\r\n  gizmoController?: GizmoController\r\n}\r\n\r\nexport interface DxfLoadOptions {\r\n  position: THREE.Vector3\r\n  scale?: number\r\n  rotation?: number\r\n  enableGizmo?: boolean\r\n}\r\n\r\nexport class AddDxf {\r\n  private _bimComponents: OBC.Components\r\n  private _world: OBC.World\r\n  private _dxfManager: DXFManager | null = null\r\n  private _loadedDxfs: Map<string, DxfInfo> = new Map()\r\n\r\n  onDxfLoaded = new OBC.Event<DxfInfo>()\r\n  onDxfTransformed = new OBC.Event<DxfInfo>()\r\n\r\n  constructor(bimComponents: OBC.Components, world: OBC.World) {\r\n    this._bimComponents = bimComponents\r\n    this._world = world\r\n    this._dxfManager = bimComponents.get(DXFManager)\r\n  }\r\n\r\n  async loadDxf(\r\n    file: File,\r\n    id: string,\r\n    options: DxfLoadOptions,\r\n  ): Promise<DxfInfo | null> {\r\n    if (!this._dxfManager) {\r\n      console.error('DXFManager not available in BIM components')\r\n      return null\r\n    }\r\n\r\n    try {\r\n      const fileUrl = URL.createObjectURL(file)\r\n\r\n      this._dxfManager.scale = options.scale || 0.001\r\n      this._dxfManager.rotation = options.rotation || 0\r\n\r\n      const dxfGroup = await this._dxfManager.load(\r\n        fileUrl,\r\n        id,\r\n        file.name,\r\n        {\r\n          x: options.position.x,\r\n          y: options.position.z, // Y and Z swapped for DXF coordinate system\r\n          z: -options.position.y,\r\n        },\r\n      )\r\n\r\n      if (!dxfGroup) {\r\n        console.error('Failed to load DXF file')\r\n        URL.revokeObjectURL(fileUrl)\r\n        return null\r\n      }\r\n\r\n      dxfGroup.position.copy(options.position)\r\n\r\n      let gizmoController: GizmoController | undefined\r\n      if (options.enableGizmo) {\r\n        gizmoController = this.setupGizmo(dxfGroup, id)\r\n      }\r\n\r\n      const dxfInfo: DxfInfo = {\r\n        id,\r\n        name: file.name,\r\n        file,\r\n        group: dxfGroup,\r\n        position: options.position.clone(),\r\n        scale: options.scale || 0.001,\r\n        rotation: options.rotation || 0,\r\n        gizmoController,\r\n      }\r\n\r\n      this._loadedDxfs.set(id, dxfInfo)\r\n\r\n      this.onDxfLoaded.trigger(dxfInfo)\r\n\r\n      return dxfInfo\r\n    }\r\n    catch (error) {\r\n      console.error('Error loading DXF file:', error)\r\n      return null\r\n    }\r\n  }\r\n\r\n  updateScale(id: string, scale: number): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    dxfInfo.scale = scale\r\n    dxfInfo.group.scale.set(scale, scale, scale)\r\n\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  updateRotation(id: string, rotation: number): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    dxfInfo.rotation = rotation\r\n    dxfInfo.group.rotation.z = THREE.MathUtils.degToRad(rotation)\r\n\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  updatePosition(id: string, position: THREE.Vector3): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    dxfInfo.position.copy(position)\r\n    dxfInfo.group.position.copy(position)\r\n\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  toggleGizmo(id: string, enable: boolean): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    if (enable && !dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController = this.setupGizmo(dxfInfo.group, id)\r\n      return true\r\n    }\r\n    else if (!enable && dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController.dispose()\r\n      dxfInfo.gizmoController = undefined\r\n      return true\r\n    }\r\n\r\n    return false\r\n  }\r\n\r\n  confirmPlacement(id: string): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    if (dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController.dispose()\r\n      dxfInfo.gizmoController = undefined\r\n    }\r\n\r\n    if (this._dxfManager) {\r\n      this._dxfManager.removeTransformControls(dxfInfo.name)\r\n    }\r\n\r\n    return true\r\n  }\r\n\r\n  removeDxf(id: string): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    this._world.scene.three.remove(dxfInfo.group)\r\n\r\n    if (dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController.dispose()\r\n    }\r\n\r\n    this._loadedDxfs.delete(id)\r\n\r\n    return true\r\n  }\r\n\r\n  getDxf(id: string): DxfInfo | undefined {\r\n    return this._loadedDxfs.get(id)\r\n  }\r\n\r\n  getAllDxfs(): DxfInfo[] {\r\n    return [...this._loadedDxfs.values()]\r\n  }\r\n\r\n  private setupGizmo(group: THREE.Group, dxfId: string): GizmoController {\r\n    const gizmoController = new GizmoController(this._world)\r\n\r\n    const notifyTransform = () => {\r\n      const dxfInfo = this._loadedDxfs.get(dxfId)\r\n      if (dxfInfo) {\r\n        dxfInfo.position.copy(group.position)\r\n        this.onDxfTransformed.trigger(dxfInfo)\r\n      }\r\n    }\r\n\r\n    gizmoController.onAccept = notifyTransform\r\n    gizmoController.onCancel = notifyTransform\r\n    gizmoController.setMode('translate')\r\n\r\n    gizmoController.attach(group)\r\n    return gizmoController\r\n  }\r\n\r\n  static isDxfFile(file: File): boolean {\r\n    return file.name.toLowerCase().endsWith('.dxf')\r\n  }\r\n\r\n  static validateDxfFile(file: File): { valid: boolean, error?: string } {\r\n    if (!this.isDxfFile(file)) {\r\n      return { valid: false, error: 'File is not a DXF file' }\r\n    }\r\n\r\n    return { valid: true }\r\n  }\r\n\r\n  dispose(): void {\r\n    for (const dxfInfo of this._loadedDxfs.values()) {\r\n      this._world.scene.three.remove(dxfInfo.group)\r\n\r\n      if (dxfInfo.gizmoController) {\r\n        dxfInfo.gizmoController.dispose()\r\n      }\r\n    }\r\n\r\n    this._loadedDxfs.clear()\r\n  }\r\n}\r\n"],"mappings":"AAAA,YAAY,WAAW;AACvB,YAAY,SAAS;AACrB,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAoBzB,MAAM,OAAO;AAAA,EASlB,YAAY,eAA+B,OAAkB;AAN7D,SAAQ,cAAiC;AACzC,SAAQ,cAAoC,oBAAI,IAAI;AAEpD,uBAAc,IAAI,IAAI,MAAe;AACrC,4BAAmB,IAAI,IAAI,MAAe;AAGxC,SAAK,iBAAiB;AACtB,SAAK,SAAS;AACd,SAAK,cAAc,cAAc,IAAI,UAAU;AAAA,EACjD;AAAA,EAEA,MAAM,QACJ,MACA,IACA,SACyB;AACzB,QAAI,CAAC,KAAK,aAAa;AACrB,cAAQ,MAAM,4CAA4C;AAC1D,aAAO;AAAA,IACT;AAEA,QAAI;AACF,YAAM,UAAU,IAAI,gBAAgB,IAAI;AAExC,WAAK,YAAY,QAAQ,QAAQ,SAAS;AAC1C,WAAK,YAAY,WAAW,QAAQ,YAAY;AAEhD,YAAM,WAAW,MAAM,KAAK,YAAY;AAAA,QACtC;AAAA,QACA;AAAA,QACA,KAAK;AAAA,QACL;AAAA,UACE,GAAG,QAAQ,SAAS;AAAA,UACpB,GAAG,QAAQ,SAAS;AAAA;AAAA,UACpB,GAAG,CAAC,QAAQ,SAAS;AAAA,QACvB;AAAA,MACF;AAEA,UAAI,CAAC,UAAU;AACb,gBAAQ,MAAM,yBAAyB;AACvC,YAAI,gBAAgB,OAAO;AAC3B,eAAO;AAAA,MACT;AAEA,eAAS,SAAS,KAAK,QAAQ,QAAQ;AAEvC,UAAI;AACJ,UAAI,QAAQ,aAAa;AACvB,0BAAkB,KAAK,WAAW,UAAU,EAAE;AAAA,MAChD;AAEA,YAAM,UAAmB;AAAA,QACvB;AAAA,QACA,MAAM,KAAK;AAAA,QACX;AAAA,QACA,OAAO;AAAA,QACP,UAAU,QAAQ,SAAS,MAAM;AAAA,QACjC,OAAO,QAAQ,SAAS;AAAA,QACxB,UAAU,QAAQ,YAAY;AAAA,QAC9B;AAAA,MACF;AAEA,WAAK,YAAY,IAAI,IAAI,OAAO;AAEhC,WAAK,YAAY,QAAQ,OAAO;AAEhC,aAAO;AAAA,IACT,SACO,OAAO;AACZ,cAAQ,MAAM,2BAA2B,KAAK;AAC9C,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,YAAY,IAAY,OAAwB;AAC9C,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,YAAQ,QAAQ;AAChB,YAAQ,MAAM,MAAM,IAAI,OAAO,OAAO,KAAK;AAE3C,SAAK,iBAAiB,QAAQ,OAAO;AACrC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,IAAY,UAA2B;AACpD,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,YAAQ,WAAW;AACnB,YAAQ,MAAM,SAAS,IAAI,MAAM,UAAU,SAAS,QAAQ;AAE5D,SAAK,iBAAiB,QAAQ,OAAO;AACrC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,IAAY,UAAkC;AAC3D,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,YAAQ,SAAS,KAAK,QAAQ;AAC9B,YAAQ,MAAM,SAAS,KAAK,QAAQ;AAEpC,SAAK,iBAAiB,QAAQ,OAAO;AACrC,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,IAAY,QAA0B;AAChD,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,QAAI,UAAU,CAAC,QAAQ,iBAAiB;AACtC,cAAQ,kBAAkB,KAAK,WAAW,QAAQ,OAAO,EAAE;AAC3D,aAAO;AAAA,IACT,WACS,CAAC,UAAU,QAAQ,iBAAiB;AAC3C,cAAQ,gBAAgB,QAAQ;AAChC,cAAQ,kBAAkB;AAC1B,aAAO;AAAA,IACT;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,iBAAiB,IAAqB;AACpC,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,QAAI,QAAQ,iBAAiB;AAC3B,cAAQ,gBAAgB,QAAQ;AAChC,cAAQ,kBAAkB;AAAA,IAC5B;AAEA,QAAI,KAAK,aAAa;AACpB,WAAK,YAAY,wBAAwB,QAAQ,IAAI;AAAA,IACvD;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,IAAqB;AAC7B,UAAM,UAAU,KAAK,YAAY,IAAI,EAAE;AACvC,QAAI,CAAC,QAAS,QAAO;AAErB,SAAK,OAAO,MAAM,MAAM,OAAO,QAAQ,KAAK;AAE5C,QAAI,QAAQ,iBAAiB;AAC3B,cAAQ,gBAAgB,QAAQ;AAAA,IAClC;AAEA,SAAK,YAAY,OAAO,EAAE;AAE1B,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,IAAiC;AACtC,WAAO,KAAK,YAAY,IAAI,EAAE;AAAA,EAChC;AAAA,EAEA,aAAwB;AACtB,WAAO,CAAC,GAAG,KAAK,YAAY,OAAO,CAAC;AAAA,EACtC;AAAA,EAEQ,WAAW,OAAoB,OAAgC;AACrE,UAAM,kBAAkB,IAAI,gBAAgB,KAAK,MAAM;AAEvD,UAAM,kBAAkB,MAAM;AAC5B,YAAM,UAAU,KAAK,YAAY,IAAI,KAAK;AAC1C,UAAI,SAAS;AACX,gBAAQ,SAAS,KAAK,MAAM,QAAQ;AACpC,aAAK,iBAAiB,QAAQ,OAAO;AAAA,MACvC;AAAA,IACF;AAEA,oBAAgB,WAAW;AAC3B,oBAAgB,WAAW;AAC3B,oBAAgB,QAAQ,WAAW;AAEnC,oBAAgB,OAAO,KAAK;AAC5B,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,UAAU,MAAqB;AACpC,WAAO,KAAK,KAAK,YAAY,EAAE,SAAS,MAAM;AAAA,EAChD;AAAA,EAEA,OAAO,gBAAgB,MAAgD;AACrE,QAAI,CAAC,KAAK,UAAU,IAAI,GAAG;AACzB,aAAO,EAAE,OAAO,OAAO,OAAO,yBAAyB;AAAA,IACzD;AAEA,WAAO,EAAE,OAAO,KAAK;AAAA,EACvB;AAAA,EAEA,UAAgB;AACd,eAAW,WAAW,KAAK,YAAY,OAAO,GAAG;AAC/C,WAAK,OAAO,MAAM,MAAM,OAAO,QAAQ,KAAK;AAE5C,UAAI,QAAQ,iBAAiB;AAC3B,gBAAQ,gBAAgB,QAAQ;AAAA,MAClC;AAAA,IACF;AAEA,SAAK,YAAY,MAAM;AAAA,EACzB;AACF;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/AddDxf.ts"],"sourcesContent":["import * as THREE from 'three'\r\nimport * as OBC from '@thatopen/components'\r\nimport { DXFManager } from '../../../DXFLoader'\r\nimport { GizmoController } from '../../../../utils/GizmoController'\r\n\r\nexport interface DxfInfo {\r\n  id: string\r\n  name: string\r\n  file: File\r\n  group: THREE.Group\r\n  position: THREE.Vector3\r\n  scale: number\r\n  rotation: number\r\n  fileUrl: string\r\n  gizmoController?: GizmoController\r\n}\r\n\r\nexport interface DxfLoadOptions {\r\n  position: THREE.Vector3\r\n  scale?: number\r\n  rotation?: number\r\n  enableGizmo?: boolean\r\n}\r\n\r\nconst DEFAULT_SCALE = 0.001 // DXF authored in millimetres → metres\r\n\r\nexport class AddDxf {\r\n  private _world: OBC.World\r\n  private _dxfManager: DXFManager | null\r\n  private _loadedDxfs: Map<string, DxfInfo> = new Map()\r\n\r\n  onDxfLoaded = new OBC.Event<DxfInfo>()\r\n  onDxfTransformed = new OBC.Event<DxfInfo>()\r\n\r\n  constructor(bimComponents: OBC.Components, world: OBC.World) {\r\n    this._world = world\r\n    this._dxfManager = bimComponents.get(DXFManager)\r\n  }\r\n\r\n  async loadDxf(file: File, id: string, options: DxfLoadOptions): Promise<DxfInfo | null> {\r\n    if (!this._dxfManager) {\r\n      console.error('DXFManager not available in BIM components')\r\n      return null\r\n    }\r\n\r\n    const fileUrl = URL.createObjectURL(file)\r\n    try {\r\n      const group = await this._dxfManager.parse(fileUrl)\r\n      const scale = options.scale ?? DEFAULT_SCALE\r\n      const rotation = options.rotation ?? 0\r\n\r\n      group.name = id\r\n      group.position.copy(options.position)\r\n      group.scale.setScalar(scale)\r\n      group.rotation.y = THREE.MathUtils.degToRad(rotation)\r\n      this._world.scene.three.add(group)\r\n\r\n      const dxfInfo: DxfInfo = {\r\n        id,\r\n        name: file.name,\r\n        file,\r\n        group,\r\n        position: options.position.clone(),\r\n        scale,\r\n        rotation,\r\n        fileUrl,\r\n      }\r\n\r\n      if (options.enableGizmo) {\r\n        dxfInfo.gizmoController = this.setupGizmo(group, id)\r\n      }\r\n\r\n      this._loadedDxfs.set(id, dxfInfo)\r\n      this.onDxfLoaded.trigger(dxfInfo)\r\n      return dxfInfo\r\n    }\r\n    catch (error) {\r\n      console.error('Error loading DXF file:', error)\r\n      URL.revokeObjectURL(fileUrl)\r\n      return null\r\n    }\r\n  }\r\n\r\n  updateScale(id: string, scale: number): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n    dxfInfo.scale = scale\r\n    dxfInfo.group.scale.setScalar(scale)\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  updateRotation(id: string, rotation: number): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n    dxfInfo.rotation = rotation\r\n    dxfInfo.group.rotation.y = THREE.MathUtils.degToRad(rotation)\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  updatePosition(id: string, position: THREE.Vector3): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n    dxfInfo.position.copy(position)\r\n    dxfInfo.group.position.copy(position)\r\n    this.onDxfTransformed.trigger(dxfInfo)\r\n    return true\r\n  }\r\n\r\n  toggleGizmo(id: string, enable: boolean): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n\r\n    if (enable && !dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController = this.setupGizmo(dxfInfo.group, id)\r\n      return true\r\n    }\r\n    if (!enable && dxfInfo.gizmoController) {\r\n      dxfInfo.gizmoController.dispose()\r\n      dxfInfo.gizmoController = undefined\r\n      return true\r\n    }\r\n    return false\r\n  }\r\n\r\n  setGizmoMode(id: string, mode: 'translate' | 'rotate' | 'scale'): void {\r\n    this._loadedDxfs.get(id)?.gizmoController?.setMode(mode)\r\n  }\r\n\r\n  confirmPlacement(id: string): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n    dxfInfo.gizmoController?.dispose()\r\n    dxfInfo.gizmoController = undefined\r\n    return true\r\n  }\r\n\r\n  removeDxf(id: string): boolean {\r\n    const dxfInfo = this._loadedDxfs.get(id)\r\n    if (!dxfInfo) return false\r\n    this._world.scene.three.remove(dxfInfo.group)\r\n    dxfInfo.gizmoController?.dispose()\r\n    URL.revokeObjectURL(dxfInfo.fileUrl)\r\n    this._loadedDxfs.delete(id)\r\n    return true\r\n  }\r\n\r\n  getDxf(id: string): DxfInfo | undefined {\r\n    return this._loadedDxfs.get(id)\r\n  }\r\n\r\n  getAllDxfs(): DxfInfo[] {\r\n    return [...this._loadedDxfs.values()]\r\n  }\r\n\r\n  private setupGizmo(group: THREE.Group, dxfId: string): GizmoController {\r\n    const gizmoController = new GizmoController(this._world)\r\n\r\n    // Enter/Esc detach the gizmo internally; clear our reference so callers\r\n    // (and the marker visibility check) know editing has ended.\r\n    const endEditing = () => {\r\n      const dxfInfo = this._loadedDxfs.get(dxfId)\r\n      if (!dxfInfo) return\r\n      dxfInfo.position.copy(group.position)\r\n      dxfInfo.scale = group.scale.x\r\n      dxfInfo.rotation = THREE.MathUtils.radToDeg(group.rotation.y)\r\n      dxfInfo.gizmoController = undefined\r\n      this.onDxfTransformed.trigger(dxfInfo)\r\n    }\r\n\r\n    gizmoController.onAccept = endEditing\r\n    gizmoController.onCancel = endEditing\r\n    gizmoController.setMode('translate')\r\n    gizmoController.attach(group)\r\n    return gizmoController\r\n  }\r\n\r\n  static isDxfFile(file: File): boolean {\r\n    return file.name.toLowerCase().endsWith('.dxf')\r\n  }\r\n\r\n  dispose(): void {\r\n    for (const dxfInfo of this._loadedDxfs.values()) {\r\n      this._world.scene.three.remove(dxfInfo.group)\r\n      dxfInfo.gizmoController?.dispose()\r\n      URL.revokeObjectURL(dxfInfo.fileUrl)\r\n    }\r\n    this._loadedDxfs.clear()\r\n  }\r\n}\r\n"],"mappings":"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","names":[]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.js

@@ -33,6 +33,7 @@ function BimSensor({
           dataFormat,
           updateFrequency,
           createdAt: timestamp,
+          onRemove,
           onClose,
           enableCollapse: true,
           defaultCollapsed: true,

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"sourcesContent":["'use client'\r\nimport * as React from \"react\";\r\nimport * as THREE from 'three'\r\nimport Sensor from '../../../../../../ui/Sensors/Sensor'\r\nimport { SensorDataFormat, SensorType } from '../../../../../../../types/dbTypes';\r\nimport { markerStyle, markerStyleHighlight } from './markerUtils'\r\n\r\ninterface SensorProps {\r\n  sensorName: string\r\n  sensorType: SensorType\r\n  dataUrl: string\r\n  dataFormat: SensorDataFormat\r\n  updateFrequency: number\r\n  tags?: string[]\r\n  worldCamera: THREE.Camera\r\n  targetPoint: THREE.Vector3          \r\n  onRemove?: () => void\r\n  onEdit?: () => void\r\n  onClose: () => void\r\n  buildingId?: number\r\n  timestamp: Date\r\n  sphere: THREE.Object3D\r\n  highlight?: boolean\r\n}\r\n\r\nexport default function BimSensor({\r\n  sensorName,\r\n  sensorType,\r\n  tags,\r\n  dataUrl,\r\n  dataFormat,\r\n  updateFrequency,\r\n  onRemove,\r\n  onEdit,\r\n  onClose,\r\n  buildingId,\r\n  timestamp,\r\n  sphere,\r\n  highlight = false,\r\n}: SensorProps): React.ReactElement {\r\n  return (\r\n    <div\r\n      className={highlight ? markerStyleHighlight : markerStyle}\r\n    >\r\n      <Sensor\r\n        buildingId={buildingId}\r\n        sensorName={sensorName}\r\n        sensorType={sensorType}\r\n        tags={tags}\r\n        tagsVariant=\"read-only\"\r\n        dataUrl={dataUrl}\r\n        dataFormat={dataFormat}\r\n        updateFrequency={updateFrequency}\r\n        createdAt={timestamp}\r\n        // onRemove={onRemove} // Remove is disabled because the card is not clickable for now\r\n        onClose={onClose}\r\n        enableCollapse\r\n        defaultCollapsed\r\n        size=\"sm\"\r\n        highlight={highlight}\r\n      />\r\n    </div>\r\n  )\r\n}"],"mappings":";AA4CM;AAzCN,OAAO,YAAY;AAEnB,SAAS,aAAa,4BAA4B;AAoBnC,SAAR,UAA2B;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,YAAY;AACd,GAAoC;AAClC,SACE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,YAAY,uBAAuB;AAAA,MAE9C;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,aAAY;AAAA,UACZ;AAAA,UACA;AAAA,UACA;AAAA,UACA,WAAW;AAAA,UAEX;AAAA,UACA,gBAAc;AAAA,UACd,kBAAgB;AAAA,UAChB,MAAK;AAAA,UACL;AAAA;AAAA,MACF;AAAA;AAAA,EACF;AAEJ;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/BimSensor.tsx"],"sourcesContent":["'use client'\r\nimport * as React from \"react\";\r\nimport * as THREE from 'three'\r\nimport Sensor from '../../../../../../ui/Sensors/Sensor'\r\nimport { SensorDataFormat, SensorType } from '../../../../../../../types/dbTypes';\r\nimport { markerStyle, markerStyleHighlight } from './markerUtils'\r\n\r\ninterface SensorProps {\r\n  sensorName: string\r\n  sensorType: SensorType\r\n  dataUrl: string\r\n  dataFormat: SensorDataFormat\r\n  updateFrequency: number\r\n  tags?: string[]\r\n  worldCamera: THREE.Camera\r\n  targetPoint: THREE.Vector3          \r\n  onRemove?: () => void\r\n  onEdit?: () => void\r\n  onClose: () => void\r\n  buildingId?: number\r\n  timestamp: Date\r\n  sphere: THREE.Object3D\r\n  highlight?: boolean\r\n}\r\n\r\nexport default function BimSensor({\r\n  sensorName,\r\n  sensorType,\r\n  tags,\r\n  dataUrl,\r\n  dataFormat,\r\n  updateFrequency,\r\n  onRemove,\r\n  onEdit,\r\n  onClose,\r\n  buildingId,\r\n  timestamp,\r\n  sphere,\r\n  highlight = false,\r\n}: SensorProps): React.ReactElement {\r\n  return (\r\n    <div\r\n      className={highlight ? markerStyleHighlight : markerStyle}\r\n    >\r\n      <Sensor\r\n        buildingId={buildingId}\r\n        sensorName={sensorName}\r\n        sensorType={sensorType}\r\n        tags={tags}\r\n        tagsVariant=\"read-only\"\r\n        dataUrl={dataUrl}\r\n        dataFormat={dataFormat}\r\n        updateFrequency={updateFrequency}\r\n        createdAt={timestamp}\r\n        onRemove={onRemove}\r\n        onClose={onClose}\r\n        enableCollapse\r\n        defaultCollapsed\r\n        size=\"sm\"\r\n        highlight={highlight}\r\n      />\r\n    </div>\r\n  )\r\n}"],"mappings":";AA4CM;AAzCN,OAAO,YAAY;AAEnB,SAAS,aAAa,4BAA4B;AAoBnC,SAAR,UAA2B;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,YAAY;AACd,GAAoC;AAClC,SACE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,YAAY,uBAAuB;AAAA,MAE9C;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,aAAY;AAAA,UACZ;AAAA,UACA;AAAA,UACA;AAAA,UACA,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA,gBAAc;AAAA,UACd,kBAAgB;AAAA,UAChB,MAAK;AAAA,UACL;AAAA;AAAA,MACF;AAAA;AAAA,EACF;AAEJ;","names":[]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.d.ts

@@ -1,6 +1,15 @@
+import * as THREE from 'three';
 import * as OBC from '@thatopen/components';
+import { CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js';
 import { ModelManager } from '../../../ModelManager';
 import { AddDxf } from './AddDxf';
 import { AddedFile } from './FileMarkerUtils';
-export declare const addFileToScene: (addedFile: AddedFile, fileScale: number, fileRotation: number, world: OBC.World | null, modelManager: ModelManager | null, addDxf: AddDxf | null, toolsDispatch: any, setCurrent3DFileId: (id: string | null) => void, onMarkerContextMenu?: (event: MouseEvent) => void) => Promise<void>;
+import type { FileMarkerAction } from '../../../../../../ui/FilesManager/src/FileMarker';
+export type PlacedKind = 'dxf' | 'model' | 'generic';
+export interface PlacedResult {
+    kind: PlacedKind;
+    marker: CSS2DObject | null;
+    object3D: THREE.Object3D;
+}
+export declare const addFileToScene: (addedFile: AddedFile, fileScale: number, fileRotation: number, world: OBC.World | null, modelManager: ModelManager | null, addDxf: AddDxf | null, setCurrent3DFileId: (id: string | null) => void, onAction?: (action: FileMarkerAction) => void) => Promise<PlacedResult | null>;
 //# sourceMappingURL=FileHandler.d.ts.map

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileHandler.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EACL,SAAS,EAIV,MAAM,mBAAmB,CAAA;AAqB1B,eAAO,MAAM,cAAc,GACzB,WAAW,SAAS,EACpB,WAAW,MAAM,EACjB,cAAc,MAAM,EACpB,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,EACvB,cAAc,YAAY,GAAG,IAAI,EACjC,QAAQ,MAAM,GAAG,IAAI,EACrB,eAAe,GAAG,EAClB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,EAC/C,sBAAsB,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,kBA4FlD,CAAA"}
+{"version":3,"file":"FileHandler.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAA;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EACL,SAAS,EAGV,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAA;AAExF,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,CAAA;AAEpD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAA;IAChB,MAAM,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAA;CACzB;AAED,eAAO,MAAM,cAAc,GACzB,WAAW,SAAS,EACpB,WAAW,MAAM,EACjB,cAAc,MAAM,EACpB,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,EACvB,cAAc,YAAY,GAAG,IAAI,EACjC,QAAQ,MAAM,GAAG,IAAI,EACrB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,EAC/C,WAAW,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,KAC5C,OAAO,CAAC,YAAY,GAAG,IAAI,CAoC7B,CAAA"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.js

@@ -1,86 +1,38 @@
 import * as THREE from "three";
 import {
   createFileMarker,
-  updateMarkerPosition,
   createGenericFileMarker
 } from "./FileMarkerUtils";
-const subscribeToGizmoTransformEnd = (gizmoController, callback) => {
-  if (!gizmoController)
-    return;
-  const controller = gizmoController;
-  const eventKeys = ["onTransformEnd", "onAfterTransform", "onChange", "onUpdated"];
-  for (const key of eventKeys) {
-    const eventCandidate = controller[key];
-    if (eventCandidate && typeof eventCandidate.add === "function") {
-      eventCandidate.add(callback);
-      return;
-    }
-  }
-};
-const addFileToScene = async (addedFile, fileScale, fileRotation, world, modelManager, addDxf, toolsDispatch, setCurrent3DFileId, onMarkerContextMenu) => {
-  if (!world || !modelManager || !addDxf) return;
+const addFileToScene = async (addedFile, fileScale, fileRotation, world, modelManager, addDxf, setCurrent3DFileId, onAction) => {
+  if (!world || !modelManager || !addDxf) return null;
   const fileName = addedFile.file.name.toLowerCase();
   if (fileName.endsWith(".glb") || fileName.endsWith(".gltf")) {
-    try {
-      const modelInfo = await modelManager.load(
-        addedFile.file,
-        addedFile.id,
-        addedFile.file.name,
-        {
-          position: addedFile.position,
-          scale: fileScale,
-          rotation: new THREE.Euler(0, THREE.MathUtils.degToRad(fileRotation), 0),
-          enableGizmo: true,
-          enableAnimations: true
-        }
-      );
-      if (modelInfo) {
-        setCurrent3DFileId(addedFile.id);
-        const markerObj = createFileMarker(addedFile, modelInfo.model, () => {
-        }, world, onMarkerContextMenu);
-        subscribeToGizmoTransformEnd(modelInfo.gizmoController, () => {
-          updateMarkerPosition(markerObj, modelInfo.model);
-        });
-        setTimeout(() => {
-          updateMarkerPosition(markerObj, modelInfo.model);
-        }, 100);
-      }
-    } catch (error) {
-      console.error("Error loading 3D model:", error);
-    }
-    return;
+    const modelInfo = await modelManager.load(addedFile.file, addedFile.id, addedFile.file.name, {
+      position: addedFile.position,
+      scale: fileScale,
+      rotation: new THREE.Euler(0, THREE.MathUtils.degToRad(fileRotation), 0),
+      enableGizmo: true,
+      enableAnimations: true
+    });
+    if (!modelInfo) return null;
+    setCurrent3DFileId(addedFile.id);
+    const marker2 = createFileMarker(addedFile, modelInfo.model, world, onAction);
+    return { kind: "model", marker: marker2, object3D: modelInfo.model };
   }
   if (fileName.endsWith(".dxf")) {
-    try {
-      const dxfInfo = await addDxf.loadDxf(
-        addedFile.file,
-        addedFile.id,
-        {
-          position: addedFile.position,
-          scale: fileScale,
-          rotation: fileRotation,
-          enableGizmo: true
-        }
-      );
-      if (dxfInfo) {
-        setCurrent3DFileId(addedFile.id);
-        const markerObj = createFileMarker(addedFile, dxfInfo.group, () => {
-        }, world, onMarkerContextMenu);
-        addDxf.onDxfTransformed.add((transformedDxfInfo) => {
-          if (transformedDxfInfo.id === addedFile.id) {
-            updateMarkerPosition(markerObj, dxfInfo.group);
-          }
-        });
-        setTimeout(() => {
-          updateMarkerPosition(markerObj, dxfInfo.group);
-        }, 100);
-      }
-    } catch (error) {
-      console.error("Error loading DXF file:", error);
-    }
-    return;
+    const dxfInfo = await addDxf.loadDxf(addedFile.file, addedFile.id, {
+      position: addedFile.position,
+      scale: fileScale,
+      rotation: fileRotation,
+      enableGizmo: true
+    });
+    if (!dxfInfo) return null;
+    setCurrent3DFileId(addedFile.id);
+    const marker2 = createFileMarker(addedFile, dxfInfo.group, world, onAction);
+    return { kind: "dxf", marker: marker2, object3D: dxfInfo.group };
   }
-  createGenericFileMarker(addedFile, world, toolsDispatch, onMarkerContextMenu);
+  const { marker, object3D } = createGenericFileMarker(addedFile, world, onAction);
+  return { kind: "generic", marker, object3D };
 };
 export {
   addFileToScene

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.ts"],"sourcesContent":["import * as THREE from 'three'\r\nimport * as OBC from '@thatopen/components'\r\nimport { ModelManager } from '../../../ModelManager'\r\nimport { AddDxf } from './AddDxf'\r\nimport {\r\n  AddedFile,\r\n  createFileMarker,\r\n  updateMarkerPosition,\r\n  createGenericFileMarker,\r\n} from './FileMarkerUtils'\r\n\r\nconst subscribeToGizmoTransformEnd = (\r\n  gizmoController: THREE.GizmoController | null | undefined,\r\n  callback: () => void,\r\n) => {\r\n  if (!gizmoController)\r\n    return\r\n\r\n  const controller = gizmoController as unknown as Record<string, unknown>\r\n  const eventKeys = ['onTransformEnd', 'onAfterTransform', 'onChange', 'onUpdated']\r\n\r\n  for (const key of eventKeys) {\r\n    const eventCandidate = controller[key] as { add?: (fn: () => void) => void } | undefined\r\n    if (eventCandidate && typeof eventCandidate.add === 'function') {\r\n      eventCandidate.add(callback)\r\n      return\r\n    }\r\n  }\r\n}\r\n\r\nexport const addFileToScene = async (\r\n  addedFile: AddedFile,\r\n  fileScale: number,\r\n  fileRotation: number,\r\n  world: OBC.World | null,\r\n  modelManager: ModelManager | null,\r\n  addDxf: AddDxf | null,\r\n  toolsDispatch: any,\r\n  setCurrent3DFileId: (id: string | null) => void,\r\n  onMarkerContextMenu?: (event: MouseEvent) => void,\r\n) => {\r\n  if (!world || !modelManager || !addDxf) return\r\n\r\n  const fileName = addedFile.file.name.toLowerCase()\r\n\r\n  // Handle 3D models (GLB/GLTF)\r\n  if (fileName.endsWith('.glb') || fileName.endsWith('.gltf')) {\r\n    try {\r\n      const modelInfo = await modelManager.load(\r\n        addedFile.file,\r\n        addedFile.id,\r\n        addedFile.file.name,\r\n        {\r\n          position: addedFile.position,\r\n          scale: fileScale,\r\n          rotation: new THREE.Euler(0, THREE.MathUtils.degToRad(fileRotation), 0),\r\n          enableGizmo: true,\r\n          enableAnimations: true,\r\n        },\r\n      )\r\n\r\n      if (modelInfo) {\r\n        // Store current 3D file ID for real-time updates\r\n        setCurrent3DFileId(addedFile.id)\r\n\r\n        // Create CSS2D label for the 3D model\r\n        const markerObj = createFileMarker(addedFile, modelInfo.model, () => {\r\n          // Click on marker — no-op (actions handled via sidebar/context menu)\r\n        }, world, onMarkerContextMenu)\r\n\r\n        // Set up transform listener to update marker position\r\n        subscribeToGizmoTransformEnd(modelInfo.gizmoController, () => {\r\n          updateMarkerPosition(markerObj, modelInfo.model)\r\n        })\r\n\r\n        // Initial marker position update after model is loaded\r\n        setTimeout(() => {\r\n          updateMarkerPosition(markerObj, modelInfo.model)\r\n        }, 100)\r\n      }\r\n    }\r\n    catch (error) {\r\n      console.error('Error loading 3D model:', error)\r\n    }\r\n    return\r\n  }\r\n\r\n  // Handle DXF files\r\n  if (fileName.endsWith('.dxf')) {\r\n    try {\r\n      const dxfInfo = await addDxf.loadDxf(\r\n        addedFile.file,\r\n        addedFile.id,\r\n        {\r\n          position: addedFile.position,\r\n          scale: fileScale,\r\n          rotation: fileRotation,\r\n          enableGizmo: true,\r\n        },\r\n      )\r\n\r\n      if (dxfInfo) {\r\n        // Store current 3D file ID for real-time updates\r\n        setCurrent3DFileId(addedFile.id)\r\n\r\n        // Create CSS2D label for the DXF\r\n        const markerObj = createFileMarker(addedFile, dxfInfo.group, () => {\r\n          // Click on marker — no-op (actions handled via sidebar/context menu)\r\n        }, world, onMarkerContextMenu)\r\n\r\n        // Set up transform listener to update marker position\r\n        addDxf.onDxfTransformed.add((transformedDxfInfo) => {\r\n          if (transformedDxfInfo.id === addedFile.id) {\r\n            updateMarkerPosition(markerObj, dxfInfo.group)\r\n          }\r\n        })\r\n\r\n        // Initial marker position update after DXF is loaded\r\n        setTimeout(() => {\r\n          updateMarkerPosition(markerObj, dxfInfo.group)\r\n        }, 100)\r\n      }\r\n    }\r\n    catch (error) {\r\n      console.error('Error loading DXF file:', error)\r\n    }\r\n    return\r\n  }\r\n\r\n  // Handle other files (create sphere marker)\r\n  createGenericFileMarker(addedFile, world, toolsDispatch, onMarkerContextMenu)\r\n}\r\n"],"mappings":"AAAA,YAAY,WAAW;AAIvB;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,MAAM,+BAA+B,CACnC,iBACA,aACG;AACH,MAAI,CAAC;AACH;AAEF,QAAM,aAAa;AACnB,QAAM,YAAY,CAAC,kBAAkB,oBAAoB,YAAY,WAAW;AAEhF,aAAW,OAAO,WAAW;AAC3B,UAAM,iBAAiB,WAAW,GAAG;AACrC,QAAI,kBAAkB,OAAO,eAAe,QAAQ,YAAY;AAC9D,qBAAe,IAAI,QAAQ;AAC3B;AAAA,IACF;AAAA,EACF;AACF;AAEO,MAAM,iBAAiB,OAC5B,WACA,WACA,cACA,OACA,cACA,QACA,eACA,oBACA,wBACG;AACH,MAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAQ;AAExC,QAAM,WAAW,UAAU,KAAK,KAAK,YAAY;AAGjD,MAAI,SAAS,SAAS,MAAM,KAAK,SAAS,SAAS,OAAO,GAAG;AAC3D,QAAI;AACF,YAAM,YAAY,MAAM,aAAa;AAAA,QACnC,UAAU;AAAA,QACV,UAAU;AAAA,QACV,UAAU,KAAK;AAAA,QACf;AAAA,UACE,UAAU,UAAU;AAAA,UACpB,OAAO;AAAA,UACP,UAAU,IAAI,MAAM,MAAM,GAAG,MAAM,UAAU,SAAS,YAAY,GAAG,CAAC;AAAA,UACtE,aAAa;AAAA,UACb,kBAAkB;AAAA,QACpB;AAAA,MACF;AAEA,UAAI,WAAW;AAEb,2BAAmB,UAAU,EAAE;AAG/B,cAAM,YAAY,iBAAiB,WAAW,UAAU,OAAO,MAAM;AAAA,QAErE,GAAG,OAAO,mBAAmB;AAG7B,qCAA6B,UAAU,iBAAiB,MAAM;AAC5D,+BAAqB,WAAW,UAAU,KAAK;AAAA,QACjD,CAAC;AAGD,mBAAW,MAAM;AACf,+BAAqB,WAAW,UAAU,KAAK;AAAA,QACjD,GAAG,GAAG;AAAA,MACR;AAAA,IACF,SACO,OAAO;AACZ,cAAQ,MAAM,2BAA2B,KAAK;AAAA,IAChD;AACA;AAAA,EACF;AAGA,MAAI,SAAS,SAAS,MAAM,GAAG;AAC7B,QAAI;AACF,YAAM,UAAU,MAAM,OAAO;AAAA,QAC3B,UAAU;AAAA,QACV,UAAU;AAAA,QACV;AAAA,UACE,UAAU,UAAU;AAAA,UACpB,OAAO;AAAA,UACP,UAAU;AAAA,UACV,aAAa;AAAA,QACf;AAAA,MACF;AAEA,UAAI,SAAS;AAEX,2BAAmB,UAAU,EAAE;AAG/B,cAAM,YAAY,iBAAiB,WAAW,QAAQ,OAAO,MAAM;AAAA,QAEnE,GAAG,OAAO,mBAAmB;AAG7B,eAAO,iBAAiB,IAAI,CAAC,uBAAuB;AAClD,cAAI,mBAAmB,OAAO,UAAU,IAAI;AAC1C,iCAAqB,WAAW,QAAQ,KAAK;AAAA,UAC/C;AAAA,QACF,CAAC;AAGD,mBAAW,MAAM;AACf,+BAAqB,WAAW,QAAQ,KAAK;AAAA,QAC/C,GAAG,GAAG;AAAA,MACR;AAAA,IACF,SACO,OAAO;AACZ,cAAQ,MAAM,2BAA2B,KAAK;AAAA,IAChD;AACA;AAAA,EACF;AAGA,0BAAwB,WAAW,OAAO,eAAe,mBAAmB;AAC9E;","names":[]}
+{"version":3,"sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileHandler.ts"],"sourcesContent":["import * as THREE from 'three'\r\nimport * as OBC from '@thatopen/components'\r\nimport { CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js'\r\nimport { ModelManager } from '../../../ModelManager'\r\nimport { AddDxf } from './AddDxf'\r\nimport {\r\n  AddedFile,\r\n  createFileMarker,\r\n  createGenericFileMarker,\r\n} from './FileMarkerUtils'\r\nimport type { FileMarkerAction } from '../../../../../../ui/FilesManager/src/FileMarker'\r\n\r\nexport type PlacedKind = 'dxf' | 'model' | 'generic'\r\n\r\nexport interface PlacedResult {\r\n  kind: PlacedKind\r\n  marker: CSS2DObject | null\r\n  object3D: THREE.Object3D\r\n}\r\n\r\nexport const addFileToScene = async (\r\n  addedFile: AddedFile,\r\n  fileScale: number,\r\n  fileRotation: number,\r\n  world: OBC.World | null,\r\n  modelManager: ModelManager | null,\r\n  addDxf: AddDxf | null,\r\n  setCurrent3DFileId: (id: string | null) => void,\r\n  onAction?: (action: FileMarkerAction) => void,\r\n): Promise<PlacedResult | null> => {\r\n  if (!world || !modelManager || !addDxf) return null\r\n\r\n  const fileName = addedFile.file.name.toLowerCase()\r\n\r\n  if (fileName.endsWith('.glb') || fileName.endsWith('.gltf')) {\r\n    const modelInfo = await modelManager.load(addedFile.file, addedFile.id, addedFile.file.name, {\r\n      position: addedFile.position,\r\n      scale: fileScale,\r\n      rotation: new THREE.Euler(0, THREE.MathUtils.degToRad(fileRotation), 0),\r\n      enableGizmo: true,\r\n      enableAnimations: true,\r\n    })\r\n    if (!modelInfo) return null\r\n\r\n    setCurrent3DFileId(addedFile.id)\r\n    const marker = createFileMarker(addedFile, modelInfo.model, world, onAction)\r\n    return { kind: 'model', marker, object3D: modelInfo.model }\r\n  }\r\n\r\n  if (fileName.endsWith('.dxf')) {\r\n    const dxfInfo = await addDxf.loadDxf(addedFile.file, addedFile.id, {\r\n      position: addedFile.position,\r\n      scale: fileScale,\r\n      rotation: fileRotation,\r\n      enableGizmo: true,\r\n    })\r\n    if (!dxfInfo) return null\r\n\r\n    setCurrent3DFileId(addedFile.id)\r\n    const marker = createFileMarker(addedFile, dxfInfo.group, world, onAction)\r\n    return { kind: 'dxf', marker, object3D: dxfInfo.group }\r\n  }\r\n\r\n  const { marker, object3D } = createGenericFileMarker(addedFile, world, onAction)\r\n  return { kind: 'generic', marker, object3D }\r\n}\r\n"],"mappings":"AAAA,YAAY,WAAW;AAKvB;AAAA,EAEE;AAAA,EACA;AAAA,OACK;AAWA,MAAM,iBAAiB,OAC5B,WACA,WACA,cACA,OACA,cACA,QACA,oBACA,aACiC;AACjC,MAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAQ,QAAO;AAE/C,QAAM,WAAW,UAAU,KAAK,KAAK,YAAY;AAEjD,MAAI,SAAS,SAAS,MAAM,KAAK,SAAS,SAAS,OAAO,GAAG;AAC3D,UAAM,YAAY,MAAM,aAAa,KAAK,UAAU,MAAM,UAAU,IAAI,UAAU,KAAK,MAAM;AAAA,MAC3F,UAAU,UAAU;AAAA,MACpB,OAAO;AAAA,MACP,UAAU,IAAI,MAAM,MAAM,GAAG,MAAM,UAAU,SAAS,YAAY,GAAG,CAAC;AAAA,MACtE,aAAa;AAAA,MACb,kBAAkB;AAAA,IACpB,CAAC;AACD,QAAI,CAAC,UAAW,QAAO;AAEvB,uBAAmB,UAAU,EAAE;AAC/B,UAAMA,UAAS,iBAAiB,WAAW,UAAU,OAAO,OAAO,QAAQ;AAC3E,WAAO,EAAE,MAAM,SAAS,QAAAA,SAAQ,UAAU,UAAU,MAAM;AAAA,EAC5D;AAEA,MAAI,SAAS,SAAS,MAAM,GAAG;AAC7B,UAAM,UAAU,MAAM,OAAO,QAAQ,UAAU,MAAM,UAAU,IAAI;AAAA,MACjE,UAAU,UAAU;AAAA,MACpB,OAAO;AAAA,MACP,UAAU;AAAA,MACV,aAAa;AAAA,IACf,CAAC;AACD,QAAI,CAAC,QAAS,QAAO;AAErB,uBAAmB,UAAU,EAAE;AAC/B,UAAMA,UAAS,iBAAiB,WAAW,QAAQ,OAAO,OAAO,QAAQ;AACzE,WAAO,EAAE,MAAM,OAAO,QAAAA,SAAQ,UAAU,QAAQ,MAAM;AAAA,EACxD;AAEA,QAAM,EAAE,QAAQ,SAAS,IAAI,wBAAwB,WAAW,OAAO,QAAQ;AAC/E,SAAO,EAAE,MAAM,WAAW,QAAQ,SAAS;AAC7C;","names":["marker"]}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileMarkerUtils.d.ts

@@ -1,5 +1,6 @@
 import * as THREE from 'three';
 import { CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js';
+import { type FileMarkerAction } from '../../../../../../ui/FilesManager/src/FileMarker';
 export interface AddedFile {
     id: string;
     file: File;
@@ -7,7 +8,10 @@ export interface AddedFile {
     imageUrl?: string;
 }
 export declare const initializeCSS2DRenderer: (world: any) => any;
-export declare const createFileMarker: (addedFile: AddedFile, object3D: THREE.Object3D, onClick: () => void, world: any, onContextMenu?: (event: MouseEvent) => void) => CSS2DObject | null;
-export declare const updateMarkerPosition: (marker: CSS2DObject | null, object3D: THREE.Object3D) => void;
-export declare const createGenericFileMarker: (addedFile: AddedFile, world: any, toolsDispatch: any, onContextMenu?: (event: MouseEvent) => void) => void;
+export declare const createFileMarker: (addedFile: AddedFile, object3D: THREE.Object3D, world: any, onAction?: (action: FileMarkerAction) => void) => CSS2DObject | null;
+export declare const createGenericFileMarker: (addedFile: AddedFile, world: any, onAction?: (action: FileMarkerAction) => void) => {
+    marker: CSS2DObject | null;
+    object3D: THREE.Object3D;
+};
+export declare const removeMarker: (marker: CSS2DObject | null, world?: any) => void;
 //# sourceMappingURL=FileMarkerUtils.d.ts.map

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileMarkerUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileMarkerUtils.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileMarkerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAEL,WAAW,EACZ,MAAM,yCAAyC,CAAA;AAKhD,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,uBAAuB,GAAI,OAAO,GAAG,QA0CjD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,WAAW,SAAS,EACpB,UAAU,KAAK,CAAC,QAAQ,EACxB,SAAS,MAAM,IAAI,EACnB,OAAO,GAAG,EACV,gBAAgB,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,KAC1C,WAAW,GAAG,IA2EhB,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,QAAQ,WAAW,GAAG,IAAI,EAAE,UAAU,KAAK,CAAC,QAAQ,SAQxF,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,EACpB,OAAO,GAAG,EACV,eAAe,GAAG,EAClB,gBAAgB,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,SAe5C,CAAA"}
+{"version":3,"file":"FileMarkerUtils.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/core/components/viewers/bim/src/tools/AddToBim/src/FileMarkerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAEL,WAAW,EACZ,MAAM,yCAAyC,CAAA;AAEhD,OAAmB,EAAE,KAAK,gBAAgB,EAAE,MAAM,kDAAkD,CAAA;AAGpG,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,uBAAuB,GAAI,OAAO,GAAG,QA4BjD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,WAAW,SAAS,EACpB,UAAU,KAAK,CAAC,QAAQ,EACxB,OAAO,GAAG,EACV,WAAW,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,KAC5C,WAAW,GAAG,IA8BhB,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,WAAW,SAAS,EACpB,OAAO,GAAG,EACV,WAAW,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,KAC5C;IAAE,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAA;CAWxD,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,QAAQ,WAAW,GAAG,IAAI,EAAE,QAAQ,GAAG,SAKnE,CAAA"}

package/dist/core/components/viewers/bim/src/tools/AddToBim/src/FileMarkerUtils.js

@@ -8,113 +8,77 @@ import { createRoot } from "react-dom/client";
 import FileMarker from "../../../../../../ui/FilesManager/src/FileMarker";
 const initializeCSS2DRenderer = (world) => {
   if (!world) return null;
-  let css2dRenderer = world.css2dRenderer;
-  if (css2dRenderer) {
-    console.log("CSS2D Renderer already exists", css2dRenderer);
-  } else {
-    css2dRenderer = new CSS2DRenderer();
-    css2dRenderer.setSize(
-      world.renderer.three.domElement.clientWidth,
-      world.renderer.three.domElement.clientHeight
-    );
-    css2dRenderer.domElement.style.position = "absolute";
-    css2dRenderer.domElement.style.top = "0";
-    css2dRenderer.domElement.style.left = "0";
-    css2dRenderer.domElement.style.pointerEvents = "none";
-    css2dRenderer.domElement.style.zIndex = "1000";
-    css2dRenderer.domElement.classList.add("css2d-renderer");
-    const container = world.renderer.three.domElement.parentElement;
-    container.append(css2dRenderer.domElement);
-    world.css2dRenderer = css2dRenderer;
-    const originalRender = world.renderer.three.render;
-    world.renderer.three.render = function(scene, camera) {
-      originalRender.call(this, scene, camera);
-      css2dRenderer.render(scene, camera);
-    };
-  }
+  if (world.css2dRenderer) return world.css2dRenderer;
+  const css2dRenderer = new CSS2DRenderer();
+  css2dRenderer.setSize(
+    world.renderer.three.domElement.clientWidth,
+    world.renderer.three.domElement.clientHeight
+  );
+  css2dRenderer.domElement.style.position = "absolute";
+  css2dRenderer.domElement.style.top = "0";
+  css2dRenderer.domElement.style.left = "0";
+  css2dRenderer.domElement.style.pointerEvents = "none";
+  css2dRenderer.domElement.style.zIndex = "1000";
+  css2dRenderer.domElement.classList.add("css2d-renderer");
+  const container = world.renderer.three.domElement.parentElement;
+  container.append(css2dRenderer.domElement);
+  world.css2dRenderer = css2dRenderer;
+  const originalRender = world.renderer.three.render;
+  world.renderer.three.render = function(scene, camera) {
+    originalRender.call(this, scene, camera);
+    css2dRenderer.render(scene, camera);
+  };
   return css2dRenderer;
 };
-const createFileMarker = (addedFile, object3D, onClick, world, onContextMenu) => {
+const createFileMarker = (addedFile, object3D, world, onAction) => {
   var _a;
   if (!world) return null;
-  console.log("Creating FileMarker for:", addedFile.file.name, "at position:", addedFile.position);
   const markerFile = {
     id: Number.parseInt(addedFile.id, 10) || 0,
     name: addedFile.file.name,
     type: addedFile.file.type || "application/octet-stream",
-    url: (_a = addedFile.imageUrl) != null ? _a : URL.createObjectURL(addedFile.file),
+    url: (_a = addedFile.imageUrl) != null ? _a : "",
     assetId: addedFile.id,
     uploadedAt: (/* @__PURE__ */ new Date()).toISOString(),
     fileOrganizationId: 0
   };
   const labelDiv = document.createElement("div");
-  labelDiv.style.display = "block";
-  labelDiv.style.visibility = "visible";
   labelDiv.style.pointerEvents = "auto";
   labelDiv.style.zIndex = "1001";
-  if (onContextMenu) {
-    labelDiv.addEventListener("contextmenu", (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      onContextMenu(e);
-    });
-  }
-  const root = createRoot(labelDiv);
-  root.render(
-    React.createElement(FileMarker, {
-      file: markerFile,
-      onClick
-    })
+  labelDiv.addEventListener("contextmenu", (e) => e.preventDefault());
+  createRoot(labelDiv).render(
+    React.createElement(FileMarker, { file: markerFile, onAction })
   );
   const css2dObject = new CSS2DObject(labelDiv);
   css2dObject.position.copy(addedFile.position);
   css2dObject.position.y += 0.2;
-  css2dObject.visible = true;
-  css2dObject.layers.set(0);
-  world.scene.three.add(css2dObject);
   css2dObject.fileId = addedFile.id;
   css2dObject.object3D = object3D;
-  const forceRender = () => {
-    if (world.css2dRenderer) {
-      world.css2dRenderer.render(world.scene.three, world.camera.three);
-    }
-  };
-  forceRender();
-  setTimeout(forceRender, 0);
-  setTimeout(forceRender, 100);
-  setTimeout(forceRender, 500);
-  console.log("FileMarker created and added to scene", {
-    position: css2dObject.position,
-    fileId: addedFile.id,
-    objectPosition: object3D.position,
-    visible: css2dObject.visible,
-    element: labelDiv,
-    renderer: world.css2dRenderer
-  });
+  world.scene.three.add(css2dObject);
   return css2dObject;
 };
-const updateMarkerPosition = (marker, object3D) => {
-  if (!marker || !object3D) return;
-  const worldPosition = new THREE.Vector3();
-  object3D.getWorldPosition(worldPosition);
-  marker.position.copy(worldPosition);
-  marker.position.y += 0.2;
-};
-const createGenericFileMarker = (addedFile, world, toolsDispatch, onContextMenu) => {
-  if (!world) return;
-  const sphereGeometry = new THREE.SphereGeometry(0.025, 10, 10);
-  const sphereMaterial = new THREE.MeshBasicMaterial({ color: 16777215 });
-  const sphere = new THREE.Mesh(sphereGeometry, sphereMaterial);
+const createGenericFileMarker = (addedFile, world, onAction) => {
+  const sphere = new THREE.Mesh(
+    new THREE.SphereGeometry(0.025, 10, 10),
+    new THREE.MeshBasicMaterial({ color: 16777215 })
+  );
   sphere.position.copy(addedFile.position);
-  world.scene.three.add(sphere);
-  createFileMarker(addedFile, sphere, () => {
-  }, world, onContextMenu);
   sphere.fileId = addedFile.id;
+  if (world) world.scene.three.add(sphere);
+  const marker = createFileMarker(addedFile, sphere, world, onAction);
+  return { marker, object3D: sphere };
+};
+const removeMarker = (marker, world) => {
+  var _a;
+  if (!marker) return;
+  if (world) world.scene.three.remove(marker);
+  const el = marker.element;
+  (_a = el == null ? void 0 : el.parentElement) == null ? void 0 : _a.removeChild(el);
 };
 export {
   createFileMarker,
   createGenericFileMarker,
   initializeCSS2DRenderer,
-  updateMarkerPosition
+  removeMarker
 };
 //# sourceMappingURL=FileMarkerUtils.js.map