@aibee/crc-bmap 0.3.0 → 0.4.1

package/lib/bmap.esm.js

@@ -5374,7 +5374,7 @@ var MergeGraphic = class extends Object3D13 {
     this.geometry = this.initGeometry();
     this.initMaterial();
     this.initMesh();
-    this.mesh.position.z = this.options[0].deltaHeight;
+    this.mesh.position.z = this.options[0].deltaHeight + this.options[0].airHeight;
     if (this.options[0].strokeOpacity !== 0) {
       this.initLineMaterial();
       this.initLineGeometry();
@@ -9442,8 +9442,17 @@ var BMapSelect = class extends Plugin {
   };
   onBoxSelected = ({ list }) => {
     this._list.clear();
+    this._poiList.clear();
     list.forEach((item) => {
-      this._list.add(item);
+      if (this.options.elements.includes("graphic")) {
+        this._list.add(item);
+      }
+      if (this.options.elements.includes("poi")) {
+        const poi = this.bmap.getPoiById(item.options.id);
+        if (poi) {
+          this._poiList.add(poi);
+        }
+      }
     });
     this.selectEnd();
   };
@@ -10602,12 +10611,12 @@ async function downloadFileToJson(fileId, config) {
 
 // src/utils/index-db.ts
 var _db;
-function createDb(database = "aibee_map") {
+function createDb(database = "aibee_map", version = 1) {
   return new Promise((resolve, reject) => {
     if (_db) {
       return resolve({ db: _db, type: "success" });
     }
-    const request = indexedDB.open(database);
+    const request = indexedDB.open(database, version);
     request.onupgradeneeded = function(event) {
       _db = event.target.result;
       console.log("onupgradeneeded");
@@ -10647,9 +10656,10 @@ function set(storeName, key, value, db = _db) {
     if (!db) {
       reject("\u6CA1\u6709db");
     }
-    return new Promise((resolve2, reject2) => {
+    return new Promise(async (resolve2, reject2) => {
+      const has = await get(storeName, key);
       const objectStore = db.transaction([storeName], "readwrite").objectStore(storeName);
-      const request = objectStore.add({ key, value });
+      const request = has !== null ? objectStore.put({ key, value }) : objectStore.add({ key, value });
       request.onsuccess = function(event) {
         resolve2(event);
       };
@@ -10687,8 +10697,10 @@ var defaultAibeeLoaderOption = {
 };
 var MapVersionStoreName = "map_version";
 var RouteVersionStoreName = "route_version";
+var FacilityVersionStoreName = "facility_version";
 var MapDataStoreName = "map_data";
 var RoadNetworkDataStoreName = "road_network_data";
+var FacilityDataStoreName = "facility_data";
 var ParkingTypeIconMap = {
   half: half_default,
   power: power_default,
@@ -10697,24 +10709,28 @@ var ParkingTypeIconMap = {
 var AibeeLoader = class {
   constructor(bmap) {
     this.bmap = bmap;
-    this.initDb();
+    this.initDbPromise = this.initDb();
   }
   floors = [];
+  initDbPromise = Promise.resolve();
+  db = null;
   async initDb() {
     try {
-      const { db, type } = await createDb();
+      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("[\u6253\u5F00indexDb\u9519\u8BEF]", e);
     }
   }
   async load(data) {
-    this.clear();
     if (Array.isArray(data)) {
       this.floors = data;
     } else {
@@ -10725,10 +10741,10 @@ var AibeeLoader = class {
     }
   }
   setCacheData(storeName, key, data) {
-    return set(storeName, `${key}`, data);
+    return this.initDbPromise.then(() => set(storeName, `${key}`, data, this.db));
   }
   getCacheData(storeName, key) {
-    return get(storeName, `${key}`);
+    return this.initDbPromise.then(() => get(storeName, `${key}`, this.db));
   }
   getFloorCacheKey(floorInfo) {
     return `${floorInfo.floor_id}`;
@@ -10751,7 +10767,8 @@ var AibeeLoader = class {
         }
       }
       return this.getFloorDataByFloorInfo(floorInfo);
-    } catch {
+    } catch (e) {
+      console.log("[get floor data error]", e);
       return this.getFloorDataByFloorInfo(floorInfo);
     }
   }
@@ -10798,8 +10815,34 @@ var AibeeLoader = class {
     return res.filter((item) => item.points);
   }
   async getFacilitiesData() {
-    if (this.floors[0]?.entry_infra_url) {
-      return fetch(this.floors[0].entry_infra_url).then((res) => res.json());
+    const floorInfo = this.floors[0];
+    if (!floorInfo) {
+      return null;
+    }
+    const cacheKey = this.getFloorCacheKey(floorInfo);
+    const getFacilityUrl = async () => {
+      const res = await fetch(floorInfo.entry_infra_url).then((res2) => res2.json());
+      if (res) {
+        this.setCacheData(FacilityDataStoreName, cacheKey, res);
+        this.setCacheData(FacilityVersionStoreName, cacheKey, floorInfo.version_id);
+      }
+      return res;
+    };
+    try {
+      const cacheVersion = await this.getCacheData(FacilityVersionStoreName, cacheKey);
+      if (cacheVersion === floorInfo.version_id) {
+        const res = await this.getCacheData(
+          FacilityDataStoreName,
+          cacheKey
+        );
+        if (res) {
+          return res;
+        }
+      }
+      return getFacilityUrl();
+    } catch (e) {
+      console.log("[get facility error]", e);
+      return getFacilityUrl();
     }
   }
   // 空闲时间请求其他数据
@@ -10843,11 +10886,12 @@ var AibeeLoader = class {
                 fillOpacity,
                 strokeColor,
                 strokeOpacity,
-                height
+                height,
+                airHeight
               } = options;
-              let key = `${fillColor.toLowerCase()}-${fillOpacity}-${strokeColor.toLowerCase()}-${strokeOpacity}-${height}`;
+              let key = `${fillColor.toLowerCase()}-${fillOpacity}-${strokeColor.toLowerCase()}-${strokeOpacity}-${height}-${airHeight}`;
               if (strokeOpacity === 0) {
-                key = `${fillColor.toLowerCase()}-${fillOpacity}-${height}`;
+                key = `${fillColor.toLowerCase()}-${fillOpacity}-${height}-${airHeight}`;
               }
               if (obj[key]) {
                 obj[key].push(options);
@@ -10967,7 +11011,8 @@ var AibeeLoader = class {
                 icon: options.poi_info.icon,
                 text: options.poi_info.showName || options.store_name || options.poi_info.text,
                 position: { x: pos[0], y: pos[1], z: options.airHeight + options.height },
-                icon_size: [18, 18]
+                icon_size: [18, 18],
+                level: options.poi_info.level || 0
               });
               floor.poiLayer2.pushPoi(poi);
               if (poi) {
@@ -10995,7 +11040,8 @@ var AibeeLoader = class {
                 icon: options.poi_info.icon,
                 text: options.poi_info.showName || options.store_name || options.poi_info.text,
                 position: { x: pos[0], y: pos[1], z: options.airHeight + options.height },
-                icon_size: [18, 18]
+                icon_size: [18, 18],
+                level: options.poi_info.level || 0
               });
               floor.poiLayer2.pushPoi(poi);
               poi.userData.type = "facility";
@@ -11082,11 +11128,11 @@ var AibeeLoader = class {
     floor.updateBox();
     return floor;
   }
-  clear() {
+  async clear() {
+    await this.initDbPromise.then(() => closeDb());
   }
   dispose() {
     this.clear();
-    closeDb();
   }
 };