@heycar/heycars-map 0.4.7 → 0.4.9

package/dist/Demo/Demo.css.d.ts

@@ -1 +1,3 @@
 export declare const demo: string;
+export declare const layout: string;
+export declare const adjustedDemo: string;

package/dist/Demo/DemoBusinessTaxiEnd.d.ts

@@ -1,4 +1,5 @@
 export declare const DemoBusinessTaxiEnd: import("vue").DefineComponent<{}, unknown, {
     from: {};
     to: {};
+    contentHeight: number;
 }, {}, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/dist/Demo/DemoBusinessTaxiService.d.ts

@@ -2050,6 +2050,7 @@ export declare const DemoBusinessTaxiService: import("vue").DefineComponent<Read
     from: Partial<Place>;
     to: Partial<Place>;
     status: DriverStatus;
+    contentHeight: number;
 }, {}, {
     getDriverPosition(): Promise<Point>;
 }, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue").ExtractPropTypes<Readonly<{}>>>, {}>;

package/dist/business-components/BusinessQuotingMap/BusinessQuotingMap.d.ts

@@ -11,4 +11,4 @@ export type BusinessQuotingMapProps = Omit<HeycarMapProps, "center" | "zoom"> &
     }) => string;
     log?: boolean;
 };
-export declare const BusinessQuotingMap: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessQuotingMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "dragEnd" | "zoomEnd", BusinessQuotingMapProps, {} | {}>;
+export declare const BusinessQuotingMap: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessQuotingMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd", BusinessQuotingMapProps, {} | {}>;

package/dist/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.d.ts

@@ -14,7 +14,6 @@ export interface BusinessRecomendPlaceMapProps extends Omit<HeycarMapProps, "cen
     geoLoadingTitle: string;
     unavailableTitle: string;
     recomendDescription: string;
-    noRecomendDescription: string;
     geoDefaultPosition?: Point;
     mapContext: BusinessRecomendPlaceContext;
     getDefaultCenterPlace: () => Promise<Place | undefined>;
@@ -28,4 +27,4 @@ export interface BusinessRecomendPlaceMapProps extends Omit<HeycarMapProps, "cen
     onGeoError?: UseGeoLocationProps["onError"];
     onClickLocator?: AbsoluteAddressBoxProps["onClick"];
 }
-export declare const BusinessRecomendPlaceMap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessRecomendPlaceMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessRecomendPlaceMapProps, Required<BusinessRecomendPlaceMapProps>>, "dragEnd" | "zoomEnd" | "changeCity" | "changePlace" | "loadGeoLocation" | "loadDefaultGeoLocation" | "changeByDrag" | "changeGeoLocation" | "changeRecomandPlace" | "geoError" | "clickLocator", BusinessRecomendPlaceMapProps, {}>;
+export declare const BusinessRecomendPlaceMap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessRecomendPlaceMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessRecomendPlaceMapProps, Required<BusinessRecomendPlaceMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "changeCity" | "changePlace" | "loadGeoLocation" | "loadDefaultGeoLocation" | "changeByDrag" | "changeGeoLocation" | "changeRecomandPlace" | "geoError" | "clickLocator", BusinessRecomendPlaceMapProps, {}>;

package/dist/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts

@@ -20,4 +20,4 @@ export type BusinessTaxiServiceMapProps = Omit<HeycarMapProps, "center" | "zoom"
     }) => string;
     getDriverPosition: () => Promise<Point>;
 };
-export declare const BusinessTaxiServiceMap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessTaxiServiceMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessTaxiServiceMapProps, Required<BusinessTaxiServiceMapProps>>, "dragEnd" | "zoomEnd", BusinessTaxiServiceMapProps, {} | {}>;
+export declare const BusinessTaxiServiceMap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<BusinessTaxiServiceMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<BusinessTaxiServiceMapProps, Required<BusinessTaxiServiceMapProps>>, "resize" | "dragEnd" | "zoomEnd", BusinessTaxiServiceMapProps, {} | {}>;

package/dist/components/Amap/Amap.d.ts

@@ -15,5 +15,6 @@ export interface AmapProps extends Omit<AMap.MapOptions, "vectorMapForeign"> {
     onDragStart?: MapEventHandler<AMap.Map>;
     onDragEnd?: MapEventHandler<AMap.Map>;
     onZoomEnd?: MapEventHandler<AMap.Map>;
+    onResize?: MapEventHandler<AMap.Map>;
 }
