aircitytype 1.0.24 → 1.0.27

package/index.d.ts

@@ -12,6 +12,7 @@ interface Misc {
     getBPFunction(path: string): Promise<{ data: { params: { functionName: string, functionParams: any[] }[] }[] }>;
     apiVersion: string;
     apiVersionServer: string;
+    getMaterial(path: string): void;
 }
 
 interface InfoTree {
@@ -22,7 +23,7 @@ interface InfoTree {
         color: string | [number, number, number, number],
         fn?: () => void
     ): void;
-    get(fn: (e: { infotree: InfoTreeItem[] }) => void): Promise<{ infotree: InfoTreeItem[] }>;
+    get(fn?: (e: { infotree: InfoTreeItem[] }) => void): Promise<{ infotree: InfoTreeItem[] }>;
     hide(ids: string[] | string, fn?: () => void): void;
     hideByGroupId(groupId: string, fn?: () => void): void;
     highlightByGroupId(groupId: string, fn: () => void): void;
@@ -116,15 +117,14 @@ interface Weather {
 }
 
 interface TileLayer {
-    [x: string]: any;
     add(data: TileLayerType | TileLayerType[], fn?: () => void): void;
-    // addModifier(id, tileLayerId, coordinates, ententBufferSize, fn)
-    // clearModifier(ids, fn)
+    addModifier(id: string, tileLayerId: string, coordinates: number[][], ententBufferSize: number, fn?: any): void;
+    clearModifier(ids: string | string[], fn?: any): void;
     delete(ids: string | string[], fn?: () => void): void;
-    // deleteModifier(id, tileLayerId, fn)
-    // disableClip(ids, fn)
+    deleteModifier(id: string, tileLayerId: string, fn?: any): void;
+    disableClip(ids: string | string[], fn?: any): void;
     disableXRay(ids: string | string[], fn?: () => void): void;
-    // enableClip(ids, fn)
+    enableClip(ids: string | string[], fn?: any): void;
     enableXRay(
         ids: string | string[],
         color?: [number, number, number, number],
@@ -136,9 +136,8 @@ interface TileLayer {
         flyTime?: number,
         fn?: () => void
     ): void;
-    stopHighlightActors(): void;
-    // focusActor(id, objectId, fn)
-    // focusActors(data, fn)
+    focusActor(id: string, objectId: string, fn?: any): void;
+    focusActors(data: { id: string; objectIds: string[] } | { id: string; objectIds: string[] }[], fn?: any): void;
     get(ids: string[] | string, fn?: () => void): Promise<{
         data: {
             bFlattenSupported: number;
@@ -158,16 +157,16 @@ interface TileLayer {
             visible: 1;
         }[]
     }>;
-    // getActorInfo(data, fn)
-    // getObjectIDs(ids, fn)
+    getActorInfo(data: { id: string; objectIds: string[] }, fn?: any): Promise<{ data: any }>;
+    getObjectIDs(ids: string | string[], fn?: () => void): Promise<{ data: { objectIds: string[] }[] }>;
     hide(p: string | string[], fn?: any): void;
-    // hideActor(id, objectId, fn)
-    // hideActors(data, fn)
-    // hideAllActors(tileLayerId)
+    hideActor(id: string, objectId: string, fn?: any): void;
+    hideActors(data: { id: string; objectIds: string[] } | { id: string; objectIds: string[] }[], fn?: any): void;
+    hideAllActors(tileLayerId: string): void;
     highlightActor(id: string, objectId: string, fn?: () => void): void;
-    // highlightActors(data, fn)
-    // setCollision(ids, enabled, fn)
-    // setFileName(id, newVal, fn)
+    highlightActors(data: { id: string; objectIds: string[] } | { id: string; objectIds: string[] }[], fn?: any): void;
+    setCollision(tileLayerIds: string | string[], enabled?: boolean, mouseInteract?: boolean, mouseFunction?: boolean, characterCollision?: boolean, fn?: any): void;
+    setFileName(id: string, newVal: string, fn?: () => void): void;
     setLocation(
         id: string | string[],
         newVal: [number, number, number],
@@ -178,7 +177,7 @@ interface TileLayer {
         newVal: [number, number, number],
         fn?: () => void
     ): void;
-    // setScale(id, newVal, fn)
+    setScale(id: string, newVal: [number, number, number], fn?: any): void;
     setStyle(
         ids: string[] | string,
         style: number,
@@ -191,14 +190,31 @@ interface TileLayer {
     ): void;
     // setViewportVisible(id, vp, fn)
     show(p: string | string[], fn?: any): void;
-    // showActor(id, objectId, fn)
-    // showActors(data, fn)
-    // showAllActors(tileLayerId)
-    stopHighlightActors(id: string, objectId: string, fn?: () => void): void;
-    stopHighlightActors(): void; // update(data, fn)
-    // updateBegin()
-    // updateEnd(fn)
-    // updateModifier(id, tileLayerId, coordinates, ententBufferSize, fn)
+    showActor(id: string, objectId: string, fn?: any): void;
+    showActors(data: { id: string; objectIds: string[] } | { id: string; objectIds: string[] }[], fn?: any): void;
+    showAllActors(tileLayerId: string | string[]): void;
+    stopHighlightAllActors(): void;
+    stopHighlightActors(data: { id: string; objectIds: string[] } | { id: string; objectIds: string[] }[], fn?: () => void): void;
+    stopHighlightActor(id: string, objectId: string): void;
+    updateBegin(): void;
+    updateEnd(): void;
+
+    // Name	Type	Description
+    // id	string	
+    // 唯一标识符
+
+    // tileLayerId	string	
+    // TileLayer对象的ID
+
+    // coordinates	array	
+    // 压平多边形的坐标
+
+    // ententBufferSize	number	
+    // 羽化范围，取值范围：[任意正浮点数]，单位：米
+
+    // fn	function	
+    // 可选的回调函数，请参考二次开发：异步接口调用方式
+    updateModifier(id: string, tileLayerId: string, coordinates: number[][], ententBufferSize: number, fn?: any): void;
 }
 
 interface Tools {
@@ -310,9 +326,19 @@ declare enum MapMode {
     BigMap = 2,
 }
 
+type EventType =
+    | "LeftMouseButtonClick"
+    | "MouseHovered" //鼠标悬停时触发此事件
+    | "MouseMoved" //鼠标悬停时触发此事件
+    | "Measurement" //进入测量模式后，测量完成时触发此事件并返回测量结果
+    | "CameraChanged" //对象执行focus()或相机执行set()/lookAt()/lookAtBBox()方法时触发
+    | "CameraTourFinished" //播放导览结束触发此事件
+    | "EditHelperFinished"
+    | "MarkerCallBack"
+
 interface AircityEvent {
     Id: string;
-    eventtype: string;
+    eventtype: EventType;
     Type: string;
     Text: string;
     BoundsMax: [number, number, number];
@@ -480,6 +506,17 @@ interface CustomObjectBPParam {
     parameters: { [key: string]: string | number | any[] }[],
 }
 
+type CustomTileLayer = {
+    id: string; //CustomObject对象的ID
+    tileLayerId: string; //TileLayer图层的ID
+    objectId: string | string[]; //TileLayer图层中包含的待复制的模型(Actor)的ObjectId，同时也支持数组类型参数即把多个actor复制为一个customObject
+    location: number[]; //位置坐标：[X, Y, Z]，取值示例，数组元素类型：(number)，取值范围：[任意数值]
+    coordinateType: number; //坐标系类型，取值：0为Projection类型，1为WGS84类型，默认值：0
+    rotation: number[]; // 旋转：[Pitch, Yaw, Roll]，数组元素类型：(number)，取值范围：[任意数值]
+    scale: number[]; // 缩放：[X, Y, Z]，数组元素类型：(number)，取值范围：[任意正整数]
+    smoothMotion: number; // 1: 平滑插值，0: 跳跃
+}
+
 interface CustomObject {
     delete: any;
     focus(id: string, t?: number): void;
@@ -511,6 +548,8 @@ interface CustomObject {
     show(ids: string[] | string, fn?: () => void): void;
     hide(ids: string[] | string, fn?: () => void): void;
     restoreMaterial(ids: string | string[]): void;
+    addByTileLayer(data: CustomTileLayer | CustomTileLayer[]): void;
+
     /**
      * 
      * data	object | array	
@@ -536,9 +575,9 @@ type marker3dType = {
     groupId?: string;
     text?: string; //3D标注显示文字
     textSize?: number; //3D标注显示文字大小
-    textColor?: [number, number, number, number]; //3D标注显示文字颜色
+    textColor?: [number, number, number, number] | string; //3D标注显示文字颜色
     textOutlineSize?: number; //3D标注显示文字轮廓大小
-    textOutlineColor?: [number, number, number, number]; // 3D标注显示文字轮廓颜色
+    textOutlineColor?: [number, number, number, number] | string; // 3D标注显示文字轮廓颜色
     textFixed?: boolean; // 3D标注显示文字是否固定文本朝向
     textVisible?: boolean; //3D标注显示文字是否显示文本
     textLocation?: number[]; // 文字位置
@@ -548,6 +587,9 @@ type marker3dType = {
     pointVisible?: boolean; //3D标注是否显示
     pointScale?: number; //3D标注整体缩放比例
     coordinate?: [number, number, number] | number[]; //3D标注的位置坐标
+    coordinateType?: number
+    range?: [number, number]
+    autoHeight?: boolean
     userData?: string;
 };
 type markType = {
@@ -578,6 +620,7 @@ type markType = {
     textBackgroundColor?: [number, number, number, number];
     popupBackgroundColor?: number[];
     hoverImagePath?: string;
+    clusterByImage?: boolean;
     displayMode?: number;
     priority?: number;
     occlusionCull?: boolean;
@@ -634,6 +677,7 @@ interface Marker {
     focus(id: string, o1?: number, o2?: number): any;
     show(ids: string[] | string, fn?: () => void): void;
     hide(ids: string[] | string, fn?: () => void): void;
+    hideAllPopupWindow(): void;
     setCoordinate(
         id: string,
         newVal: [number, number, number],
@@ -653,6 +697,11 @@ interface Marker3D {
     hide(ids: string[] | string, fn?: () => void): void;
     delete(ids: string[] | string): void;
     deleteByGroupId(id: string): void;
+    hideByGroupId(id: string): void;
+}
+
+interface Vehicle {
+    delete(id: string): void;
 }
 
 interface EditHelper {
@@ -708,8 +757,11 @@ declare class AirCityAPI {
     polygon3d: Polygon3D;
     polyline: Polyline;
     marker: Marker;
+    vehicle: Vehicle;
     marker3d: Marker3D;
     editHelper: EditHelper;
+    reset(p?: number): void;
+    destroy(): void;
 }
 
 declare interface AirInstance {
@@ -805,3 +857,5 @@ declare var imgURL: string;
 declare var Disk: string;
 declare var objectIds: string[];
 declare var wrap: (id: string, id1: string, url: string) => void;
+
+

package/package.json

@@ -1,12 +1,40 @@
 {
-  "name": "aircitytype",
-  "version": "1.0.24",
+  "_args": [
+    [
+      "aircitytype@1.0.26",
+      "E:\\projects\\srdnqd6.0"
+    ]
+  ],
+  "_from": "aircitytype@1.0.26",
+  "_id": "aircitytype@1.0.26",
+  "_inBundle": false,
+  "_integrity": "sha512-xSu2UsPN/cn0MlbdsI0X6VdKLBvnHS9T5bzMun58c/CpB4iviuJzP7gCxB7VGMesc71UBcst/SiB1InPEEP2PQ==",
+  "_location": "/aircitytype",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "aircitytype@1.0.26",
+    "name": "aircitytype",
+    "escapedName": "aircitytype",
+    "rawSpec": "1.0.26",
+    "saveSpec": null,
+    "fetchSpec": "1.0.26"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/aircitytype/-/aircitytype-1.0.26.tgz",
+  "_spec": "1.0.26",
+  "_where": "E:\\projects\\srdnqd6.0",
+  "author": "",
   "description": "",
+  "keywords": [],
+  "license": "ISC",
   "main": "index.js",
+  "name": "aircitytype",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC"
-}
+  "version": "1.0.27"
+}