tg-map-vue3 3.7.2 → 3.7.4

package/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 3.7.x
 
 - feat: 添加[IconSequence]到[TgPolyline]中
+- ***BREAKING CHANGE***: [MapStyle]简化成纯对象, 方便使用
 
 ## 3.6.x
 
@@ -67,3 +68,4 @@
 [LatLngBounds]: src/map/lat-lng.ts#L157
 [LatLng]: src/map/lat-lng.ts#L26
 [BaiduShape]: src/map/map/overlay/shape.ts#L32
+[MapStyle]: src/map/map/map-options.ts#72

package/dist/src/components/index.d.ts

@@ -20,8 +20,10 @@ export * from '../map/map/extra/marker-clusterer';
 export * from '../map/map/extra/places-service';
 export * from '../map/map/extra/search-box';
 export * from '../map/map/map';
+export * from '../map/map/map-options';
 export * from '../map/map/map-type';
 export * from '../map/map/overlay/circle';
+export * from '../map/map/overlay/element-overlay';
 export * from '../map/map/overlay/icon';
 export * from '../map/map/overlay/info-box';
 export * from '../map/map/overlay/info-window';

package/dist/src/components/overlays/TgMarker.vue.d.ts

@@ -102,7 +102,7 @@ declare const TgMarker: import("vue").DefineComponent<{
             }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
                 [key: string]: any;
             }>) => void)[] | undefined;
