tg-map-vue3 3.6.3 → 3.6.5

package/CHANGELOG.md

@@ -3,7 +3,9 @@
 ## 3.6.x
 
 - feat: 添加[MapUrls], 支持打开地图网页
+- feat: [LatLng]和[TgMarker]添加`normalize`相关方法/参数, 处理经纬度不合法的问题
 - fix: 百度地图的覆盖物([BaiduShape])不能隐藏填充/线条颜色的问题
+- perf: [TgLabel]/[TgInfoBox]/[TgInfoWindow]和[TgMarker]不必紧密相邻, 可以放其他组件
 - ***BREAKING CHANGE***: `placeService` -> `placesService`
 
 ## 3.5.x
@@ -47,6 +49,9 @@
 [TgRectangle]: src/components/overlays/TgRectangle.vue
 [TgPolygon]: src/components/overlays/TgPolygon.vue
 [TgPolyline]: src/components/overlays/TgPolyline.vue
+[TgMarker]: src/components/overlays/TgMarker.vue
+[TgInfoBox]: src/components/overlays/TgInfoBox.vue
+[TgInfoWindow]: src/components/overlays/TgInfoWindow.vue
 [Icon]: src/map/map/overlay/icon.ts#L18 "图标"
 [SymbolIcon]: src/map/map/overlay/icon.ts#L55 "Svg图标"
 [PlacesService]: src/map/map/extra/places-service.ts "位置服务"
@@ -55,4 +60,5 @@
 [SearchBox]: src/map/map/extra/search-box.ts "搜索框"
 [useTgMapInner]: src/components/map-hooks.ts
 [LatLngBounds]: src/map/lat-lng.ts#L157
+[LatLng]: src/map/lat-lng.ts#L26
 [BaiduShape]: src/map/map/overlay/shape.ts#L32

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

@@ -1,8 +1,8 @@
-import { type EventEmits } from '../../utils/vue-utils';
 import { LatLng } from '../../map/lat-lng';
-import { type TgMarkerPublicInstance } from './TgMarker.vue';
-import type { InfoBoxOverlay, InfoBoxOptions } from '../../map/map/overlay/info-box';
+import type { InfoBoxOptions, InfoBoxOverlay } from '../../map/map/overlay/info-box';
 import type { MarkerOverlay } from '../../map/map/overlay/marker';
+import { type EventEmits } from '../../utils/vue-utils';
+import { type TgMarkerPublicInstance } from './TgMarker.vue';
 type TgInfoBoxEmits = {
     'update:show': boolean;
 };
