@aibee/crc-bmap 0.8.45 → 0.8.46

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

@@ -1,5 +1,5 @@
 // 加载Aibee地图/路网数据
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import "core-js/modules/web.dom-collections.iterator.js";
 import { createStore, createDb, closeDb, set, get } from "../../utils/index-db";
 import { Floor, Graphic } from "../../elements";
 import { transformGraphicData, HooksName, sleepOneRf, TaskQueue } from "../../utils";
@@ -15,196 +15,161 @@ const MapDataStoreName = "map_data"; // 地图数据
 const RoadNetworkDataStoreName = "road_network_data"; // 路网
 const FacilityDataStoreName = "facility_data"; // 设施
 export class AibeeLoader extends EventDispatcher {
-    initDb() {
-        var _this = this;
-        return _async_to_generator(function*() {
-            try {
-                const { db, type } = yield createDb("aibee_map", 2);
-                if (type === "onupgradeneeded") {
-                    createStore(MapVersionStoreName);
-                    createStore(RouteVersionStoreName);
-                    createStore(FacilityVersionStoreName);
-                    createStore(MapDataStoreName);
-                    createStore(RoadNetworkDataStoreName);
-                    createStore(FacilityDataStoreName);
-                }
-                _this.db = db;
-            } catch (e) {
-                console.log("[打开indexDb错误]", e);
+    async initDb() {
+        try {
+            const { db, type } = await createDb("aibee_map", 2);
+            if (type === "onupgradeneeded") {
+                createStore(MapVersionStoreName);
+                createStore(RouteVersionStoreName);
+                createStore(FacilityVersionStoreName);
+                createStore(MapDataStoreName);
+                createStore(RoadNetworkDataStoreName);
+                createStore(FacilityDataStoreName);
             }
-        })();
+            this.db = db;
+        } catch (e) {
+            console.log("[打开indexDb错误]", e);
+        }
     }
-    load(data) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            if (Array.isArray(data)) {
-                _this.floors = data;
-            } else {
-                const res = yield fetch(data).then((res)=>res.json());
-                if (res.code === "0") {
-                    _this.floors = res.data.list;
-                }
+    async load(data) {
+        if (Array.isArray(data)) {
+            this.floors = data;
+        } else {
+            const res = await fetch(data).then((res)=>res.json());
+            if (res.code === "0") {
+                this.floors = res.data.list;
             }
-        })();
+        }
     }
     setCacheData(storeName, key, data) {
-        return this.initDbPromise.then(()=>set(storeName, `${key}`, data, this.db));
+        return this.initDbPromise.then(()=>set(storeName, "" + key, data, this.db));
     }
     getCacheData(storeName, key) {
-        return this.initDbPromise.then(()=>get(storeName, `${key}`, this.db));
+        return this.initDbPromise.then(()=>get(storeName, "" + key, this.db));
     }
     getFloorCacheKey(floorInfo) {
-        return `${floorInfo.floor_id}`;
+        return "" + floorInfo.floor_id;
     }
-    getFloorData(floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const data = yield _this.getFloorJsonData(floor);
-            if (!data) {
-                return null;
-            }
-            return _this.getDataByJson(data);
-        })();
+    async getFloorData(floor) {
+        const data = await this.getFloorJsonData(floor);
+        if (!data) {
+            return null;
+        }
+        return this.getDataByJson(data);
     }
-    getFloorDataByFloorInfo(floorInfo) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const data = yield _this.getFloorJsonDataByFloorInfo(floorInfo);
-            return _this.getDataByJson(data);
-        })();
+    async getFloorDataByFloorInfo(floorInfo) {
+        const data = await this.getFloorJsonDataByFloorInfo(floorInfo);
+        return this.getDataByJson(data);
     }
