vis-core 0.30.0-beta.6 → 0.30.0-beta.60

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.30.0-beta.6";
+declare const _default: "0.30.0-beta.60";
 export default _default;

package/dist/vis/all/json/index.d.ts

@@ -1,3 +1,4 @@
+export declare const extendsAdcodeAll: (cb: any) => void;
 export declare const findAdcodeInfo: (adcode: number) => {
     adcode: number;
     lng: number;
@@ -8,3 +9,14 @@ export declare const findAdcodeInfo: (adcode: number) => {
     c: number[];
     b: number[];
 } | undefined;
+export declare const findAdcodeInfoByName: (name: string) => {
+    adcode: number;
+    lng: number;
+    lat: number;
+    name: string;
+    level: string;
+    parent: number;
+    c: number[];
+    b: number[];
+} | undefined;
+export declare const getAdcodeShowLevel: (adcode: number, fix?: boolean) => string | undefined;

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

@@ -12,6 +12,7 @@ export interface BaseOptions {
     container: HTMLElement;
     assetsPrefix?: string;
     css2DContainer?: HTMLElement;
+    controlsContainer?: HTMLElement;
     pencil?: any;
     pencil2?: any;
     pencilConfig?: Record<string, any>;
@@ -96,7 +97,7 @@ export default class Base extends Camera {
     initCameraUserData(): void;
     initSceneUserData(): void;
     initBaseObjectUserData(baseObject: BaseObject): void;
-    addCSS3DRenderer(): void;
+    addCSS3DRenderer(container?: HTMLElement): void;
     initSettingsObj?: Record<string, any>;
     mouseButtonsActiveStore: Record<string, any> | null;
     initSettings(): void;
@@ -104,14 +105,17 @@ export default class Base extends Camera {
     show(): void;
     showAction(): void;
     hide(): void;
+    addGroup(): Promise<import("gl-draw/dist/objects").Group>;
     addCSS2D(dom: HTMLElement, options?: {
         display?: string;
         onTop?: number;
+        target?: BaseObject;
     }): Promise<Node>;
     addCSS3D(dom: HTMLElement, options?: {
         display?: string;
         onTop?: number;
         type?: '3d' | '3dSprite';
+        target?: BaseObject;
     }): Promise<Node>;
     getRoomEnvMap(): THREE.Texture<unknown>;
     handlePick(objArr: PickFunctionsItem['objArr'], type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;

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

@@ -4,6 +4,7 @@ import { type BaseObject, type Lead } from 'gl-draw';
 import { type Group } from 'gl-draw/dist/objects';
 import { getProjection } from 'gl-draw/dist/utils';
 import * as THREE from 'three';
+import type { IBaseObject } from "../../editor";
 import type Building from './objects/building';
 import type Road from './objects/road';
 interface CityOptions extends BaseOptions {
@@ -71,13 +72,11 @@ export default class extends Base {
     projection: ReturnType<typeof getProjection>;
     options: CityOptions;
     group: Group;
-    outAreaGroup: Group;
     building: Building;
     road: Road;
     setOptions(options: CityOptions): void;
     multiplyScalar: number;
     loaderAdd(): void;
-    loaderAddJson(jsonName: string): void;
     initMaterial(): Promise<void>;
     disableSSAO(): void;
     enabledSSAO(): void;
@@ -85,27 +84,22 @@ export default class extends Base {
     getInvert(vector3: THREE.Vector3): any;
     fitTo(obj: BaseObject, enableTransition?: boolean): Promise<void>;
     initVis(): Promise<void>;
+    drawCityPlane(adcode: number, target?: IBaseObject): Promise<void>;
     drawBuilding(options?: {
-        json?: {
-            features: any[];
-        };
+        jsonUrl?: string;
         meters?: number;
         grey?: boolean;
         sideGradient?: boolean;
         hasSide?: boolean;
     }): Promise<Building | undefined>;
     drawArea(options?: {
-        json?: {
-            features: any[];
-        };
+        jsonUrl?: string;
         type?: 'river' | 'grassland';
         oArr?: number[];
         grey?: boolean;
     }): Promise<import("./objects/area").default | undefined>;
     drawRoad(options?: {
-        json?: {
-            features: any[];
-        };
+        jsonUrl?: string;
         meters?: number;
         z?: number;
         grey?: boolean;

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

@@ -2,9 +2,7 @@ import { BaseObject } from 'gl-draw';
 import type { ExtrudePolygon } from 'gl-draw/dist/objects';
 import type * as THREE from 'three';
 interface Options {
-    json: {
-        features: any[];
-    };
+    jsonUrl: string;
     projection: {
         center: [number, number];
         scale: number;

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

@@ -1,9 +1,7 @@
 import { BaseObject } from 'gl-draw';
 import * as THREE from 'three';
 interface Options {
-    json: {
-        features: any[];
-    };
+    jsonUrl: string;
     projection: {
         center: [number, number];
         scale: number;

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

@@ -1,9 +1,7 @@
 import { BaseObject } from 'gl-draw';
 import type { Line } from 'gl-draw/dist/objects';
 interface Options {
-    json: {
-        features: any[];
-    };
+    jsonUrl: string;
     projection: {
         center: [number, number];
         scale: number;

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

@@ -0,0 +1,131 @@
+import Map from './';
+export interface FixConfig {
+    [key: `${string}`]: {
+        s: string[];
+        z: string[];
+    };
+}
+export interface MapManagerConfig {
+    container: HTMLDivElement;
+    controlsContainer?: HTMLDivElement;
+    assetsPrefix?: string;
+    fixConfig?: FixConfig;
+    raycasterPointsThreshold?: number;
+    mapPadding?: [number, number, number, number];
+    rmTemplateIdentifier?: boolean;
+    geojsonExtensions?: Record<string, any[]>;
+}
+export interface MapEventHandlers {
+    [key: string]: (...args: any[]) => void;
+}
+/**
+ * MapManager - 地图管理类
+ */
+export declare class MapManager {
+    private container;
+    private controlsContainer?;
+    private assetsPrefix?;
+    private fixConfig?;
+    private raycasterPointsThreshold;
+    private readonly MAX_ZOOM_FACTOR;
+    private readonly MIN_ZOOM_FACTOR;
+    private mapInstances;
+    private mapDistances;
+    private mapConfigs;
+    private currentMap;
+    private currentZoom;
+    private mapPadding;
+    private isInitializing;
+    private rmTemplateIdentifier;
+    private geojsonExtensions;
+    private groups;
+    private eventHandlers;
+    private areaCloseTimer;
+    static findAdcodeInfoByName: (name: string) => {
+        adcode: number;
+        lng: number;
+        lat: number;
+        name: string;
+        level: string;
+        parent: number;
+        c: number[];
+        b: number[];
+    } | undefined;
+    static getAdcodeShowLevel: (adcode: number, fix?: boolean) => string | undefined;
+    static findAdcodeInfo: (adcode: number) => {
+        adcode: number;
+        lng: number;
+        lat: number;
+        name: string;
+        level: string;
+        parent: number;
+        c: number[];
+        b: number[];
+    } | undefined;
+    constructor(config: MapManagerConfig);
+    /**
+     * 设置事件处理器
+     */
+    setEventHandlers(handlers: MapEventHandlers): void;
+    /**
+     * 触发事件
+     */
+    emit<K extends keyof MapEventHandlers>(eventName: K, ...args: Parameters<MapEventHandlers[K]>): void;
+    /**
+     * 获取当前地图实例
+     */
+    getCurrentMap(): Map | null;
+    /**
+     * 获取当前缩放级别
+     */
+    getCurrentZoom(): number;
+    /**
+     * 初始化地图
+     */
+    initMap(adcodeArr: number[], fixedAdcode?: boolean): Promise<Map | null | undefined>;
+    /**
+     * 创建地图实例
+     */
+    private createMapInstance;
+    /**
+     * 应用地图修复配置
+     */
+    private applyFixConfig;
+    /**
+     * 绑定区域交互事件
+     */
+    private bindAreaEvents;
+    /**
+     * 设置缩放级别
+     */
+    setZoom(zoom: number): void;
+    /**
+     * 创建分组
+     * @param groupId 分组ID，用于后续管理
+     * @returns 分组实例
+     */
+    createGroup(groupId: string): Promise<Awaited<ReturnType<Map['addGroup']>> | null>;
+    /**
+     * 获取分组
+     */
+    getGroup(groupId: string): Awaited<ReturnType<Map['addGroup']>> | undefined;
+    /**
+     * 清除指定分组
+     */
+    clearGroup(groupId: string): void;
+    /**
+     * 清除所有分组
+     */
+    clearAllGroups(): void;
+    /**
+     * 清除区域关闭定时器（供 PortalModal 调用）
+     */
+    clearAreaCloseTimer(): void;
+    triggerAreaLeave({ areaName }?: {
+        areaName: string;
+    }): void;
+    /**
+     * 销毁所有地图实例
+     */
+    dispose(): void;
+}

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

@@ -5,7 +5,7 @@ import type ContinentsBg from "./objects/ContinentsBg";
 import type PlaneMap from "./objects/PlaneMap";
 import type { FeatureCollection, MultiPolygon, Polygon } from 'geojson';
 import { type BaseObject, type Lead } from 'gl-draw';
-import { type ExtrudePolygon, type Group, Line, MeshLineMaterial } from 'gl-draw/dist/objects';
+import { type ExtrudePolygon, type Group, MeshLineMaterial } from 'gl-draw/dist/objects';
 import { getProjection } from 'gl-draw/dist/utils';
 import * as THREE from 'three';
 import City from './city';
@@ -16,7 +16,6 @@ export interface MapOptions extends BaseOptions {
     parentBg?: boolean | number;
     parentBgDepth?: number;
     topSegments?: number;
-    fixCity?: Record<number, number>;
     continentsBg?: boolean;
     continentsBgDepth?: number;
     clickOusideBack?: boolean;
@@ -52,9 +51,9 @@ export interface MapOptions extends BaseOptions {
     style?: 'map2Base' | 'map2CityOnMap';
     bottomPlane?: boolean;
     bottomPlaneWater?: boolean;
+    geojsonExtensions?: Record<string, GeoJSON | string | number | (GeoJSON | string | number)[]>;
 }
 interface MapCityOptions extends MapOptions {
-    jsonNameObj?: Record<number, string>;
     cacheCity?: boolean;
     nearbyCities?: boolean | 'full';
     showBuilding?: boolean;
@@ -93,7 +92,7 @@ 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 Line;
+        Line: typeof import("gl-draw/dist/objects").Line;
         Line2: typeof import("gl-draw/dist/objects").Line2;
         ExtrudePolygon: typeof ExtrudePolygon;
         ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
@@ -153,7 +152,7 @@ export default class extends Base {
         b: number[];
     };
     get mapArea(): ExtrudePolygon[];
-    get mapLine(): Line[];
+    get mapLine(): import("gl-draw/dist/objects").Line[];
     get adcodes(): number[];
     activePlaneMap: PlaneMap | null;
     isAnimating: boolean;
@@ -164,7 +163,7 @@ export default class extends Base {
     pcenter: [number, number];
     pscale: number;
     meters: number;
-    cityVis: City | null;
+    cityVis: City[];
     extendsOptions: Record<string, any>;
     setOptions(options: MapOptions): void;
     initSettingsObj: Record<string, any>;
@@ -226,11 +225,19 @@ export default class extends Base {
      * @param height - 距离地图平面的高度，默认为0
      */
     setObjectOnMap(object: BaseObject, location: [number, number], height?: number): void;
+    setObjectOnMapAreaByProperty(object: BaseObject, key: string, value: any, height?: number): void;
     getAdcodeScreenPosition(adcode: number): {
         x: number;
         y: number;
     } | undefined;
     booleanPointInCn(location: [number, number]): boolean;
+    /**
+     * 判断经纬度是否在当前地图板块内
+     * @param location - 经纬度坐标 [经度, 纬度]
+     * @param adcode - 可选，指定板块的行政区划代码，不传则使用当前地图的adcode
+     * @returns 是否在板块内
+     */
+    booleanPointInMap(location: [number, number], adcode?: number): boolean;
     private getGeojson;
     handleDrillDown({ adcode, duration, handleLook, saveBackCamvasState, extrudelineBloom, }: {
         adcode: number;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vis-core",
-  "version": "0.30.0-beta.6",
+  "version": "0.30.0-beta.60",
   "scripts": {
-    "start": "npm run version && PORT=5173 bundler-dev",
+    "start": "npm run version && PORT=5174 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",
     "build:lib": "npm run version && PUBLIC_EXCLUDE=true BUILD_LIBRARY=src/sdk/index.ts CSS_EXTRACT=false bundler && npm run build:type",
     "build:type": "BUILD_LIBRARY=src/sdk/index.ts bundler-type",
@@ -64,7 +64,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.2.5",
-    "gl-draw": "0.17.0-beta.14",
+    "gl-draw": "0.17.0-beta.43",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },