vis-core 0.21.55 → 0.21.57

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.21.55";
+declare const _default: "0.21.57";
 export default _default;

package/dist/vis/base/index.d.ts

@@ -72,9 +72,9 @@ export default class Base extends Event {
     setOptions(options: Record<string, any>): void;
     get fromJSON(): (jsonOrUrl: Record<string, any> | string, extendVisOptions?: (json: any) => any) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
-        (uuid: `arc${string}`): import("../all/objects/Arc").default;
-        (uuid: `sprite${string}`): import("../all/objects/Sprite").default;
-        (uuid: string): BaseObject;
+        (uuid: `arc${string}`, flag?: boolean): import("../all/objects/Arc").default;
+        (uuid: `sprite${string}`, flag?: boolean): import("../all/objects/Sprite").default;
+        (uuid: string, flag?: boolean): BaseObject;
     };
     get objectByUuid(): (uuid: string) => THREE.Mesh<THREE.BufferGeometry<THREE.NormalBufferAttributes>, THREE.Material | THREE.Material[], THREE.Object3DEventMap> | undefined;
     get getDataURL(): () => string;

package/dist/vis/city/index.d.ts

@@ -84,6 +84,8 @@ export default class extends Base {
     loaderAdd(): void;
     loaderAddJson(jsonName: string): void;
     initMaterial(): Promise<void>;
+    disableSSAO(): void;
+    enabledSSAO(): void;
     init(): Promise<void>;
     getInvert(vector3: THREE.Vector3): any;
     fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;

package/dist/vis/map/index.d.ts

@@ -2,7 +2,7 @@ import { BaseObject } from 'gl-draw';
 import Base, { BaseOptions } from "../base";
 import { getProjection } from 'gl-draw/dist/utils';
 import type { FeatureCollection, Polygon, MultiPolygon } from 'geojson';
-import { MeshLineMaterial, Group } from 'gl-draw/dist/objects';
+import { MeshLineMaterial, Group, ExtrudePolygon, Line } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
 import PlaneMap from "./objects/PlaneMap";
 import ContinentsBg from "./objects/ContinentsBg";
@@ -75,9 +75,9 @@ export default class extends Base {
         Lathe: typeof import("../all/objects/Lathe").default;
         Octahedron: typeof import("../all/objects/Octahedron").default;
         Node: typeof import("gl-draw/dist/objects").Node;
-        Line: typeof import("gl-draw/dist/objects").Line;
+        Line: typeof Line;
         Line2: typeof import("gl-draw/dist/objects").Line2;
-        ExtrudePolygon: typeof import("gl-draw/dist/objects").ExtrudePolygon;
+        ExtrudePolygon: typeof ExtrudePolygon;
         ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
         Group: typeof Group;
         Light: typeof import("../all/objects/Light").default;
@@ -108,8 +108,8 @@ export default class extends Base {
     };
     get map(): PlaneMap | undefined;
     get mapInfo(): any;
-    get mapArea(): import("gl-draw/dist/objects").ExtrudePolygon[] | undefined;
-    get mapLine(): import("gl-draw/dist/objects").Line[] | undefined;
+    get mapArea(): ExtrudePolygon[] | undefined;
+    get mapLine(): Line[] | undefined;
     get adcodes(): any[];
     activePlaneMap: PlaneMap | null;
     isAnimating: boolean;
@@ -135,6 +135,7 @@ export default class extends Base {
     setLineColorByProperty(key: string, value: any, color: string): void;
     setLineWidthByProperty(key: string, value: any, width: number | 'origin'): void;
     addAreaPlaneByProperty(key: string, value: any, options?: {
+        uid?: string;
         material?: THREE.Material;
         lineMaterial?: MeshLineMaterial;
         topSegments?: number;

package/dist/vis/map/objects/PlaneMap.d.ts

@@ -38,6 +38,7 @@ export default class PlaneMap extends BaseObject {
     groupArr: Group[];
     areaArr: ExtrudePolygon[];
     lineArr: Line[];
+    mergeSideArea: ExtrudePolygon | null;
     extrudelineArr?: Line[];
     constructor(options: Options);
     create(): Promise<void>;
@@ -52,6 +53,7 @@ export default class PlaneMap extends BaseObject {
         hasSide?: boolean;
         hasTop?: boolean;
         onTop?: number;
+        castShadow?: boolean;
     }): Promise<ExtrudePolygon[]>;
     getPropertiesKey(properties: Record<string, any>): string;
     addPlane(geojson: Feature<Polygon | MultiPolygon, GeoJsonProperties>, options: {
@@ -71,12 +73,12 @@ export default class PlaneMap extends BaseObject {
     pickArea(e: MouseEvent): import("gl-draw/dist/core/BaseObject").IBaseObject | undefined;
     update(delta: number, elapsed: number): void;
     findGroup(adcode: string | number): Group | undefined;
-    setAreaMaterial(material: THREE.Material[] | THREE.Material): void;
-    resetAreaMaterial(): void;
-    setLineMaterial(material: THREE.Material): void;
-    resetLineMaterial(): void;
-    setExtrudeLineMaterial(material: THREE.Material): void;
-    resetExtrudeLineMaterial(): void;
+    setAreaMaterial(key: string, material: THREE.Material[] | THREE.Material): void;
+    useAreaMaterial(key: string): void;
+    setLineMaterial(key: string, material: THREE.Material): void;
+    useLineMaterial(key: string): void;
+    setExtrudeLineMaterial(key: string, material: THREE.Material): void;
+    useExtrudeLineMaterial(key: string): void;
     changeLineAnimateParams({ speed, extrude, }: {
         speed?: number;
         extrude?: boolean;

package/dist/vis/map2/map.d.ts

@@ -53,6 +53,10 @@ export default class extends Map {
         label: boolean;
         labelLite: boolean;
         shadowMap: boolean;
+        '\u6D4B\u8BD5\u677F\u5757\u989C\u8272.color:::caId': string;
+        '\u6D4B\u8BD5\u8FB9\u6846\u989C\u8272.color:::caId': string;
+        '\u6D4B\u8BD5\u8FB9\u6846\u5BBD\u5EA6:::caId': number;
+        '\u6D4B\u8BD5\u6DFB\u52A0\u9762.btn:::caId': number;
     };
     loaderAddBg(): void;
     initMaterialBg(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.21.55",
+  "version": "0.21.57",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",
@@ -67,7 +67,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.1.29",
-    "gl-draw": "0.11.38",
+    "gl-draw": "0.11.40",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },

package/dist/vis/map2/utils/index.d.ts

@@ -1,2 +0,0 @@
-export declare const fileLoader: (url: string) => Promise<any>;
-export declare const animation: (source: any, target: any, duration?: number, onUpdate?: (...args: any[]) => void, onComplete?: () => void, ease?: (amount: number) => number) => Promise<void>;