-export declare const Amap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<AmapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapProps, Required<AmapProps>>, "dragStart" | "dragEnd" | "zoomEnd", AmapProps, {}>;
+export declare const Amap: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<AmapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapProps, Required<AmapProps>>, "resize" | "dragStart" | "dragEnd" | "zoomEnd", AmapProps, {}>;

package/dist/components/MapProvider/MapProvider.d.ts

@@ -9,6 +9,7 @@ export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "load
     mapRef?: SetMap<AMap.Map> | SetMap<google.maps.Map>;
     onDragEnd?: (value: [number, number]) => any;
     onZoomEnd?: (value: number) => any;
+    onResize?: () => any;
     touchEnable?: boolean;
 }
-export declare const HeycarMap: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "dragEnd" | "zoomEnd", HeycarMapProps, {}>;
+export declare const HeycarMap: import("vue").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<HeycarMapProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<HeycarMapProps, Required<HeycarMapProps>>, "resize" | "dragEnd" | "zoomEnd", HeycarMapProps, {}>;

package/dist/index.cjs

@@ -1,4 +1,10 @@
 "use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
@@ -1860,6 +1866,7 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
     onDragStart,
     onDragEnd,
     onZoomEnd,
+    onResize,
     mapRef: setMap,
     vectorMapForeign = "style_zh_cn",
     ...defaultOptions
@@ -1926,7 +1933,12 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
     { name: "mask", defaultValue: [] },
     { name: "labelRejectMask", defaultValue: false }
   ]);
-  watchPostEffectForAMapEvent(mapRef, props, emit, ["onDragStart", "onDragEnd", "onZoomEnd"]);
+  watchPostEffectForAMapEvent(mapRef, props, emit, [
+    "onDragStart",
+    "onDragEnd",
+    "onZoomEnd",
+    "onResize"
+  ]);
   return () => {
     var _a;
     return Vue.h("div", { ref: elementRef, class: amap }, (_a = slots.default) == null ? void 0 : _a.call(slots));
@@ -2020,7 +2032,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
   emit
 }) {
   const payload = useMapSupplier();
-  const gmapDebouncedEmit = ({
+  const gmapHandleDargEnd = ({
     target
   }) => {
     const {
@@ -2029,7 +2041,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
     } = target.getCenter();
     emit("dragEnd", [lng(), lat()]);
   };
-  const amapDebounceEmit = ({
+  const amapHandleDragEnd = ({
     target
   }) => {
     const {
@@ -2038,6 +2050,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
     } = target.getCenter();
     emit("dragEnd", [lng, lat]);
   };
+  const handleResize = () => emit("resize");
   return () => {
     var _a, _b, _c;
     const {
@@ -2075,7 +2088,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
             "panControl": touchEnable
           },
           "on": {
-            "dragEnd": gmapDebouncedEmit
+            "dragEnd": gmapHandleDargEnd
           }
         }, [children]);
       default:
@@ -2095,7 +2108,8 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
             "pitchEnable": touchEnable
           },
           "on": {
-            "dragEnd": amapDebounceEmit
+            "dragEnd": amapHandleDragEnd,
+            "resize": handleResize
           }
         }, [children]);
     }
