@realsee/dnalogel 2.0.0-alpha.42 → 2.0.0-alpha.43

package/libs/floorplan/ModelFloorplanPlugin/Controller.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import to from '../../shared-utils/to';
 import equal from '../../shared-utils/equal';
 import Main from '../Components/Main';
@@ -185,7 +176,7 @@ export class Controller extends BasePlugin.Controller {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (options = {}) => __awaiter(this, void 0, void 0, function* () {
+            value: async (options = {}) => {
                 if (!this.state.enabled)
                     return;
                 // 已经展示完成了，不做任何操作
@@ -194,14 +185,14 @@ export class Controller extends BasePlugin.Controller {
                 const userAction = options.userAction !== undefined ? options.userAction : true;
                 this.updateState({ visible: true }, userAction);
                 this._show(options);
-            })
+            }
         });
         /** 隐藏户型图 */
         Object.defineProperty(this, "hide", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (options = {}) => __awaiter(this, void 0, void 0, function* () {
+            value: async (options = {}) => {
                 if (!this.state.enabled)
                     return;
                 this.isHiddenByHideFunc = true;
@@ -209,7 +200,7 @@ export class Controller extends BasePlugin.Controller {
                     return;
                 this.updateState({ visible: false }, options.userAction || true);
                 this._hide(options);
-            })
+            }
         });
         /** 更新户型图大小 */
         Object.defineProperty(this, "updateSize", {
@@ -275,11 +266,11 @@ export class Controller extends BasePlugin.Controller {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: (options) => __awaiter(this, void 0, void 0, function* () {
-                var _b;
+            value: async (options) => {
+                var _a;
                 if (!this.state.enabled)
                     return;
-                if (!((_b = this.five.model) === null || _b === void 0 ? void 0 : _b.loaded))
+                if (!((_a = this.five.model) === null || _a === void 0 ? void 0 : _a.loaded))
                     throw new Error(FloorplanErrorType.ModelNotLoaded);
                 if (!this.data)
                     throw new Error(FloorplanErrorType.DataNotLoaded);
@@ -293,7 +284,7 @@ export class Controller extends BasePlugin.Controller {
                     userAction: true,
                 };
                 const mergedOptions = Object.assign(Object.assign({}, baseShowOpts), options);
-                const getShowPromise = () => __awaiter(this, void 0, void 0, function* () {
+                const getShowPromise = async () => {
                     this.hooks.emit('show', { userAction: mergedOptions.userAction, auto: mergedOptions.isAutoShow });
                     let hasRejected = false;
                     let externalErrorMsg;
@@ -301,7 +292,7 @@ export class Controller extends BasePlugin.Controller {
                         hasRejected = true;
                         externalErrorMsg = errorMsg;
                     };
-                    const [correctError] = yield to(correctFiveState(this.five, this.showState, mergedOptions.userAction));
+                    const [correctError] = await to(correctFiveState(this.five, this.showState, mergedOptions.userAction));
                     if (correctError)
                         throw correctError;
                     // 异步结束要判断当前是不是被中断了
@@ -319,7 +310,7 @@ export class Controller extends BasePlugin.Controller {
                     const renderDuration = mergedOptions.immediately ? 0 : SHOW_ANIME_DURATION;
                     changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
                     this.render(renderDuration);
-                });
+                };
                 this.showPromise = getShowPromise()
                     .then(() => {
                     this.hooks.emit('showAnimationEnded', {
@@ -341,7 +332,7 @@ export class Controller extends BasePlugin.Controller {
                     this.showRejection = undefined;
                 });
                 return this.showPromise;
-            })
+            }
         });
         Object.defineProperty(this, "_hide", {
             enumerable: true,
@@ -575,24 +566,22 @@ export class Controller extends BasePlugin.Controller {
         five.once('dispose', this.dispose);
         this.addEventListener();
     }
-    load(serverData, state, userAction = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            function isPluginServerData(serverData) {
-                return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
-            }
-            const _data = serverData;
-            if (_data && !_data.version)
-                console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
-            const copyData = JSON.parse(JSON.stringify(serverData));
-            const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
-            const prevData = this.data;
-            this.data = yield formatData(_serverData);
-            this.hooks.emit('dataLoaded', this.data);
-            this.hooks.emit('dataChange', this.data, prevData);
-            if (state)
-                this.updateState(state, userAction);
-            this.render();
-        });
+    async load(serverData, state, userAction = true) {
+        function isPluginServerData(serverData) {
+            return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
+        }
+        const _data = serverData;
+        if (_data && !_data.version)
+            console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
+        const copyData = JSON.parse(JSON.stringify(serverData));
+        const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
+        const prevData = this.data;
+        this.data = await formatData(_serverData);
+        this.hooks.emit('dataLoaded', this.data);
+        this.hooks.emit('dataChange', this.data, prevData);
+        if (state)
+            this.updateState(state, userAction);
+        this.render();
     }
     /** 把插件的渲染DOM插入到对应的容器中去 */
     appendTo(wrapper) {
@@ -640,10 +629,8 @@ export class Controller extends BasePlugin.Controller {
             return;
         this.render();
     }
-    formatData(serverData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield formatData(serverData.data);
-        });
+    async formatData(serverData) {
+        return await formatData(serverData.data);
     }
     updateState(state, userAction) {
         const prevState = this.state;

package/libs/floorplan/PanoFloorplanRadarPlugin/Controller.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import Main from './Components/Main';
 import equal from '../../shared-utils/equal';
 import { CAMERA_IMAGE } from '../Assets/camera';
@@ -110,55 +101,49 @@ export class Controller extends BasePlugin.Controller {
         // =============== init Listener ===============
         five.once('dispose', this.dispose);
     }
-    load(serverData, state, userAction = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // const loadImage = async () => {
-            //   const floorIndex = this.five.work.observers[this.five.getCurrentState().panoIndex].floorIndex
-            //   // 当有 svgString 时，没有加载过程
-            //   if (floorplanData.outlines[floorIndex]?.svgContent) return
-            //   // 如果当前楼层图片不存在，不存在加载过程
-            //   const nowFloorImageSrc = floorplanData.outlines[floorIndex]?.url
-            //   if (!nowFloorImageSrc) return
-            //   // 图片加载完成时再 render
-            //   await new Promise<void>((resolve) => {
-            //     const nowFloorImage = new Image()
-            //     nowFloorImage.src = nowFloorImageSrc
-            //     nowFloorImage.onload = () => resolve()
-            //   })
-            // }
-            // await loadImage()
-            function isPluginServerData(serverData) {
-                return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
-            }
-            const copyData = JSON.parse(JSON.stringify(serverData));
-            const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
-            const prevData = this.data;
-            this.data = yield formatData(_serverData);
-            this.hooks.emit('dataLoaded', this.data);
-            this.hooks.emit('dataChange', this.data, prevData);
-            if (state)
-                this.updateState(state, userAction);
-            this.render();
-        });
+    async load(serverData, state, userAction = true) {
+        // const loadImage = async () => {
+        //   const floorIndex = this.five.work.observers[this.five.getCurrentState().panoIndex].floorIndex
+        //   // 当有 svgString 时，没有加载过程
+        //   if (floorplanData.outlines[floorIndex]?.svgContent) return
+        //   // 如果当前楼层图片不存在，不存在加载过程
+        //   const nowFloorImageSrc = floorplanData.outlines[floorIndex]?.url
+        //   if (!nowFloorImageSrc) return
+        //   // 图片加载完成时再 render
+        //   await new Promise<void>((resolve) => {
+        //     const nowFloorImage = new Image()
+        //     nowFloorImage.src = nowFloorImageSrc
+        //     nowFloorImage.onload = () => resolve()
+        //   })
+        // }
+        // await loadImage()
+        function isPluginServerData(serverData) {
+            return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
+        }
+        const copyData = JSON.parse(JSON.stringify(serverData));
+        const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
+        const prevData = this.data;
+        this.data = await formatData(_serverData);
+        this.hooks.emit('dataLoaded', this.data);
+        this.hooks.emit('dataChange', this.data, prevData);
+        if (state)
+            this.updateState(state, userAction);
+        this.render();
     }
-    show(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 已经展示完成了，不做任何操作
-            if (this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: true }, userAction);
-            this._show({ userAction });
-        });
+    async show(options = {}) {
+        // 已经展示完成了，不做任何操作
+        if (this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: true }, userAction);
+        this._show({ userAction });
     }
-    hide(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: false }, userAction);
-            this._hide({ userAction });
-        });
+    async hide(options = {}) {
+        if (!this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: false }, userAction);
+        this._hide({ userAction });
     }
     enable(options = {}) {
         if (this.state.enabled)
@@ -203,10 +188,8 @@ export class Controller extends BasePlugin.Controller {
         this.extraObjects = formatExtraObjects(data, this.five, this.data);
         this.render();
     }
-    formatData(serverData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield formatData(serverData.data);
-        });
+    async formatData(serverData) {
+        return await formatData(serverData.data);
     }
     _enable(options) {
         const { userAction } = options;

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import * as THREE from 'three';
 import equal from '../../shared-utils/equal';
 import Main from '../Components/Main';
@@ -306,24 +297,22 @@ export class Controller extends BasePlugin.Controller {
         five.once('dispose', this.dispose);
         this.addEventListener();
     }
-    load(serverData, state, userAction = true) {
-        return __awaiter(this, void 0, void 0, function* () {
-            function isPluginServerData(serverData) {
-                return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
-            }
-            const _data = serverData;
-            if (_data && !_data.version)
-                console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
-            const copyData = JSON.parse(JSON.stringify(serverData));
-            const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
-            const prevData = this.data;
-            this.data = yield formatData(_serverData);
-            this.hooks.emit('dataLoaded', this.data);
-            this.hooks.emit('dataChange', this.data, prevData);
-            if (state)
-                this.updateState(state, userAction);
-            this.render();
-        });
+    async load(serverData, state, userAction = true) {
+        function isPluginServerData(serverData) {
+            return Object.prototype.hasOwnProperty.apply(serverData, ['version']);
+        }
+        const _data = serverData;
+        if (_data && !_data.version)
+            console.warn('传入 serverData.data 的方式后续可能不再支持，请把 serverData 整体传入 load 函数');
+        const copyData = JSON.parse(JSON.stringify(serverData));
+        const _serverData = isPluginServerData(copyData) ? copyData.data : copyData;
+        const prevData = this.data;
+        this.data = await formatData(_serverData);
+        this.hooks.emit('dataLoaded', this.data);
+        this.hooks.emit('dataChange', this.data, prevData);
+        if (state)
+            this.updateState(state, userAction);
+        this.render();
     }
     /** 更新户型图位置 */
     updatePosition() {
@@ -348,25 +337,21 @@ export class Controller extends BasePlugin.Controller {
         this.render();
         return this;
     }
-    show(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 已经展示完成了，不做任何操作
-            if (this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: true }, userAction);
-            this._show({ userAction });
-        });
+    async show(options = {}) {
+        // 已经展示完成了，不做任何操作
+        if (this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: true }, userAction);
+        this._show({ userAction });
     }
