tg-map-core 4.2.3 → 4.2.5

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): BaiduMapTypeControl | EmptyControl;
+    static create(this: BaiduMap, options: MapTypeControlOptions): EmptyControl | BaiduMapTypeControl;
 }
 export declare class GoogleMapTypeControl extends GoogleControl implements MapTypeControl {
     type: MapTypeControlType;

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

@@ -34,6 +34,8 @@ export declare class TalksMap extends BaseMap {
      * @see computeBaseLayerId
      */
     private baseLayoutIds;
+    /** 复写图层内部定义的attribution */
+    private overrideLayerAttribution?;
     private map;
     private attributionControl;
     private baseLayerGroup;
@@ -43,7 +45,9 @@ export declare class TalksMap extends BaseMap {
      * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
      * @see computeBaseLayerId
      */
-    baseLayoutIds: [TalksBaseLayerId, ...(TalksBaseLayerId | undefined)[]]);
+    baseLayoutIds: [TalksBaseLayerId, ...(TalksBaseLayerId | undefined)[]], 
+    /** 复写图层内部定义的attribution */
+    overrideLayerAttribution?: string | undefined);
     private getCurrentBaseLayer;
     private onBaseLayerChanged;
     private computeBaseLayerId;

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

@@ -33,6 +33,8 @@ export interface TgMapConfig {
         layerId?: TalksBaseLayerId | '';
         /** 只有第一个元素非空, 才是有效的值; 默认`bing` */
         layerIds?: (TalksBaseLayerId | undefined)[];
+        /** 复写图层内部定义的attribution */
+        overrideLayerAttribution?: string;
     };
 }
 export type PartialTgMapConfig = DeepPartial<TgMapConfig>;

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

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

@@ -7352,10 +7352,21 @@ class TalksMarkerClusterer {
         if (process.env.NODE_ENV !== 'production' && options.stylesIndexCalculator && !createDefaultStylesIndexCalculator(options.styles)) {
             console.warn('talks不支持stylesIndexCalculator选项, 应该同时在styles中设置minMarkersLength');
         }
+        let isBaiduBaseLayer;
+        switch (map.cachedBaseLayerId) {
+            case 'baidu':
+            case 'baidu-detail':
+            case 'baidu-https':
+                isBaiduBaseLayer = true;
+                break;
+            default:
+                isBaiduBaseLayer = false;
+                break;
+        }
         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.cachedBaseLayerId === 'baidu' || map.cachedBaseLayerId === 'baidu-detail' ? 60 : 100),
+            maxClusterRadius: options.gridSize ?? (isBaiduBaseLayer ? 60 : 100),
             maxClusterZoom: options.maxZoom,
             zIndex: options.zIndex,
         }));
