tg-map-core 4.1.3 → 4.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-map-core",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "author": "ipcjs",
   "description": "封装 百度地图, Google地图, Here地图(未完成), Maptalks 的地图库",
   "keywords": [
@@ -33,21 +33,25 @@
     "dist"
   ],
   "dependencies": {
-    "@google/markerclusterer": "2.0.9",
     "@types/baidumap-web-sdk": "0.0.11",
+    "@types/bmapgl-browser": "github:TranscodeGroup/DefinitelyTyped#path:/types/bmapgl-browser&9ed2593293c552e55d3defc8ca17d13d5f37cf5b",
     "@types/google.maps": "3.51.1",
     "@types/heremaps": "3.0.14",
-    "bmaplib.heatmap": "github:TranscodeGroup/BMapLib.Heatmap#v2",
-    "bmaplib.markerclusterer": "github:TranscodeGroup/BMapLib.MarkerClusterer#e24e502c4e626a8e698ae3fcb17d0b3c31815f0f",
     "coordtransform": "github:TranscodeGroup/coordtransform#fa1d037ed54bac0beddfd62d2c4c00f882b07004",
     "deepmerge": "^4.3.1",
     "is-plain-object": "3.0.1",
-    "maptalks": "1.5.0",
-    "tg-commons": "^1.2.2"
+    "maptalks": "^1.7.1",
+    "maptalks.markercluster": "0.8.8",
+    "tg-commons": "^1.2.8"
   },
   "devDependencies": {
+    "@google/markerclusterer": "2.0.9",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-typescript": "^12.1.2",
+    "bmaplib.heatmap": "github:TranscodeGroup/BMapLib.Heatmap#v2",
+    "bmaplib.markerclusterer": "github:TranscodeGroup/BMapLib.MarkerClusterer#e24e502c4e626a8e698ae3fcb17d0b3c31815f0f",
     "rollup": "^4.37.0",
     "rollup-plugin-postcss": "^4.0.2",
     "sass": "^1.89.2",

package/src/map/dts/baidu.d.ts

@@ -51,3 +51,12 @@ declare namespace BMap {
     imageSize?: Size
   }
 }
+
+declare namespace BMapGL {
+  interface SVGSymbol {
+    style: {
+      /** 设置的锚点 */
+      anchor: Size
+    }
+  }
+}

package/src/map/dts/maptalks.d.ts

