tg-map-core 4.2.0 → 4.2.1

package/dist/src/map/event-target.d.ts

@@ -65,6 +65,7 @@ export declare class TalksEventTargetDelegate<T extends UnionTalksEventTarget =
     static EVENT_TYPE_MAP: {
         'center-changed': string;
         'zoom-changed': string;
+        'map-type-changed': string;
     } & Record<string, string | undefined>;
     private eventTypeMap;
     /**

package/dist/src/map/map/controls/map-type.control.d.ts

@@ -1,8 +1,9 @@
+import * as maptalks from 'maptalks';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
 import { MapType } from '../map-type';
 import type { TalksMap } from '../talks-map';
-import { AbstractControl, BaiduControl, ControlPosition, EmptyControl, GoogleControl } from './control';
+import { AbstractControl, BaiduControl, ControlPosition, EmptyControl, GoogleControl, TalksControl } from './control';
 export interface MapTypeControl extends AbstractControl {
 }
 export declare enum MapTypeControlType {
@@ -17,7 +18,7 @@ export interface MapTypeControlOptions {
     mapTypes?: MapType[];
 }
 export declare class BaiduMapTypeControl extends BaiduControl<BMap.MapTypeControl> implements MapTypeControl {
-    static create(this: BaiduMap, options: MapTypeControlOptions): BaiduMapTypeControl;
+    static create(this: BaiduMap, options: MapTypeControlOptions): EmptyControl | BaiduMapTypeControl;
 }
 export declare class GoogleMapTypeControl extends GoogleControl implements MapTypeControl {
     type: MapTypeControlType;
@@ -28,6 +29,6 @@ export declare class GoogleMapTypeControl extends GoogleControl implements MapTy
     onCreateOptions(): any;
     addTo(map: GoogleMap): void;
 }
-export declare class TalksMapTypeControl extends EmptyControl implements MapTypeControl {
+export declare class TalksMapTypeControl extends TalksControl<maptalks.control.LayerSwitcher> implements MapTypeControl {
     static create(this: TalksMap, options: MapTypeControlOptions): TalksMapTypeControl;
 }

package/dist/src/map/map/map-options.d.ts

@@ -79,4 +79,9 @@ export interface MapStyle {
         styles?: google.maps.MapTypeStyle[];
         mapId?: string;
     };
+    talks?: {
+        /** 给瓦片地图切换亮色/暗色 */
+        theme?: 'light' | 'dark';
+        styles?: any;
+    };
 }

package/dist/src/map/map/map-type.d.ts