@@ -26,7 +26,7 @@ declare const TgInfoBox: import("vue").DefineComponent<{
     zIndex: {
         type: import("vue").PropType<number>;
     };
-    'onUpdate:show': import("vue").Prop<import("../../utils/vue-utils").EventCallback<boolean>>;
+    'onUpdate:show': import("vue").Prop<import("..").EventCallback<boolean>>;
 }, {
     attrs: import("vue").ComputedRef<{
         binds: Record<string, unknown>;
@@ -62,7 +62,7 @@ declare const TgInfoBox: import("vue").DefineComponent<{
     zIndex: {
         type: import("vue").PropType<number>;
     };
-    'onUpdate:show': import("vue").Prop<import("../../utils/vue-utils").EventCallback<boolean>>;
+    'onUpdate:show': import("vue").Prop<import("..").EventCallback<boolean>>;
 }>> & {
     "onUpdate:show"?: ((event: boolean) => any) | undefined;
 }, {}, {}>;

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

@@ -22,7 +22,7 @@ declare const TgInfoWindow: import("vue").DefineComponent<{
     disableAutoPan: {
         type: import("vue").PropType<boolean>;
     };
-    'onUpdate:show': import("vue").Prop<import("../../utils/vue-utils").EventCallback<boolean>>;
+    'onUpdate:show': import("vue").Prop<import("..").EventCallback<boolean>>;
 }, {
     attrs: import("vue").ComputedRef<{
         binds: Record<string, unknown>;
@@ -53,12 +53,12 @@ declare const TgInfoWindow: import("vue").DefineComponent<{
     disableAutoPan: {
         type: import("vue").PropType<boolean>;
     };
-    'onUpdate:show': import("vue").Prop<import("../../utils/vue-utils").EventCallback<boolean>>;
+    'onUpdate:show': import("vue").Prop<import("..").EventCallback<boolean>>;
 }>> & {
     "onUpdate:show"?: ((event: boolean) => any) | undefined;
-    onCloseclick?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
-    onOpen?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
-    onClose?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
+    onCloseclick?: ((event: import("..").Tg.Event) => any) | undefined;
+    onOpen?: ((event: import("..").Tg.Event) => any) | undefined;
+    onClose?: ((event: import("..").Tg.Event) => any) | undefined;
 }, {}, {}>;
 type TgInfoWindow = InstanceType<typeof TgInfoWindow>;
 export default TgInfoWindow;

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

@@ -15,7 +15,7 @@ declare const TgLabel: import("vue").DefineComponent<{
         type: import("vue").PropType<number>;
     };
     mapPane: {
-        type: import("vue").PropType<import("../../utils/mapped-types").StringEnumValue<typeof MapPane>>;
+        type: import("vue").PropType<import("..").StringEnumValue<typeof MapPane>>;
     };
 }, {
     attrs: import("vue").ComputedRef<{
@@ -42,10 +42,10 @@ declare const TgLabel: import("vue").DefineComponent<{
         type: import("vue").PropType<number>;
     };
     mapPane: {
-        type: import("vue").PropType<import("../../utils/mapped-types").StringEnumValue<typeof MapPane>>;
+        type: import("vue").PropType<import("..").StringEnumValue<typeof MapPane>>;
     };
 }>> & {
-    onClick?: ((event: import("../../map/event").Tg.Event) => any) | undefined;
+    onClick?: ((event: import("..").Tg.Event) => any) | undefined;
 }, {}, {}>;
 type TgLabel = InstanceType<typeof TgLabel>;
 export default TgLabel;

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

@@ -39,6 +39,9 @@ declare const TgMarker: import("vue").DefineComponent<{
     visible: {
         type: PropType<boolean>;
     };
+    normalizePositionForBaidu: {
+        type: PropType<boolean>;
+    };
     'onUpdate:position': import("vue").Prop<import("../../utils/vue-utils").EventCallback<LatLng>>;
 }, {
     attrs: import("vue").ComputedRef<{
@@ -233,6 +236,9 @@ declare const TgMarker: import("vue").DefineComponent<{
     visible: {
         type: PropType<boolean>;
     };
+    normalizePositionForBaidu: {
+        type: PropType<boolean>;
+    };
     'onUpdate:position': import("vue").Prop<import("../../utils/vue-utils").EventCallback<LatLng>>;
 }>> & {
     onClick?: ((event: import("../../map/event").Tg.MouseEvent) => any) | undefined;

package/dist/src/map/lat-lng.d.ts

@@ -28,6 +28,18 @@ export declare class LatLng {
     /** 坐标系 */
     readonly coord: CoordType;
     static ZERO: LatLng;
+    /**
+     * {@template latlng_normalize}
+     *
+     * 对经纬度进行标准化, 参考google的实现
+     *
+     * ## 行为不一致
+     * - google: google.maps.LatLng的构造器会对经纬度进行标准化, 所有点都能正常显示
+     * - baidu: BMap.Point的构造器不会对经纬度进行标准化, 超出范围的点显示到(0, 0)位置
+     *
+     * {@endtemplate}
+     */
+    static _normalize(lng: number, lat: number): number[];
     /** @param coord Baidu Map的坐标一般都是bd09 */
     static fromBaidu(point: BMap.Point, coord: CoordType): LatLng;
     /** @param coord Google Map的坐标依据地图类型不同是不一样的 */
@@ -49,7 +61,16 @@ export declare class LatLng {
     coord: CoordType);
     /** 转换坐标到指定坐标系 */
     to(coordType: StringEnumValue<typeof CoordType>): LatLng;
-    toBaidu(coord: CoordType): BMap.Point;
+    /**
+     * 转换成baidu的经纬度
+     * @param normalize 转换时是否进行标准化, 默认false
+     * @see _normalize {@macro latlng_normalize}
+     */
+    toBaidu(coord: CoordType, normalize?: boolean): BMap.Point;
+    /**
+     * 转换成google的经纬度, 内部会自动进行标准化
+     * @see _normalize {@macro latlng_normalize}
+     */
     toGoogle(coord: CoordType): google.maps.LatLng;
     toHere(coord: CoordType): H.geo.Point;
     /**
@@ -61,6 +82,11 @@ export declare class LatLng {
      * @throws 若当前coord和targetCoord相同, 会抛异常, 故请在外部判断
      */
     _convert(targetCoord: CoordType): LngLatTuple;
+    /**
+     * 标准化, 返回合法的坐标点
+     * @see _normalize {@macro latlng_normalize}
+     */
+    normalize(): LatLng;
     equals(other: LatLng): boolean;
     toString(): string;
 }

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

@@ -1,3 +1,5 @@
+import GMarkerClusterer from '@google/markerclusterer';
+import BMarkerClusterer from 'bmaplib.markerclusterer';
 import type { Point, Size } from '../../types';
 import type { BaiduMap } from '../baidu-map';
 import type { GoogleMap } from '../google-map';
@@ -45,7 +47,7 @@ export interface ClusterIconStyle {
  */
 export declare abstract class MarkerClusterer {
     map: AbstractMap;
-    inner: any;
+    abstract inner: any;
     constructor(map: AbstractMap);
     /** baidu/google 拥有相同的函数名 */
     clearMarkers(): void;
@@ -60,10 +62,12 @@ export declare abstract class MarkerClusterer {
     abstract recreate(): void;
 }
 export declare class BaiduMarkerClusterer extends MarkerClusterer {
+    inner: BMarkerClusterer;
     constructor(map: BaiduMap, options: MarkerClustererOptions);
     recreate(): void;
 }
 export declare class GoogleMarkerClusterer extends MarkerClusterer {
+    inner: GMarkerClusterer;
     constructor(map: GoogleMap, options: MarkerClustererOptions);
     recreate(): void;
 }

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

@@ -12,6 +12,15 @@ import type { BaiduLabelOverlay, GoogleLabelOverlay, LabelOverlay } from './labe
 import { BaiduOverlay, GoogleOverlay, Overlay, type OverlayOptions } from './overlay';
 export interface MarkerOptions extends OverlayOptions {
     position: LatLng;
+    /**
+     * 执行{@link LatLng.toBaidu}时是否对经纬度进行标准化
+     *
+     * 因为{@link LatLng.toGoogle}内部是会自动标准化的, 并且LatLng绝大部分情况下是合法的,
+     * 所以添加这个参数, 只在使用者认为必要的时候, 执行标准化
+     *
+     * {@macro latlng_normalize}
+     */
+    normalizePositionForBaidu?: boolean;
     title?: string;
     icon?: UnionIcon;
     /** @default true */
@@ -88,6 +97,7 @@ export declare class BaiduMarker extends BaiduOverlay<BMarker> implements Marker
         clickable: boolean;
         draggable: boolean;
         zIndex: number | undefined;
+        normalize?: boolean;
     });
     getPosition(): LatLng;
     setPosition(position: LatLng): void;

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

@@ -19,8 +19,6 @@ export declare namespace Arrays {
      * @see https://stackoverflow.com/questions/56006111/is-it-possible-to-define-a-non-empty-array-type-in-typescript
      */
     function isNotEmpty<T>(arr: T[]): arr is [T, ...T[]];
-    /** @see isNotEmpty */
-    function isNullOrEmpty<T>(arr: T[] | null | undefined): arr is [] | null | undefined;
 }
 export declare namespace MVCArrays {
     function indexOf<T>(arr: google.maps.MVCArray<T>, item: T): number;

package/dist/src/utils/mapped-types.d.ts

@@ -32,8 +32,18 @@ export declare function typed<T>(t: T): T;
 export declare function isInstanceOf<T>(obj: any, constructor: Constructor<T>): obj is T;
 /** @see isInstanceOf */
 export declare function safeAs<T>(obj: any, constructor: Constructor<T>): T | undefined;
+/** 判断{@link instance}是否是{@link component}的实例 */
+export declare function isComponentByType<C extends Component & AbstractConstructor>(instance: ComponentPublicInstance | null, component: C): instance is InstanceType<C>;
 /** 安全转换组件类型, 若不能转换会返回`undefined` */
 export declare function safeAsComponent<C extends Component & AbstractConstructor>(instance: ComponentPublicInstance | null, component: C): InstanceType<C> | undefined;
+/**
+ * 查找[startInstance, endComponent)之间的第一个类型为{@link component}的父组件
+ * @param component 查找的组件
+ * @param startInstance 查找的开始实例, 包含
+ * @param endComponent 查找的终止组件, 不包含
+ * @returns
+ */
+export declare function findAncestorComponentByType<C extends Component & AbstractConstructor>(component: C, startInstance: ComponentPublicInstance | null, endComponent?: Component & AbstractConstructor): InstanceType<C> | undefined;
 /** {@link NonNullable} 的反义词 */
 export type Nullable<T> = T | null | undefined;
 /** T的所有value的联合类型 */