@@ -1,10 +1,82 @@
-// cspell: ignore zindex
+import * as maptalks from 'maptalks'
 
 /**
  * maptalks的类型声明有点问题, 使用该模块扩展, 规避一些报错
  */
 declare module 'maptalks' {
+  interface LayerAbstractRenderer {
+    setToRedraw():void
+  }
   type Eventable = InstanceType<ReturnType<typeof Eventable>>
+  interface Map {
+    config(options: MapOptionsType): this
+    config<K extends keyof MapOptionsType>(conf: K, value: MapOptionsType[K]): this
+    config(): MapOptionsType
+  }
+  interface TileLayer {
+    config(options: TileLayerOptionsType): this
+    config<K extends keyof TileLayerOptionsType>(conf: K, value: TileLayerOptionsType[K]): this
+    config(): TileLayerOptionsType
+  }
+  interface Marker {
+    config(options: MarkerOptionsType): this
+    config<K extends keyof MarkerOptionsType>(conf: K, value: MarkerOptionsType[K]): this
+    config(): MarkerOptionsType
+    updateSymbol(props: AnyMarkerSymbol | Array<AnyMarkerSymbol>): this
+  }
+  interface Polygon {
+    config(options: PolygonOptionsType): this
+    config<K extends keyof PolygonOptionsType>(conf: K, value: PolygonOptionsType[K]): this
+    config(): PolygonOptionsType
+    updateSymbol(props: FillSymbol | Array<AnySymbol>): this
+  }
+  interface LineString {
+    config(options: LineStringOptionsType): this
+    config<K extends keyof LineStringOptionsType>(conf: K, value: LineStringOptionsType[K]): this
+    config(): LineStringOptionsType
+    updateSymbol(props: LineSymbol | Array<AnySymbol>): this
+  }
+  interface Circle {
+    config(options: CircleOptionsType): this
+    config<K extends keyof CircleOptionsType>(conf: K, value: CircleOptionsType[K]): this
+    config(): CircleOptionsType
+    updateSymbol(props: FillSymbol | Array<AnySymbol>): this
+  }
+  interface Rectangle {
+    config(options: RectangleOptionsType): this
+    config<K extends keyof RectangleOptionsType>(conf: K, value: RectangleOptionsType[K]): this
+    config(): RectangleOptionsType
+    updateSymbol(props: FillSymbol | Array<AnySymbol>): this
+  }
+  namespace ui {
+    interface UIMarker {
+      config(options: UIMarkerOptionsType): this
+      config<K extends keyof UIMarkerOptionsType>(conf: K, value: UIMarkerOptionsType[K]): this
+      config(): UIMarkerOptionsType
+    }
+    interface InfoWindow {
+      config(options: InfoWindowOptionsType): this
+      config<K extends keyof InfoWindowOptionsType>(conf: K, value: InfoWindowOptionsType[K]): this
+      config(): InfoWindowOptionsType
+      /** 若不传{@link coordinate}则使用owner的中心点 */
+      show(coordinate?: Coordinate): this;
+    }
+  }
+  namespace control {
+    interface Control {
+      config(options: ControlOptionsType): this
+      config<K extends keyof ControlOptionsType>(conf: K, value: ControlOptionsType[K]): this
+      config(): ControlOptionsType
+    }
+    interface Zoom {
+      config(options: ZoomOptionsTypeSpec & ControlOptionsType): this
+      config<K extends keyof ZoomOptionsTypeSpec & ControlOptionsType>(conf: K, value: (ZoomOptionsTypeSpec & ControlOptionsType)[K]): this
+      config(): ZoomOptionsTypeSpec & ControlOptionsType
+    }
+  }
+  /** {@link DomPositionType}里设置transform等其他css样式， 也会生效 */
+  type FixedDomPositionType = DomPositionType & Partial<Pick<CSSStyleDeclaration, 'transform'>>
 }
 
-export { }
+// TODO: 使用这个导出的maptalks编译会报错...
+export { maptalks }

package/src/map/dts/maptalks.markercluster.d.ts

@@ -0,0 +1,35 @@
+declare module 'maptalks.markercluster' {
+  import * as maptalks from 'maptalks'
+
+  export interface ClusterLayerOptionsType extends maptalks.OverlayLayerOptionsType {
+    renderer?: string;
+    /** @default 160 */
+    maxClusterRadius?: number;
+    textSumProperty?: string;
+    symbol?: maptalks.AnyMarkerSymbol;
+    /** @default true */
+    drawClusterText?: boolean;
+    textSymbol?: maptalks.TextSymbol;
+    /** @default true */
+    animation?: boolean;
+    /** @default 450 */
+    animationDuration?: number;
+    maxClusterZoom?: number;
+    /** @default true */
+    noClusterWithOneMarker?: boolean;
+    /** @default true */
+    forceRenderOnZooming?: boolean;
+  }
+
+  export class ClusterLayer extends maptalks.OverlayLayer {
+    constructor(name: string, markers?: maptalks.Marker[] | ClusterLayerOptionsType, options?: ClusterLayerOptionsType)
+    addMarker(markers: maptalks.Marker | maptalks.Marker[]): this
+    /** @see https://github.com/maptalks/maptalks.markercluster/blob/c2ebb293b04e4ce5560137a1ec093023c8ea81f2/index.js#L283-L286 */
+    identify(coordinate: Coordinate, options: LayerIdentifyOptionsType): maptalks.Marker[] | { center: maptalks.Coordinate, children: maptalks.Marker[] } | null
+    getClusters(): { center: maptalks.Coordinate; children: maptalks.Marker[]; count: number; key: string }[]
+
+    config(options: ClusterLayerOptionsType): this
+    config<K extends keyof ClusterLayerOptionsType>(conf: K, value: ClusterLayerOptionsType[K]): this
+    config(): ClusterLayerOptionsType
+  }
+}

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

@@ -1,7 +0,0 @@
-export declare namespace Talks {
-    function setVisible(that: {
-        isVisible(): boolean;
-        show(): void;
-        hide(): void;
-    }, visible: boolean): void;
-}