tg-map-core 4.1.8 → 4.2.1

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

@@ -65,7 +65,13 @@ 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;
+    /**
+     * @param eventTypeMap 额外的事件类型映射
+     */
+    constructor(inner: T, coordTypeSupplier: CoordTypeSupplier, eventTypeMap?: Record<string, string>);
     addEventListener(type: string, listener: Tg.EventListener): void;
     removeEventListener(type: string, listener: Tg.EventListener): void;
 }

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

@@ -20,7 +20,6 @@ import { BaiduInfoBoxOverlay } from './overlay/info-box';
 import { BaiduInfoWindow } from './overlay/info-window';
 import { BaiduLabelOverlay } from './overlay/label';
 import { BaiduMarker } from './overlay/marker';
-import type { BaiduOverlay } from './overlay/overlay';
 import { BaiduPolygon } from './overlay/polygon';
 import { BaiduPolyline } from './overlay/polyline';
 import { BaiduRectangle } from './overlay/rectangle';
@@ -59,8 +58,6 @@ export declare class BaiduMap extends BaseMap {
     getBounds(): LatLngBounds;
     addElementOverlay(overlay: ElementOverlay): void;
     removeElementOverlay(overlay: ElementOverlay): void;
-    addOverlay(overlay: BaiduOverlay): void;
-    removeOverlay(overlay: BaiduOverlay): void;
     addCustomControl(control: CustomControl): void;
     removeCustomControl(control: CustomControl): void;
     createLabel: typeof BaiduLabelOverlay.create;

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/google-map.d.ts

@@ -20,7 +20,6 @@ import { GoogleInfoBoxOverlay } from './overlay/info-box';
 import { GoogleInfoWindow } from './overlay/info-window';
 import { GoogleLabelOverlay } from './overlay/label';
 import { GoogleMarker } from './overlay/marker';
-import type { GoogleOverlay } from './overlay/overlay';
 import { GooglePolygon } from './overlay/polygon';
 import { GooglePolyline } from './overlay/polyline';
 import { GoogleRectangle } from './overlay/rectangle';
@@ -58,8 +57,6 @@ export declare class GoogleMap extends BaseMap {
     getBounds(): LatLngBounds;
     addElementOverlay(overlay: ElementOverlay): void;
     removeElementOverlay(overlay: ElementOverlay): void;
-    addOverlay(overlay: GoogleOverlay): void;
-    removeOverlay(overlay: GoogleOverlay): void;
     addCustomControl(control: CustomControl): void;
     removeCustomControl(control: CustomControl): void;
     createLabel: typeof GoogleLabelOverlay.create;

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

@@ -20,7 +20,6 @@ import type { InfoBoxOptions, InfoBoxOverlay } from './overlay/info-box';
 import type { InfoWindowOptions, InfoWindowOverlay } from './overlay/info-window';
 import type { LabelOptions, LabelOverlay } from './overlay/label';
 import type { MarkerOptions, MarkerOverlay } from './overlay/marker';
-import type { Overlay } from './overlay/overlay';
 import type { PolygonOptions, PolygonOverlay } from './overlay/polygon';
 import type { PolylineOptions, PolylineOverlay } from './overlay/polyline';
 import type { RectangleOptions, RectangleOverlay } from './overlay/rectangle';
@@ -55,8 +54,6 @@ export declare class HereMap extends BaseMap {
     getBounds(): LatLngBounds;
     addElementOverlay(overlay: ElementOverlay): void;
     removeElementOverlay(overlay: ElementOverlay): void;
-    addOverlay(overlay: Overlay<unknown>): void;
-    removeOverlay(overlay: Overlay<unknown>): void;
     createMarker(options: MarkerOptions): MarkerOverlay;
     createMarkerClusterer(options: MarkerClustererOptions): MarkerClusterer;
     createHeatmap(options: HeatmapOptions): Heatmap;

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/map.d.ts

@@ -168,8 +168,8 @@ export declare abstract class BaseMap implements AbstractMap {
     abstract getBounds(): LatLngBounds;
     abstract addElementOverlay(overlay: ElementOverlay): void;
     abstract removeElementOverlay(overlay: ElementOverlay): void;
-    abstract addOverlay(overlay: Overlay): void;
-    abstract removeOverlay(overlay: Overlay): void;
+    addOverlay(overlay: Overlay): void;
+    removeOverlay(overlay: Overlay): void;
     abstract createMarker(options: MarkerOptions): MarkerOverlay;
     abstract createMarkerClusterer(options: MarkerClustererOptions): MarkerClusterer;
     abstract createHeatmap(options: HeatmapOptions): Heatmap;

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

@@ -1,6 +1,6 @@
 import * as maptalks from 'maptalks';
 import type { Tg } from '../../event';
-import { EventHubEventTargetDelegate } from '../../event-target';
+import { EventHubEventTargetDelegate, type EventTargetDelegate } from '../../event-target';
 import { LatLng } from '../../lat-lng';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
@@ -35,7 +35,7 @@ export declare class BaiduCircle extends BaiduShape<BMap.Circle> implements Circ
     private isDoingSetCenter;
     private isDoingSetRadius;
     private eventHubDelegate;
-    protected createDelegate(): EventHubEventTargetDelegate<"radius-changed" | "center-changed">;
+    protected createDelegate(): EventHubEventTargetDelegate<"center-changed" | "radius-changed">;
     private onRadiusChanged;
     private onCenterChanged;
     private resetEditableTimeoutId;
@@ -53,6 +53,12 @@ export declare class GoogleCircle extends GoogleShape<google.maps.Circle> implem
 }
 export declare class TalksCircle extends TalksShape<maptalks.Circle> implements Circle {
     static create(this: TalksMap, options: CircleOptions): TalksCircle;
+    private prevCenter?;
+    private prevRadius?;
+    private eventHubDelegate?;
+    protected createDelegate(): EventTargetDelegate;
+    private onRadiusChanged;
+    private onCenterChanged;
     setCenter(center: LatLng): void;
     getCenter(): LatLng;
     setRadius(radius: number): void;

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/overlay/label.d.ts

@@ -107,6 +107,8 @@ export declare class GoogleLabelOverlay extends GoogleOverlay<GoogleLabel> imple
 export type TalksLabel = maptalks.ui.UIMarker;
 export declare class TalksLabelOverlay extends TalksOverlay<TalksLabel> implements Label {
     static create(this: TalksMap, options: LabelOptions): TalksLabelOverlay;
+    addTo(map: TalksMap): void;
+    remove(): void;
     setContent(content: LabelContent): void;
     getPosition(): LatLng;
     setPosition(position: LatLng): void;

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

@@ -163,6 +163,8 @@ export declare class TalksMarker extends TalksOverlay<maptalks.Marker> implement
     private labelMapChangedListener;
     private labelVisibleChangeInCluster;
     constructor(innerOverlay: maptalks.Marker, coordType: CoordType, map: TalksMap, state: Pick<MarkerOptions, 'icon' | 'label' | 'title'>);
+    addTo(map: TalksMap): void;
+    remove(): void;
     getPosition(): LatLng;
     setPosition(position: LatLng): void;
     setTitle(title: string): void;

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

@@ -17,13 +17,20 @@ export declare abstract class Overlay<T = unknown> implements Tg.EventTarget {
     constructor(innerOverlay: T, 
     /** 用于保存Overlay内部点的坐标, 它的值有可能和map的不同 */
     coordType: CoordType);
+    /** @see addTo */
     protected abstract map: BaseMap;
     protected abstract createDelegate(): EventTargetDelegate;
     private _delegate;
     private get delegate();
     addEventListener(type: string, listener: Tg.EventListener): void;
     removeEventListener(type: string, listener: Tg.EventListener): void;
-    remove(): void;
+    /**
+     * 添加到地图
+     * @param map 应该和this.map是同一个对象, 目前没有处理两个对象不同的情况, 因此在{@link remove}中也没有清空this.map, 并且this.map也没被声明成可空
+     */
+    abstract addTo(map: BaseMap): void;
+    /** @see addTo */
+    abstract remove(): void;
     abstract isVisible(): boolean;
     abstract setVisible(visible: boolean): void;
 }
@@ -31,6 +38,8 @@ export declare class GoogleOverlay<T extends UnionGoogleOverlay = UnionGoogleOve
     protected map: GoogleMap;
     constructor(innerOverlay: T, coordType: CoordType, map: GoogleMap);
     protected createDelegate(): EventTargetDelegate;
+    addTo(map: GoogleMap): void;
+    remove(): void;
     isVisible(): boolean;
     setVisible(visible: boolean): void;
 }
@@ -38,6 +47,8 @@ export declare class BaiduOverlay<T extends UnionBaiduOverlay = UnionBaiduOverla
     protected map: BaiduMap;
     constructor(innerOverlay: T, coordType: CoordType, map: BaiduMap);
     protected createDelegate(): EventTargetDelegate;
+    addTo(map: BaiduMap): void;
+    remove(): void;
     /** 仅限内部使用; 设为private时, 生成的d.ts文件中, 方法返回值会变成any, 故改成了public */
     get overlay(): Required<Pick<UnionBaiduOverlay, "isVisible" | "show" | "hide">>;
     isVisible(): boolean;
@@ -45,7 +56,7 @@ export declare class BaiduOverlay<T extends UnionBaiduOverlay = UnionBaiduOverla
     /** 在创建BaiduOverlay时, 设置options.visible, 仅内部使用 */
     visibleOptionInternal(visible: boolean | undefined): this;
 }
-export declare class TalksOverlay<T extends UnionTalksOverlay = UnionTalksOverlay> extends Overlay<T> {
+export declare abstract class TalksOverlay<T extends UnionTalksOverlay = UnionTalksOverlay> extends Overlay<T> {
     protected map: TalksMap;
     constructor(innerOverlay: T, coordType: CoordType, map: TalksMap);
     protected createDelegate(): EventTargetDelegate;

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

@@ -1,6 +1,6 @@
 import * as maptalks from 'maptalks';
 import type { Tg } from '../../event';
-import { EventHubEventTargetDelegate } from '../../event-target';
+import { EventHubEventTargetDelegate, type EventTargetDelegate } from '../../event-target';
 import { LatLng } from '../../lat-lng';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
@@ -44,6 +44,7 @@ export declare class GooglePolygon extends GoogleShape<google.maps.Polygon> impl
 }
 export declare class TalksPolygon extends TalksShape<maptalks.Polygon> implements Polygon {
     static create(this: TalksMap, options: PolygonOptions): TalksPolygon;
+    protected createDelegate(): EventTargetDelegate;
     getPaths(): LatLng[][];
     setPaths(paths: LatLng[][]): void;
 }

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

@@ -1,6 +1,6 @@
 import * as maptalks from 'maptalks';
 import type { Tg } from '../../event';
-import { EventHubEventTargetDelegate } from '../../event-target';
+import { EventHubEventTargetDelegate, type EventTargetDelegate } from '../../event-target';
 import { LatLng } from '../../lat-lng';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
@@ -73,6 +73,7 @@ export declare class GooglePolyline extends GoogleShape<google.maps.Polyline> im
 }
 export declare class TalksPolyline extends TalksShape<maptalks.LineString> implements Polyline {
     static create(this: TalksMap, options: PolylineOptions): TalksPolyline;
+    protected createDelegate(): EventTargetDelegate;
     getPath(): LatLng[];
     setPath(path: LatLng[]): void;
 }

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

@@ -1,5 +1,6 @@
 import * as maptalks from 'maptalks';
 import type { Tg } from '../../event';
+import { type EventTargetDelegate } from '../../event-target';
 import { CoordType, LatLngBounds } from '../../lat-lng';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
@@ -53,6 +54,7 @@ export declare class GoogleRectangle extends GoogleShape<google.maps.Rectangle>
 export declare class TalksRectangle extends TalksShape<maptalks.Rectangle> implements Rectangle {
     static create(this: TalksMap, options: RectangleOptions): TalksRectangle;
     private static convertBoundsToRect;
+    protected createDelegate(): EventTargetDelegate;
     getBounds(): LatLngBounds;
     setBounds(bounds: LatLngBounds): void;
 }

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

@@ -1,6 +1,7 @@
 import type { CoordType } from '../../lat-lng';
 import type { UnionBaiduShape, UnionGoogleShape, UnionTalksShape } from '../../unions';
 import type { BaiduMap } from '../baidu-map';
+import type { TalksMap } from '../talks-map';
 import type { SymbolIcon } from './icon';
 import { BaiduOverlay, GoogleOverlay, TalksOverlay, type OverlayOptions } from './overlay';
 export interface ShapeOptions extends OverlayOptions {
@@ -75,6 +76,20 @@ export declare abstract class GoogleShape<T extends UnionGoogleShape> extends Go
     setZIndex(zIndex: number): void;
 }
 export declare abstract class TalksShape<T extends UnionTalksShape> extends TalksOverlay<T> implements Shape {
+    addTo(map: TalksMap): void;
+    remove(): void;
+    /**
+     * ## 编辑状态的映射
+     * tg-map的editable, 直接表示是否处于编辑状态
+     * talks的editable, 只是标记overlay是否可以编辑(默认为true), 要进入编辑状态(isEditing), 还需要执行startEdit()
+     * 也就是说我们需要想办法把talks的四个状态, 映射为tg-map的两个状态
+     *
+     * 我们的做法是, 用editable保存isEditing期望的值, 保证editable为true时isEditing也会为true, 为false时isEditing也会为false
+     * 这样就可以和tg-map的editable的语义简单对应上了
+     *
+     * @see addTo
+     * @see setEditable
+     */
     isEditable(): boolean;
     setEditable(editable: boolean): void;
     setStrokeColor(color: string): void;

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

@@ -24,16 +24,30 @@ import { TalksInfoBoxOverlay } from './overlay/info-box';
 import { TalksInfoWindow } from './overlay/info-window';
 import { TalksLabelOverlay } from './overlay/label';
 import { TalksMarker } from './overlay/marker';
-import type { TalksOverlay } from './overlay/overlay';
 import { TalksPolygon } from './overlay/polygon';
 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;
-    protected markerLayer: maptalks.VectorLayer;
-    protected overlayLayer: maptalks.VectorLayer;
-    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;
@@ -60,8 +74,6 @@ export declare class TalksMap extends BaseMap {
     getBounds(): LatLngBounds;
     addElementOverlay(overlay: ElementOverlay): void;
     removeElementOverlay(overlay: ElementOverlay): void;
-    addOverlay(overlay: TalksOverlay): void;
-    removeOverlay(overlay: TalksOverlay): void;
     createMarker: typeof TalksMarker.create;
     createMarkerClusterer(options: MarkerClustererOptions): MarkerClusterer;
     createHeatmap(options: HeatmapOptions): Heatmap;

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-simple", "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?: "google" | "osm" | "osm-simple" | "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 {};