-    getFloorJsonDataByFloorInfo(floorInfo) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const cacheKey = _this.getFloorCacheKey(floorInfo);
-            // 直接请求json数据
-            console.time(`zstd_json`);
-            const res1 = yield fetch(floorInfo.map_url).then((res)=>res.json());
-            res1.floor = floorInfo.floor;
-            console.timeEnd(`zstd_json`);
-            _this.setCacheData(MapDataStoreName, cacheKey, res1);
-            _this.setCacheData(MapVersionStoreName, cacheKey, floorInfo.version_id);
-            return res1;
-        })();
+    async getFloorJsonDataByFloorInfo(floorInfo) {
+        const cacheKey = this.getFloorCacheKey(floorInfo);
+        // 直接请求json数据
+        console.time("zstd_json");
+        const res1 = await fetch(floorInfo.map_url).then((res)=>res.json());
+        res1.floor = floorInfo.floor;
+        console.timeEnd("zstd_json");
+        this.setCacheData(MapDataStoreName, cacheKey, res1);
+        this.setCacheData(MapVersionStoreName, cacheKey, floorInfo.version_id);
+        return res1;
     }
-    getFloorJsonData(floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const floorInfo = _this.floors.find((item)=>item.floor === floor);
-            if (!floorInfo) {
-                return null;
+    async getFloorJsonData(floor) {
+        const floorInfo = this.floors.find((item)=>item.floor === floor);
+        if (!floorInfo) {
+            return null;
+        }
+        const cacheKey = this.getFloorCacheKey(floorInfo);
+        try {
+            const cacheVersion = await this.getCacheData(MapVersionStoreName, cacheKey);
+            if (cacheVersion === floorInfo.version_id) {
+                const res = await this.getCacheData(MapDataStoreName, cacheKey);
+                if (res) {
+                    return res;
+                }
             }
-            const cacheKey = _this.getFloorCacheKey(floorInfo);
+            return this.getFloorJsonDataByFloorInfo(floorInfo);
+        } catch (e) {
+            console.log("[get floor data error]", e);
+            return this.getFloorJsonDataByFloorInfo(floorInfo);
+        }
+    }
+    // 获取路网数据
+    async getRoadNetworkData() {
+        const res = await Promise.all(this.floors.map(async (item)=>{
+            const cacheKey = this.getFloorCacheKey(item);
             try {
-                const cacheVersion = yield _this.getCacheData(MapVersionStoreName, cacheKey);
-                if (cacheVersion === floorInfo.version_id) {
-                    const res = yield _this.getCacheData(MapDataStoreName, cacheKey);
+                const cacheVersion = await this.getCacheData(RouteVersionStoreName, cacheKey);
+                if (cacheVersion === item.version_id) {
+                    const res = await this.getCacheData(RoadNetworkDataStoreName, cacheKey);
                     if (res) {
                         return res;
                     }
                 }
-                return _this.getFloorJsonDataByFloorInfo(floorInfo);
+                const route = await fetch(item.route_url).then((res)=>res.json());
+                this.setCacheData(RoadNetworkDataStoreName, cacheKey, route);
+                this.setCacheData(RouteVersionStoreName, cacheKey, item.version_id);
+                return route;
             } catch (e) {
-                console.log("[get floor data error]", e);
-                return _this.getFloorJsonDataByFloorInfo(floorInfo);
+                const route = await fetch(item.route_url).then((res)=>res.json());
+                this.setCacheData(RoadNetworkDataStoreName, cacheKey, route);
+                return route;
             }
-        })();
-    }
-    // 获取路网数据
-    getRoadNetworkData() {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const res = yield Promise.all(_this.floors.map(/*#__PURE__*/ _async_to_generator(function*(item) {
-                const cacheKey = _this.getFloorCacheKey(item);
-                try {
-                    const cacheVersion = yield _this.getCacheData(RouteVersionStoreName, cacheKey);
-                    if (cacheVersion === item.version_id) {
-                        const res = yield _this.getCacheData(RoadNetworkDataStoreName, cacheKey);
-                        if (res) {
-                            return res;
-                        }
-                    }
-                    const route = yield fetch(item.route_url).then((res)=>res.json());
-                    _this.setCacheData(RoadNetworkDataStoreName, cacheKey, route);
-                    _this.setCacheData(RouteVersionStoreName, cacheKey, item.version_id);
-                    return route;
-                } catch (e) {
-                    const route = yield fetch(item.route_url).then((res)=>res.json());
-                    _this.setCacheData(RoadNetworkDataStoreName, cacheKey, route);
-                    return route;
-                }
-            })));
-            return res.filter((item)=>item.points);
-        })();
+        }));
+        return res.filter((item)=>item.points);
     }
