@aibee/crc-bmap 0.6.4 → 0.6.6

package/lib/src/bmap.d.ts

@@ -107,14 +107,14 @@ export declare class BMap extends EventDispatcher<BmapEventMap> {
      * @param duration
      * @returns
      */
-    reduceMap(zoom?: number, duration?: number): void | Promise<unknown>;
+    reduceMap(zoom?: number, duration?: number): Promise<unknown>;
     /**
      * 放大地图
      * @param zoom
      * @param duration
      * @returns
      */
-    enlargeMap(zoom?: number, duration?: number): void | Promise<unknown>;
+    enlargeMap(zoom?: number, duration?: number): Promise<unknown>;
     onKeydown: (e: KeyboardEvent) => void;
     onKeyUp: (e: KeyboardEvent) => void;
     registryEvent(): void;

package/lib/src/context/context.d.ts

@@ -126,7 +126,7 @@ export declare class Context extends EventDispatcher<ContextEventMap> {
      * @param center
      * @returns
      */
-    setZoom(zoom: number, center: Vector3, duration?: number): void | Promise<unknown>;
+    setZoom(zoom: number, center: Vector3, duration?: number): Promise<unknown>;
     getFitCameraToObjectZoom(object: Object3D, padding?: [number, number, number, number], duration?: number, force2DView?: boolean): {
         zoom: number;
         center: Vector3;
@@ -138,9 +138,9 @@ export declare class Context extends EventDispatcher<ContextEventMap> {
      * @param duration
      * @returns
      */
-    fitCameraToObject(object: Object3D, padding?: [number, number, number, number], duration?: number, force2DView?: boolean): void | Promise<unknown>;
+    fitCameraToObject(object: Object3D, padding?: [number, number, number, number], duration?: number, force2DView?: boolean): Promise<unknown>;
     getFitCameraToGroundZoom(padding?: [number, number, number, number], duration?: number, force2DView?: boolean): number | undefined;
-    fitCameraToGround(padding?: [number, number, number, number], duration?: number, force2DView?: boolean): void | Promise<unknown>;
+    fitCameraToGround(padding?: [number, number, number, number], duration?: number, force2DView?: boolean): Promise<unknown>;
     /**
      * 修改相机位置
      * @param position 修改后的相机的位置

package/lib/src/context/control.d.ts

@@ -41,7 +41,7 @@ export declare class Control extends MapControls {
      * @param center
      * @returns
      */
-    setZoomByDuration(zoom: number, center: Vector3, force?: boolean, duration?: number): void | Promise<unknown>;
+    setZoomByDuration(zoom: number, center: Vector3, force?: boolean, duration?: number): Promise<unknown>;
     setTargetByOffset(offsetY: number, target?: Vector3): void;
     clearTween(): void;
     dispose(): void;

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

@@ -5,6 +5,7 @@ import { PathData2, TweenUtil, PathData } from "../../utils";
 import { Floor, Poi2, PoiOptions2 } from "../../elements";
 import { Tween } from "@tweenjs/tween.js";
 import { NavigationProcessInfo, PositionNavigation, PositionNavigationConfig } from "./position-navigation";
+import TaskQueue from "src/utils/taskQueue";
 export type Point = [number, number];
 export { NavigationProcessInfo };
 interface EventMap {
@@ -50,7 +51,7 @@ export declare class Navigation extends Plugin<EventMap> {
     movedDistance: number;
     pathStart: [number, number];
     tweenUtil: TweenUtil;
-    toPositionPromise?: Promise<any> | null;
+    taskQueue: TaskQueue;
     animationPathOptions: {
         cPathIndex: number;
     };
@@ -63,6 +64,7 @@ export declare class Navigation extends Plugin<EventMap> {
     onNavigationInfo: ({ info }: {
         info: NavigationProcessInfo;
     }) => void;
+    toPositionByTask(pos: [number, number]): void;
     pauseAnimation(): void;
     continueAnimation(): void;
     clearTween(): void;
@@ -83,7 +85,7 @@ export declare class Navigation extends Plugin<EventMap> {
     getPathDirection(): number | null;
     changeCameraToPathUp(duration?: number): Promise<unknown>;
     initNavigationCamera(duration?: number): Promise<void>;
-    translateCameraToStartPoi(duration?: number): Promise<unknown>;
+    translateCameraToStartPoi(duration?: number): Promise<void>;
     initCameraZoom(duration?: number): Promise<unknown>;
     toPosition(floor: string, pos: [number, number]): void;
     startSimulation(): void;

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

@@ -0,0 +1,83 @@
+import { EventDispatcher } from "three";
+export interface Task {
+    run: () => any;
+    meta: Record<string, any>;
+    tid: number;
+}
+interface TaskEventMap {
+    "active-task-end": {
+        task: Task;
+    };
+    "active-task-start": {
+        task: Task;
+    };
+}
+/**
+ * 按照队列执行任务
+ */
+export default class TaskQueue extends EventDispatcher<TaskEventMap> {
+    _task: Task[];
+    started: boolean;
+    activeTask: Task | null;
+    _id: number;
+    constructor(start?: boolean);
+    /**
+     * 判断任务是否有效
+     * @param task
+     * @return {boolean}
+     * @private
+     */
+    _isEffectiveTask(task: MakeOptional<Task, "meta" | "tid">): task is Task;
+    /**
+     * 根据tid获取元素的位置
+     * @param tid
+     * @return {number}
+     * @private
+     */
+    _getIndexByTid(tid: number): number;
+    /**
+     * 创建任务
+     * @param task
+     * @private
+     */
+    _createTask(task: Task): Task | false;
+    get task(): Task[];
+    /**
+     * 获取当前队列中的任务
+     */
+    getTasks(): Task[];
+    /**
+     * 添加任务
+     * @param task
+     * @return
+     */
+    add(task: MakeOptional<Task, "meta" | "tid">): number | false;
+    /**
+     * 替换队列中的某个任务
+     * @param id
+     * @param task
+     */
+    replace(id: number, task: MakeOptional<Task, "meta" | "tid">): number | false;
+    /**
+     * 根据id删除对应的task
+     * @param id
+     */
+    remove(id: number): boolean;
+    /**
+     * 清空队列
+     */
+    clear(): void;
+    /**
+     * 开始执行任务，默认在构造函数中执行
+     */
+    start(): void;
+    /**
+     * 停止执行队列中的任务，不包括当前执行中的任务
+     */
+    stop(): void;
+    /**
+     * 从任务队列中的第一个任务开始执行
+     */
+    exec(): Promise<false>;
+}
+export {};

package/package.json

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