@@ -2205,7 +2219,7 @@ const ADrivingLine = defineSetup(function ADrivingLine2(props) {
       "attrs": {
         "showDir": true,
         "path": props.path,
-        "strokeWeight": strokeWidth + 2 * dirWidth,
+        "strokeWeight": strokeWidth + dirWidth,
         "strokeOpacity": 1,
         "strokeColor": "transparent",
         "lineJoin": "round",
@@ -2830,6 +2844,7 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     renderDescription
   } = props;
   const fittableRegistryOverlay = createFittableRegisterOverlay(registerOverlay);
+  const deferedSetFitView = pipeDefer(registerOverlay.setFitView);
   return () => {
     const {
       from: fromPlace,
@@ -2843,6 +2858,9 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
         "mapRef": mapRef,
         "center": from,
         "zoom": 13
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [Vue.h(StartEndPoint, {
       "attrs": {
@@ -2884,6 +2902,49 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+class SingleGeoWatch {
+  constructor(option) {
+    __publicField(this, "id", 0);
+    __publicField(this, "listeners", /* @__PURE__ */ new Map());
+    __publicField(this, "option", {});
+    __publicField(this, "singleWatchId");
+    this.option = option != null ? option : {};
+  }
+  watchPosition(onSuccess, onError) {
+    this.id += 1;
+    const { id } = this;
+    this.listeners.set(id, [onSuccess, onError]);
+    this.start();
+    return id;
+  }
+  clearWatch(id) {
+    this.listeners.delete(id);
+  }
+  async start() {
+    const { listeners, option, singleWatchId } = this;
+    if (singleWatchId) {
+      navigator.geolocation.clearWatch(singleWatchId);
+      await sleep(20);
+    }
+    this.singleWatchId = navigator.geolocation.watchPosition(
+      (position) => {
+        for (const [onSuccess] of listeners.values()) {
+          onSuccess(position);
+        }
+      },
+      (error) => {
+        for (const [_, onError] of listeners.values()) {
+          onError == null ? void 0 : onError(error);
+        }
+      },
+      option
+    );
+  }
+}
 const useAmapGCJ02 = () => {
   const { readyPromise } = useMapSupplier();
   async function toGcj02(point) {
@@ -2914,6 +2975,11 @@ const useMapGCJ02 = () => {
   return supplier === "gmap" ? useGmapGCJ02() : useAmapGCJ02();
 };
 const GEO_TIMEOUT = 5e3;
+const singleGeoWatch = new SingleGeoWatch({
+  timeout: GEO_TIMEOUT,
+  maximumAge: 0,
+  enableHighAccuracy: false
+});
 const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
@@ -2936,12 +3002,11 @@ const useGeoLocation = (props) => {
     () => true,
     (_1, _2, onCleanup) => {
       loading.value = true;
-      const watchId = navigator.geolocation.watchPosition(
+      const watchId = singleGeoWatch.watchPosition(
         async (position) => {
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
           const point = await toGcj02(wgsPoint);
-          console.log("wgsPoint, point = ", wgsPoint, point);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           if (loading.value) {
@@ -2960,10 +3025,9 @@ const useGeoLocation = (props) => {
             onLoadDefault == null ? void 0 : onLoadDefault({ position });
           }
           onError == null ? void 0 : onError(error);
-        },
-        { timeout: GEO_TIMEOUT, maximumAge: 0, enableHighAccuracy: false }
+        }
       );
-      onCleanup(() => navigator.geolocation.clearWatch(watchId));
+      onCleanup(() => singleGeoWatch.clearWatch(watchId));
     },
     { immediate: true }
   );
@@ -3888,11 +3952,10 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     const {
       geoLoadingTitle,
       recomendDescription,
-      noRecomendDescription,
       unavailableTitle
     } = props;
     const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : (_a2 = centerPlace.name) != null ? _a2 : DEFAULT_PLACE_NAME;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : noRecomendDescription;
+    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
@@ -3922,11 +3985,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       }
     })]);
   };
-}).props(["log", "geoLoadingTitle", "unavailableTitle", "recomendDescription", "noRecomendDescription", "fallback", "geoDefaultPosition", "getRecomendPlace", "getDefaultCenterPlace", "loading", "mapContext"]);
+}).props(["log", "geoLoadingTitle", "unavailableTitle", "recomendDescription", "fallback", "geoDefaultPosition", "getRecomendPlace", "getDefaultCenterPlace", "loading", "mapContext"]);
 const BEIJIN_POINT = [116.2317, 39.5427];
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
 const useAmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
@@ -4715,6 +4775,7 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
     autoFitTimeout: 5e3,
     padding: [25, 20, 15, 15]
   });