@@ -42,10 +42,14 @@ export interface Layer {
 export type OverlayMapType = MapType & Layer;
 export declare class BuildInMapType implements MapType {
     id: BuildInMapTypeIdIncludeIncompatible;
+    /** 在{@link MapType.BUILD_IN_MAP_TYPES.values}中的index */
+    index: number;
     private baidu;
     private google;
     private googleCoordType;
-    constructor(id: BuildInMapTypeIdIncludeIncompatible, baidu: () => BMap.MapType, // 需要延迟初始化, 故写成方法
+    constructor(id: BuildInMapTypeIdIncludeIncompatible, 
+    /** 在{@link MapType.BUILD_IN_MAP_TYPES.values}中的index */
+    index: number, baidu: () => BMap.MapType, // 需要延迟初始化, 故写成方法
     google: () => google.maps.MapTypeId, // 同上
     googleCoordType: CoordType);
     getId(): BuildInMapTypeIdIncludeIncompatible;

package/dist/src/map/map/overlay/icon.d.ts

@@ -1,4 +1,4 @@
-import type { maptalks } from '../../dts/maptalks';
+import type * as maptalks from 'maptalks';
 import type { Point, Size } from '../../types';
 export type BaiduIcon = BMap.Icon & {
     __icon__?: Icon;

package/dist/src/map/map/talks-map.d.ts

@@ -29,8 +29,25 @@ import { TalksPolyline } from './overlay/polyline';
 import { TalksRectangle } from './overlay/rectangle';
 export declare class TalksMap extends BaseMap {
     mapOptions: MapOptions;
+    /**
+     * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
+     * @see computeBaseLayerId
+     */
+    private baseLayoutIds;
     private map;
-    constructor(element: HTMLElement, mapOptions: MapOptions, baseLayoutIds: [normal: TalksBaseLayerId] | [normal: TalksBaseLayerId, satellite: TalksBaseLayerId] | [normal: TalksBaseLayerId, satellite: TalksBaseLayerId, hybrid: TalksBaseLayerId]);
+    private attributionControl;
+    private baseLayerGroup;
+    private mapStyleTheme;
+    constructor(element: HTMLElement, mapOptions: MapOptions, 
+    /**
+     * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
+     * @see computeBaseLayerId
+     */
+    baseLayoutIds: [TalksBaseLayerId, ...(TalksBaseLayerId | undefined)[]]);
+    private getCurrentBaseLayer;
+    private onBaseLayerChanged;
+    private computeBaseLayerId;
+    private setBaseLayer;
     setGestureHandling(gestureHandling?: GestureHandlingOptions): void;
     get innerMap(): maptalks.Map;
     get coordType(): CoordType;

package/dist/src/map/map-config.d.ts

@@ -29,8 +29,10 @@ export interface TgMapConfig {
     amap: EmptyObject;
     osm: EmptyObject;
     talks: {
-        /** @default bing */
+        /** @deprecated 使用layerIds替代 */
         layerId?: TalksBaseLayerId | '';
+        /** 只有第一个元素非空, 才是有效的值; 默认`bing` */
+        layerIds?: (TalksBaseLayerId | undefined)[];
     };
 }
 export type PartialTgMapConfig = DeepPartial<TgMapConfig>;

package/dist/src/utils/talks-layers.d.ts

@@ -1,9 +1,13 @@
 import * as maptalks from 'maptalks';
 import { CoordType } from '../map/lat-lng';
-export declare const talksBaseLayerIds: readonly ["osm", "osm-light", "osm-dark", "google", "baidu", "baidu-detail", "amap", "tencent", "geoq", "tianditu", "yandex", "bing"];
+export declare const talksBaseLayerIds: readonly ["osm", "osm-light", "osm-dark", "osm-terrain", "google", "baidu", "baidu-detail", "amap", "amap-terrain", "tencent", "geoq", "tianditu", "yandex", "bing"];
 export type TalksBaseLayerId = typeof talksBaseLayerIds[number];
-export declare function talksBaseLayerIdToCoordType(layerId: TalksBaseLayerId): CoordType;
-export declare function createTalksBaseLayer(layerId: TalksBaseLayerId, { id, visible, }?: {
-    id?: "osm" | "osm-light" | "osm-dark" | "google" | "baidu" | "baidu-detail" | "amap" | "tencent" | "geoq" | "tianditu" | "yandex" | "bing" | undefined;
+export declare function talksBaseLayerIdToCoordType(layerId: TalksBaseLayerId | (string & {
+    readonly __flavor__?: 'layerId';
+})): CoordType;
+declare function createTalksBaseLayerImpl(layerId: TalksBaseLayerId, { id, visible, }?: {
+    id?: "osm" | "osm-light" | "osm-dark" | "osm-terrain" | "google" | "baidu" | "baidu-detail" | "amap" | "amap-terrain" | "tencent" | "geoq" | "tianditu" | "yandex" | "bing" | undefined;
     visible?: boolean | undefined;
 }): maptalks.TileLayer;
+export declare const createTalksBaseLayer: typeof createTalksBaseLayerImpl;
+export {};

package/dist/tg-map-core.cjs

@@ -1555,6 +1555,8 @@ class TalksEventTargetDelegate extends AbstractEventTargetDelegate {
     static EVENT_TYPE_MAP = typedRecord({
         'center-changed': 'movestart moving moveend zoomend',
         'zoom-changed': 'zoomend',
+        // https://maptalks.org/maptalks.js/api/1.x/Map.html#event:setbaselayer
+        'map-type-changed': 'setbaselayer',
     });
     eventTypeMap;
     /**
@@ -1759,6 +1761,19 @@ function hideBaiduMapUnauthWarn() {
         }
         return false;
     };
+    if (!isBaiduGL()) {
+        // 新的V3版也会直接从签名的`B_BUSINESS_INFO`中检测是否弹窗警告, 强制清空它可以规避检测(
+        Object.defineProperty(window, 'B_BUSINESS_INFO', {
+            configurable: true,
+            enumerable: true,
+            get: () => {
+                return undefined;
+            },
+            set: (v) => {
+                console.debug('B_BUSINESS_INFO', 'set', v);
+            },
+        });
+    }
     let originalBMap;
     let originalBMapVerifyCbk;
     Object.defineProperty(window, 'BMap', {
@@ -2195,13 +2210,17 @@ exports.BuildInMapTypeId = void 0;
 })(exports.BuildInMapTypeId || (exports.BuildInMapTypeId = {}));
 class BuildInMapType {
     id;
+    index;
     baidu;
     google;
     googleCoordType;
-    constructor(id, baidu, // 需要延迟初始化, 故写成方法
+    constructor(id, 
+    /** 在{@link MapType.BUILD_IN_MAP_TYPES.values}中的index */
+    index, baidu, // 需要延迟初始化, 故写成方法
     google, // 同上
     googleCoordType) {
         this.id = id;
+        this.index = index;
         this.baidu = baidu;
         this.google = google;
         this.googleCoordType = googleCoordType;
@@ -2311,10 +2330,10 @@ class TrafficLayer {
 }
 exports.MapType = void 0;
 (function (MapType) {
-    MapType.NORMAL = new BuildInMapType(exports.BuildInMapTypeId.normal, () => BMAP_NORMAL_MAP, () => google.maps.MapTypeId.ROADMAP, exports.CoordType.gcj02);
-    MapType.SATELLITE = new BuildInMapType(exports.BuildInMapTypeId.satellite, () => BMAP_SATELLITE_MAP, () => google.maps.MapTypeId.SATELLITE, exports.CoordType.wgs84);
-    MapType.HYBRID = new BuildInMapType(exports.BuildInMapTypeId.hybrid, () => BMAP_HYBRID_MAP, () => google.maps.MapTypeId.HYBRID, exports.CoordType.gcj02);
-    MapType.TERRAIN = new BuildInMapType('terrain', () => /* 三维 */ BMAP_PERSPECTIVE_MAP, () => /* 地形 */ google.maps.MapTypeId.TERRAIN, exports.CoordType.wgs84);
+    MapType.NORMAL = new BuildInMapType(exports.BuildInMapTypeId.normal, 0, () => BMAP_NORMAL_MAP, () => google.maps.MapTypeId.ROADMAP, exports.CoordType.gcj02);
+    MapType.SATELLITE = new BuildInMapType(exports.BuildInMapTypeId.satellite, 1, () => BMAP_SATELLITE_MAP, () => google.maps.MapTypeId.SATELLITE, exports.CoordType.wgs84);
+    MapType.HYBRID = new BuildInMapType(exports.BuildInMapTypeId.hybrid, 2, () => BMAP_HYBRID_MAP, () => google.maps.MapTypeId.HYBRID, exports.CoordType.gcj02);
+    MapType.TERRAIN = new BuildInMapType('terrain', 3, () => /* 三维 */ BMAP_PERSPECTIVE_MAP, () => /* 地形 */ google.maps.MapTypeId.TERRAIN, exports.CoordType.wgs84);
     MapType.BUILD_IN_MAP_TYPES = new FastFindValues([MapType.NORMAL, MapType.SATELLITE, MapType.HYBRID, MapType.TERRAIN]);
 })(exports.MapType || (exports.MapType = {}));
 
@@ -2327,6 +2346,10 @@ exports.MapTypeControlType = void 0;
 const MAP_TYPES_DEFAULT = [exports.MapType.NORMAL, exports.MapType.SATELLITE, exports.MapType.HYBRID];
 class BaiduMapTypeControl extends BaiduControl {
     static create(options) {
+        if (isBaiduGL()) {
+            // GL版, 不存在MapTypeControl...故返回空
+            return new EmptyControl(true, options.position ?? exports.ControlPosition.TOP_LEFT);
+        }
         const mapTypes = options.mapTypes ?? MAP_TYPES_DEFAULT;
         const type2baidu = {
             [exports.MapTypeControlType.DEFAULT]: BMAP_MAPTYPE_CONTROL_HORIZONTAL,
@@ -2378,9 +2401,13 @@ class GoogleMapTypeControl extends GoogleControl {
         });
     }
 }
-class TalksMapTypeControl extends EmptyControl {
+class TalksMapTypeControl extends TalksControl {
     static create(options) {
-        return new TalksMapTypeControl(true, options.position ?? exports.ControlPosition.TOP_LEFT);
+        const position = options.position ?? exports.ControlPosition.TOP_LEFT;
+        const inner = new maptalks__namespace.control.LayerSwitcher({
+            position: exports.ControlPositionConverter.getTalks().toValue(position),
+        });
+        return new TalksMapTypeControl(inner, position);
     }
 }
 
@@ -7328,7 +7355,7 @@ class TalksMarkerClusterer {
         this.inner = new maptalks_markercluster.ClusterLayer('cluster', options.markers?.map(it => it.innerOverlay), exports.Objects.deleteUndefinedPropertyOnPlainObjectDeeply({
             ...ClusterIconStyle.toTalks(options.styles),
             // {@macro marker_clusterer_grid_size}
-            maxClusterRadius: options.gridSize ?? (map.currentBaseLayerId === 'baidu' || map.currentBaseLayerId === 'baidu-detail' ? 60 : 100),
+            maxClusterRadius: options.gridSize ?? (map.cachedBaseLayerId === 'baidu' || map.cachedBaseLayerId === 'baidu-detail' ? 60 : 100),
             maxClusterZoom: options.maxZoom,
             zIndex: options.zIndex,
         }));
@@ -7879,7 +7906,7 @@ class TalksShape extends TalksOverlay {
      * @see setEditable
      */
     isEditable() {
-        return this.innerOverlay.config().editable ?? false;
+        return this.innerOverlay.options.editable ?? false;
     }
     setEditable(editable) {
         // 同步设置editable和isEditing
@@ -9258,7 +9285,7 @@ class TalksLabelOverlay extends TalksOverlay {
         this.innerOverlay.setCoordinates(position.toTalks(this.coordType));
     }
     getOffset() {
-        const options = this.innerOverlay.config();
+        const options = this.innerOverlay.options;
         return { x: options.dx ?? 0, y: options.dy ?? 0 };
     }
     setOffset(offset) {
@@ -9806,13 +9833,13 @@ class TalksMarker extends TalksOverlay {
         this.innerOverlay.config('interactive', enable);
     }
     isClickable() {
-        return this.innerOverlay.config().interactive ?? true;
+        return this.innerOverlay.options.interactive ?? true;
     }
     setDraggable(enable) {
         this.innerOverlay.config('draggable', enable);
     }
     isDraggable() {
-        return this.innerOverlay.config().draggable ?? false;
+        return this.innerOverlay.options.draggable ?? false;
     }
     setZIndex(zIndex) {
         this.innerOverlay.setZIndex(zIndex ?? 0);
@@ -10994,10 +11021,12 @@ const talksBaseLayerIds = [
     'osm',
     'osm-light',
     'osm-dark',
+    'osm-terrain',
     'google',
     'baidu',
     'baidu-detail',
     'amap',
+    'amap-terrain',
     'tencent',
     'geoq',
     'tianditu',
@@ -11031,15 +11060,29 @@ function talksBaseLayerIdToCoordType(layerId) {
  * @see https://maptalks.org/examples/cn/tilelayer-projection/baidu/#tilelayer-projection_baidu
  */
 const TILE_LAYER_BAIDU_SCALER = 1;
-function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
+function createTalksBaseLayerImpl(layerId, { id = layerId, visible = true, } = {}) {
     switch (layerId) {
         case 'amap':
             return new maptalks__namespace.TileLayer(id, {
                 visible,
-                urlTemplate: 'http://webrd03.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}&lang=zh_cn',
+                urlTemplate: 'http://webrd{s}.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}&lang=zh_cn',
+                subdomains: ['01', '02', '03', '04'],
                 minZoom: 3,
                 maxZoom: 18,
                 attribution: '&copy; <a target="_blank" href="https://amap.com/">AMap</a>',
+                spatialReference: { projection: 'EPSG:3857' },
+            });
+        case 'amap-terrain':
+            // http://examples.maptalks.com/examples/cn/3d/terrain/load
+            return new maptalks__namespace.TileLayer(id, {
+                visible,
+                minZoom: 1,
+                // 深圳最大可以到18级, 一些偏远地带, 18级可能没有数据
+                maxZoom: 18,
+                urlTemplate: 'http://webst{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+                subdomains: ['01', '02', '03', '04'],
+                attribution: '&copy; <a target="_blank" href="https://amap.com/">AMap</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'baidu':
             return new maptalks__namespace.TileLayer(id, {
@@ -11047,20 +11090,20 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 urlTemplate: `http://online{s}.map.bdimg.com/tile/?qt=vtile&x={x}&y={y}&z={z}&styles=pl&type=sate&scaler=${TILE_LAYER_BAIDU_SCALER}`,
                 subdomains: ['0', '1', '2', '3'],
                 spatialReference: {
-                    projection: 'baidu',
+                    projection: 'BAIDU',
                 },
                 minZoom: 3,
                 maxZoom: 20,
                 attribution: '&copy; <a target="_blank" href="http://map.baidu.com">Baidu</a>',
             });
         case 'baidu-detail':
-            // 参考: https://maptalks.org/examples/cn/tilelayer-projection/baidu/#tilelayer-projection_baidu
+            // https://maptalks.org/examples/cn/tilelayer-projection/baidu/#tilelayer-projection_baidu
             return new maptalks__namespace.TileLayer(id, {
                 visible,
                 urlTemplate: `https://gss{s}.bdstatic.com/8bo_dTSlRsgBo1vgoIiO_jowehsv/tile/?qt=tile&x={x}&y={y}&z={z}&styles=pl&scaler=${TILE_LAYER_BAIDU_SCALER}&udt=20170927`,
                 subdomains: ['0', '1', '2', '3'],
                 spatialReference: {
-                    projection: 'baidu',
+                    projection: 'BAIDU',
                 },
                 minZoom: 3,
                 maxZoom: 19,
@@ -11075,6 +11118,7 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 subdomains: ['0', '1', '2', '3'],
                 minZoom: 3,
                 maxZoom: 18,
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'google':
             return new maptalks__namespace.TileLayer(id, {
@@ -11082,6 +11126,7 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 urlTemplate: 'https://api.xiox.top/proxy/https://maps.google.com/maps/vt?lyrs=m&x={x}&y={y}&z={z}&hl=zh-CN',
                 subdomains: ['0', '1', '2', '3'],
                 attribution: '&copy; <a target="_blank" href="https://www.google.com/maps">Google</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'geoq':
             // 不知道是哪家的, 无法显示
@@ -11089,6 +11134,7 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 visible,
                 urlTemplate: 'https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineCommunity/MapServer/tile/{z}/{y}/{x}',
                 subdomains: ['0', '1', '2', '3'],
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'tianditu':
             // key已失效, 无法显示
@@ -11111,6 +11157,7 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 subdomains: ['1', '2', '3', '4'],
                 maxZoom: 21,
                 attribution: '&copy; <a target="_blank" href="https://yandex.com/maps/">Yandex</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'bing':
             return new maptalks__namespace.TileLayer(id, {
@@ -11119,58 +11166,97 @@ function createTalksBaseLayer(layerId, { id = layerId, visible = true, } = {}) {
                 subdomains: ['1', '2', '3'],
                 minZoom: 3,
                 maxZoom: 18,
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'osm':
+            // https://operations.osmfoundation.org/policies/tiles/
             return new maptalks__namespace.TileLayer(id, {
                 visible,
                 urlTemplate: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
                 subdomains: ['a', 'b', 'c'],
                 attribution: '&copy; <a target="_blank" href="http://www.osm.org/copyright">OSM</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'osm-light':
+            // https://github.com/CartoDB/basemap-styles
             return new maptalks__namespace.TileLayer(id, {
                 visible,
                 urlTemplate: 'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png',
                 subdomains: ['a', 'b', 'c', 'd'],
                 attribution: '&copy; <a target="_blank" href="http://www.osm.org/copyright">OSM</a> contributors, &copy; <a target="_blank" href="https://carto.com/attributions">CARTO</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
         case 'osm-dark':
+            // https://github.com/CartoDB/basemap-styles
             return new maptalks__namespace.TileLayer(id, {
                 visible,
                 urlTemplate: 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png',
                 subdomains: ['a', 'b', 'c', 'd'],
                 attribution: '&copy; <a target="_blank" href="http://www.osm.org/copyright">OSM</a> contributors, &copy; <a target="_blank" href="https://carto.com/attributions">CARTO</a>',
+                spatialReference: { projection: 'EPSG:3857' },
+            });
+        case 'osm-terrain':
+            // https://wiki.openstreetmap.org/wiki/OpenTopoMap#Usage
+            return new maptalks__namespace.TileLayer(id, {
+                visible,
+                urlTemplate: 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
+                subdomains: ['a', 'b', 'c'],
+                attribution: '&copy; <a target="_blank" href="http://www.osm.org/copyright">OSM</a>',
+                spatialReference: { projection: 'EPSG:3857' },
             });
     }
 }
+const createTalksBaseLayer = process.env.NODE_ENV !== 'production'
+    ? (layerId, options) => {
+        const layer = createTalksBaseLayerImpl(layerId, options);
+        if (layer.options.visible == null || layer.options.spatialReference == null) {
+            console.warn('创建的baseLayer必须设置visible和spatialReference', layer.options);
+        }
+        return layer;
+    }
+    : createTalksBaseLayerImpl;
 
 const MAP_ATTRIBUTION_TG = { content: 'TG' };
 class TalksMap extends BaseMap {
     mapOptions;
+    baseLayoutIds;
     map;
-    /** @internal */
-    currentBaseLayerId;
+    attributionControl;
+    baseLayerGroup;
+    mapStyleTheme;
+    /**
+     * 由于通过{@link MapTypeControl}, maptalks可以在内部切换可见的baseLayer, 所以要获取实际当前的显示的baseLayer, 应该使用{@link getCurrentBaseLayer}
+     * 但为了方便快速的执行{@link coordType}, 因而增加了这个缓存的值
+     * @internal
+     * */
+    cachedBaseLayerId;
     /** @internal */
     markerLayer;
     /** @internal */
     overlayLayer;
-    constructor(element, mapOptions, baseLayoutIds) {
+    constructor(element, mapOptions, 
+    /**
+     * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
+     * @see computeBaseLayerId
+     */
+    baseLayoutIds) {
         super(element);
         this.mapOptions = mapOptions;
-        // TODO: 2025/11/05 ipcjs 实现MapType机制
-        const buildInMapTypeIdIndex = tgCommons.StringEnums.values(exports.BuildInMapTypeId).indexOf(mapOptions.buildInMapTypeId ?? exports.BuildInMapTypeId.normal);
-        this.currentBaseLayerId = baseLayoutIds[buildInMapTypeIdIndex] ?? baseLayoutIds[0];
-        const baseLayers = baseLayoutIds.map(id => createTalksBaseLayer(id, { visible: id === this.currentBaseLayerId }));
-        const baseLayer = baseLayers.find(it => it.isVisible());
+        this.baseLayoutIds = baseLayoutIds;
+        this.mapStyleTheme = mapOptions.mapStyle?.talks?.theme ?? 'light';
+        this.cachedBaseLayerId = this.computeBaseLayerId(mapOptions.buildInMapTypeId, this.mapStyleTheme);
+        this.baseLayerGroup = new maptalks__namespace.GroupTileLayer('base', baseLayoutIds
+            .filter(tgCommons.isTruthy)
+            .map(id => createTalksBaseLayer(id, { visible: id === this.cachedBaseLayerId })));
         this.markerLayer = new maptalks__namespace.VectorLayer('markers');
         this.overlayLayer = new maptalks__namespace.VectorLayer('overlays');
+        const baseLayer = this.getCurrentBaseLayer();
         this.map = new maptalks__namespace.Map(element, {
-            attribution: mapOptions.hideLogo ? false : MAP_ATTRIBUTION_TG,
-            // TODO: 使用GroupTileLayer, Map无法正确读取到当前显示的Layer的attribution, 故暂时不使用它
-            // baseLayer: new maptalks.GroupTileLayer('base', baseLayers),
-            baseLayer: baseLayer,
+            // 默认的attribution不会显示GroupTileLayer的子layer的attribution, 故不显示, 使用自己的this.attributionControl来处理
+            attribution: false,
+            baseLayer: this.baseLayerGroup,
             // {@macro layer_baidu_spatial_reference}
-            spatialReference: baseLayer?.config().spatialReference,
+            spatialReference: baseLayer?.options.spatialReference,
             // 参考google, marker和其他overlay分属不同layer, 并且marker位于overlay上方
             layers: [
                 this.overlayLayer, this.markerLayer,
@@ -11179,11 +11265,60 @@ class TalksMap extends BaseMap {
             seamlessZoom: mapOptions.fractionalZoom ?? false,
             zoom: mapOptions.zoom,
             // 默认使用baseLayer的Zoom范围
-            minZoom: mapOptions.minZoom ?? baseLayer?.config().minZoom,
-            maxZoom: mapOptions.maxZoom ?? baseLayer?.config().maxZoom,
+            minZoom: mapOptions.minZoom ?? baseLayer?.options.minZoom,
+            maxZoom: mapOptions.maxZoom ?? baseLayer?.options.maxZoom,
         });
         this.setGestureHandling(mapOptions.gestureHandling);
         this.setEventTargetDelegate(new TalksEventTargetDelegate(this.map, this));
+        this.attributionControl = new maptalks__namespace.control.Attribution(MAP_ATTRIBUTION_TG);
+        this.map.addControl(this.attributionControl);
+        this.setHideLogo(mapOptions.hideLogo ?? false);
+        this.map.on('setbaselayer', this.onBaseLayerChanged);
+        this.onBaseLayerChanged();
+    }
+    getCurrentBaseLayer() {
+        return this.baseLayerGroup.layers.find(it => it.isVisible());
+    }
+    onBaseLayerChanged = () => {
+        const baseLayer = this.getCurrentBaseLayer();
+        if (!baseLayer)
+            return;
+        // 更新cacheBaseLayerId, attribution, spatialReference, 但并没有更新minZoom/maxZoom, 因为感觉必要性不大
+        this.cachedBaseLayerId = baseLayer.getId();
+        const layerAttribution = baseLayer.options.attribution;
+        this.attributionControl.setContent(MAP_ATTRIBUTION_TG.content + (layerAttribution ? ` - ${layerAttribution}` : ''));
+        if (this.map.getSpatialReference().options.projection !== baseLayer.getSpatialReference().options.projection) {
+            console.debug('setSpatialReference', this.map.getSpatialReference().options, '==>', baseLayer.getSpatialReference().options);
+            this.map.setSpatialReference(baseLayer.getSpatialReference().options);
+        }
+    };
+    computeBaseLayerId(buildInMapTypeId = exports.BuildInMapTypeId.normal, theme = 'light') {
+        const mapType = exports.MapType.BUILD_IN_MAP_TYPES.get(BuildInMapType.prototype.getId, buildInMapTypeId);
+        if (theme === 'dark') {
+            const darkOffset = exports.MapType.BUILD_IN_MAP_TYPES.values.length;
+            // 遍历: 7, 6, 5, 4, 查找设置了值的暗色layerId
+            for (let i = Math.min((mapType.index + darkOffset), this.baseLayoutIds.length - 1); i >= darkOffset; i--) {
+                if (this.baseLayoutIds[i]) {
+                    return this.baseLayoutIds[i];
+                }
+            }
+        }
+        // 遍历: 3, 2, 1, 0, 查找设置了值的亮色layerId
+        for (let i = Math.min(mapType.index, this.baseLayoutIds.length - 1); i >= 0; i--) {
+            if (this.baseLayoutIds[i]) {
+                return this.baseLayoutIds[i];
+            }
+        }
+        return this.baseLayoutIds[0];
+    }
+    setBaseLayer(id, theme) {
+        this.mapStyleTheme = theme;
+        const baseLayerId = this.computeBaseLayerId(id, theme);
+        const currentBaseLayerId = this.getCurrentBaseLayer()?.getId();
+        if (currentBaseLayerId !== baseLayerId) {
+            this.baseLayerGroup.layers.forEach((layer) => exports.Talks.setVisible(layer, layer.getId() === baseLayerId));
+            this.onBaseLayerChanged();
+        }
     }
     setGestureHandling(gestureHandling = exports.GestureHandlingOptions.auto) {
         if (gestureHandling === exports.GestureHandlingOptions.auto) {
@@ -11219,7 +11354,7 @@ class TalksMap extends BaseMap {
         return this.map;
     }
     get coordType() {
-        return talksBaseLayerIdToCoordType(this.currentBaseLayerId);
+        return talksBaseLayerIdToCoordType(this.cachedBaseLayerId);
     }
     fromContainerPointToLatLng(point) {
         const coordinate = this.map.containerPointToCoordinate(new maptalks__namespace.Point(point.x, point.y));
@@ -11230,7 +11365,7 @@ class TalksMap extends BaseMap {
         return point; // maptalks.Point符合Point接口, 可以直接返回
     }
     setHideLogo(hideLogo) {
-        this.map.config('attribution', hideLogo ? false : MAP_ATTRIBUTION_TG);
+        exports.Talks.setVisible(this.attributionControl, !hideLogo);
     }
     setFractionalZoom(enabled) {
         this.map.config('seamlessZoom', enabled);
@@ -11257,16 +11392,31 @@ class TalksMap extends BaseMap {
         this.map.setMaxZoom(zoom);
     }
     setMapStyle(mapStyle) {
-        // TODO: 2026/01/05 ipcjs 下一版再实现该功能
+        if (mapStyle?.talks?.theme) {
+            const mapType = this.getMapType();
+            if (mapType instanceof BuildInMapType) {
+                this.setBaseLayer(mapType.id, mapStyle.talks.theme);
+            }
+            else {
+                console.log('自定义MapType不支持设置地图样式', mapType);
+            }
+        }
     }
     setBuildInMapTypeId(id) {
-        // TODO: 2026/01/05 ipcjs 下一版再实现该功能
+        this.setBaseLayer(id, this.mapStyleTheme);
     }
     setMapType(mapType) {
-        // TODO: 2026/01/05 ipcjs 下一版再实现该功能
+        if (mapType instanceof BuildInMapType) {
+            this.setBaseLayer(mapType.getId(), this.mapStyleTheme);
+        }
     }
     getMapType() {
-        // TODO: 2026/01/05 ipcjs 下一版再实现该功能
+        const currentBaseLayerId = this.getCurrentBaseLayer()?.getId();
+        const index = this.baseLayoutIds.findIndex(it => it === currentBaseLayerId);
+        if (index !== -1) {
+            return exports.MapType.BUILD_IN_MAP_TYPES.values[index % exports.MapType.BUILD_IN_MAP_TYPES.values.length];
+        }
+        // TODO: 2026/01/05 ipcjs 自定义MapType, 下一版再实现该功能
         return exports.MapType.NORMAL;
     }
     addLayer(layer) {
@@ -11381,17 +11531,20 @@ exports.TgMapFactory = void 0;
             case exports.TgMapType.here:
                 return new HereMap($map, options);
             case exports.TgMapType.baiduFree:
-                return new TalksMap($map, options, ['baidu', 'osm']);
+                return new TalksMap($map, options, ['baidu', 'amap-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.googleFree:
-                return new TalksMap($map, options, ['google', 'osm']);
+                return new TalksMap($map, options, ['google', 'osm-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.amap:
-                return new TalksMap($map, options, ['amap']);
+                return new TalksMap($map, options, ['amap', 'amap-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.osm:
-                return new TalksMap($map, options, ['osm']);
+                return new TalksMap($map, options, ['osm-light', 'osm-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.yandex:
-                return new TalksMap($map, options, ['yandex']);
-            case exports.TgMapType.talks:
-                return new TalksMap($map, options, [getTgMapConfig().talks.layerId || 'bing']);
+                return new TalksMap($map, options, ['yandex', undefined, undefined, undefined, 'osm-dark']);
+            case exports.TgMapType.talks: {
+                const hasDefinedFirstElement = (array) => !!(array && array.length && array[0]);
+                const talks = getTgMapConfig().talks;
+                return new TalksMap($map, options, hasDefinedFirstElement(talks.layerIds) ? talks.layerIds : [talks.layerId || 'bing']);
+            }
             default:
                 tgCommons.assertNever(type);
         }