-    hide(options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.isHiddenByHideFunc = true;
-            if (!this.state.visible)
-                return;
-            const userAction = options.userAction !== undefined ? options.userAction : true;
-            this.updateState({ visible: false }, userAction);
-            this._hide({ userAction });
-        });
+    async hide(options = {}) {
+        this.isHiddenByHideFunc = true;
+        if (!this.state.visible)
+            return;
+        const userAction = options.userAction !== undefined ? options.userAction : true;
+        this.updateState({ visible: false }, userAction);
+        this._hide({ userAction });
     }
     enable(options = {}) {
         if (this.state.enabled)
@@ -396,42 +381,36 @@ export class Controller extends BasePlugin.Controller {
             state.visible ? this._show(options) : this._hide(options);
         }
     }
-    formatData(serverData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield formatData(serverData.data);
-        });
+    async formatData(serverData) {
+        return await formatData(serverData.data);
     }
-    _show(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.state.enabled)
-                return;
-            this.isHiddenByHideFunc = false;
-            const { userAction } = options;
-            this.hooks.emit('show', { userAction });
-            if (this.five.getCurrentState().mode !== 'Topview') {
-                yield changeMode(this.five, ['Topview', undefined, undefined, userAction]);
-            }
-            this.five.model.show(this.floorIndex);
-            this.updatePosition();
-            this.updateSize();
-            const renderDuration = 500;
-            const modelOpacity = this.state.config.modelOpacity;
-            changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-            this.hooks.emit('showAnimationEnded', { userAction });
-            this.render();
-        });
+    async _show(options) {
+        if (!this.state.enabled)
+            return;
+        this.isHiddenByHideFunc = false;
+        const { userAction } = options;
+        this.hooks.emit('show', { userAction });
+        if (this.five.getCurrentState().mode !== 'Topview') {
+            await changeMode(this.five, ['Topview', undefined, undefined, userAction]);
+        }
+        this.five.model.show(this.floorIndex);
+        this.updatePosition();
+        this.updateSize();
+        const renderDuration = 500;
+        const modelOpacity = this.state.config.modelOpacity;
+        changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
+        this.hooks.emit('showAnimationEnded', { userAction });
+        this.render();
     }
-    _hide(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.state.enabled)
-                return;
-            const { userAction } = options;
-            this.hooks.emit('hide', { userAction });
-            const modelOpacity = 1;
-            const renderDuration = 0;
-            changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
-            this.render();
-        });
+    async _hide(options) {
+        if (!this.state.enabled)
+            return;
+        const { userAction } = options;
+        this.hooks.emit('hide', { userAction });
+        const modelOpacity = 1;
+        const renderDuration = 0;
+        changeModelCanvasOpacity(this.five, modelOpacity, renderDuration);
+        this.render();
     }
     _enable(options) {
         const { userAction } = options;

package/libs/floorplan/utils/correctFiveState.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import to from '../../shared-utils/to';
 import { FloorplanErrorType } from '../utils/constant';
 import nearlyEqual from '../../shared-utils/nearlyEqual';
@@ -31,27 +22,25 @@ export function checkShowState(five, showState) {
  * 2. 内置了相应的动画时间计算
  * 3. 纠正成功会返回 true，失败「可能会被用户行为中断」会返回 false
  */
-export default function correctFiveState(five, showState, userAction = true) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 当前已满足状态，不需要变更
-        const result = checkShowState(five, showState);
-        if (result === true)
-            return;
-        const currentFiveState = five.getCurrentState();
-        // 纠正 mode
-        if (currentFiveState.mode !== showState.mode) {
-            const [changeModeError] = yield to(changeMode(five, [showState.mode, showState, undefined, userAction]));
-            if (changeModeError)
-                throw new Error(FloorplanErrorType.ChangeModeError);
-            return;
-        }
-        // 纠正相机状态
-        // 根据 latitude、longitude、fov 计算动画时间，最多 1s
-        const { latitude, longitude, fov } = currentFiveState;
-        const time = Math.min(1000, Math.max(200, Math.abs(latitude - Math.PI / 2) * 1000, (longitude > Math.PI ? 2 * Math.PI - longitude : longitude) * 500, Math.abs(fov - showState.fov) * 10));
-        const [updateCameraError] = yield to(five.updateCamera(showState, time, userAction));
-        if (updateCameraError)
-            throw new Error(FloorplanErrorType.UpdateCameraError);
+export default async function correctFiveState(five, showState, userAction = true) {
+    // 当前已满足状态，不需要变更
+    const result = checkShowState(five, showState);
+    if (result === true)
         return;
-    });
+    const currentFiveState = five.getCurrentState();
+    // 纠正 mode
+    if (currentFiveState.mode !== showState.mode) {
+        const [changeModeError] = await to(changeMode(five, [showState.mode, showState, undefined, userAction]));
+        if (changeModeError)
+            throw new Error(FloorplanErrorType.ChangeModeError);
+        return;
+    }
+    // 纠正相机状态
+    // 根据 latitude、longitude、fov 计算动画时间，最多 1s
+    const { latitude, longitude, fov } = currentFiveState;
+    const time = Math.min(1000, Math.max(200, Math.abs(latitude - Math.PI / 2) * 1000, (longitude > Math.PI ? 2 * Math.PI - longitude : longitude) * 500, Math.abs(fov - showState.fov) * 10));
+    const [updateCameraError] = await to(five.updateCamera(showState, time, userAction));
+    if (updateCameraError)
+        throw new Error(FloorplanErrorType.UpdateCameraError);
+    return;
 }