-            readonly mapPane?: import("../../utils/mapped-types").StringEnumValue<typeof import("../../map/map/overlay/element-overlay").MapPane> | undefined;
+            readonly mapPane?: import("../../utils/mapped-types").StringEnumValue<typeof import("..").MapPane> | undefined;
         };
         $attrs: {
             [x: string]: unknown;
@@ -128,7 +128,7 @@ declare const TgMarker: import("vue").DefineComponent<{
                 type: PropType<number>;
             };
             mapPane: {
-                type: PropType<import("../../utils/mapped-types").StringEnumValue<typeof import("../../map/map/overlay/element-overlay").MapPane>>;
+                type: PropType<import("../../utils/mapped-types").StringEnumValue<typeof import("..").MapPane>>;
             };
         }>> & {
             onClick?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
@@ -177,7 +177,7 @@ declare const TgMarker: import("vue").DefineComponent<{
             type: PropType<number>;
         };
         mapPane: {
-            type: PropType<import("../../utils/mapped-types").StringEnumValue<typeof import("../../map/map/overlay/element-overlay").MapPane>>;
+            type: PropType<import("../../utils/mapped-types").StringEnumValue<typeof import("..").MapPane>>;
         };
     }>> & {
         onClick?: ((event: import("../../map/event").Tg.Event) => any) | undefined;

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

@@ -43,7 +43,7 @@ export declare class BaiduMap extends AbstractMap {
     setZoom(zoom: number): void;
     setMinZoom(zoom: number): void;
     setMaxZoom(zoom: number): void;
-    setMapStyle(mapStyle: MapStyle): void;
+    setMapStyle(mapStyle?: MapStyle): void;
     setBuildInMapTypeId(id: BuildInMapTypeId): void;
     setMapType(mapType: MapType): void;
     getMapType(): MapType;

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

@@ -41,7 +41,7 @@ export declare class GoogleMap extends AbstractMap {
     setCenter(latlng: LatLng): void;
     setMinZoom(zoom: number): void;
     setMaxZoom(zoom: number): void;
-    setMapStyle(mapStyle: MapStyle): void;
+    setMapStyle(mapStyle?: MapStyle): void;
     setBuildInMapTypeId(id: BuildInMapTypeId): void;
     setMapType(mapType: MapType): void;
     getMapType(): MapType;

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

@@ -40,7 +40,7 @@ export declare class HereMap extends AbstractMap {
     setDoubleClickZoom(enable: boolean): void;
     setMinZoom(zoom: number): void;
     setMaxZoom(zoom: number): void;
-    setMapStyle(mapStyle: MapStyle): void;
+    setMapStyle(mapStyle?: MapStyle): void;
     setBuildInMapTypeId(id: BuildInMapTypeId): void;
     setMapType(mapType: MapType): void;
     getMapType(): MapType;

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

@@ -1,3 +1,4 @@
+/// <reference types="baidumap-web-sdk" />
 /// <reference types="google.maps" />
 import { LatLng } from '../lat-lng';
 import type { BuildInMapTypeId } from './map-type';
@@ -43,14 +44,19 @@ export interface MapOptions {
 export declare namespace MapOptions {
     function create(options?: Partial<MapOptions>): MapOptions;
 }
+/**
+ * ## 本地样式编辑器
+ * - google: https://mapstyle.withgoogle.com/
+ * - baidu: https://lbsyun.baidu.com/apiconsole/custommap
+ *
+ * ## 关于云端样式
+ * - google: mapId只有创建时有效, 之后再更改无效
+ * - baidu: styleId无效, 原因未知
+ */
 export interface MapStyle {
-    toBaidu(): BMap.MapStyleV2;
-    toGoogle(): google.maps.MapTypeStyle[];
-}
-export declare class SimpleMapStyle implements MapStyle {
     baidu: BMap.MapStyleV2;
-    google: google.maps.MapTypeStyle[];
-    constructor(baidu: BMap.MapStyleV2, google: google.maps.MapTypeStyle[]);
-    toBaidu(): BMap.MapStyleV2;
-    toGoogle(): google.maps.MapTypeStyle[];
+    google: {
+        styles?: google.maps.MapTypeStyle[];
+        mapId?: string;
+    };
 }

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

@@ -116,7 +116,7 @@ export declare abstract class AbstractMap implements CoordTypeSupplier, Tg.Event
     abstract setCenter(latlng: LatLng): void;
     abstract setMinZoom(zoom: number): void;
     abstract setMaxZoom(zoom: number): void;
-    abstract setMapStyle(mapStyle: MapStyle): void;
+    abstract setMapStyle(mapStyle?: MapStyle): void;
     /** setMapType的便利版, 只能够用来设置内置地图类型 */
     abstract setBuildInMapTypeId(id: BuildInMapTypeId): void;
     abstract setMapType(mapType: MapType): void;

package/dist/tg-map.js

@@ -4222,7 +4222,7 @@ class Gi extends Tt {
       mapType: r.buildInMapTypeId && ((s = this.buildInMapTypeId2BIMT.get(r.buildInMapTypeId)) == null ? void 0 : s.asBaiduMapType()),
       enableMapClick: !1
       // 关闭底图点击功能
-    }), this.map.centerAndZoom(r.center.toBaidu(this.coordType), r.zoom + ee), this.setGestureHandling(r.gestureHandling), r.infoWindowMode === "multi" && console.warn("baidu不支持多个InfoWindow, 可能会出现未知问题"), r.mapStyle && this.map.setMapStyleV2(r.mapStyle.toBaidu()), this.setEventTargetDelegate(new ae(this.map, this)), this.map.addEventListener("addoverlay", (n) => {
+    }), this.map.centerAndZoom(r.center.toBaidu(this.coordType), r.zoom + ee), this.setGestureHandling(r.gestureHandling), r.infoWindowMode === "multi" && console.warn("baidu不支持多个InfoWindow, 可能会出现未知问题"), r.mapStyle && this.map.setMapStyleV2(r.mapStyle.baidu), this.setEventTargetDelegate(new ae(this.map, this)), this.map.addEventListener("addoverlay", (n) => {
       const a = n.target.__info_box__;
       a && (console.debug("add:info-box", a), this.map.addOverlay(a));
     }), this.map.addEventListener("removeoverlay", (n) => {
@@ -4297,7 +4297,7 @@ class Gi extends Tt {
     this.map.setMaxZoom(e + ee);
   }
   setMapStyle(e) {
-    this.map.setMapStyleV2(e.toBaidu());
+    this.map.setMapStyleV2((e == null ? void 0 : e.baidu) ?? { styleJson: [] });
   }
   setBuildInMapTypeId(e) {
     var s;
@@ -4381,7 +4381,7 @@ class Gi extends Tt {
 }
 class Zi extends Tt {
   constructor(e, r) {
-    var n;
+    var n, a;
     super(e);
     c(this, "buildInMapTypeId2BIMT");
     c(this, "googleMapTypeId2BIMT");
@@ -4407,7 +4407,8 @@ class Zi extends Tt {
       gestureHandling: r.gestureHandling,
       minZoom: r.minZoom,
       maxZoom: r.maxZoom,
-      styles: (n = r.mapStyle) == null ? void 0 : n.toGoogle(),
+      styles: (n = r.mapStyle) == null ? void 0 : n.google.styles,
+      mapId: (a = r.mapStyle) == null ? void 0 : a.google.mapId,
       mapTypeId: s == null ? void 0 : s.getGoogleMapTypeId()
     }), this.setEventTargetDelegate(new re(this.map, this));
   }
@@ -4464,7 +4465,10 @@ class Zi extends Tt {
     this.map.setOptions({ maxZoom: e });
   }
   setMapStyle(e) {
-    this.map.setOptions({ styles: e.toGoogle() });
+    this.map.setOptions({
+      styles: e == null ? void 0 : e.google.styles,
+      mapId: e == null ? void 0 : e.google.mapId
+    });
   }
   setBuildInMapTypeId(e) {
     var s;
@@ -6132,7 +6136,9 @@ export {
   z as ControlPositionConverter,
   x as CoordType,
   gi as CustomControl,
+  zi as ElementOverlay,
   pi as FastFindValues,
+  j as GestureHandlingOptions,
   _i as GoogleAutocomplete,
   Ct as GoogleCircle,
   gt as GoogleControl,
@@ -6154,6 +6160,7 @@ export {
   Ze as IconSequence,
   Hs as ImageMapType,
   wt as InfoWindow,
+  Si as InfoWindowModeValues,
   Ht as KeyValue,
   y as LatLng,
   R as LatLngBounds,
@@ -6164,6 +6171,9 @@ export {
   Gt as MIXIN_MAP_NAME,
   ce as MVCArrays,
   k as MapMixin,
+  lt as MapOptions,
+  we as MapPane,
+  Ee as MapPanes,
   $ as MapType,
   dr as MapTypeControlType,
   fr as MapUrls,