@xingm/vmap-cesium-toolbar 1.0.0 → 1.0.2

package/{dist/core → core}/services/toolbar/types.d.ts

@@ -71,6 +71,11 @@ export interface ToolbarCallbacks {
     getAreaDrawOptions?: () => any;
     onDistanceComplete?: (positions: any[], distance: number) => void;
     onAreaComplete?: (positions: any[], area: number) => void;
+    onMeasurementComplete?: (result: {
+        type: 'distance' | 'area';
+        positions: any[];
+        value: number;
+    }) => void;
     onClear?: () => void;
     /** 缩放回调 */
     onZoomIn?: (beforeHeight: number, afterHeight: number) => void;
@@ -89,6 +94,7 @@ export interface SearchResult {
     longitude: number;
     latitude: number;
     height?: number;
+    coordSystem?: 'WGS84' | 'GCJ02' | 'BD09';
 }
 /**
  * 搜索服务配置
@@ -102,6 +108,7 @@ export interface SearchServiceConfig {
 export interface MeasurementCompleteEvent {
     type: 'distance' | 'area';
     positions: any[];
+    geographicPositions?: any[];
     value: number;
 }
 export interface MeasurementServiceLike {

package/{dist/core → core}/types.d.ts

@@ -1,6 +1,8 @@
 import { Cartesian3, Cartographic, Color, MaterialProperty, Rectangle, Entity } from '../../node_modules/cesium';
 import { I18nLike } from '../i18n';
 import { ToolbarCallbacks } from './services/toolbar/types';
+import { BaseMapConfig, BaseMapProviderId, MapAuthConfig, MapProviderContext, OfflineCameraBoundsConfig, BaseMapRectangle } from './mapProviders/types';
+import { CoordSystem, LngLat } from './mapProviders/coordinates/types';
 import * as Cesium from 'cesium';
 /**
  * 核心类型定义 - 整合所有地图插件相关的类型
@@ -27,6 +29,14 @@ export interface ToolbarConfig {
     buttons?: CustomButtonConfig[];
     useI18n?: boolean;
     i18n?: I18nLike;
+    /** @deprecated 兼容旧版 toolbar 认证字段 */
+    token?: string;
+    /** @deprecated 兼容旧版 toolbar 认证字段 */
+    sk?: string;
+    /** @deprecated 兼容旧版 toolbar 认证字段 */
+    TD_Token?: string;
+    /** @deprecated 兼容旧版 toolbar 认证字段 */
+    TD_SK?: string;
 }
 /**
  * 基础按钮配置接口
@@ -45,7 +55,7 @@ export interface ButtonConfig {
     hoverColor?: string;
     activeColor?: string;
     backgroundColor?: string;
-    callback?: () => void;
+    callback?: (...args: any[]) => void;
     activeIcon?: string | HTMLElement;
 }
 /**
@@ -54,7 +64,7 @@ export interface ButtonConfig {
 export interface CustomButtonConfig {
     id: string;
     icon: string | HTMLElement | false;
-    title: string;
+    title?: string;
     titleKey?: string;
     enabled?: boolean;
     visible?: boolean;
@@ -69,7 +79,7 @@ export interface CustomButtonConfig {
     backgroundColor?: string;
     sort?: number;
     activeIcon?: string | HTMLElement | false;
-    callback?: () => void;
+    callback?: (...args: any[]) => void;
     onClick?: (buttonId: string, buttonElement: HTMLElement) => void;
 }
 /**
@@ -97,14 +107,15 @@ export interface SearchResult {
     longitude: number;
     latitude: number;
     height?: number;
+    coordSystem?: CoordSystem;
 }
 /**
  * 测量回调接口
  */
 export interface MeasurementCallback {
     onMeasurementStart?: (positions?: Cartesian3[]) => void;
-    onDistanceComplete?: (positions: Cartesian3[], distance: number) => void;
-    onAreaComplete?: (positions: Cartesian3[], area: number) => void;
+    onDistanceComplete?: (positions: Array<Cartesian3 | LngLat>, distance: number) => void;
+    onAreaComplete?: (positions: Array<Cartesian3 | LngLat>, area: number) => void;
     onClear?: () => void;
 }
 /**
@@ -119,8 +130,11 @@ export interface ZoomCallback {
  */
 export interface MapType {
     id: string;
+    providerId?: BaseMapProviderId;
     name: string;
     nameKey?: string;
+    /** 运行时依赖脚本列表，初始化时可按需加载 */
+    runtimeScripts?: string[];
     /** 选中态左上角"路网"文案（可选，未配置时走 i18n 默认 key） */
     placeNameLabel?: string;
     /** 选中态左上角"路网"文案 i18n key（可选） */
@@ -128,9 +142,9 @@ export interface MapType {
     /** 是否强制始终显示路网层（不受 placeName 开关影响） */
     forcePlaceName?: boolean;
     thumbnail: string;
-    provider: (token: string) => Cesium.ImageryProvider[];
-    terrainProvider?: (token: string) => Cesium.TerrainProvider | null;
-    geoWTFS?: (token: string, viewer: Cesium.Viewer) => any | null;
+    provider: (context: MapProviderContext | string, legacySk?: string) => Cesium.ImageryProvider[] | Promise<Cesium.ImageryProvider[]>;
+    terrainProvider?: (context: MapProviderContext | string, legacySk?: string) => Cesium.TerrainProvider | null | Promise<Cesium.TerrainProvider | null>;
+    geoWTFS?: (token: string, viewer: Cesium.Viewer, sk?: string) => any | null;
 }
 export interface LayersPanelStyleConfig {
     containerStyle?: Partial<CSSStyleDeclaration>;
@@ -186,7 +200,8 @@ export interface NoFlyZonePluginOptions {
 /**
  * 地图提供商类型
  */
-export type ProviderType = 'tdt' | 'gaode' | 'baidu' | 'arcgis' | 'osm' | 'custom';
+export type ProviderType = BaseMapProviderId | 'arcgis' | 'osm';
+export type TDTMapTypeId = 'vec' | 'img' | 'ter' | 'tdt3d';
 /**
  * 相机/视图配置
  */
@@ -199,15 +214,18 @@ export interface CameraConfig {
     heading?: number;
     /** 翻滚角（度），默认 0 */
     roll?: number;
+    /** 输入中心点坐标系，默认 WGS84 */
+    coordSystem?: CoordSystem;
 }
 /**
  * 天地图图层配置
  */
 export interface TDTLayerConfig {
-    /** 天地图子类型：矢量/影像/地形 */
-    mapTypeId?: 'vec' | 'img' | 'ter';
+    /** 天地图子类型：矢量/影像/地形/三维地图 */
+    mapTypeId?: TDTMapTypeId;
     /** 天地图 token */
     token: string;
+    sk?: string;
     /** 是否显示注记层，默认 true */
     showLabel?: boolean;
 }
@@ -219,6 +237,7 @@ export interface GaodeLayerConfig {
     mapTypeId?: 'vector' | 'satellite' | 'terrain';
     /** 高德 key */
     token?: string;
+    sk?: string;
     /** 是否显示注记层，默认 true */
     showLabel?: boolean;
 }
@@ -230,6 +249,7 @@ export interface BaiduLayerConfig {
     mapTypeId?: 'normal' | 'satellite' | 'terrain';
     /** 百度 ak */
     token?: string;
+    sk?: string;
     /** 是否显示注记层，默认 true */
     showLabel?: boolean;
 }
@@ -257,6 +277,19 @@ export interface OSMLayerConfig {
 export interface CustomLayerConfig {
     /** 自定义影像图层提供者数组 */
     providers: Cesium.ImageryProvider[];
+    type?: 'xyz' | 'wmts' | 'imageryProviders';
+    mode?: 'online' | 'offline';
+    customUrl?: string;
+    urlTemplate?: string;
+    rectangle?: BaseMapRectangle;
+    minimumLevel?: number;
+    maximumLevel?: number;
+    credit?: string;
+    cameraBounds?: OfflineCameraBoundsConfig;
+    wmtsLayer?: string;
+    wmtsStyle?: string;
+    wmtsFormat?: string;
+    tileMatrixSetId?: string;
 }
 /**
  * 图层配置 - 支持多种地图提供商
@@ -287,6 +320,10 @@ export interface MapPluginOptions {
     camera?: CameraConfig;
     /** 图层配置 */
     layers?: LayersConfig;
+    /** 新版底图配置 */
+    baseMap?: BaseMapConfig;
+    /** 多厂商鉴权配置 */
+    mapAuth?: MapAuthConfig;
     /** Cesium Ion Token */
     cesiumToken?: string;
     /** 禁飞区初始化配置 */
@@ -365,7 +402,7 @@ export interface MapToolsConfig {
     /** @deprecated 使用 layers.type 代替 */
     mapType?: 'tdt' | 'ion';
     /** @deprecated 使用 layers.tdt.mapTypeId 代替 */
-    tdtMapTypeId?: 'vec' | 'img' | 'ter';
+    tdtMapTypeId?: TDTMapTypeId;
     /** @deprecated 使用 layers.tdt.token 代替 */
     token?: string;
 }
@@ -437,6 +474,12 @@ export interface OverlayOptions {
         material?: Color;
     };
 }
+export interface CoordinateAwareInput {
+    coordSystem?: CoordSystem;
+}
+export interface CoordinateAwareOutput {
+    outputCoordSystem?: CoordSystem;
+}
 /**
  * 覆盖物位置类型
  */
@@ -583,4 +626,4 @@ export interface ComponentStyleConfig {
     measurement?: StyleConfig;
     layers?: StyleConfig;
 }
-export type { Cesium };
+export type { Cesium, BaseMapConfig, BaseMapProviderId, MapAuthConfig, MapProviderContext, OfflineCameraBoundsConfig, BaseMapRectangle, CoordSystem, LngLat, };

package/{dist/i18n → i18n}/en-US.d.ts

@@ -38,6 +38,11 @@ declare const enUS: {
         custom_visibility_title: string;
     };
     ui: {
+        group: {
+            draw: string;
+            overlay: string;
+            overlay_edit: string;
+        };
         draw: {
             line: string;
             area: string;
@@ -63,6 +68,7 @@ declare const enUS: {
             label: string;
             rectangle: string;
             info_window: string;
+            info_window_close: string;
             ring: string;
             ring_test: string;
             heatmap: string;
@@ -97,6 +103,7 @@ declare const enUS: {
             vec: string;
             img: string;
             ter: string;
+            tdt3d: string;
         };
     };
     measurement: {

package/{dist/i18n → i18n}/zh-CN.d.ts

@@ -38,6 +38,11 @@ declare const zhCN: {
         custom_visibility_title: string;
     };
     ui: {
+        group: {
+            draw: string;
+            overlay: string;
+            overlay_edit: string;
+        };
         draw: {
             line: string;
             area: string;
@@ -63,6 +68,7 @@ declare const zhCN: {
             label: string;
             rectangle: string;
             info_window: string;
+            info_window_close: string;
             ring: string;
             ring_test: string;
             heatmap: string;
@@ -97,6 +103,7 @@ declare const zhCN: {
             vec: string;
             img: string;
             ter: string;
+            tdt3d: string;
         };
     };
     measurement: {

package/{dist/index.d.ts → index.d.ts}

@@ -5,17 +5,22 @@ export { MapPlugin, createMapPlugin } from './core/MapPlugin';
 /**
  * @deprecated 使用 MapPluginOptions 代替
  */
-export type { ToolbarConfig, ButtonConfig, CustomButtonConfig, SearchCallback, SearchResult, MeasurementCallback, ZoomCallback, MapType, MapToolsConfig, ComponentStyleConfig, StyleConfig, LayersPanelStyleConfig, SearchPanelStyleConfig, ToolbarSearchMenuOptions, ToolbarLayersMenuOptions, NoFlyZonePluginOptions, MapPluginOptions, CameraConfig, LayersConfig, ProviderType, TDTLayerConfig, GaodeLayerConfig, BaiduLayerConfig, ArcGISLayerConfig, OSMLayerConfig, CustomLayerConfig, } from './core/types';
+export type { ToolbarConfig, ButtonConfig, CustomButtonConfig, SearchCallback, SearchResult, MeasurementCallback, ZoomCallback, MapType, MapToolsConfig, ComponentStyleConfig, StyleConfig, LayersPanelStyleConfig, SearchPanelStyleConfig, ToolbarSearchMenuOptions, ToolbarLayersMenuOptions, NoFlyZonePluginOptions, MapPluginOptions, CameraConfig, LayersConfig, ProviderType, BaseMapConfig, BaseMapProviderId, MapAuthConfig, BaseMapRectangle, OfflineCameraBoundsConfig, CoordSystem, CoordinateAwareInput, CoordinateAwareOutput, TDTLayerConfig, GaodeLayerConfig, BaiduLayerConfig, ArcGISLayerConfig, OSMLayerConfig, CustomLayerConfig, } from './core/types';
 export { BaseOverlay, Marker, Label, Icon, SVG, InfoWindow, Polyline, Polygon, Rectangle, Circle, Ring, } from './core/entities';
 export type { OverlayPosition, BaseOverlayOptions, OverlayClickHighlightOptions, OverlayHoverHighlightOptions, OverlayEntity, MarkerOptions, LabelOptions, IconOptions, SvgOptions, InfoWindowOptions, PolylineOptions, PolygonOptions, RectangleOptions, CircleOptions, RingOptions, } from './core/entities';
 export { OverlayService, DrawService, ToolbarService, createToolbarService } from './core/services';
-export type { OverlayServiceOptions, DrawMode, DrawOptions, DrawResult, DrawServiceOptions, MeasurementFillStyle, MeasurementLabelOffset, MeasurementStrokeStyle, MeasurementSummaryLabelStyle, MeasurementTheme, MeasurementVertexStyle, ToolbarServiceOptions, ToolbarCallbacks, } from './core/services';
-export { HeatmapLayer, PointClusterLayer } from './core/layers';
-export type { HeatPoint, HeatmapGradient, HeatmapOptions, ClusterPoint, ClusterStyleStep, PointClusterLayerOptions, } from './core/layers';
+export type { OverlayServiceOptions, DrawMode, DrawOptions, DrawResult, DrawServiceOptions, MeasurementFillStyle, MeasurementLabelOffset, MeasurementStrokeStyle, MeasurementSummaryLabelStyle, MeasurementTheme, MeasurementVertexStyle, MarkCallbacks, MarkDrawOptions, MarkDrawResult, MarkDrawType, MarkEditOptions, MarkExportItem, MarkServiceOptions, MarkWorkAreaKind, MarkWorkAreaType, ToolbarServiceOptions, ToolbarCallbacks, } from './core/services';
+export { MarkService, MarkToolbar } from './core/services';
+export { PointClusterLayer, setTDTPlugin, createTDTImageryConfig, createTDTVectorConfig, createTDTTerrainConfig, createTDT3DImageryConfig, createTDT3DTerrainProvider, createTDT3DGeoWTFS, hasTDT3DExtension, } from './core/layers';
+export { HeatmapLayer } from './adapters/HeatmapLayerAdapter';
+export { baseMapRegistry } from './core/mapProviders/registry';
+export type { ClusterPoint, ClusterStyleStep, PointClusterLayerOptions, } from './core/layers';
+export type { HeatPoint, HeatmapAutoUpdateOptions, HeatmapGradient, HeatmapOptions, } from './adapters/HeatmapLayerAdapter';
 export { BaseComponent, Toolbar, ToolbarButton, SearchBox, } from './components';
 export { styleManager, initStyleSystem, applyTheme, getCurrentTheme, getAvailableThemes, } from './styles';
 export { i18n } from './i18n';
 export type { I18nLike } from './i18n';
+export { CoordinateService, coordinateService } from './core/mapProviders/coordinates/CoordinateService';
 export { DrawHelperAdapter as DrawHelper } from './adapters/DrawHelperAdapter';
 export type { LegacyDrawCallbacks, LegacyDrawOptions, LegacyDrawEntity, } from './adapters/DrawHelperAdapter';
 export { OverlayServiceAdapter as CesiumOverlayService } from './adapters/OverlayServiceAdapter';
@@ -24,7 +29,9 @@ export { ToolbarAdapter as CesiumMapToolbar } from './adapters/ToolbarAdapter';
 export type { LegacyCesiumMapToolbarCallbacks } from './adapters/ToolbarAdapter';
 export { initCesium } from './adapters/MapLoaderAdapter';
 export type { LegacyInitOptions, LegacyInitResult, LegacyMapCenter } from './adapters/MapLoaderAdapter';
-export { DrawHelperAdapter as CompatDrawHelper, OverlayServiceAdapter as CompatCesiumOverlayService, ToolbarAdapter as CompatCesiumMapToolbar, } from './adapters';
+export { MapMarkAdapter as CesiumMapMark } from './adapters/MapMarkAdapter';
+export type { CesiumMapMarkOptions } from './adapters/MapMarkAdapter';
+export { DrawHelperAdapter as CompatDrawHelper, OverlayServiceAdapter as CompatCesiumOverlayService, ToolbarAdapter as CompatCesiumMapToolbar, MapMarkAdapter as CompatCesiumMapMark, } from './adapters';
 /**
  * 快速创建地图插件实例
  */