package/libs/floorplan/utils/formatData.js

@@ -1,34 +1,21 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { FLOORPLAN_EXTRA_OBJECT_IMAGE } from '../Assets/floorplanExtraObject';
 import { floorplanPosition2ImagePosition, getFloorIndexFromModelPosition, modelPosition2FloorplanPosition, } from './formatPosition';
-function formatOutlines(outlines) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const headers = new Headers({ 'Content-Type': 'text/plain' });
-        const getOutlineItem = function (item) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const outlineItem = {
-                    index: item.index,
-                    url: item.url,
-                    svgUrl: item.svg_url,
-                };
-                if (item.svg_url) {
-                    const svgContent = yield fetch(item.svg_url, { headers }).then((res) => res.text());
-                    outlineItem.svgContent = svgContent;
-                }
-                return outlineItem;
-            });
+async function formatOutlines(outlines) {
+    const headers = new Headers({ 'Content-Type': 'text/plain' });
+    const getOutlineItem = async function (item) {
+        const outlineItem = {
+            index: item.index,
+            url: item.url,
+            svgUrl: item.svg_url,
         };
-        const svgOutlineItems = yield Promise.all(outlines.map(getOutlineItem));
-        return svgOutlineItems;
-    });
+        if (item.svg_url) {
+            const svgContent = await fetch(item.svg_url, { headers }).then((res) => res.text());
+            outlineItem.svgContent = svgContent;
+        }
+        return outlineItem;
+    };
+    const svgOutlineItems = await Promise.all(outlines.map(getOutlineItem));
+    return svgOutlineItems;
 }
 function formatRoom(data) {
     const floorplanRoomItem = {
@@ -74,21 +61,19 @@ function formatFloorplanEntrance(data) {
     };
     return floorplanEntrance;
 }
-export default function formatData(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const outlines = yield formatOutlines(data.outlines);
-        const bounding = data.computed_data.bounding;
-        const floorDatas = data.computed_data.floor_datas.map(formatFloorData);
-        const entrance = data.computed_data.entrance ? formatFloorplanEntrance(data.computed_data.entrance) : null;
-        const floorplanData = {
-            outlines,
-            entrance,
-            bounding,
-            floorDatas,
-            observers: data.computed_data.observers.map(formateFloorplanObserver),
-        };
-        return floorplanData;
-    });
+export default async function formatData(data) {
+    const outlines = await formatOutlines(data.outlines);
+    const bounding = data.computed_data.bounding;
+    const floorDatas = data.computed_data.floor_datas.map(formatFloorData);
+    const entrance = data.computed_data.entrance ? formatFloorplanEntrance(data.computed_data.entrance) : null;
+    const floorplanData = {
+        outlines,
+        entrance,
+        bounding,
+        floorDatas,
+        observers: data.computed_data.observers.map(formateFloorplanObserver),
+    };
+    return floorplanData;
 }
 export function formatExtraObjects(data, five, floorplanData) {
     const extraObjects = data.map((object) => {