-    getFacilitiesData() {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const floorInfo = _this.floors.reduce((floor, cur)=>floor.updated_at > cur.updated_at ? floor : cur, _this.floors[0]);
-            if (!floorInfo) {
-                return null;
+    async getFacilitiesData() {
+        const floorInfo = this.floors.reduce((floor, cur)=>floor.updated_at > cur.updated_at ? floor : cur, this.floors[0]);
+        if (!floorInfo) {
+            return null;
+        }
+        const cacheKey = this.getFloorCacheKey(floorInfo);
+        const getFacilityUrl = async ()=>{
+            const res = await fetch(floorInfo.entry_infra_url).then((res)=>res.json());
+            if (res) {
+                this.setCacheData(FacilityDataStoreName, cacheKey, res);
+                this.setCacheData(FacilityVersionStoreName, cacheKey, floorInfo.version_id);
             }
-            const cacheKey = _this.getFloorCacheKey(floorInfo);
-            const getFacilityUrl = /*#__PURE__*/ _async_to_generator(function*() {
-                const res = yield fetch(floorInfo.entry_infra_url).then((res)=>res.json());
+            return res;
+        };
+        try {
+            const cacheVersion = await this.getCacheData(FacilityVersionStoreName, cacheKey);
+            if (cacheVersion === floorInfo.version_id) {
+                const res = await this.getCacheData(FacilityDataStoreName, cacheKey);
                 if (res) {
-                    _this.setCacheData(FacilityDataStoreName, cacheKey, res);
-                    _this.setCacheData(FacilityVersionStoreName, cacheKey, floorInfo.version_id);
-                }
-                return res;
-            });
-            try {
-                const cacheVersion = yield _this.getCacheData(FacilityVersionStoreName, cacheKey);
-                if (cacheVersion === floorInfo.version_id) {
-                    const res = yield _this.getCacheData(FacilityDataStoreName, cacheKey);
-                    if (res) {
-                        return res;
-                    }
+                    return res;
                 }
-                return getFacilityUrl();
-            } catch (e) {
-                console.log("[get facility error]", e);
-                return getFacilityUrl();
             }
-        })();
+            return getFacilityUrl();
+        } catch (e) {
+            console.log("[get facility error]", e);
+            return getFacilityUrl();
+        }
     }
     // 空闲时间请求其他数据
-    getOtherDataByFreeTime() {
-        return _async_to_generator(function*() {
-        // requestIdleCallback((deadline: IdleDeadline) => { 
-        //   while (deadline.timeRemaining() > 0) {  
-        //     // TODO 获取其他数据
-        //     // 在空闲时间执行的任务  
-        //     console.log('执行任务...', deadline.timeRemaining());
-        //     // TODO 看一下还有哪些楼层没有获取最新的数据  
-        //     // 模拟一些工作  
-        //     // fetchData(); // 在空闲时间请求数据  
-        //   }  
-        // })
-        })();
+    async getOtherDataByFreeTime() {
+    // requestIdleCallback((deadline: IdleDeadline) => { 
+    //   while (deadline.timeRemaining() > 0) {  
+    //     // TODO 获取其他数据
+    //     // 在空闲时间执行的任务  
+    //     console.log('执行任务...', deadline.timeRemaining());
+    //     // TODO 看一下还有哪些楼层没有获取最新的数据  
+    //     // 模拟一些工作  
+    //     // fetchData(); // 在空闲时间请求数据  
+    //   }  
+    // })
     }
     // 获取多楼层数据
-    getMulFloorsData(floors) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            return Promise.all(floors.map((floor)=>_this.getFloorData(floor))).then((data)=>data.filter((item)=>item));
-        })();
+    async getMulFloorsData(floors) {
+        return Promise.all(floors.map((floor)=>this.getFloorData(floor))).then((data)=>data.filter((item)=>item));
     }
