@heycar/heycars-map 0.4.8 → 0.4.9

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 = "";
@@ -2213,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",
@@ -2896,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) {
@@ -2926,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 : {};
@@ -2948,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) {
@@ -2972,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 }
   );
@@ -3935,9 +3987,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   };
 }).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) => {
@@ -4756,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,
@@ -4768,9 +4816,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   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))
@@ -4785,7 +4831,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from: from2,
+      from,
       to,
       dispatchingTitle,
       bookDispatchingTitle,
@@ -4796,7 +4842,7 @@ 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
@@ -4806,26 +4852,26 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }, [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,
@@ -4833,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
@@ -4847,7 +4893,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "driverArrived" ? Vue.h(SectionDriverArrived, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
@@ -4855,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
       }
@@ -4869,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;
@@ -2211,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",
@@ -2894,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) {
@@ -2924,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 : {};
@@ -2946,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) {
@@ -2970,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 }
   );
@@ -3933,9 +3985,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   };
 }).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) => {
@@ -4754,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,
@@ -4766,9 +4814,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   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))
@@ -4783,7 +4829,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   return () => {
     const {
       driverStatus,
-      from: from2,
+      from,
       to,
       dispatchingTitle,
       bookDispatchingTitle,
@@ -4794,7 +4840,7 @@ 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
@@ -4804,26 +4850,26 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }, [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,
@@ -4831,7 +4877,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "book-dispatched" ? h(SectionBookDispatched, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "to": to,
         "passengerPosition": passengerPosition,
         "registerOverlay": registerOverlay
@@ -4845,7 +4891,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }
     }) : driverStatus === "driverArrived" ? h(SectionDriverArrived, {
       "attrs": {
-        "from": from2,
+        "from": from,
         "carPosition": carPosition,
         "passengerPosition": passengerPosition,
         "title": driverArrivedTitle,
@@ -4853,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
       }
@@ -4867,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.8",
+  "version": "0.4.9",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",

package/todo.md

@@ -9,20 +9,8 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 - 5033 是否可以关闭
 - 5177 不太明白
 
-孙明
-
-- 4991
-- 5236 地图高度问题
-- 5237
-- 5240
-
-谭红亚
-
-- 4772
-
 测试环境看下
 
-- 4903
 - 4914
 - 4976
 - 5002
@@ -31,7 +19,6 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 - 5017
 - 5036
 - 5092
-- 5223
 - 5225
 - 5229 优先看
 - 5238
@@ -80,3 +67,10 @@ setView 类 bug
   0.4.8
 
 - 5014
+
+  0.4.9
+
+- 4903
+- 5006
+- 5017
+- 5238