vis-core 0.31.23 → 0.31.24

package/dist/index.d.ts

@@ -16,6 +16,7 @@ import { MeshLineMaterial } from 'gl-draw';
 import { MeshObject } from 'gl-draw';
 import { MultiPolygon } from 'geojson';
 import { NodeObject } from 'gl-draw';
+import { Pencil } from 'gl-draw';
 import { PickFunctionsItem } from 'gl-draw';
 import { PointLightObject } from 'gl-draw';
 import { Polygon } from 'geojson';
@@ -80,9 +81,9 @@ declare class Arc extends LineObject {
 
 declare class Area extends GroupObject {
     objectType: string;
-    options: Options_7;
+    options: Options_11;
     area: ExtrudePolygonObject[];
-    constructor(options: Options_7);
+    constructor(options: Options_11);
     create(): Promise<void>;
     rebuildFromScene(): void;
 }
@@ -250,7 +251,6 @@ declare interface BaseOptions {
     css2DContainer?: HTMLElement;
     controlsContainer?: HTMLElement;
     pencil?: any;
-    pencil2?: any;
     pencilConfig?: Record<string, any>;
     disableInitShow?: boolean;
     logarithmicDepthBuffer?: boolean;
@@ -267,8 +267,8 @@ declare class Box extends MeshObject {
 
 declare class Building extends GroupObject {
     objectType: string;
-    options: Options_5;
-    constructor(options: Options_5);
+    options: Options_9;
+    constructor(options: Options_9);
     create(): Promise<void>;
     rebuildFromScene(): void;
     worldPositionZ: {
@@ -307,25 +307,23 @@ declare class Circle extends MeshObject {
     create(): void;
 }
 
-export declare class City extends Base {
-    static VisName: string;
+declare class City {
     adcode: number;
     pcenter: [number, number];
     pscale: number;
-    projection: ReturnType<typeof getProjection>;
+    projection: ReturnType<typeof getProjection_2>;
     options: CityOptions;
     group: GroupObject;
     building: Building;
     road: Road;
+    pencil: Pencil;
+    lead: Pencil['lead'];
+    mList: Pencil['mList'];
+    constructor(pencil: Pencil);
     setOptions(options: CityOptions): void;
     multiplyScalar: number;
-    disableSSAO(): void;
-    enabledSSAO(): void;
-    initGroup(): Promise<void>;
-    beforeInit(): Promise<void>;
-    getInvert(vector3: THREE.Vector3): [number, number] | null | undefined;
-    fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;
-    initVis(): Promise<void>;
+    fixNearFar(n?: number, f?: number): void;
+    init(): Promise<void>;
     drawCityPlane(adcode: number, target?: BaseObject): Promise<void>;
     drawBuilding(options?: {
         jsonUrl?: string;
@@ -346,56 +344,13 @@ export declare class City extends Base {
         z?: number;
         grey?: boolean;
     }): Promise<Road | undefined>;
-    getWorldPosition(longitude: number, latitude: number): {
-        x: number;
-        y: number;
-    };
-    restoreScene(str: string, objectsMap?: {
-        Building: typeof Building;
-        Road: typeof Road;
-        Area: Area;
-        CityPlane: CityPlane;
-        Target: Target;
-        Point: Point;
-        Arc: Arc;
-        Model: Model;
-        Plane: Plane;
-        PlaneShadow: PlaneShadow;
-        Sphere: Sphere;
-        Sprite: Sprite;
-        Box: Box;
-        Circle: Circle;
-        Tube: Tube;
-        Ring: Ring;
-        AmbientLight: AmbientLight;
-        DirectionalLight: DirectionalLight;
-        PointLight: PointLight;
-        SpotLight: SpotLight;
-        HemisphereLight: HemisphereLight;
-        RectAreaLight: RectAreaLight;
-        Node: NodeObject;
-        ExtrudePolygon: ExtrudePolygonObject;
-        Line: LineObject;
-        Group: typeof GroupObject;
-    }): Promise<void>;
-    rebuildFromScene(): Promise<void>;
-}
-
-declare class city extends City {
-    multiplyScalar: number;
-    fixNearFar(n?: number, f?: number): void;
 }
 
-declare interface CityOptions extends BaseOptions {
+declare interface CityOptions {
     adcode: number;
     jsonName: string;
     cacheKey?: string;
     center?: [number, number];
-    fitTo?: boolean;
-    coordtransformFunc?: (lng: number, lat: number) => {
-        longitude: number;
-        latitude: number;
-    };
     plane?: boolean;
     grey?: boolean;
     showBuilding?: boolean;
@@ -405,13 +360,12 @@ declare interface CityOptions extends BaseOptions {
     showGrassland?: boolean;
     showRiver?: boolean;
     setWaterMaterial?: boolean;
-    ssao?: boolean;
 }
 
 declare class CityPlane extends MeshObject {
     objectType: string;
-    options: Options_8;
-    constructor(options: Options_8);
+    options: Options_13;
+    constructor(options: Options_13);
     plane: THREE.PlaneGeometry;
     water?: Water;
     create(): Promise<void>;
@@ -421,9 +375,9 @@ declare class CityPlane extends MeshObject {
 
 declare class ContinentsBg extends GroupObject {
     objectType: string;
-    options: Options_12;
+    options: Options_8;
     mapArr: PlaneMap[];
-    constructor(options: Options_12);
+    constructor(options: Options_8);
     create(): Promise<void>;
     getLocationPosition(location: [number, number], name?: string): [number, number, number] | undefined;
     render(): void;
@@ -511,8 +465,8 @@ export declare class Earth extends Base {
 
 declare class Earth_2 extends Sphere {
     objectType: string;
-    options: Required<Options_10>;
-    constructor(options: Options_10);
+    options: Required<Options_6>;
+    constructor(options: Options_6);
     create(): void;
     rebuildFromScene(): void;
 }
@@ -565,16 +519,6 @@ declare type GeoJSON_3 = FeatureCollection<Polygon | MultiPolygon>;
 
 declare type GeoJSON_4 = FeatureCollection<Polygon | MultiPolygon>;
 
-/**
- * 获取城市配置
- * @param adcode 区域代码
- */
-export declare const getCityConfig: (adcode: number) => {
-    center: number[];
-    adcode: number;
-    jsonName: string;
-};
-
 declare const getProjection: (options: {
     center: [number, number];
     scale: number;
@@ -597,14 +541,6 @@ declare class HemisphereLight extends HemisphereLightObject {
     render(): void;
 }
 
-/**
- * 加载模板纹理图片，直接返回图片用于设置到材质上
- */
-export declare const loadTemplateImages: (templateId: string, adcode: number, base?: string, customTemplateConfigs?: Record<string, TemplateConfig>) => Promise<{
-    map?: HTMLImageElement;
-    emissiveMap?: HTMLImageElement;
-}>;
-
 declare class Map_2 extends Base {
     static VisName: string;
     options: Required<MapCityOptions>;
@@ -663,11 +599,11 @@ declare class Map_2 extends Base {
     parentBg: PlaneMap[];
     continentsBg?: ContinentsBg;
     group: GroupObject;
-    projection: ReturnType<typeof getProjection_2>;
+    projection: ReturnType<typeof getProjection>;
     pcenter: [number, number];
     pscale: number;
     meters: number;
-    cityVis: city[];
+    cityVis: City[];
     cityGroup: GroupObject[];
     extendsOptions: Record<string, any>;
     setOptions(options: MapOptions): void;
@@ -679,7 +615,7 @@ declare class Map_2 extends Base {
     private clickHandleDrillDownMark;
     private clickOusideBackMark;
     afterInit(): Promise<void>;
-    initCityVis(adcode: number, grey?: boolean): Promise<city>;
+    initCityVis(adcode: number, grey?: boolean): Promise<City>;
     initCityOnMap(adcode: number): Promise<void>;
     initVisBg(): Promise<void>;
     initVis(): Promise<void>;
@@ -842,6 +778,12 @@ declare class Map_2 extends Base {
         Line: LineObject;
         Group: typeof GroupObject;
     }): Promise<void>;
+    private _removeLiveExtrudeLines;
+    private _initPlaneMapExtrudeLines;
+    private _syncExtrudeLineToLivePlaneMaps;
+    private _clearCityOnMapInScene;
+    private _syncCityOnMapFeaturesToLiveScene;
+    private _syncCityOnMapInnerLineToLivePlaneMaps;
     /**
      * Called from Viewport.setExtendsOptions immediately before toJSON().
      * Updates the live PlaneMap / ExtrudePolygon / Line objects' .options so
@@ -1112,9 +1054,9 @@ declare class Model extends GroupObject {
 
 declare class Mountain extends GroupObject {
     objectType: string;
-    options: Required<Omit<Options_13, 'bbox'>> & Pick<Options_13, 'bbox'>;
+    options: Required<Omit<Options_12, 'bbox'>> & Pick<Options_12, 'bbox'>;
     extrudePolygon: ExtrudePolygonObject;
-    constructor(options: Options_13);
+    constructor(options: Options_12);
     geojson2Meta(geojson: GeoJSON_4): {
         coords: Position[][];
         properties: GeoJsonProperties;
@@ -1125,30 +1067,36 @@ declare class Mountain extends GroupObject {
     rebuildFromScene(): void;
 }
 
-declare interface Opt {
-    scale?: number;
-}
-
 declare interface Options {
     sprite?: boolean;
 }
 
 declare interface Options_10 {
-    radius?: number;
-    rotationY?: number;
+    uuid?: string;
+    jsonUrl: string;
+    projection: {
+        center: [number, number];
+        scale: number;
+    };
+    cacheKey?: string;
+    meters?: number;
+    grey?: boolean;
 }
 
 declare interface Options_11 {
-    radius?: number;
+    uuid?: string;
+    jsonUrl: string;
+    projection: {
+        center: [number, number];
+        scale: number;
+    };
+    material: THREE.Material;
+    type: string;
+    cacheKey?: string;
+    oArr?: number[];
 }
 
 declare interface Options_12 {
-    scale: number;
-    depth: number;
-    assetsPrefix?: string;
-}
-
-declare interface Options_13 {
     geojson: GeoJSON_4;
     projection: {
         center: [number, number];
@@ -1160,6 +1108,14 @@ declare interface Options_13 {
     bbox?: number[];
 }
 
+declare interface Options_13 {
+    width: number;
+    height: number;
+    material?: THREE.Material;
+    color?: string;
+    map?: THREE.Texture | null;
+}
+
 declare interface Options_2 extends NonNullable<ConstructorParameters<typeof LineObject>[0]> {
     from: number[];
     to: number[];
@@ -1185,54 +1141,6 @@ declare interface Options_4 {
 }
 
 declare interface Options_5 {
-    uuid?: string;
-    jsonUrl: string;
-    projection: {
-        center: [number, number];
-        scale: number;
-    };
-    cacheKey?: string;
-    material?: THREE.Material | THREE.Material[];
-    meters?: number;
-    hasSide?: boolean;
-    sideGradient?: boolean;
-    grey?: boolean;
-}
-
-declare interface Options_6 {
-    uuid?: string;
-    jsonUrl: string;
-    projection: {
-        center: [number, number];
-        scale: number;
-    };
-    cacheKey?: string;
-    meters?: number;
-    grey?: boolean;
-}
-
-declare interface Options_7 {
-    uuid?: string;
-    jsonUrl: string;
-    projection: {
-        center: [number, number];
-        scale: number;
-    };
-    material: THREE.Material;
-    type: string;
-    cacheKey?: string;
-    oArr?: number[];
-}
-
-declare interface Options_8 {
-    width: number;
-    height: number;
-    material?: THREE.Material;
-    color?: string;
-    map?: THREE.Texture | null;
-}
-
-declare interface Options_9 {
     uuid?: string;
     areaGroup?: boolean;
     geojson: GeoJSON_2;
@@ -1254,6 +1162,7 @@ declare interface Options_9 {
     conic?: boolean;
     castShadow?: boolean;
     mergeSide?: boolean;
+    hasExtrudeLine?: boolean;
     materialOptions: {
         topMat: THREE.Material;
         sideMat?: THREE.Material;
@@ -1268,6 +1177,36 @@ declare interface Options_9 {
     bloom?: boolean;
 }
 
+declare interface Options_6 {
+    radius?: number;
+    rotationY?: number;
+}
+
+declare interface Options_7 {
+    radius?: number;
+}
+
+declare interface Options_8 {
+    scale: number;
+    depth: number;
+    assetsPrefix?: string;
+}
+
+declare interface Options_9 {
+    uuid?: string;
+    jsonUrl: string;
+    projection: {
+        center: [number, number];
+        scale: number;
+    };
+    cacheKey?: string;
+    material?: THREE.Material | THREE.Material[];
+    meters?: number;
+    hasSide?: boolean;
+    sideGradient?: boolean;
+    grey?: boolean;
+}
+
 declare class Plane extends MeshObject {
     objectType: string;
     create(): void;
@@ -1275,7 +1214,7 @@ declare class Plane extends MeshObject {
 
 declare class PlaneMap extends GroupObject {
     objectType: string;
-    options: Required<Omit<Options_9, 'bbox' | 'extrudeLineGeojson'>> & Pick<Options_9, 'bbox' | 'extrudeLineGeojson'>;
+    options: Required<Omit<Options_5, 'bbox' | 'extrudeLineGeojson'>> & Pick<Options_5, 'bbox' | 'extrudeLineGeojson'>;
     isActive: boolean;
     groupArr: GroupObject[];
     areaArr: ExtrudePolygonObject[];
@@ -1283,8 +1222,12 @@ declare class PlaneMap extends GroupObject {
     mergeSideArea: ExtrudePolygonObject | null;
     extrudelineArr?: LineObject[];
     splitPolygons: number;
-    constructor(options: Options_9);
+    constructor(options: Options_5);
     create(): Promise<void>;
+    private ensureExtrudeLineMaterials;
+    createExtrudeLines(): Promise<void>;
+    clearExtrudeLines(): void;
+    syncExtrudeLines(hasExtrudeLine?: boolean): Promise<void>;
     mergeAreaSide(): Promise<void>;
     unmergeAreaSide(): Promise<void>;
     addArea(geojson: GeoJSON_2, options: {
@@ -1305,7 +1248,7 @@ declare class PlaneMap extends GroupObject {
         coords: Position[][];
         properties: GeoJsonProperties;
     }[];
-    update(delta: number, elapsed: number): void;
+    update(_delta: number, elapsed: number): void;
     findGroup(adcode: string | number, fix?: boolean): GroupObject | undefined;
     setAreaMaterial(key: string, material: THREE.Material[] | THREE.Material): void;
     useAreaMaterial(key: string): void;
@@ -1358,8 +1301,8 @@ declare class Ring extends MeshObject {
 
 declare class Road extends GroupObject {
     objectType: string;
-    options: Options_6;
-    constructor(options: Options_6);
+    options: Options_10;
+    constructor(options: Options_10);
     linePrimary: LineObject[];
     lineSecondary: LineObject[];
     create(): Promise<void>;
@@ -1405,8 +1348,8 @@ declare class Sphere extends MeshObject {
 
 declare class SphereShadow extends MeshObject {
     objectType: string;
-    options: Required<Options_11>;
-    constructor(options: Options_11);
+    options: Required<Options_7>;
+    constructor(options: Options_7);
     create(): Promise<void>;
     rebuildFromScene(): void;
 }
@@ -1438,37 +1381,6 @@ declare interface SwitchFixConfig {
     r?: string[];
 }
 
-declare class Target extends GroupObject {
-    objectType: string;
-    options: Opt;
-    time: {
-        value: number;
-    };
-    offset: THREE.Vector2;
-    timer: ReturnType<typeof setTimeout> | null;
-    inTween: Tween<any> | null;
-    outTween: Tween<any> | null;
-    constructor(options: Opt);
-    createWave(color: string): THREE.Mesh<THREE.PlaneGeometry, THREE.ShaderMaterial, THREE.Object3DEventMap>;
-    createRipple(texture: THREE.Texture): THREE.Mesh<THREE.CylinderGeometry, THREE.ShaderMaterial, THREE.Object3DEventMap>;
-    createCylinder(texture: THREE.Texture): THREE.Object3D<THREE.Object3DEventMap>;
-    createTorus(color: string): THREE.Mesh<THREE.TorusGeometry, THREE.MeshBasicMaterial, THREE.Object3DEventMap>;
-    create(): Promise<void>;
-    rebuildFromScene(): void;
-    erase(): void;
-    update(delta: number, elapsed: number): void;
-}
-
-/**
- * 模板配置接口
- */
-declare interface TemplateConfig {
-    id: string;
-    map?: boolean;
-    emissiveMap?: boolean | 'map';
-    cityOnly?: boolean;
-}
-
 export { THREE }
 
 declare const timeOut: (ms: number) => Promise<any>;
@@ -1484,7 +1396,7 @@ export { TWEEN }
 
 export { Tween }
 
-export declare const VERSION = "0.31.23";
+export declare const VERSION = "0.31.24";
 
 export { }