@aibee/crc-bmap 0.6.2 → 0.6.4

package/lib/bmap.esm.js

@@ -8399,7 +8399,6 @@ var PositionNavigation = class extends EventDispatcher10 {
   onAddPaths = ({ paths }) => {
     this.paths = paths;
     this.resetStatus(paths);
-    this.emitNavigationStatus();
   };
   onUpdate = () => {
     this.tweenUtil.update();
@@ -8442,12 +8441,16 @@ var PositionNavigation = class extends EventDispatcher10 {
       ...allPath.slice(routeIndex + 1)
     ];
     const { distance, closestPoint, index, i } = paths.reduce((obj, cur, index2) => {
+      console.log("cur", cur.floor, floor);
       if (cur.floor !== floor) {
         return obj;
       }
       const { distance: distance2, closestPoint: closestPoint2, index: i2 } = cur.points.reduce((obj2, cur2, index3, arr) => {
         if (!arr[index3 + 1]) {
-          return obj2;
+          return {
+            ...obj2,
+            distance: obj2.distance === Infinity ? getLength(cur2, _position) : obj2.distance
+          };
         }
         const { distance: distance3, closestPoint: closestPoint3 } = distancePointToSegment(_position, cur2, arr[index3 + 1]);
         if (distance3 < obj2.distance) {
@@ -8464,6 +8467,7 @@ var PositionNavigation = class extends EventDispatcher10 {
   }
   toPosition(floor, pos) {
     const adsorbData = this.adsorb(floor, pos);
+    console.log("adsorbData", adsorbData);
     if (!adsorbData) {
       return;
     }
@@ -8481,6 +8485,7 @@ var PositionNavigation = class extends EventDispatcher10 {
       this.reset = false;
       if (this.resetTimer) {
         this.timer.clearTimeout(this.resetTimer);
+        this.resetTimer = null;
       }
     }
     this.routeIndex = routeIndex;
@@ -8516,6 +8521,8 @@ var PositionNavigation = class extends EventDispatcher10 {
       }, 200);
       const tween = this.simulationTween = new Tween3({ distance: 0 }, this.tweenUtil.group).to({ distance }, time * 1e3).onUpdate(onUpdate).onComplete(() => {
         this.tweenUtil.remove(tween);
+        onUpdate.flush();
+        onUpdate.cancel();
         if (this.routeIndex + 1 < this.paths.length) {
           this.routeIndex++;
           this.position = this.paths[this.routeIndex].points[0];
@@ -8523,7 +8530,7 @@ var PositionNavigation = class extends EventDispatcher10 {
           resolve(this.startCurRouteSimulation());
         } else {
           resolve(true);
-          console.log(arr);
+          console.log(arr, this.routeIndex, this.paths);
         }
       }).start();
     });
@@ -8560,7 +8567,7 @@ var PositionNavigation = class extends EventDispatcher10 {
     const p2 = curRoutePathPoints[pointIndex + 1];
     const p3 = curRoutePathPoints[pointIndex + 2];
     if (!p1 || !p2) {
-      return null;
+      return { dir: "end" /* END */, distance: 0 };
     }
     const distance = getLength(position, p2);
     if (pointIndex === 0) {
@@ -8691,7 +8698,7 @@ var Navigation = class extends Plugin {
       if (!this.toPositionPromise) {
         this.toPositionPromise = this.toPositionBySpeed(info.pos, this.options.speed);
       } else {
-        this.toPositionPromise.then(() => {
+        this.toPositionPromise.finally(() => {
           return this.toPositionBySpeed(info.pos, this.options.speed);
         });
       }
@@ -8742,7 +8749,7 @@ var Navigation = class extends Plugin {
       this.currentPathPosition = path.points[0];
     }
     this.movedDistance = 0;
-    this.toPositionPromise = null;
+    this.clearTween();
   }
   setCurPathIndex(index) {
     this.curPathIndex = index;
@@ -8997,14 +9004,14 @@ var Navigation = class extends Plugin {
     if (this.pathTween) {
       this.clearTween();
     }
-    return new Promise((resolve) => {
+    return timeoutPromise(new Promise((resolve) => {
       const tween = this.pathTween = new Tween4({ distance: 0 }, this.tweenUtil.group).to({ distance }, time * 1e3).onUpdate(async (v) => {
         this.moveDistance(v.distance + curDistance, tween);
       }).onComplete(() => {
         this.tweenUtil.remove(tween);
         resolve(true);
       }).start();
-    });
+    }), time * 1e3 + 500);
   }
   async moveDistance(distance, tween) {
     this.movedDistance = distance;