tg-map-core 4.2.2 → 4.2.3

package/README.md

@@ -1,3 +1,3 @@
-# tg-map-core
-
-封装 百度地图, Google地图, Here地图(未完成), Maptalks 的地图库
+# tg-map-core
+
+封装 百度地图, Google地图, Here地图(未完成), Maptalks 的地图库

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

@@ -18,7 +18,7 @@ export interface MapTypeControlOptions {
     mapTypes?: MapType[];
 }
 export declare class BaiduMapTypeControl extends BaiduControl<BMap.MapTypeControl> implements MapTypeControl {
-    static create(this: BaiduMap, options: MapTypeControlOptions): EmptyControl | BaiduMapTypeControl;
+    static create(this: BaiduMap, options: MapTypeControlOptions): BaiduMapTypeControl | EmptyControl;
 }
 export declare class GoogleMapTypeControl extends GoogleControl implements MapTypeControl {
     type: MapTypeControlType;

package/dist/src/map/map/extra/marker-clusterer.d.ts

@@ -134,6 +134,10 @@ export declare class TalksMarkerClusterer implements MarkerClusterer {
     private map;
     inner: ClusterLayer;
     constructor(map: TalksMap, options: MarkerClustererOptions);
+    private checkMarkersVisibility;
+    private timeoutId;
+    private isRenderStarted;
+    private postCheckMarkersVisibility;
     clearMarkers(removeFromMap?: boolean): void;
     addMarker(marker: TalksMarker): void;
     removeMarker(marker: TalksMarker): boolean;

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

@@ -35,7 +35,7 @@ export declare class BaiduCircle extends BaiduShape<BMap.Circle> implements Circ
     private isDoingSetCenter;
     private isDoingSetRadius;
     private eventHubDelegate;
-    protected createDelegate(): EventHubEventTargetDelegate<"center-changed" | "radius-changed">;
+    protected createDelegate(): EventHubEventTargetDelegate<"radius-changed" | "center-changed">;
     private onRadiusChanged;
     private onCenterChanged;
     private resetEditableTimeoutId;

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

@@ -60,6 +60,7 @@ export declare class TalksMap extends BaseMap {
     setDoubleClickZoom(enable: boolean): void;
     getCenter(): LatLng;
     setCenter(latlng: LatLng): void;
+    setZoom(zoom: number): void;
     setMinZoom(zoom: number): void;
     setMaxZoom(zoom: number): void;
     setMapStyle(mapStyle?: MapStyle): void;

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

@@ -6,7 +6,7 @@ export declare function talksBaseLayerIdToCoordType(layerId: TalksBaseLayerId |
     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;
+    id?: "google" | "osm" | "osm-light" | "osm-dark" | "osm-terrain" | "baidu" | "baidu-detail" | "amap" | "amap-terrain" | "tencent" | "geoq" | "tianditu" | "yandex" | "bing" | undefined;
     visible?: boolean | undefined;
 }): maptalks.TileLayer;
 export declare const createTalksBaseLayer: typeof createTalksBaseLayerImpl;

package/dist/tg-map-core.cjs

@@ -7120,7 +7120,7 @@ function includesMethod(keys) {
 /** 用于替代Vue2中的filter, 直接交给模板使用 */
 exports.Objects.toJsonSafely;
 
-// cspell: ignore bmaplib, markerclusterer, texticonoverlay
+// cspell: ignore bmaplib, markerclusterer, texticonoverlay, renderend, renderstart
 const createDefaultStylesIndexCalculator = (_styles) => {
     if (_styles?.[0]?.minMarkersLength == null) {
         return undefined;
@@ -7373,30 +7373,57 @@ class TalksMarkerClusterer {
             }
         });
         map.innerMap.addLayer(this.inner);
-        const checkMarkersVisibility = debounce(() => {
-            // 检测marker在点聚合中的可见性改变, 然后发送事件通知marker点
-            const visibleMarkerSet = new Set(this.inner.getRenderer()?.getCurrentNeedRenderGeos() ?? []);
-            const markers = this.inner.getGeometries();
-            for (const marker of markers) {
-                const prev = marker.__visible_in_cluster ?? marker.isVisible();
-                const curr = visibleMarkerSet.has(marker);
-                if (prev !== curr) {
-                    marker.__visible_in_cluster = curr;
-                    marker.fire('visible-change-in-cluster', { visible: curr });
-                }
+        this.inner.on('renderstart', () => {
+            // renderstart在每次渲染时都会触发, renderend在动画时, 不会每次都触发
+            // 渲染过程中, 才会重新计算getCurrentNeedRenderGeos(), 故需要等待渲染执行过之后, 再去执行checkMarkersVisibility
+            this.isRenderStarted = true;
+        });
+        map.innerMap.on('zoomend', this.postCheckMarkersVisibility);
+        this.postCheckMarkersVisibility();
+    }
+    checkMarkersVisibility = () => {
+        // 检测marker在点聚合中的可见性改变, 然后发送事件通知marker点
+        const visibleMarkerSet = new Set(this.inner.getRenderer()?.getCurrentNeedRenderGeos() ?? []);
+        const markers = this.inner.getGeometries();
+        for (const marker of markers) {
+            const prev = marker.__visible_in_cluster ?? marker.isVisible();
+            const curr = visibleMarkerSet.has(marker);
+            if (prev !== curr) {
+                marker.__visible_in_cluster = curr;
+                marker.fire('visible-change-in-cluster', { visible: curr });
             }
-        }, 100);
-        map.innerMap.on('zoomend', checkMarkersVisibility);
-        checkMarkersVisibility();
-    }
+        }
+    };
+    timeoutId;
+    isRenderStarted = false;
+    postCheckMarkersVisibility = () => {
+        clearTimeout(this.timeoutId);
+        if (!this.inner.getCount()) {
+            // 没有marker点, 不需要检测
+            return;
+        }
+        this.isRenderStarted = false;
+        const waitRenderStarted = (times = 0) => {
+            // 为了防止无限等待, 最多等3次
+            if (this.isRenderStarted || times > 3) {
+                this.checkMarkersVisibility();
+            }
+            else {
+                this.timeoutId = setTimeout(() => waitRenderStarted(times + 1), 50);
+            }
+        };
+        this.timeoutId = setTimeout(waitRenderStarted, 100);
+    };
     clearMarkers(removeFromMap = true) {
         this.inner.clear();
         if (removeFromMap) {
             this.inner.remove();
+            clearTimeout(this.timeoutId);
         }
     }
     addMarker(marker) {
         this.inner.addMarker(marker.innerOverlay);
+        this.postCheckMarkersVisibility();
     }
     removeMarker(marker) {
         this.inner.removeGeometry(marker.innerOverlay);
@@ -7404,6 +7431,7 @@ class TalksMarkerClusterer {
     }
     addMarkers(markers) {
         this.inner.addMarker(markers.map(it => it.innerOverlay));
+        this.postCheckMarkersVisibility();
     }
     removeMarkers(markers) {
         this.inner.removeGeometry(markers.map(it => it.innerOverlay));
@@ -9189,9 +9217,9 @@ class BaiduLabelOverlay extends BaiduOverlay {
                                 icon.__icon__.scale,
                                 icon.__icon__.strokeWeight,
                             ].map(it => it ?? '').join(',');
-                            console.warn('BaiduLabelOverlay.attachIcon', icon.__icon__, exports.Strings.trimIndent(`
-                 为了保证Label的位置正确, 请将SymbolIcon(${iconInfo})中baiduLabelOffset的值改写成: 
-                 ${JSON.stringify({ x, y })}
+                            console.warn('BaiduLabelOverlay.attachIcon', icon.__icon__, exports.Strings.trimIndent(`
+                 为了保证Label的位置正确, 请将SymbolIcon(${iconInfo})中baiduLabelOffset的值改写成: 
+                 ${JSON.stringify({ x, y })}
                  `));
                         }
                     }, 1);
@@ -9295,7 +9323,7 @@ class TalksLabelOverlay extends TalksOverlay {
         });
     }
     setZIndex(zIndex) {
-        this.setZIndex(zIndex);
+        this.innerOverlay.setZIndex(zIndex);
     }
 }
 
@@ -9874,6 +9902,7 @@ class TalksMarker extends TalksOverlay {
             };
             const mapChanged = this.labelMapChangedListener = () => {
                 // 存在layer说明marker已经被添加到地图上, label也要添加进去
+                // TODO: 2026/02/05 ipcjs 向talks地图中添加label非常耗时, 并且如果在点聚合中, 大部分label其实会被隐藏, 这里是一个可以优化的点
                 if (this.innerOverlay.getLayer()) {
                     this.map.addOverlay(label);
                 }
@@ -11385,6 +11414,10 @@ class TalksMap extends BaseMap {
     setCenter(latlng) {
         this.map.setCenter(latlng.toTalks(this.coordType));
     }
+    setZoom(zoom) {
+        // tg-map中, setZoom的语义是直接改变zoom, 不播放动画
+        this.map.setZoom(zoom, { animation: false });
+    }
     setMinZoom(zoom) {
         this.map.setMinZoom(zoom);
     }

package/dist/tg-map-core.mjs

@@ -7093,7 +7093,7 @@ function includesMethod(keys) {
 /** 用于替代Vue2中的filter, 直接交给模板使用 */
 Objects.toJsonSafely;
 
-// cspell: ignore bmaplib, markerclusterer, texticonoverlay
+// cspell: ignore bmaplib, markerclusterer, texticonoverlay, renderend, renderstart
 const createDefaultStylesIndexCalculator = (_styles) => {
     if (_styles?.[0]?.minMarkersLength == null) {
         return undefined;
@@ -7346,30 +7346,57 @@ class TalksMarkerClusterer {
             }
         });
         map.innerMap.addLayer(this.inner);
-        const checkMarkersVisibility = debounce(() => {
-            // 检测marker在点聚合中的可见性改变, 然后发送事件通知marker点
-            const visibleMarkerSet = new Set(this.inner.getRenderer()?.getCurrentNeedRenderGeos() ?? []);
-            const markers = this.inner.getGeometries();
-            for (const marker of markers) {
-                const prev = marker.__visible_in_cluster ?? marker.isVisible();
-                const curr = visibleMarkerSet.has(marker);
-                if (prev !== curr) {
-                    marker.__visible_in_cluster = curr;
-                    marker.fire('visible-change-in-cluster', { visible: curr });
-                }
+        this.inner.on('renderstart', () => {
+            // renderstart在每次渲染时都会触发, renderend在动画时, 不会每次都触发
+            // 渲染过程中, 才会重新计算getCurrentNeedRenderGeos(), 故需要等待渲染执行过之后, 再去执行checkMarkersVisibility
+            this.isRenderStarted = true;
+        });
+        map.innerMap.on('zoomend', this.postCheckMarkersVisibility);
+        this.postCheckMarkersVisibility();
+    }
+    checkMarkersVisibility = () => {
+        // 检测marker在点聚合中的可见性改变, 然后发送事件通知marker点
+        const visibleMarkerSet = new Set(this.inner.getRenderer()?.getCurrentNeedRenderGeos() ?? []);
+        const markers = this.inner.getGeometries();
+        for (const marker of markers) {
+            const prev = marker.__visible_in_cluster ?? marker.isVisible();
+            const curr = visibleMarkerSet.has(marker);
+            if (prev !== curr) {
+                marker.__visible_in_cluster = curr;
+                marker.fire('visible-change-in-cluster', { visible: curr });
             }
-        }, 100);
-        map.innerMap.on('zoomend', checkMarkersVisibility);
-        checkMarkersVisibility();
-    }
+        }
+    };
+    timeoutId;
+    isRenderStarted = false;
+    postCheckMarkersVisibility = () => {
+        clearTimeout(this.timeoutId);
+        if (!this.inner.getCount()) {
+            // 没有marker点, 不需要检测
+            return;
+        }
+        this.isRenderStarted = false;
+        const waitRenderStarted = (times = 0) => {
+            // 为了防止无限等待, 最多等3次
+            if (this.isRenderStarted || times > 3) {
+                this.checkMarkersVisibility();
+            }
+            else {
+                this.timeoutId = setTimeout(() => waitRenderStarted(times + 1), 50);
+            }
+        };
+        this.timeoutId = setTimeout(waitRenderStarted, 100);
+    };
     clearMarkers(removeFromMap = true) {
         this.inner.clear();
         if (removeFromMap) {
             this.inner.remove();
+            clearTimeout(this.timeoutId);
         }
     }
     addMarker(marker) {
         this.inner.addMarker(marker.innerOverlay);
+        this.postCheckMarkersVisibility();
     }
     removeMarker(marker) {
         this.inner.removeGeometry(marker.innerOverlay);
@@ -7377,6 +7404,7 @@ class TalksMarkerClusterer {
     }
     addMarkers(markers) {
         this.inner.addMarker(markers.map(it => it.innerOverlay));
+        this.postCheckMarkersVisibility();
     }
     removeMarkers(markers) {
         this.inner.removeGeometry(markers.map(it => it.innerOverlay));
@@ -9162,9 +9190,9 @@ class BaiduLabelOverlay extends BaiduOverlay {
                                 icon.__icon__.scale,
                                 icon.__icon__.strokeWeight,
                             ].map(it => it ?? '').join(',');
-                            console.warn('BaiduLabelOverlay.attachIcon', icon.__icon__, Strings.trimIndent(`
-                 为了保证Label的位置正确, 请将SymbolIcon(${iconInfo})中baiduLabelOffset的值改写成: 
-                 ${JSON.stringify({ x, y })}
+                            console.warn('BaiduLabelOverlay.attachIcon', icon.__icon__, Strings.trimIndent(`
+                 为了保证Label的位置正确, 请将SymbolIcon(${iconInfo})中baiduLabelOffset的值改写成: 
+                 ${JSON.stringify({ x, y })}
                  `));
                         }
                     }, 1);
@@ -9268,7 +9296,7 @@ class TalksLabelOverlay extends TalksOverlay {
         });
     }
     setZIndex(zIndex) {
-        this.setZIndex(zIndex);
+        this.innerOverlay.setZIndex(zIndex);
     }
 }
 
@@ -9847,6 +9875,7 @@ class TalksMarker extends TalksOverlay {
             };
             const mapChanged = this.labelMapChangedListener = () => {
                 // 存在layer说明marker已经被添加到地图上, label也要添加进去
+                // TODO: 2026/02/05 ipcjs 向talks地图中添加label非常耗时, 并且如果在点聚合中, 大部分label其实会被隐藏, 这里是一个可以优化的点
                 if (this.innerOverlay.getLayer()) {
                     this.map.addOverlay(label);
                 }
@@ -11358,6 +11387,10 @@ class TalksMap extends BaseMap {
     setCenter(latlng) {
         this.map.setCenter(latlng.toTalks(this.coordType));
     }
+    setZoom(zoom) {
+        // tg-map中, setZoom的语义是直接改变zoom, 不播放动画
+        this.map.setZoom(zoom, { animation: false });
+    }
     setMinZoom(zoom) {
         this.map.setMinZoom(zoom);
     }