@aibee/crc-bmap 0.8.40 → 0.8.41

package/lib/src/plugins/car-inertial-position/compass.js

@@ -17,6 +17,9 @@ import { removeOutliers } from "./utils";
    * @param compass
    * @param time
    */ setAbsoluteCompass(compass, time) {
+        if (!this.delta) {
+            this.emitCompass(compass);
+        }
         if (!this.compassData.length) {
             return;
         }
@@ -41,10 +44,13 @@ import { removeOutliers } from "./utils";
         const delta = compass - curCompass.res;
         this.deltas.push(delta);
         const deltas = removeOutliers(this.deltas);
-        this.delta = deltas.reduce((sum, cur)=>sum + cur, 0) / deltas.length;
+        if (deltas.length) {
+            this.delta = deltas.reduce((sum, cur)=>sum + cur, 0) / deltas.length;
+        }
     }
     emitCompass(compass) {
         // 把 compass 限制在 0 ~ 360 
+        console.log("compass delta", this.delta, compass);
         this.dispatchEvent({
             type: "compass",
             value: (compass + this.delta + 360) % 360

package/lib/src/plugins/car-inertial-position/utils.js

@@ -63,7 +63,9 @@ import { Vector2 } from "three";
  * @param timeIntervalMs
  * @returns
  */ export function predictFutureSpeed(positions, timeIntervalMs) {
+    console.log("timeIntervalMs", timeIntervalMs);
     const speeds = calculateInstantaneousSpeed(positions);
+    console.log("speeds", speeds);
     const n = speeds.length;
     if (n === 0) {
         return 0; // 如果没有速度数据，返回0
@@ -75,8 +77,13 @@ import { Vector2 } from "three";
     if (n > 1) {
         const speedDifferences = speeds.slice(1).map((speed, index)=>speed - speeds[index]);
         const time = positions.slice(1).reduce((sum, cur, index)=>sum + (cur.time - positions[index].time), 0);
+        console.log("time", time);
+        if (!time) {
+            return 0;
+        }
         acceleration = speedDifferences.reduce((sum, value)=>sum + value, 0) / time;
     }
+    console.log("acceleration", acceleration);
     // 预测未来速度 m/ms
     const futureSpeed = Math.max(currentSpeed + acceleration * timeIntervalMs, 0);
     return futureSpeed;

package/lib/src/plugins/navigation/navigation.d.ts

@@ -1,7 +1,7 @@
 import { BMap } from "../../bmap";
 import { Plugin } from "../base";
 import { Path, PathConfig } from "./path";
-import { PathData2, TweenUtil, PathData, RoadData2 } from "../../utils";
+import { PathData2, TweenUtil, RoadData2 } from "../../utils";
 import { Floor, Poi2, PoiOptions2 } from "../../elements";
 import { Tween } from "@tweenjs/tween.js";
 import { type NavigationProcessInfo, PositionNavigation, type PositionNavigationConfig } from "./position-navigation";
@@ -24,7 +24,7 @@ interface EventMap {
         info: NavigationProcessInfo;
     };
     "add-path": {
-        paths: PathData2 | PathData;
+        paths: PathData2;
     };
 }
 export interface NavigationConfig {

package/lib/src/plugins/navigation/position-navigation.d.ts

@@ -1,6 +1,6 @@
 import { EventDispatcher } from "three";
 import { Navigation } from "./navigation";
-import { PathData, PathDirection, RoadData2, Timer, TweenUtil } from "../../utils";
+import { PathData2, PathDirection, RoadData2, Timer, TweenUtil } from "../../utils";
 import { Tween } from "@tweenjs/tween.js";
 import { DebouncedFuncLeading } from 'lodash';
 export interface PositionNavigationConfig {
@@ -16,6 +16,7 @@ export interface NavigationProcessInfo {
     dir: PathDirection;
     pos: [number, number];
     routeIndex: number;
+    crossName: string;
     offset: boolean;
     reset: boolean;
 }
@@ -31,7 +32,7 @@ export declare class PositionNavigation extends EventDispatcher<PositionNavigati
     position: [number, number];
     routeIndex: number;
     pointIndex: number;
-    paths: PathData;
+    paths: PathData2;
     options: PositionNavigationConfig;
     timer: Timer;
     resetTimer: number | null;
@@ -41,15 +42,15 @@ export declare class PositionNavigation extends EventDispatcher<PositionNavigati
     roadData: RoadData2[];
     paused: boolean;
     constructor(navigation: Navigation, options: Partial<PositionNavigationConfig>, roadData: RoadData2[]);
-    get curRoutePath(): PathData[0] | null;
+    get curRoutePath(): PathData2[0] | null;
     get curRoutePathPoints(): [number, number][];
     registryEvent(): void;
     unRegistryEvent(): void;
     onAddPaths: ({ paths }: {
-        paths: PathData;
+        paths: PathData2;
     }) => void;
     onUpdate: () => void;
-    resetStatus(paths: PathData): void;
+    resetStatus(paths: PathData2): void;
     emitNavigationStatus(): void;
     adsorb(floor: string, _position: [number, number]): {
         distance: number;
@@ -72,6 +73,7 @@ export declare class PositionNavigation extends EventDispatcher<PositionNavigati
     getNextDirDistance(): {
         dir: PathDirection;
         distance: number;
+        crossName: string;
     } | null;
     private getNavigationInfo;
     dispose(): void;

package/lib/src/plugins/navigation/position-navigation.js

@@ -249,12 +249,14 @@ export class PositionNavigation extends EventDispatcher {
     }
     // 计算下一个拐弯点的方向和距离
     getNextDirDistance() {
+        var _curRoutePath_pointInfos_index;
         if (!this.position) {
             return null;
         }
-        const { pointIndex, curRoutePathPoints, position } = this;
+        const { pointIndex, curRoutePathPoints, position, curRoutePath } = this;
         let index = pointIndex;
         let dir = PathDirection.FRONT;
+        let crossName = (curRoutePath == null ? void 0 : (_curRoutePath_pointInfos_index = curRoutePath.pointInfos[index]) == null ? void 0 : _curRoutePath_pointInfos_index.crossName) || "";
         let distance = 0;
         let t = Date.now(); // 循环控制在5ms内，防止死循环
         while(dir === PathDirection.FRONT && distance < this.options.directionEmitThreshold && Date.now() - t < 5){
@@ -276,6 +278,8 @@ export class PositionNavigation extends EventDispatcher {
                         dir = PathDirection.END;
                     } else {
                         dir = calc_direction(p1, p2, p3);
+                        var _curRoutePath_pointInfos__crossName;
+                        crossName = (_curRoutePath_pointInfos__crossName = curRoutePath == null ? void 0 : curRoutePath.pointInfos[index + 1].crossName) != null ? _curRoutePath_pointInfos__crossName : "";
                         index += 1;
                     }
                 }
@@ -285,7 +289,8 @@ export class PositionNavigation extends EventDispatcher {
         if (dir === PathDirection.END && distance <= this.options.directionEmitThreshold) {
             return {
                 dir,
-                distance
+                distance,
+                crossName
             };
         }
         // 其他情况下判断距离起点的距离，如果是 <= 5米 就是start
@@ -293,7 +298,8 @@ export class PositionNavigation extends EventDispatcher {
         if (distanceToStart <= 5) {
             return {
                 dir: PathDirection.START,
-                distance
+                distance,
+                crossName
             };
         }
         // 其他情况根据拐弯距离判断是不是直行
@@ -302,7 +308,8 @@ export class PositionNavigation extends EventDispatcher {
         }
         return {
             dir,
-            distance
+            distance,
+            crossName
         };
     }
     getNavigationInfo() {
@@ -314,7 +321,7 @@ export class PositionNavigation extends EventDispatcher {
         if (!nextDirInfo) {
             return null;
         }
-        let { dir, distance: nextDirDistance } = nextDirInfo;
+        let { dir, distance: nextDirDistance, crossName } = nextDirInfo;
         if (dir === PathDirection.END && nextDirDistance > 15) {
             // 请直行
             dir = PathDirection.FRONT;
@@ -330,6 +337,7 @@ export class PositionNavigation extends EventDispatcher {
             dir,
             pos: this.position,
             routeIndex: this.routeIndex,
+            crossName,
             offset: this.offset,
             reset: this.reset
         };

package/lib/src/utils/road2.d.ts

@@ -30,6 +30,7 @@ export interface RoadData2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }>;
 }
 export interface Facility {
@@ -74,6 +75,7 @@ export type RouteType2 = "" | "escalator" | "straightLadder" | "forward";
 export type PathData2 = {
     floor: string;
     points: [number, number][];
+    pointInfos: RoadData2['points'];
     endType: string;
     destId: string;
     distance: number;
@@ -101,6 +103,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }>;
     nodeMap: Map<string, string>;
     facilityMap: Map<string, {
@@ -121,6 +124,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }[]>;
     straightLadderMap: Map<string, {
         id: string;
@@ -140,6 +144,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }[]>;
     escalatorMap: Map<string, {
         start?: RoadData2["points"][0];
@@ -167,6 +172,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }[]>;
     connectionPointMap: Map<string, {
         id: string;
@@ -186,6 +192,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }[]>;
     parkingMap: Map<string, {
         id: string;
@@ -205,6 +212,7 @@ export declare class RoadNetwork2 {
         endTime?: string;
         permission?: number;
         relatedId?: string;
+        crossName?: string;
     }>;
     lineMap: Map<string, Map<string, number>>;
     baseRoute: Graph;

package/lib/src/utils/road2.js

@@ -738,6 +738,7 @@ export class RoadNetwork2 {
                 if (((_arr_ = arr[arr.length - 1]) == null ? void 0 : _arr_.floor) === floor) {
                     const pathData = arr[arr.length - 1];
                     pathData.points.push(point.cds);
+                    pathData.pointInfos.push(point);
                     //  type: normal | graph | escalator(扶梯) | straightLadder(直梯) | staircase(楼梯) | facility(设备) | connectionPoint(路网连接点)
                     pathData.endType = endType;
                     pathData.destId = point.nodeId;
@@ -748,6 +749,9 @@ export class RoadNetwork2 {
                         points: [
                             point.cds
                         ],
+                        pointInfos: [
+                            point
+                        ],
                         endType: endType,
                         destId: point.nodeId,
                         distance: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aibee/crc-bmap",
-  "version": "0.8.40",
+  "version": "0.8.41",
   "description": "",
   "main": "lib/bmap.min.js",
   "module": "lib/bmap.esm.js",