@@ -9217,9 +9228,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);
@@ -11053,6 +11064,7 @@ const talksBaseLayerIds = [
     'osm-terrain',
     'google',
     'baidu',
+    'baidu-https',
     'baidu-detail',
     'amap',
     'amap-terrain',
@@ -11065,6 +11077,7 @@ const talksBaseLayerIds = [
 function talksBaseLayerIdToCoordType(layerId) {
     switch (layerId) {
         case 'baidu':
+        case 'baidu-https':
         case 'baidu-detail':
             return exports.CoordType.bd09;
         case 'osm-light':
@@ -11114,6 +11127,7 @@ function createTalksBaseLayerImpl(layerId, { id = layerId, visible = true, } = {
                 spatialReference: { projection: 'EPSG:3857' },
             });
         case 'baidu':
+            // 废弃, https的网站上瓦片url也会自动变成https, 然后会报证书错误
             return new maptalks__namespace.TileLayer(id, {
                 visible,
                 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}`,
@@ -11125,6 +11139,19 @@ function createTalksBaseLayerImpl(layerId, { id = layerId, visible = true, } = {
                 maxZoom: 20,
                 attribution: '&copy; <a target="_blank" href="http://map.baidu.com">Baidu</a>',
             });
+        case 'baidu-https':
+            // gemini提供的瓦片地址
+            return new maptalks__namespace.TileLayer(id, {
+                visible,
+                urlTemplate: `https://maponline{s}.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',
+                },
+                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
             return new maptalks__namespace.TileLayer(id, {
@@ -11249,6 +11276,7 @@ const MAP_ATTRIBUTION_TG = { content: 'TG' };
 class TalksMap extends BaseMap {
     mapOptions;
     baseLayoutIds;
+    overrideLayerAttribution;
     map;
     attributionControl;
     baseLayerGroup;
@@ -11268,10 +11296,13 @@ class TalksMap extends BaseMap {
      * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
      * @see computeBaseLayerId
      */
-    baseLayoutIds) {
+    baseLayoutIds, 
+    /** 复写图层内部定义的attribution */
+    overrideLayerAttribution) {
         super(element);
         this.mapOptions = mapOptions;
         this.baseLayoutIds = baseLayoutIds;
+        this.overrideLayerAttribution = overrideLayerAttribution;
         this.mapStyleTheme = mapOptions.mapStyle?.talks?.theme ?? 'light';
         this.cachedBaseLayerId = this.computeBaseLayerId(mapOptions.buildInMapTypeId, this.mapStyleTheme);
         this.baseLayerGroup = new maptalks__namespace.GroupTileLayer('base', baseLayoutIds
@@ -11314,7 +11345,7 @@ class TalksMap extends BaseMap {
             return;
         // 更新cacheBaseLayerId, attribution, spatialReference, 但并没有更新minZoom/maxZoom, 因为感觉必要性不大
         this.cachedBaseLayerId = baseLayer.getId();
-        const layerAttribution = baseLayer.options.attribution;
+        const layerAttribution = this.overrideLayerAttribution ?? 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);
@@ -11564,7 +11595,7 @@ exports.TgMapFactory = void 0;
             case exports.TgMapType.here:
                 return new HereMap($map, options);
             case exports.TgMapType.baiduFree:
-                return new TalksMap($map, options, ['baidu', 'amap-terrain', undefined, undefined, 'osm-dark']);
+                return new TalksMap($map, options, ['baidu-https', 'amap-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.googleFree:
                 return new TalksMap($map, options, ['google', 'osm-terrain', undefined, undefined, 'osm-dark']);
             case exports.TgMapType.amap:
@@ -11576,7 +11607,7 @@ exports.TgMapFactory = void 0;
             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']);
+                return new TalksMap($map, options, hasDefinedFirstElement(talks.layerIds) ? talks.layerIds : [talks.layerId || 'bing'], talks.overrideLayerAttribution);
             }
             default:
                 tgCommons.assertNever(type);

package/dist/tg-map-core.mjs

@@ -7325,10 +7325,21 @@ class TalksMarkerClusterer {
         if (process.env.NODE_ENV !== 'production' && options.stylesIndexCalculator && !createDefaultStylesIndexCalculator(options.styles)) {
             console.warn('talks不支持stylesIndexCalculator选项, 应该同时在styles中设置minMarkersLength');
         }
+        let isBaiduBaseLayer;
+        switch (map.cachedBaseLayerId) {
+            case 'baidu':
+            case 'baidu-detail':
+            case 'baidu-https':
+                isBaiduBaseLayer = true;
+                break;
+            default:
+                isBaiduBaseLayer = false;
+                break;
+        }
         this.inner = new ClusterLayer('cluster', options.markers?.map(it => it.innerOverlay), Objects.deleteUndefinedPropertyOnPlainObjectDeeply({
             ...ClusterIconStyle.toTalks(options.styles),
             // {@macro marker_clusterer_grid_size}
-            maxClusterRadius: options.gridSize ?? (map.cachedBaseLayerId === 'baidu' || map.cachedBaseLayerId === 'baidu-detail' ? 60 : 100),
+            maxClusterRadius: options.gridSize ?? (isBaiduBaseLayer ? 60 : 100),
             maxClusterZoom: options.maxZoom,
             zIndex: options.zIndex,
         }));
@@ -9190,9 +9201,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);
@@ -11026,6 +11037,7 @@ const talksBaseLayerIds = [
     'osm-terrain',
     'google',
     'baidu',
+    'baidu-https',
     'baidu-detail',
     'amap',
     'amap-terrain',
@@ -11038,6 +11050,7 @@ const talksBaseLayerIds = [
 function talksBaseLayerIdToCoordType(layerId) {
     switch (layerId) {
         case 'baidu':
+        case 'baidu-https':
         case 'baidu-detail':
             return CoordType.bd09;
         case 'osm-light':
@@ -11087,6 +11100,7 @@ function createTalksBaseLayerImpl(layerId, { id = layerId, visible = true, } = {
                 spatialReference: { projection: 'EPSG:3857' },
             });
         case 'baidu':
+            // 废弃, https的网站上瓦片url也会自动变成https, 然后会报证书错误
             return new maptalks.TileLayer(id, {
                 visible,
                 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}`,
@@ -11098,6 +11112,19 @@ function createTalksBaseLayerImpl(layerId, { id = layerId, visible = true, } = {
                 maxZoom: 20,
                 attribution: '&copy; <a target="_blank" href="http://map.baidu.com">Baidu</a>',
             });
+        case 'baidu-https':
+            // gemini提供的瓦片地址
+            return new maptalks.TileLayer(id, {
+                visible,
+                urlTemplate: `https://maponline{s}.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',
+                },
+                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
             return new maptalks.TileLayer(id, {
@@ -11222,6 +11249,7 @@ const MAP_ATTRIBUTION_TG = { content: 'TG' };
 class TalksMap extends BaseMap {
     mapOptions;
     baseLayoutIds;
+    overrideLayerAttribution;
     map;
     attributionControl;
     baseLayerGroup;
@@ -11241,10 +11269,13 @@ class TalksMap extends BaseMap {
      * 最多8项, 前四项对应{@link MapType.BUILD_IN_MAP_TYPES}的四个值(普通、卫星、混合、地形)的亮色版, 后四项对应暗色版
      * @see computeBaseLayerId
      */
-    baseLayoutIds) {
+    baseLayoutIds, 
+    /** 复写图层内部定义的attribution */
+    overrideLayerAttribution) {
         super(element);
         this.mapOptions = mapOptions;
         this.baseLayoutIds = baseLayoutIds;
+        this.overrideLayerAttribution = overrideLayerAttribution;
         this.mapStyleTheme = mapOptions.mapStyle?.talks?.theme ?? 'light';
         this.cachedBaseLayerId = this.computeBaseLayerId(mapOptions.buildInMapTypeId, this.mapStyleTheme);
         this.baseLayerGroup = new maptalks.GroupTileLayer('base', baseLayoutIds
@@ -11287,7 +11318,7 @@ class TalksMap extends BaseMap {
             return;
         // 更新cacheBaseLayerId, attribution, spatialReference, 但并没有更新minZoom/maxZoom, 因为感觉必要性不大
         this.cachedBaseLayerId = baseLayer.getId();
-        const layerAttribution = baseLayer.options.attribution;
+        const layerAttribution = this.overrideLayerAttribution ?? 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);
@@ -11537,7 +11568,7 @@ var TgMapFactory;
             case TgMapType.here:
                 return new HereMap($map, options);
             case TgMapType.baiduFree:
-                return new TalksMap($map, options, ['baidu', 'amap-terrain', undefined, undefined, 'osm-dark']);
+                return new TalksMap($map, options, ['baidu-https', 'amap-terrain', undefined, undefined, 'osm-dark']);
             case TgMapType.googleFree:
                 return new TalksMap($map, options, ['google', 'osm-terrain', undefined, undefined, 'osm-dark']);
             case TgMapType.amap:
@@ -11549,7 +11580,7 @@ var TgMapFactory;
             case 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']);
+                return new TalksMap($map, options, hasDefinedFirstElement(talks.layerIds) ? talks.layerIds : [talks.layerId || 'bing'], talks.overrideLayerAttribution);
             }
             default:
                 assertNever(type);