soonspacejs 2.11.3 → 2.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.11.3",
+  "version": "2.11.5",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -29,5 +29,5 @@
   "peerDependencies": {
     "three": ">=0.155.0"
   },
-  "gitHead": "269e1de41a081d624d2017b01302887de8b785a6"
+  "gitHead": "7e6126ef38c60b44f5232a7c803bbbbf2c050c29"
 }

package/types/Interface/viewport.d.ts

@@ -64,8 +64,7 @@ interface EmissiveSelectOptions extends Omit<BaseSelectOptions, 'opacity'> {
 }
 interface FogOptions {
     color?: IColor;
-    near?: number;
-    far?: number;
+    density?: number;
 }
 interface SkyOptions {
     enabled?: boolean;
@@ -99,7 +98,6 @@ interface ViewportOptions {
     closeInfoLog?: boolean;
     closeWarnLog?: boolean;
     useIndexedDB?: boolean;
-    logarithmicDepthBuffer?: boolean;
 }
 interface ViewportState {
     useFreq: number;

package/types/Manager/Canvas3DManage.d.ts

@@ -1,3 +1,4 @@
+import { Object3D } from 'three';
 import Viewport from '../Viewport';
 import { Group, GroupInfo, Canvas3D, Canvas3DInfo } from '../Library';
 import DefaultManage from './DefaultManage';
@@ -6,7 +7,7 @@ declare class Canvas3DManage extends DefaultManage {
     readonly viewport: Viewport;
     readonly cache: ManageCache;
     constructor(viewport: Viewport, cache: ManageCache);
-    create(info: Canvas3DInfo): Canvas3D;
+    create(info: Canvas3DInfo, parent?: Object3D | null): Canvas3D;
     createToGroup(groupInfo: GroupInfo, poiInfo: Canvas3DInfo[]): Group;
     addForGroup(group: Group | null, poiInfo: Canvas3DInfo[]): Group | null;
 }

package/types/Manager/ModelManage.d.ts

@@ -1,9 +1,9 @@
-import { Scene, LoadingManager, Object3D } from 'three';
+import { LoadingManager, Object3D } from 'three';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import localforage from 'localforage';
 import { FBXLoader } from '../Loader/FBXLoader.js';
 import Viewport from '../Viewport';
-import { BaseObject3D, Group, GroupInfo, Model, ModelInfo } from '../Library';
+import { Group, GroupInfo, Model, ModelInfo } from '../Library';
 import { CloneModelInfo, ManageCache } from '../Interface';
 import DefaultManage from './DefaultManage';
 declare class ModelManage extends DefaultManage {
@@ -36,7 +36,7 @@ declare class ModelManage extends DefaultManage {
      * @param modelInfo
      * @returns
      */
-    load(modelInfo: ModelInfo, parent?: BaseObject3D | Scene | null): Promise<Model | null>;
+    load(modelInfo: ModelInfo, parent?: Object3D | null): Promise<Model | null>;
     /**
      * 模型解析
      * @param format
@@ -45,7 +45,7 @@ declare class ModelManage extends DefaultManage {
      * @returns
      */
     parse(modelInfo: ModelInfo): Promise<Model | null>;
-    clone(model: Model, info: CloneModelInfo, parent?: Object3D | Scene | null): Promise<Model>;
+    clone(model: Model, info: CloneModelInfo, parent?: Object3D | null): Promise<Model>;
     loadToGroup(groupInfo: GroupInfo, modelInfo: ModelInfo[]): Promise<Group>;
     addForGroup(group: Group | null, modelInfo: ModelInfo[]): Promise<Group | null>;
     /**

package/types/Manager/TopologyManage.d.ts

@@ -3,10 +3,12 @@ import { Group, GroupInfo, Topology, Node, TopologyInfo } from '../Library';
 import { TopologyInfoForGml, ShortestPathInfo, ShortestPathByMultipleStartPoints, ShortestPathByMultipleEndPoints, TopologyNodeInfo, TopologyInnerNodeInfo, Position, TopologyPassableInfo, ManageCache } from '../Interface';
 import Viewport from '../Viewport';
 import { Dijkstras } from '../Math/dijkstra';
+import { DijkstraWorker } from '../Math/dijkstra/DijkstraWorker';
 declare class TopologyManage extends DefaultManage {
     readonly viewport: Viewport;
     readonly cache: ManageCache;
     dijkstra: Dijkstras;
+    dijkstraWorker: DijkstraWorker;
     constructor(viewport: Viewport, cache: ManageCache);
     createFromGml(topologyInfoForGml: TopologyInfoForGml): Promise<Topology>;
     create(topologyInfo: TopologyInfo): Topology;
@@ -24,6 +26,10 @@ declare class TopologyManage extends DefaultManage {
      * @returns
      */
     protected _getPath(topology: Topology, info: Pick<ShortestPathInfo, 'start' | 'end'>): Node[] | null;
+    /**
+     * @todo getPath 重复代码优化
+     */
+    protected _getPathAsync(topology: Topology, info: Pick<ShortestPathInfo, 'start' | 'end'>): Promise<Node[] | null>;
     protected _generateNodesInfo(nodes: Node[]): TopologyInnerNodeInfo[];
     /**
      * 根据两点获取最短路径
@@ -32,6 +38,10 @@ declare class TopologyManage extends DefaultManage {
      * @returns
      */
     getShortestPath(topology: Topology, info: ShortestPathInfo): Topology | null;
+    /**
+     * @todo getShortestPathAsync 重复代码优化
+     */
+    getShortestPathAsync(topology: Topology, info: ShortestPathInfo): Promise<Topology | null>;
     /**
      * 多起点或多终点最短路径
      * @param topology
@@ -42,9 +52,16 @@ declare class TopologyManage extends DefaultManage {
      * @returns
      */
     protected _getShortestPathByMultiplePoints(topology: Topology, info: ShortestPathByMultipleStartPoints | ShortestPathByMultipleEndPoints, points: Position[], point: Position, pointsType: 'start' | 'end'): Topology | null;
+    /**
+     * @todo getShortestPathByMultiplePointsAsync 重复代码优化
+     */
+    protected _getShortestPathByMultiplePointsAsync(topology: Topology, info: ShortestPathByMultipleStartPoints | ShortestPathByMultipleEndPoints, points: Position[], point: Position, pointsType: 'start' | 'end'): Promise<Topology | null>;
     getShortestPathByMultipleStartPoints(topology: Topology, info: ShortestPathByMultipleStartPoints): Topology | null;
     getShortestPathByMultipleEndPoints(topology: Topology, info: ShortestPathByMultipleEndPoints): Topology | null;
+    getShortestPathByMultipleStartPointsAsync(topology: Topology, info: ShortestPathByMultipleStartPoints): Promise<Topology | null>;
+    getShortestPathByMultipleEndPointsAsync(topology: Topology, info: ShortestPathByMultipleEndPoints): Promise<Topology | null>;
     private setDijkstraGraph;
     private generateLineTopologyInfoNodeGraphs;
+    dispose(): void;
 }
 export default TopologyManage;

package/types/Math/dijkstra/DijkstraWorker.d.ts

@@ -0,0 +1,13 @@
+import { WorkerPool } from 'three/examples/jsm/utils/WorkerPool.js';
+import { BaseId, Dijkstras, InputGraph } from './index';
+declare class DijkstraWorker {
+    readonly dijkstra: Dijkstras;
+    workerPool: WorkerPool;
+    workerSourceURL: string | null;
+    _mainThreadGraph: InputGraph;
+    _needsUpdateGraph: boolean;
+    constructor(dijkstra: Dijkstras);
+    getPath(source: BaseId, target: BaseId): Promise<BaseId[]>;
+    dispose(): void;
+}
+export { DijkstraWorker, };

package/types/Math/dijkstra/dijkstra.worker.d.ts

@@ -0,0 +1,2 @@
+declare function dijkstraWorker(): void;
+export { dijkstraWorker, };

package/types/Math/dijkstra/index.d.ts

@@ -4,7 +4,7 @@ import { MinHeap } from '../../Shared';
 * Javascript implementation of Dijkstra's algorithm
 * Based on: http://en.wikipedia.org/wiki/Dijkstra's_algorithm
 * Author: James Jackson (www.jamesdavidjackson.com)
-* Source: http://github.com/nojacko/dijkstras-js/tree/
+* Source: https://github.com/nojacko/dijkstras-js
 *
 * Useage:
 *	const d = new Dijkstras();
@@ -19,7 +19,7 @@ import { MinHeap } from '../../Shared';
 *	const path = d.getPath('A', 'D');
 *
 */
-type BaseId = BaseObjectInfo['id'];
+export type BaseId = BaseObjectInfo['id'];
 type Graph = Map<BaseId, Map<BaseId, number>>;
 type InputGraph = [BaseId, [BaseId, number][]][];
 declare class Dijkstras {

package/types/Viewport/SoonGISManager/coords-to-matrix.d.ts

@@ -1,8 +1,8 @@
 import type { MercatorCoordinate } from 'maplibre-gl';
-export type Coordinates = {
+export type Coordinate = {
     longitude: number;
     latitude: number;
     altitude: number;
 };
 /** calculate Matrix4 from coordinates */
-export declare function coordsToMatrix({ longitude, latitude, altitude, }: Coordinates, fromLngLat: typeof MercatorCoordinate.fromLngLat): Promise<import("three").Matrix4Tuple>;
+export declare function coordsToMatrix({ longitude, latitude, altitude, }: Coordinate, fromLngLat: typeof MercatorCoordinate.fromLngLat): import("three").Matrix4Tuple;

package/types/Viewport/SoonGISManager/index.d.ts

@@ -1,22 +1,35 @@
-import { PerspectiveCamera } from 'three';
-import type { Map } from 'maplibre-gl';
+import { PerspectiveCamera, Vector3 } from 'three';
+import type { Map, MercatorCoordinate } from 'maplibre-gl';
 import type SoonGIS from 'soongis';
 import Viewport from '..';
-import { Coordinates } from './coords-to-matrix';
+import { IVector3 } from '../..';
+import { Coordinate } from './coords-to-matrix';
 declare class SoonGISManager {
     readonly viewport: Viewport;
     readonly soongis?: SoonGIS | undefined;
-    SOONSPACE_LAYER_ID: string;
-    map: Map | undefined;
-    camera: PerspectiveCamera;
-    coordinates: Coordinates;
-    _mapResize: () => void;
+    readonly SOONSPACE_LAYER_ID = "SOONSPACE_LAYER";
+    readonly map: Map | undefined;
+    readonly camera: PerspectiveCamera;
+    readonly _basisCoordinate: Coordinate;
+    readonly _basisMercatorCoordinate: MercatorCoordinate | undefined;
+    readonly _mapResize: () => void;
     constructor(viewport: Viewport, soongis?: SoonGIS | undefined);
+    /**
+     * 从笛卡尔转经纬度
+     * @param position
+     * @returns
+     */
+    fromPositionToCoordinate(position: IVector3): Coordinate | null;
+    /**
+     * 从经纬度转笛卡尔
+     * @param coordinates
+     * @returns
+     */
+    fromCoordinateToPosition(coordinates: Coordinate): Vector3 | null;
     /**
      * 设置经纬度、海拔
      * @param coordinates
      */
-    setCoordinates(coordinates: Coordinates): void;
     /**
      * 使用 map 的 render 代替 soonspace render
      */

package/types/index.d.ts

@@ -59,7 +59,7 @@ export declare class SoonSpace {
             Quartic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
-                InOut: (amount: number) => number; /******* Init methods */
+                InOut: (amount: number) => number;
             };
             Quintic: {
                 In: (amount: number) => number;
@@ -138,7 +138,7 @@ export declare class SoonSpace {
             Quartic: {
                 In: (amount: number) => number;
                 Out: (amount: number) => number;
-                InOut: (amount: number) => number; /******* Init methods */
+                InOut: (amount: number) => number;
             };
             Quintic: {
                 In: (amount: number) => number;
@@ -681,7 +681,7 @@ export declare class SoonSpace {
     /******* Group methods */
     /******/
     /******/
-    createGroup(groupInfo: GroupInfo): Group;
+    createGroup(groupInfo: GroupInfo, parent?: Object3D | null): Group;
     getGroupById(id: GroupInfo['id']): Group | null;
     getGroupByName(name: string): Group[];
     getAllGroup(): Group[];
@@ -734,7 +734,7 @@ export declare class SoonSpace {
      * @param modelInfo
      * @param parent
      */
-    loadModel(modelInfo: ModelInfo): Promise<Model | null>;
+    loadModel(modelInfo: ModelInfo, parent?: Object3D | null): Promise<Model | null>;
     /**
      * 克隆 Model 模型
      * @param model
@@ -1029,7 +1029,7 @@ export declare class SoonSpace {
      * 创建 Canvas3D
      * @param info
      */
-    createCanvas3D(info: Canvas3DInfo): Canvas3D;
+    createCanvas3D(info: Canvas3DInfo, parent?: Object3D | null): Canvas3D;
     /**
      * 根据 id 查询 Canvas3D
      * @param id
@@ -1113,18 +1113,39 @@ export declare class SoonSpace {
      * @param info
      */
     getShortestPath(topology: Topology, info: ShortestPathInfo): Topology | null;
+    /**
+     * 获取最短路径（worker）
+     * @param topology
+     * @param info
+     * @returns
+     */
+    getShortestPathAsync(topology: Topology, info: ShortestPathInfo): Promise<Topology | null>;
     /**
      * 通过多个起点获取最短路径
      * @param topology
      * @param info
      */
     getShortestPathByMultipleStartPoints(topology: Topology, info: ShortestPathByMultipleStartPoints): Topology | null;
+    /**
+     * 获取最短路径（worker）
+     * @param topology
+     * @param info
+     * @returns
+     */
+    getShortestPathByMultipleStartPointsAsync(topology: Topology, info: ShortestPathByMultipleStartPoints): Promise<Topology | null>;
     /**
      * 通过多个终点获取最短路径
      * @param topology
      * @param info
      */
     getShortestPathByMultipleEndPoints(topology: Topology, info: ShortestPathByMultipleEndPoints): Topology | null;
+    /**
+     * 通过多个终点获取最短路径（worker）
+     * @param topology
+     * @param info
+     * @returns
+     */
+    getShortestPathByMultipleEndPointsAsync(topology: Topology, info: ShortestPathByMultipleEndPoints): Promise<Topology | null>;
     /**
      * 创建 Topology，从 gml 文件资源
      * @param groupInfo