-    getDataByUrl(url) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            const data = yield fetch(url).then((res)=>res.json());
-            return _this.getDataByJson(data);
-        })();
+    async getDataByUrl(url) {
+        const data = await fetch(url).then((res)=>res.json());
+        return this.getDataByJson(data);
     }
-    getDataByJson(data, floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            floor = _this.getFloorBaseLayer(data, floor);
-            yield _this.getFloorContentLayer(data, floor);
-            _this.changeFloorBox(data, floor);
-            return floor;
-        })();
+    async getDataByJson(data, floor) {
+        floor = this.getFloorBaseLayer(data, floor);
+        await this.getFloorContentLayer(data, floor);
+        this.changeFloorBox(data, floor);
+        return floor;
     }
     changeFloorBox(data, floor) {
         floor.updateBox();
@@ -212,95 +177,90 @@ export class AibeeLoader extends EventDispatcher {
         const max = Math.max(size.x, size.y, size.z);
         floor.userData.height = max / 4 + data.floorHeight;
     }
-    switchFloor(data) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            return new Promise((resolve)=>{
-                const task = {
-                    run: ()=>_this._switchFloor(data),
-                    meta: {
-                        type: "switchFloor"
-                    }
-                };
-                const tid = _this.taskQueue.replaceByMetaType(task);
-                const handleTaskEnd = ({ task, res })=>{
-                    if (task.tid === tid) {
-                        _this.taskQueue.removeEventListener("active-task-end", handleTaskEnd);
-                        resolve(res);
-                    }
-                };
-                _this.taskQueue.addEventListener("active-task-end", handleTaskEnd);
-            });
-        })();
-    }
-    _switchFloor(data) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            var _floor_userData_data_layers_find;
-            let floorData = data;
-            if (typeof data === 'string') {
-                const jsonData = yield _this.getFloorJsonData(data);
-                if (jsonData) {
-                    floorData = jsonData;
-                } else {
-                    return null;
-                }
-            }
-            const floor = new Floor(_this.bmap.context);
-            const floorInfo = _this.floors.find((item)=>item.floor === floorData.floor);
-            var _floorInfo_map_angle;
-            const angle = (_floorInfo_map_angle = floorInfo == null ? void 0 : floorInfo.map_angle) != null ? _floorInfo_map_angle : 0;
-            _this.bmap.dispatchEvent({
-                type: HooksName.SWITCH_FLOOR_BEFORE,
-                data: {
-                    curFloor: floor,
-                    graphics: []
+    async switchFloor(data) {
+        return new Promise((resolve)=>{
+            const task = {
+                run: ()=>this._switchFloor(data),
+                meta: {
+                    type: "switchFloor"
                 }
-            });
-            _this.dispatchEvent({
-                type: "switch-floor-before",
-                data: {
-                    curFloor: floor,
-                    graphics: []
+            };
+            const tid = this.taskQueue.replaceByMetaType(task);
+            const handleTaskEnd = (param)=>{
+                let { task, res } = param;
+                if (task.tid === tid) {
+                    this.taskQueue.removeEventListener("active-task-end", handleTaskEnd);
+                    resolve(res);
                 }
-            });
-            _this.bmap.context.control.setAzimuthalAngle(angle / 180 * Math.PI, true);
-            _this.getFloorBaseLayer(floorData, floor);
-            _this.changeFloorBox(floorData, floor);
-            _this.bmap.buildingCenter = floor.userData.center;
-            _this.bmap.currentBuildGround = (_floor_userData_data_layers_find = floor.userData.data.layers.find((item)=>item.l_type === "range")) == null ? void 0 : _floor_userData_data_layers_find.elements[0];
-            _this.bmap.context.switchFloor(floor);
-            _this.bmap.initialFloorCamera();
-            yield sleepOneRf();
-            _this.dispatchEvent({
-                type: "switch-floor-ground",
-                data: {
-                    curFloor: floor,
-                    graphics: []
-                }
-            });
-            yield _this.getFloorContentLayer(floorData, floor);
-            // TODO 兼容数据
-            _this.changeFloorBox(floorData, floor);
-            _this.bmap.initialFloorCamera();
-            _this.bmap.context.cameraBound.updateBox();
-            // TODO 兼容结束
-            _this.dispatchEvent({
-                type: "switch-floor-after",
-                data: {
-                    curFloor: floor,
-                    graphics: floor.graphicLayer.children
-                }
-            });
-            _this.bmap.dispatchEvent({
-                type: HooksName.SWITCH_FLOOR_AFTER,
-                data: {
-                    curFloor: floor,
-                    graphics: floor.graphicLayer.children
-                }
-            });
-            return floor;
-        })();
+            };
+            this.taskQueue.addEventListener("active-task-end", handleTaskEnd);
+        });
+    }
+    async _switchFloor(data) {
+        var _floor_userData_data_layers_find;
+        let floorData = data;
+        if (typeof data === 'string') {
+            const jsonData = await this.getFloorJsonData(data);
+            if (jsonData) {
+                floorData = jsonData;
+            } else {
+                return null;
+            }
+        }
+        const floor = new Floor(this.bmap.context);
+        const floorInfo = this.floors.find((item)=>item.floor === floorData.floor);
+        var _floorInfo_map_angle;
+        const angle = (_floorInfo_map_angle = floorInfo == null ? void 0 : floorInfo.map_angle) != null ? _floorInfo_map_angle : 0;
+        this.bmap.dispatchEvent({
+            type: HooksName.SWITCH_FLOOR_BEFORE,
+            data: {
+                curFloor: floor,
+                graphics: []
+            }
+        });
+        this.dispatchEvent({
+            type: "switch-floor-before",
+            data: {
+                curFloor: floor,
+                graphics: []
+            }
+        });
+        this.bmap.context.control.setAzimuthalAngle(angle / 180 * Math.PI, true);
+        this.getFloorBaseLayer(floorData, floor);
+        this.changeFloorBox(floorData, floor);
+        this.bmap.buildingCenter = floor.userData.center;
+        this.bmap.currentBuildGround = (_floor_userData_data_layers_find = floor.userData.data.layers.find((item)=>item.l_type === "range")) == null ? void 0 : _floor_userData_data_layers_find.elements[0];
+        this.bmap.context.switchFloor(floor);
+        this.bmap.initialFloorCamera();
+        await sleepOneRf();
+        this.dispatchEvent({
+            type: "switch-floor-ground",
+            data: {
+                curFloor: floor,
+                graphics: []
+            }
+        });
+        await this.getFloorContentLayer(floorData, floor);
+        // TODO 兼容数据
+        this.changeFloorBox(floorData, floor);
+        this.bmap.initialFloorCamera();
+        this.bmap.context.cameraBound.updateBox();
+        // TODO 兼容结束
+        this.dispatchEvent({
+            type: "switch-floor-after",
+            data: {
+                curFloor: floor,
+                graphics: floor.graphicLayer.children
+            }
+        });
+        this.bmap.dispatchEvent({
+            type: HooksName.SWITCH_FLOOR_AFTER,
+            data: {
+                curFloor: floor,
+                graphics: floor.graphicLayer.children
+            }
+        });
+        return floor;
     }
     getFloorBaseLayer(data, floor) {
         if (!floor) {
@@ -334,39 +294,33 @@ export class AibeeLoader extends EventDispatcher {
         floor.userData.data = data;
         return floor;
     }
-    getFloorContentLayer(data, floor) {
-        var _this = this;
-        return _async_to_generator(function*() {
-            if (!floor) {
-                floor = new Floor(_this.bmap.context);
+    async getFloorContentLayer(data, floor) {
+        if (!floor) {
+            floor = new Floor(this.bmap.context);
+        }
+        floor.userData.graphics = [];
+        floor.userData.graphicMap = new Map();
+        let startTime = Date.now();
+        for(let i = 0; i < data.layers.length; i++){
+            const layer = data.layers[i];
+            if ([
+                'range',
+                'ground'
+            ].includes(layer.l_type)) {
+                continue;
             }
-            floor.userData.graphics = [];
-            floor.userData.graphicMap = new Map();
-            let startTime = Date.now();
-            for(let i = 0; i < data.layers.length; i++){
-                const layer = data.layers[i];
-                if ([
-                    'range',
-                    'ground'
-                ].includes(layer.l_type)) {
-                    continue;
-                }
-                transformLayers(layer, floor);
-                console.log('time', Date.now() - startTime, layer.l_type);
-                if (Date.now() - startTime > 16) {
-                    yield sleepOneRf();
-                    startTime = Date.now();
-                }
+            transformLayers(layer, floor);
+            console.log('time', Date.now() - startTime, layer.l_type);
+            if (Date.now() - startTime > 16) {
+                await sleepOneRf();
+                startTime = Date.now();
             }
-            return floor;
-        })();
+        }
+        return floor;
     }
-    clear() {
-        var _this = this;
-        return _async_to_generator(function*() {
-            var _this_db;
-            closeDb((_this_db = _this.db) != null ? _this_db : undefined);
-        })();
+    async clear() {
+        var _this_db;
+        closeDb((_this_db = this.db) != null ? _this_db : undefined);
     }
     dispose() {
         this.clear();

package/lib/src/loader/AibeeLoader/layer.js

@@ -1,4 +1,6 @@
 import { _ as _extends } from "@swc/helpers/_/_extends";
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/web.dom-collections.iterator.js";
 import { getMinEdgeSquare, transformGraphicData, translatePosToCenter } from "../../utils";
 import { GlbModel, GroundTexture, Lane, MergeGraphic, Poi2, TextTexture, Wall } from "../../elements";
 import { ParkingTypeIconMap } from '../../assets';
@@ -41,9 +43,9 @@ export function transformLayers(layer, floor) {
     // 对可以合并的图形做合并处理
     const group = canMergeGraphics.reduce((obj, options)=>{
         const { fillColor, fillOpacity, strokeColor, strokeOpacity, height, airHeight } = options;
-        let key = `${fillColor.toLowerCase()}-${fillOpacity}-${strokeColor.toLowerCase()}-${strokeOpacity}-${height}-${airHeight}`;
+        let key = fillColor.toLowerCase() + "-" + fillOpacity + "-" + strokeColor.toLowerCase() + "-" + strokeOpacity + "-" + height + "-" + airHeight;
         if (strokeOpacity === 0) {
-            key = `${fillColor.toLowerCase()}-${fillOpacity}-${height}-${airHeight}`;
+            key = fillColor.toLowerCase() + "-" + fillOpacity + "-" + height + "-" + airHeight;
         }
         if (obj[key]) {
             obj[key].push(options);
@@ -69,9 +71,9 @@ export function transformLayers(layer, floor) {
     // 分组
     const wallGroup = layer.elements.reduce((obj, options)=>{
         const { fillColor, fillOpacity, strokeColor, strokeOpacity, height } = options;
-        let key = `${fillColor.toLowerCase()}-${fillOpacity}-${strokeColor.toLowerCase()}-${strokeOpacity}-${height}`;
+        let key = fillColor.toLowerCase() + "-" + fillOpacity + "-" + strokeColor.toLowerCase() + "-" + strokeOpacity + "-" + height;
         if (strokeOpacity === 0) {
-            key = `${fillColor.toLowerCase()}-${fillOpacity}-${height}`;
+            key = fillColor.toLowerCase() + "-" + fillOpacity + "-" + height;
         }
         if (obj[key]) {
             obj[key].push(options);
@@ -95,9 +97,9 @@ export function transformLayers(layer, floor) {
     // 分组
     const laneGroup = layer.elements.reduce((obj, options)=>{
         const { fillColor, fillOpacity, strokeColor, strokeOpacity } = options;
-        let key = `${fillColor.toLowerCase()}-${fillOpacity}-${strokeColor.toLowerCase()}-${strokeOpacity}`;
+        let key = fillColor.toLowerCase() + "-" + fillOpacity + "-" + strokeColor.toLowerCase() + "-" + strokeOpacity;
         if (strokeOpacity === 0) {
-            key = `${fillColor.toLowerCase()}-${fillOpacity}`;
+            key = fillColor.toLowerCase() + "-" + fillOpacity;
         }
         if (obj[key]) {
             obj[key].push(options);