tg-map-vue3 3.2.0 → 3.2.1

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

@@ -1,11 +1,11 @@
 import { type PropType } from 'vue';
 import { LatLng } from '../../map/lat-lng';
+import type { UnionIcon } from '../../map/map/overlay/icon';
 import { type MarkerOverlay } from '../../map/map/overlay/marker';
-import type { Icon } from '../../map/map/overlay/icon';
 import TgMarkerClusterer from '../extra/TgMarkerClusterer.vue';
-import type TgLabel from './TgLabel.vue';
-import type TgInfoWindow from './TgInfoWindow.vue';
 import type TgInfoBox from './TgInfoBox.vue';
+import type TgInfoWindow from './TgInfoWindow.vue';
+import type TgLabel from './TgLabel.vue';
 declare const TgMarker: import("vue").DefineComponent<{
     position: {
         type: PropType<LatLng>;
@@ -15,7 +15,7 @@ declare const TgMarker: import("vue").DefineComponent<{
         type: PropType<string>;
     };
     icon: {
-        type: PropType<Icon>;
+        type: PropType<UnionIcon>;
     };
     clickable: {
         type: PropType<boolean>;
@@ -157,7 +157,7 @@ declare const TgMarker: import("vue").DefineComponent<{
         type: PropType<string>;
     };
     icon: {
-        type: PropType<Icon>;
+        type: PropType<UnionIcon>;
     };
     clickable: {
         type: PropType<boolean>;

package/dist/src/map/map/extra/places-service.d.ts

@@ -29,7 +29,7 @@ export declare abstract class PlacesService {
 export declare class GooglePlacesService extends PlacesService {
     map: GoogleMap;
     inner: google.maps.places.PlacesService;
-    constructor(map: GoogleMap, options: PlaceServiceOptions);
+    constructor(map: GoogleMap, _options: PlaceServiceOptions);
     search(query: string, location?: string | LatLng): Promise<Place[]>;
     searchInBounds(query: string, bounds: LatLngBounds): Promise<Place[]>;
     searchNearBy(query: string, center: LatLng, radius: number): Promise<Place[]>;
@@ -40,7 +40,7 @@ export declare class BaiduPlacesService extends PlacesService {
     private searchRequestMap;
     get inner(): BMap.LocalSearch;
     currentSearch: BMap.LocalSearch | undefined;
-    constructor(map: BaiduMap, options: PlaceServiceOptions);
+    constructor(map: BaiduMap, _options: PlaceServiceOptions);
     search(query: string, location?: string | LatLng): Promise<Place[]>;
     searchInBounds(query: string, bounds: LatLngBounds): Promise<Place[]>;
     searchNearBy(query: string, center: LatLng, radius: number): Promise<Place[]>;

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

@@ -1,7 +1,16 @@
 /// <reference types="google.maps" />
 /// <reference types="baidumap-web-sdk" />
 import type { Point, Size } from '../../types';
-/** 字面量形式, 使用起来会简单点, 目前没看出使用class形式的必要🤔 */
+export type UnionIcon = Icon | SymbolIcon;
+export declare const UnionIcon: {
+    toGoogle: (icon: UnionIcon) => google.maps.Icon | google.maps.Symbol;
+    toBaidu: (icon: UnionIcon) => BMap.Icon | BaiduSymbolIcon;
+};
+/**
+ * 图片Icon
+ *
+ * 字面量形式, 使用起来会简单点, 目前没看出使用class形式的必要🤔
+ * */
 export interface Icon {
     readonly url: string;
     readonly size: Size;
@@ -14,3 +23,65 @@ export declare namespace Icon {
     function toGoogle(icon: Icon): google.maps.Icon;
     function toBaidu(icon: Icon): BMap.Icon;
 }
+/** 简单的矢量Icon */
+export interface SymbolIcon {
+    readonly path: string | SymbolPath;
+    readonly anchor?: Point;
+    readonly fillColor?: string;
+    /** @default 0, 不显示填充色 */
+    readonly fillOpacity?: number;
+    readonly scale?: number;
+    readonly rotation?: number;
+    readonly strokeColor?: string;
+    /** @default 1, 显示stroke */
+    readonly strokeOpacity?: number;
+    readonly strokeWeight?: number;
+    /**
+   * baidu地图中Marker的Label的偏移量, 用来保证Label默认对齐到Marker的position
+   *
+   * 这个值的取值和如下参数相关, 但计算这个值的公式没找到...故只能运行时读取+手动设置:
+   * - {@link path}
+   * - {@link rotation}
+   * - {@link scale}
+   * - {@link strokeWeight}
+   * - {@link anchor}
+   *
+   * 详见{@link BaiduLabelOverlay.attachIcon}
+   */
+    readonly baiduLabelOffset?: Point;
+}
+export declare namespace SymbolIcon {
+    function toGoogle(icon: SymbolIcon): google.maps.Symbol;
+    function toBaidu(icon: SymbolIcon): BaiduSymbolIcon;
+}
+export type BaiduSymbolIcon = BMap.Symbol & {
+    __icon__?: SymbolIcon;
+};
+export interface SymbolPath {
+    baidu(): BMap.SymbolShapeType;
+    google(): google.maps.SymbolPath;
+    toString(): string;
+}
+/** 模拟一个SymbolPath的枚举对象 */
+export declare const SymbolPath: {
+    readonly CIRCLE: {
+        readonly baidu: () => number;
+        readonly google: () => google.maps.SymbolPath.CIRCLE;
+    };
+    readonly BACKWARD_CLOSED_ARROW: {
+        readonly baidu: () => number;
+        readonly google: () => google.maps.SymbolPath.BACKWARD_CLOSED_ARROW;
+    };
+    readonly BACKWARD_OPEN_ARROW: {
+        readonly baidu: () => number;
+        readonly google: () => google.maps.SymbolPath.BACKWARD_OPEN_ARROW;
+    };
+    readonly FORWARD_CLOSED_ARROW: {
+        readonly baidu: () => number;
+        readonly google: () => google.maps.SymbolPath.FORWARD_CLOSED_ARROW;
+    };
+    readonly FORWARD_OPEN_ARROW: {
+        readonly baidu: () => number;
+        readonly google: () => google.maps.SymbolPath.FORWARD_OPEN_ARROW;
+    };
+};

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

@@ -5,6 +5,7 @@ import { Point } from '../../types';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
 import { type GoogleLabel } from './google-label';
+import type { BaiduSymbolIcon } from './icon';
 import { BaiduOverlay, GoogleOverlay, Overlay } from './overlay';
 export type BaiduLabel = BMap.Label & {
     __label__?: BaiduLabelOverlay;
@@ -61,6 +62,7 @@ declare namespace LabelContent {
 export declare class BaiduLabelOverlay extends BaiduOverlay<BaiduLabel> implements Label {
     static create(this: BaiduMap, options: LabelOptions): BaiduLabelOverlay;
     private icon;
+    private iconAnchor;
     private content;
     private contentObserver;
     constructor(innerOverlay: BaiduLabel, coordType: CoordType, map: BaiduMap, content: LabelContent);
@@ -75,7 +77,7 @@ export declare class BaiduLabelOverlay extends BaiduOverlay<BaiduLabel> implemen
      * 关联新的Icon, 内部使用的方法
      * @description baidu中Label默认左上角对齐Icon的左上, 我们要将其转换为对齐marker的position
      * */
-    attachIcon(icon: BMap.Icon | undefined): void;
+    attachIcon(icon: BMap.Icon | BaiduSymbolIcon | undefined): void;
 }
 export declare class GoogleLabelOverlay extends GoogleOverlay<GoogleLabel> implements Label {
     static create(this: GoogleMap, options: LabelOptions): GoogleLabelOverlay;

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

@@ -1,20 +1,19 @@
-/// <reference types="baidumap-web-sdk" />
 /// <reference types="google.maps" />
 import type { Nullable } from '../../../utils/mapped-types';
 import type { Tg } from '../../event';
 import { CoordType, LatLng } from '../../lat-lng';
-import type { UnionIcon } from '../../unions';
+import type { UnionBaiduIcon, UnionGoogleIcon } from '../../unions';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
 import type { AbstractMap } from '../map';
 import type { BaiduInfoBox } from './baidu-info-box';
-import { Icon } from './icon';
+import { UnionIcon } from './icon';
 import type { BaiduLabelOverlay, GoogleLabelOverlay, LabelOverlay } from './label';
 import { BaiduOverlay, GoogleOverlay, Overlay, type OverlayOptions } from './overlay';
 export interface MarkerOptions extends OverlayOptions {
     position: LatLng;
     title?: string;
-    icon?: Icon;
+    icon?: UnionIcon;
     /** @default true */
     clickable?: boolean;
     /** @default false */
@@ -51,9 +50,9 @@ export interface Marker extends Tg.EventTargetTyped<Marker, MarkerEventMap> {
     setPosition(position: LatLng): void;
     setTitle(title: string): void;
     getTitle(): string;
-    setIcon(icon: Icon): void;
-    /** 感觉并没有读取Icon的必要, 直接返回UnionIcon, 懒得写包装类_(:3」∠)_ */
-    getIcon(): Nullable<UnionIcon>;
+    setIcon(icon: UnionIcon): void;
+    /** 感觉并没有读取Icon的必要, 直接返回内部的Icon, 懒得写包装类_(:3」∠)_ */
+    getIcon(): Nullable<UnionGoogleIcon | UnionBaiduIcon>;
     /**
      * ## 不同行为
      * - baidu: 不支持设置clickable
@@ -92,8 +91,8 @@ export declare class BaiduMarker extends BaiduOverlay<BMarker> implements Marker
     setPosition(position: LatLng): void;
     setTitle(title: string): void;
     getTitle(): string;
-    setIcon(icon: Icon): void;
-    getIcon(): UnionIcon;
+    setIcon(icon: UnionIcon): void;
+    getIcon(): UnionBaiduIcon;
     setClickable(enable: boolean): void;
     isClickable(): boolean;
     setDraggable(enable: boolean): void;
@@ -113,8 +112,8 @@ export declare class GoogleMarker extends GoogleOverlay<google.maps.Marker> impl
     setPosition(position: LatLng): void;
     setTitle(title: string): void;
     getTitle(): string;
-    setIcon(icon: Icon): void;
-    getIcon(): Nullable<UnionIcon>;
+    setIcon(icon: UnionIcon): void;
+    getIcon(): Nullable<UnionGoogleIcon>;
     setClickable(flag: boolean): void;
     isClickable(): boolean;
     setDraggable(enable: boolean): void;

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

@@ -8,7 +8,8 @@ import type { GoogleLabel } from './map/overlay/google-label';
  * Map相关的各种类型的联合, 可以用来简化一部分代码的书写
  */
 export type UnionMap = google.maps.Map | BMap.Map | H.Map;
-export type UnionIcon = google.maps.Icon | google.maps.Symbol | google.maps.UrlIcon | BMap.Icon;
+export type UnionBaiduIcon = BMap.Icon | BMap.Symbol;
+export type UnionGoogleIcon = google.maps.Icon | google.maps.Symbol | google.maps.UrlIcon;
 export type UnionInfoWindow = google.maps.InfoWindow | BMap.InfoWindow;
 export type UnionAutocomplete = google.maps.places.Autocomplete | BMap.Autocomplete;
 export type UnionPlacesService = google.maps.places.PlacesService | BMap.LocalSearch;

package/dist/src/utils/objects.d.ts

@@ -8,6 +8,10 @@ export declare namespace Objects {
     function toJsonSafely(value: any): string;
     /** 删除obj中纯对象上的值为undefined的属性 */
     function deleteUndefinedPropertyOnPlainObjectDeeply(obj: any): void;
+    /** @see Omit */
+    function omit<T, K extends keyof any>(obj: T, ...keys: K[]): Omit<T, K>;
+    /** @see Pick */
+    function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 }
 /** 用于替代Vue2中的filter, 直接交给模板使用 */
 export declare const stringify: typeof Objects.toJsonSafely;