@aibee/crc-bmap 0.8.44 → 0.8.46

package/lib/src/loader/CrLoader/api/floor.js

@@ -1,95 +1,67 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 /**
  * 请求楼栋地面
- */ export function loadBuildingGround(_, config) {
-    return _loadBuildingGround.apply(this, arguments);
-}
-function _loadBuildingGround() {
-    _loadBuildingGround = _async_to_generator(function*({ brand, project }, config) {
-        const { apiDomain, apiPath: { floorRange }, apiInfo } = config;
-        const url = `${apiDomain}${floorRange}?brand=${brand}&project=${project}&phase=${project}&building=${project}`;
-        const data = yield fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>{
-            const data = (res || [])[0];
-            if (data) {
-                data.info = JSON.parse(data.info);
-            }
-            return data;
-        });
+ */ export async function loadBuildingGround(param, config) {
+    let { brand, project } = param;
+    const { apiDomain, apiPath: { floorRange }, apiInfo } = config;
+    const url = "" + apiDomain + floorRange + "?brand=" + brand + "&project=" + project + "&phase=" + project + "&building=" + project;
+    const data = await fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>{
+        const data = (res || [])[0];
+        if (data) {
+            data.info = JSON.parse(data.info);
+        }
         return data;
     });
-    return _loadBuildingGround.apply(this, arguments);
+    return data;
 }
 /**
  * 加载图元
  * @param param0 
  * @param config 
  * @returns 
- */ export function loadGraphics(_, config) {
-    return _loadGraphics.apply(this, arguments);
-}
-function _loadGraphics() {
-    _loadGraphics = _async_to_generator(function*({ brand, project, floor, ts, resource_type_list }, config) {
-        const { apiDomain, apiPath: { floorGraphic }, apiInfo } = config;
-        const url = `${apiDomain}${floorGraphic}?brand=${brand}&project=${project}&phase=${project}&building=${project}&floor=${floor}&ts=${ts}&resource_type_list=${resource_type_list}`;
-        const data = yield fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>{
-            (res || []).map((item)=>item.info = JSON.parse(item.info));
-            return res || [];
-        });
-        return data;
+ */ export async function loadGraphics(param, config) {
+    let { brand, project, floor, ts, resource_type_list } = param;
+    const { apiDomain, apiPath: { floorGraphic }, apiInfo } = config;
+    const url = "" + apiDomain + floorGraphic + "?brand=" + brand + "&project=" + project + "&phase=" + project + "&building=" + project + "&floor=" + floor + "&ts=" + ts + "&resource_type_list=" + resource_type_list;
+    const data = await fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>{
+        (res || []).map((item)=>item.info = JSON.parse(item.info));
+        return res || [];
     });
-    return _loadGraphics.apply(this, arguments);
+    return data;
 }
 /**
  * 加载外部街道
  * @param param0 
  * @param config 
  * @returns 
- */ export function loadExternalStreet(_, config) {
-    return _loadExternalStreet.apply(this, arguments);
-}
-function _loadExternalStreet() {
-    _loadExternalStreet = _async_to_generator(function*({ project, floor }, config) {
-        const { apiDomain, apiInfo } = config;
-        const url = `${apiDomain}/api/inception-map/external_street/get?projectCode=${project}&floorCode=${floor}`;
-        const data = yield fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>JSON.parse(res[0].streetInfo || "{}")).then((res)=>{
-            if (res.fileId) {
-                return downloadFileToJson(res.fileId, config);
-            } else {
-                return null;
-            }
-        });
-        return data;
-    });
-    return _loadExternalStreet.apply(this, arguments);
-}
-function downloadFileToBlob(fileId, config) {
-    return _downloadFileToBlob.apply(this, arguments);
-}
-function _downloadFileToBlob() {
-    _downloadFileToBlob = _async_to_generator(function*(fileId, config) {
-        const { apiDomain, apiInfo } = config;
-        return fetch(`${apiDomain}/api/inception-map/file/getFileStream?fileId=${fileId}`, apiInfo).then((res)=>res.blob());
+ */ export async function loadExternalStreet(param, config) {
+    let { project, floor } = param;
+    const { apiDomain, apiInfo } = config;
+    const url = apiDomain + "/api/inception-map/external_street/get?projectCode=" + project + "&floorCode=" + floor;
+    const data = await fetch(url, apiInfo).then((res)=>res.json()).then((res)=>res.data).then((res)=>JSON.parse(res[0].streetInfo || "{}")).then((res)=>{
+        if (res.fileId) {
+            return downloadFileToJson(res.fileId, config);
+        } else {
+            return null;
+        }
     });
-    return _downloadFileToBlob.apply(this, arguments);
+    return data;
 }
-function downloadFileToJson(fileId, config) {
-    return _downloadFileToJson.apply(this, arguments);
+async function downloadFileToBlob(fileId, config) {
+    const { apiDomain, apiInfo } = config;
+    return fetch(apiDomain + "/api/inception-map/file/getFileStream?fileId=" + fileId, apiInfo).then((res)=>res.blob());
 }
-function _downloadFileToJson() {
-    _downloadFileToJson = _async_to_generator(function*(fileId, config) {
-        const { apiDomain, apiInfo } = config;
-        return fetch(`${apiDomain}/api/inception-map/file/getFileStream?fileId=${fileId}`, apiInfo).then((res)=>res.arrayBuffer()).then((arrayBuffer)=>{
-            // 将 ArrayBuffer 转换为字符串  
-            const decoder = new TextDecoder('utf-8');
-            const text = decoder.decode(arrayBuffer);
-            // 将字符串解析为 JSON  
-            if (text) {
-                const jsonData = JSON.parse(text);
-                return jsonData;
-            } else {
-                return null;
-            }
-        });
+async function downloadFileToJson(fileId, config) {
+    const { apiDomain, apiInfo } = config;
+    return fetch(apiDomain + "/api/inception-map/file/getFileStream?fileId=" + fileId, apiInfo).then((res)=>res.arrayBuffer()).then((arrayBuffer)=>{
+        // 将 ArrayBuffer 转换为字符串  
+        const decoder = new TextDecoder('utf-8');
+        const text = decoder.decode(arrayBuffer);
+        // 将字符串解析为 JSON  
+        if (text) {
+            const jsonData = JSON.parse(text);
+            return jsonData;
+        } else {
+            return null;
+        }
     });
-    return _downloadFileToJson.apply(this, arguments);
 }

package/lib/src/loader/CrLoader/index.js

@@ -1,48 +1,43 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _extends } from "@swc/helpers/_/_extends";
+import "core-js/modules/web.dom-collections.iterator.js";
 import { loadBuildingGround, loadGraphics } from "./api";
 import { Floor } from "../../elements";
 import { generatorKeyByObj, HooksName, transformGraphicData } from "../../utils";
 export class CrLoader {
-    load(query) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const cacheKey = generatorKeyByObj(query);
-            if (_this.cacheData.has(cacheKey)) {
-                return _this.cacheData.get(cacheKey);
-            }
-            const [, data] = yield Promise.all([
-                _this.loadBuildGround(query),
-                loadGraphics(query, _this.bmap.config)
-            ]);
-            const lenKey = generatorKeyByObj({
-                floor: query.floor,
-                ts: query.ts
-            });
-            transformGraphicData(data.map((item)=>item.info), _this.bmap.buildingCenter, _this.floorDataLengthMap.get(lenKey) || 0);
-            data.forEach((item)=>item.info.transformToBuildingGround = false);
-            _this.cacheData.set(cacheKey, data);
-            const len = _this.floorDataLengthMap.get(lenKey) || 0;
-            _this.floorDataLengthMap.set(lenKey, len + data.length);
-            _this.loadExternalStreet(query);
-            return data;
-        })();
+    async load(query) {
+        const cacheKey = generatorKeyByObj(query);
+        if (this.cacheData.has(cacheKey)) {
+            return this.cacheData.get(cacheKey);
+        }
+        const [, data] = await Promise.all([
+            this.loadBuildGround(query),
+            loadGraphics(query, this.bmap.config)
+        ]);
+        const lenKey = generatorKeyByObj({
+            floor: query.floor,
+            ts: query.ts
+        });
+        transformGraphicData(data.map((item)=>item.info), this.bmap.buildingCenter, this.floorDataLengthMap.get(lenKey) || 0);
+        data.forEach((item)=>item.info.transformToBuildingGround = false);
+        this.cacheData.set(cacheKey, data);
+        const len = this.floorDataLengthMap.get(lenKey) || 0;
+        this.floorDataLengthMap.set(lenKey, len + data.length);
+        this.loadExternalStreet(query);
+        return data;
     }
     /**
    * 加载外部街道
-   */ loadExternalStreet(query) {
-        return _async_to_generator(function*() {
-        // const key = `project=${query.project}&floor=${query.floor}`
-        // if (this.externalStreetMap.has(key)) {
-        //   return this.externalStreetMap.get(key)!
-        // } else {
-        //   const res = await loadExternalStreet({ project: query.project, floor: query.floor }, this.bmap.config)
-        //   if (res) {
-        //     // TODO
-        //   }
-        //   console.log(res)
-        // }
-        })();
+   */ async loadExternalStreet(query) {
+    // const key = `project=${query.project}&floor=${query.floor}`
+    // if (this.externalStreetMap.has(key)) {
+    //   return this.externalStreetMap.get(key)!
+    // } else {
+    //   const res = await loadExternalStreet({ project: query.project, floor: query.floor }, this.bmap.config)
+    //   if (res) {
+    //     // TODO
+    //   }
+    //   console.log(res)
+    // }
     }
     switchFloorByData(data, floor) {
         if (!data.length) {
@@ -110,79 +105,66 @@ export class CrLoader {
         const graphicMap = floor.userData.graphicMap || new Map();
         return data.filter((graphic)=>!graphicMap.has(graphic.element_uuid));
     }
-    switchFloorByStoreData(query, floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const storeData = yield _this.load(_extends({}, query, {
-                resource_type_list: "6"
-            }));
-            const filterData = _this.filterData(storeData, floor);
-            _this.switchFloorByData(filterData, floor);
-        })();
+    async switchFloorByStoreData(query, floor) {
+        const storeData = await this.load(_extends({}, query, {
+            resource_type_list: "6"
+        }));
+        const filterData = this.filterData(storeData, floor);
+        this.switchFloorByData(filterData, floor);
     }
-    switchFloorByOtherData(query, floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const otherData = yield _this.load(_extends({}, query, {
-                resource_type_list: "1,2,3,4"
-            }));
-            const filterData = _this.filterData(otherData, floor);
-            _this.switchFloorByData(filterData, floor);
-        })();
+    async switchFloorByOtherData(query, floor) {
+        const otherData = await this.load(_extends({}, query, {
+            resource_type_list: "1,2,3,4"
+        }));
+        const filterData = this.filterData(otherData, floor);
+        this.switchFloorByData(filterData, floor);
     }
-    loadBuildGround({ brand, project }) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const data = yield _this.loadBuildingGround({
-                brand,
-                project
-            });
-            _this.bmap.currentBuildGround = data;
-            _this.bmap.changeBuildingCenter(data, {
-                brand,
-                project
-            });
-            return _this.bmap.currentBuildGround;
-        })();
+    async loadBuildGround(param) {
+        let { brand, project } = param;
+        const data = await this.loadBuildingGround({
+            brand,
+            project
+        });
+        this.bmap.currentBuildGround = data;
+        this.bmap.changeBuildingCenter(data, {
+            brand,
+            project
+        });
+        return this.bmap.currentBuildGround;
     }
-    loadBuildingGround({ brand, project }) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const key = generatorKeyByObj({
-                brand,
-                project
-            });
-            if (_this.buildingGroundMap.has(key)) {
-                const data = _this.buildingGroundMap.get(key);
-                return data;
-            }
-            const promise = loadBuildingGround({
-                brand,
-                project
-            }, _this.bmap.config).then((data)=>{
-                _this.buildingGroundMap.set(key, data);
-                return data;
-            });
-            _this.buildingGroundMap.set(key, promise);
-            return promise;
-        })();
+    async loadBuildingGround(param) {
+        let { brand, project } = param;
+        const key = generatorKeyByObj({
+            brand,
+            project
+        });
+        if (this.buildingGroundMap.has(key)) {
+            const data = this.buildingGroundMap.get(key);
+            return data;
+        }
+        const promise = loadBuildingGround({
+            brand,
+            project
+        }, this.bmap.config).then((data)=>{
+            this.buildingGroundMap.set(key, data);
+            return data;
+        });
+        this.buildingGroundMap.set(key, promise);
+        return promise;
     }
-    switchFloor(query) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const floor = new Floor(_this.bmap.context);
-            floor.userData.graphicMap = new Map();
-            floor.name = query.floor;
-            try {
-                yield Promise.all([
-                    _this.switchFloorByStoreData(query, floor),
-                    _this.switchFloorByOtherData(query, floor)
-                ]);
-            } catch (e) {
-                console.log(e);
-            }
-            return floor;
-        })();
+    async switchFloor(query) {
+        const floor = new Floor(this.bmap.context);
+        floor.userData.graphicMap = new Map();
+        floor.name = query.floor;
+        try {
+            await Promise.all([
+                this.switchFloorByStoreData(query, floor),
+                this.switchFloorByOtherData(query, floor)
+            ]);
+        } catch (e) {
+            console.log(e);
+        }
+        return floor;
     }
     dispose() {
         this.cacheData.clear();

package/lib/src/operations/hover/hover-helper.js

@@ -1,8 +1,17 @@
+import "core-js/modules/es.set.difference.v2.js";
+import "core-js/modules/es.set.intersection.v2.js";
+import "core-js/modules/es.set.is-disjoint-from.v2.js";
+import "core-js/modules/es.set.is-subset-of.v2.js";
+import "core-js/modules/es.set.is-superset-of.v2.js";
+import "core-js/modules/es.set.symmetric-difference.v2.js";
+import "core-js/modules/es.set.union.v2.js";
+import "core-js/modules/web.dom-collections.iterator.js";
 import { Poi, Poi2 } from "../../elements";
 import { EventDispatcher, Vector2 } from "three";
 import { Timer } from "../../utils";
 export class HoverHelper extends EventDispatcher {
-    handleHoverGraphicsChange(graphics = this.curGraphics) {
+    handleHoverGraphicsChange(graphics) {
+        if (graphics === void 0) graphics = this.curGraphics;
         this.dispatchEvent({
             type: 'hover-change',
             graphics: Array.from(graphics)
@@ -25,7 +34,8 @@ export class HoverHelper extends EventDispatcher {
         this.timer.dispose();
     }
     constructor(context){
-        super(), this.context = context, this.curGraphics = new Set(), this.timer = new Timer(), this.graphicTimerMap = new Map(), this.onPointerMove = ({ graphics, pois, e })=>{
+        super(), this.context = context, this.curGraphics = new Set(), this.timer = new Timer(), this.graphicTimerMap = new Map(), this.onPointerMove = (param)=>{
+            let { graphics, pois, e } = param;
             const poiGraphics = pois.map((item)=>{
                 var _this_context_currentFloor;
                 return (_this_context_currentFloor = this.context.currentFloor) == null ? void 0 : _this_context_currentFloor.graphicLayer.graphicMap.get(item.options.id);

package/lib/src/operations/selection/selection.js

@@ -1,3 +1,12 @@
+import "core-js/modules/web.dom-collections.iterator.js";
+import "core-js/modules/es.set.difference.v2.js";
+import "core-js/modules/es.set.intersection.v2.js";
+import "core-js/modules/es.set.is-disjoint-from.v2.js";
+import "core-js/modules/es.set.is-subset-of.v2.js";
+import "core-js/modules/es.set.is-superset-of.v2.js";
+import "core-js/modules/es.set.symmetric-difference.v2.js";
+import "core-js/modules/es.set.union.v2.js";
+import "core-js/modules/es.array.push.js";
 import { EventDispatcher } from "three";
 import { BoxSelection } from "./box-selection";
 import { isControl, isMac } from "../../utils";
@@ -108,7 +117,8 @@ export class Selection extends EventDispatcher {
             if (isControl(e.key)) {
                 this.disableBoxSelection();
             }
-        }, this.onBoxSelected = ({ list })=>{
+        }, this.onBoxSelected = (param)=>{
+            let { list } = param;
             this._list.clear();
             list.forEach((item)=>{
                 this._list.add(item);

package/lib/src/plugins/car-inertial-position/car-inertial-position.d.ts

@@ -1,11 +1,17 @@
+/**
+ * 定位结果有三种：视觉定位结果、beacon定位结果、pdr定位结果
+ * 以 pdr 定位为主要流程，以视觉结果和beacon结果为校准，其中主视觉定位，beacon是在长期无视觉情况下才会采用的
+ * 以视觉定位结果计算角度、速度，通过卡尔曼滤波平滑速度和角度的变化
+ * 什么时候通过视觉、蓝牙校准pdr的结果???
+ */
 import { EventDispatcher } from "three";
-import { Compass } from "./compass";
 import { Timer } from "../../utils";
+import { KalmanFilter } from "./kalman-filter";
 export interface CarPosition {
     position: [number, number];
     time: number;
     clientTime: number;
-    type: "vision" | "beacon";
+    type: "vision" | "beacon" | "pdr";
 }
 export interface CarPosInfo {
     success: boolean;
@@ -14,25 +20,51 @@ export interface CarPosInfo {
     speed: number;
 }
 interface CarInertialPositionEventMap {
-    'change-compass': {
+    "change-compass": {
         value: number;
     };
-    'change-pos': {
+    "change-position-compass": {
+        value: number;
+    };
+    "change-pos": {
         value: CarPosInfo;
     };
 }
 export declare class CarInertialPosition extends EventDispatcher<CarInertialPositionEventMap> {
     history: CarPosition[];
-    compass: Compass;
-    compassAngle: number;
+    visionHistory: CarPosition[];
+    speed: number;
+    angle: null | number;
     timer: Timer;
     positionTimer: number | null;
-    autoCleanTimer: number | null;
+    speedFilter: KalmanFilter;
+    visionExcessesCount: number;
+    beaconExcessesCount: number;
+    angleExcessesCount: number;
+    pathAngle: number;
     constructor();
-    startCompass(): void;
-    setPosition(position: CarPosition['position'], time: number, duration: number): void;
-    setBeaconPosition(position: CarPosition['position'], time: number, duration: number): void;
+    setPathAngle(angle: number): void;
+    changeSpeed(): void;
+    changeAngle(histories?: CarPosition[]): void;
+    setAngle(angle: number, dispatch?: boolean): void;
+    /**
+     * 添加视觉结果
+     * @param position
+     * @param time
+     * @param duration
+     * @returns
+     */
+    setPosition(position: CarPosition["position"], time: number, duration: number): void;
+    resetPdrPosition(): void;
+    /**
+     * 获取 最后一个视觉坐标在加了pdr惯性的坐标
+     */
+    getLastVisionPdrPos(): CarPosition | null;
+    private _setVisionHistoryForAngle;
+    addHistory(data: CarPosition): void;
+    setBeaconPosition(position: CarPosition["position"], time: number, duration: number): void;
     startPositionTimer(): void;
+    changePosition(from?: string): void;
     getPosition(from: string): CarPosInfo;
     dispose(): void;
 }