+  const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
     const {
       from,
@@ -4728,6 +4789,9 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
         "zoom": 3,
         "mapRef": setMap,
         "touchEnable": false
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [isReady && Vue.h(SectionEndService, {
       "attrs": {
@@ -4741,7 +4805,6 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
 const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
 const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap2(props) {
   const {
-    from,
     interval,
     registerOverlay,
     mapRef,
@@ -4749,12 +4812,11 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     renderStartSerivceTitle,
     renderInServiceTitle
   } = props;
+  const deferedSetFitView = pipeDefer(registerOverlay.setFitView);
   const {
     geoPosition,
     geoError
-  } = useGeoLocation({
-    geoDefaultPosition: place2point(from)
-  });
+  } = useGeoLocation();
   const carPositionRef = Vue.ref(place2point(props.from));
   Vue.watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
@@ -4769,7 +4831,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from: from2,
+      from,
       to,
       dispatchingTitle,
       bookDispatchingTitle,
@@ -4780,33 +4842,36 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     const passengerPosition = geoError.value ? void 0 : geoPosition.value;
     return Vue.h(HeycarMap, {
       "attrs": {
-        "center": place2point(from2),
+        "center": place2point(from),
         "zoom": 13,
         "mapRef": mapRef,
         "touchEnable": touchEnable
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [driverStatus === "dispatching" ? Vue.h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": dispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "book-dispatching" ? Vue.h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": bookDispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "assign" || driverStatus === "confirmed" ? Vue.h(SectionConfirmed, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? Vue.h(SectionDriverStartService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "renderTitle": renderStartSerivceTitle,
@@ -4814,7 +4879,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "book-dispatched" ? Vue.h(SectionBookDispatched, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
@@ -4828,7 +4893,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "driverArrived" ? Vue.h(SectionDriverArrived, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
@@ -4836,13 +4901,13 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "canceled" || driverStatus === "canceling" ? Vue.h(SectionCanceled, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "endService" || driverStatus === "completed" || driverStatus === "banlanceRefund" || driverStatus === "waitBanlanceRefund" || driverStatus === "rechargePayed" || driverStatus === "waitRechargePay" || driverStatus === "payed" || driverStatus === "waitpay" || driverStatus === "refund" ? Vue.h(SectionEndService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
@@ -4850,7 +4915,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       // 匹配不到就显示灰色路线
       Vue.h(SectionEndService, {
         "attrs": {
-          "from": from2,
+          "from": from,
           "to": to,
           "registerOverlay": registerOverlay
         }

package/dist/index.js

@@ -1,3 +1,9 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, reactive, toRefs, ref, toRef, watchEffect } from "vue";
 const style = "";
 Vue.util.warn;
@@ -1858,6 +1864,7 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
     onDragStart,
     onDragEnd,
     onZoomEnd,
+    onResize,
     mapRef: setMap,
     vectorMapForeign = "style_zh_cn",
     ...defaultOptions
@@ -1924,7 +1931,12 @@ const Amap = defineSetup(function Amap2(props, { slots, emit }) {
     { name: "mask", defaultValue: [] },
     { name: "labelRejectMask", defaultValue: false }
   ]);
-  watchPostEffectForAMapEvent(mapRef, props, emit, ["onDragStart", "onDragEnd", "onZoomEnd"]);
+  watchPostEffectForAMapEvent(mapRef, props, emit, [
+    "onDragStart",
+    "onDragEnd",
+    "onZoomEnd",
+    "onResize"
+  ]);
   return () => {
     var _a;
     return h("div", { ref: elementRef, class: amap }, (_a = slots.default) == null ? void 0 : _a.call(slots));
@@ -2018,7 +2030,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
   emit
 }) {
   const payload = useMapSupplier();
-  const gmapDebouncedEmit = ({
+  const gmapHandleDargEnd = ({
     target
   }) => {
     const {
@@ -2027,7 +2039,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
     } = target.getCenter();
     emit("dragEnd", [lng(), lat()]);
   };
-  const amapDebounceEmit = ({
+  const amapHandleDragEnd = ({
     target
   }) => {
     const {
@@ -2036,6 +2048,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
     } = target.getCenter();
     emit("dragEnd", [lng, lat]);
   };
+  const handleResize = () => emit("resize");
   return () => {
     var _a, _b, _c;
     const {
@@ -2073,7 +2086,7 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
             "panControl": touchEnable
           },
           "on": {
-            "dragEnd": gmapDebouncedEmit
+            "dragEnd": gmapHandleDargEnd
           }
         }, [children]);
       default:
@@ -2093,7 +2106,8 @@ const HeycarMap = defineLagecySetup(function HeycarMap2(props, {
             "pitchEnable": touchEnable
           },
           "on": {
-            "dragEnd": amapDebounceEmit
+            "dragEnd": amapHandleDragEnd,
+            "resize": handleResize
           }
         }, [children]);
     }
@@ -2203,7 +2217,7 @@ const ADrivingLine = defineSetup(function ADrivingLine2(props) {
       "attrs": {
         "showDir": true,
         "path": props.path,
-        "strokeWeight": strokeWidth + 2 * dirWidth,
+        "strokeWeight": strokeWidth + dirWidth,
         "strokeOpacity": 1,
         "strokeColor": "transparent",
         "lineJoin": "round",
@@ -2828,6 +2842,7 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     renderDescription
   } = props;
   const fittableRegistryOverlay = createFittableRegisterOverlay(registerOverlay);
+  const deferedSetFitView = pipeDefer(registerOverlay.setFitView);
   return () => {
     const {
       from: fromPlace,
@@ -2841,6 +2856,9 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
         "mapRef": mapRef,
         "center": from,
         "zoom": 13
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [h(StartEndPoint, {
       "attrs": {
@@ -2882,6 +2900,49 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+class SingleGeoWatch {
+  constructor(option) {
+    __publicField(this, "id", 0);
+    __publicField(this, "listeners", /* @__PURE__ */ new Map());
+    __publicField(this, "option", {});
+    __publicField(this, "singleWatchId");
+    this.option = option != null ? option : {};
+  }
+  watchPosition(onSuccess, onError) {
+    this.id += 1;
+    const { id } = this;
+    this.listeners.set(id, [onSuccess, onError]);
+    this.start();
+    return id;
+  }
+  clearWatch(id) {
+    this.listeners.delete(id);
+  }
+  async start() {
+    const { listeners, option, singleWatchId } = this;
+    if (singleWatchId) {
+      navigator.geolocation.clearWatch(singleWatchId);
+      await sleep(20);
+    }
+    this.singleWatchId = navigator.geolocation.watchPosition(
+      (position) => {
+        for (const [onSuccess] of listeners.values()) {
+          onSuccess(position);
+        }
+      },
+      (error) => {
+        for (const [_, onError] of listeners.values()) {
+          onError == null ? void 0 : onError(error);
+        }
+      },
+      option
+    );
+  }
+}
 const useAmapGCJ02 = () => {
   const { readyPromise } = useMapSupplier();
   async function toGcj02(point) {
@@ -2912,6 +2973,11 @@ const useMapGCJ02 = () => {
   return supplier === "gmap" ? useGmapGCJ02() : useAmapGCJ02();
 };
 const GEO_TIMEOUT = 5e3;
+const singleGeoWatch = new SingleGeoWatch({
+  timeout: GEO_TIMEOUT,
+  maximumAge: 0,
+  enableHighAccuracy: false
+});
 const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
@@ -2934,12 +3000,11 @@ const useGeoLocation = (props) => {
     () => true,
     (_1, _2, onCleanup) => {
       loading.value = true;
-      const watchId = navigator.geolocation.watchPosition(
+      const watchId = singleGeoWatch.watchPosition(
         async (position) => {
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
           const point = await toGcj02(wgsPoint);
-          console.log("wgsPoint, point = ", wgsPoint, point);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           if (loading.value) {
@@ -2958,10 +3023,9 @@ const useGeoLocation = (props) => {
             onLoadDefault == null ? void 0 : onLoadDefault({ position });
           }
           onError == null ? void 0 : onError(error);
-        },
-        { timeout: GEO_TIMEOUT, maximumAge: 0, enableHighAccuracy: false }
+        }
       );
-      onCleanup(() => navigator.geolocation.clearWatch(watchId));
+      onCleanup(() => singleGeoWatch.clearWatch(watchId));
     },
     { immediate: true }
   );
@@ -3886,11 +3950,10 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     const {
       geoLoadingTitle,
       recomendDescription,
-      noRecomendDescription,
       unavailableTitle
     } = props;
     const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : (_a2 = centerPlace.name) != null ? _a2 : DEFAULT_PLACE_NAME;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : noRecomendDescription;
+    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
@@ -3920,11 +3983,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       }
     })]);
   };
-}).props(["log", "geoLoadingTitle", "unavailableTitle", "recomendDescription", "noRecomendDescription", "fallback", "geoDefaultPosition", "getRecomendPlace", "getDefaultCenterPlace", "loading", "mapContext"]);
+}).props(["log", "geoLoadingTitle", "unavailableTitle", "recomendDescription", "fallback", "geoDefaultPosition", "getRecomendPlace", "getDefaultCenterPlace", "loading", "mapContext"]);
 const BEIJIN_POINT = [116.2317, 39.5427];
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
 const useAmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
@@ -4713,6 +4773,7 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
     autoFitTimeout: 5e3,
     padding: [25, 20, 15, 15]
   });
+  const deferedSetFitView = pipeDefer(registerFitVeiw.setFitView);
   return () => {
     const {
       from,
@@ -4726,6 +4787,9 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
         "zoom": 3,
         "mapRef": setMap,
         "touchEnable": false
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [isReady && h(SectionEndService, {
       "attrs": {
@@ -4739,7 +4803,6 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
 const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
 const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap2(props) {
   const {
-    from,
     interval,
     registerOverlay,
     mapRef,
@@ -4747,12 +4810,11 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     renderStartSerivceTitle,
     renderInServiceTitle
   } = props;
+  const deferedSetFitView = pipeDefer(registerOverlay.setFitView);
   const {
     geoPosition,
     geoError
-  } = useGeoLocation({
-    geoDefaultPosition: place2point(from)
-  });
+  } = useGeoLocation();
   const carPositionRef = ref(place2point(props.from));
   watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
@@ -4767,7 +4829,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from: from2,
+      from,
       to,
       dispatchingTitle,
       bookDispatchingTitle,
@@ -4778,33 +4840,36 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
     const passengerPosition = geoError.value ? void 0 : geoPosition.value;
     return h(HeycarMap, {
       "attrs": {
-        "center": place2point(from2),
+        "center": place2point(from),
         "zoom": 13,
         "mapRef": mapRef,
         "touchEnable": touchEnable
+      },
+      "on": {
+        "resize": deferedSetFitView
       }
     }, [driverStatus === "dispatching" ? h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": dispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "book-dispatching" ? h(SectionDispatching, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "title": bookDispatchingTitle,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "assign" || driverStatus === "confirmed" ? h(SectionConfirmed, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? h(SectionDriverStartService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "renderTitle": renderStartSerivceTitle,
@@ -4812,7 +4877,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "book-dispatched" ? h(SectionBookDispatched, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
@@ -4826,7 +4891,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "driverArrived" ? h(SectionDriverArrived, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
@@ -4834,13 +4899,13 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "canceled" || driverStatus === "canceling" ? h(SectionCanceled, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
     }) : driverStatus === "endService" || driverStatus === "completed" || driverStatus === "banlanceRefund" || driverStatus === "waitBanlanceRefund" || driverStatus === "rechargePayed" || driverStatus === "waitRechargePay" || driverStatus === "payed" || driverStatus === "waitpay" || driverStatus === "refund" ? h(SectionEndService, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "registerOverlay": registerOverlay
       }
@@ -4848,7 +4913,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       // 匹配不到就显示灰色路线
       h(SectionEndService, {
         "attrs": {
-          "from": from2,
+          "from": from,
           "to": to,
           "registerOverlay": registerOverlay
         }

package/dist/utils/helper.d.ts

@@ -1,2 +1,3 @@
 import type { Place } from "../types/interface";
 export declare const isPlace: (place: Partial<Place>) => place is Place;
+export declare const sleep: (milliSeconds: number) => Promise<unknown>;

package/dist/utils/singleGeoWatch.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @note navigator.geolocation.watchPosition 期间，再调用 watchPosition 或  getCurrentPosition 会导致定位失败。
+ */
+export declare class SingleGeoWatch {
+    id: number;
+    listeners: Map<number, [PositionCallback, PositionErrorCallback | undefined]>;
+    option: PositionOptions;
+    singleWatchId: number | undefined;
+    constructor(option?: PositionOptions);
+    watchPosition(onSuccess: PositionCallback, onError?: PositionErrorCallback): number;
+    clearWatch(id: number): void;
+    start(): Promise<void>;
+}

package/dist/utils/waitQueue.d.ts

@@ -0,0 +1,7 @@
+export declare class WaitQueue {
+    id: number;
+    queue: Set<number>;
+    done: (() => void) | undefined;
+    promise: Promise<void>;
+    add(): () => void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",

package/todo.md

@@ -2,30 +2,15 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 
 2. Google 地址名称太长
 3. 高德地图加载期间出现大量的请求
+4. 做完其他事情进入首页，变成了获取定位失败，但其实 gps 是 ok 的，因为刷新页面是有点位的
 
 郝瑞
 
 - 5033 是否可以关闭
 - 5177 不太明白
 
-孙明
-
-- 4991
-- 5236 地图高度问题
-- 5237
-- 5240
-
-谭红亚
-
-- 4772
-
-谭瑞平
-
-- 5145 关闭浏览器再打开，sensor 失效了
-
 测试环境看下
 
-- 4903
 - 4914
 - 4976
 - 5002
@@ -34,8 +19,6 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 - 5017
 - 5036
 - 5092
-- 5095 大概率可以关掉
-- 5223
 - 5225
 - 5229 优先看
 - 5238
@@ -80,3 +63,14 @@ setView 类 bug
 - 4836
 - 4915
 - 5228
+
+  0.4.8
+
+- 5014
+
+  0.4.9
+
+- 4903
+- 5006
+- 5017
+- 5238