@heycar/heycars-map 0.6.5 → 0.6.6

package/dist/index.cjs

@@ -943,6 +943,11 @@ const isPlaceEqual = (p1, p2) => {
 const isPointEqual = (p1, p2) => {
   return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
 };
+const isGeoPositionEqual = (p1, p2) => {
+  if (!p2)
+    return false;
+  return p1.coords.longitude === p2.coords.longitude && p1.coords.latitude === p2.coords.latitude;
+};
 const toPlaceType = (maybePlace) => {
   const lng = Number(maybePlace.lng);
   if (isNaN(lng))
@@ -952,6 +957,21 @@ const toPlaceType = (maybePlace) => {
     throw new Error("MyError: expect lat to be number");
   return { lng, lat, name: maybePlace.name };
 };
+const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
+  const { longitude, latitude, accuracy } = res;
+  const speed = Number(res.speed);
+  const timestamp = Date.now();
+  const coords = {
+    accuracy: Number(accuracy),
+    altitude: null,
+    altitudeAccuracy: null,
+    heading: null,
+    latitude: Number(latitude),
+    longitude: Number(longitude),
+    speed
+  };
+  return { timestamp, coords };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
     return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
@@ -3036,6 +3056,90 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
+const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
+const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
+const takeIsForceBrowserGeo = () => {
+  const searchParam = new URLSearchParams(location.search);
+  return searchParam.has(`force-browser-geo`);
+};
+const sleep$1 = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
+const wxReady = () => new Promise((resolve, reject) => {
+  wx.ready(resolve);
+  wx.error(reject);
+});
+const detectPlatform = () => {
+  const useragent = navigator.userAgent.toLowerCase();
+  if (useragent.includes("micromessenger"))
+    return "wechat";
+  if (useragent.includes("alipay"))
+    return "alipay";
+  return "other";
+};
+function wechatWatchPosition(onSuccess, onError, option) {
+  const { timeout } = option;
+  let enable = true;
+  let interval = WX_GET_LOCATION_INTERVAL_STILL;
+  let prevGeoPosition = void 0;
+  const startWatch = async () => {
+    await wxReady();
+    do {
+      const geoPosition = await new Promise((resolve, reject) => {
+        let isHandled = false;
+        wx.getLocation({
+          type: "wgs84",
+          success(res) {
+            if (isHandled)
+              return;
+            isHandled = true;
+            const speed = Number(res.speed);
+            interval = speed === 0 ? WX_GET_LOCATION_INTERVAL_STILL : speed < 2 ? WX_GET_LOCATION_INTERVAL_SLOW : WX_GET_LOCATION_INTERVAL_FAST;
+            resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
+          },
+          fail(res) {
+            if (isHandled)
+              return;
+            isHandled = true;
+            const error = new Error(res.errMsg);
+            reject(error);
+            onError == null ? void 0 : onError(error);
+          }
+        });
+        if (!timeout)
+          return;
+        setTimeout(() => {
+          if (isHandled)
+            return;
+          interval = WX_GET_LOCATION_INTERVAL_SLOW;
+          resolve(void 0);
+        }, timeout);
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep$1(interval);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+  };
+}
+function compatibleWathPosition(onSuccess, onError, option) {
+  const isForceBrowserGeo = takeIsForceBrowserGeo();
+  if (isForceBrowserGeo) {
+    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId);
+  }
+  switch (detectPlatform()) {
+    case "wechat":
+      return wechatWatchPosition(onSuccess, onError, option);
+    default: {
+      const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+      return () => navigator.geolocation.clearWatch(watchId);
+    }
+  }
+}
 const isPlace = (place) => {
   return place.lng !== void 0 && place.lat !== void 0;
 };
@@ -3055,7 +3159,7 @@ class SingleGeoWatch {
     __publicField(this, "id", 0);
     __publicField(this, "listeners", /* @__PURE__ */ new Map());
     __publicField(this, "option", {});
-    __publicField(this, "singleWatchId");
+    __publicField(this, "unwatch");
     this.option = option != null ? option : {};
   }
   watchPosition(onSuccess, onError) {
@@ -3069,12 +3173,12 @@ class SingleGeoWatch {
     this.listeners.delete(id);
   }
   async start() {
-    const { listeners, option, singleWatchId } = this;
-    if (singleWatchId) {
-      navigator.geolocation.clearWatch(singleWatchId);
+    const { listeners, option, unwatch } = this;
+    if (unwatch) {
+      unwatch();
       await sleep(20);
     }
-    this.singleWatchId = navigator.geolocation.watchPosition(
+    this.unwatch = compatibleWathPosition(
       (position) => {
         for (const [onSuccess] of listeners.values()) {
           onSuccess(position);
@@ -3145,10 +3249,12 @@ const useGeoLocation = (props) => {
   Vue.watch(
     () => true,
     (_1, _2, onCleanup) => {
+      const logStartTime = Date.now();
       loading.value = true;
       const watchId = singleGeoWatch.watchPosition(
         async (position) => {
-          console.log("watchPosition success position = ", position);
+          const duration = Date.now() - logStartTime;
+          spaceLog("watchPosition", "success duration, position = ", duration, position);
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
           const point = await toGcj02(wgsPoint);
@@ -3162,7 +3268,7 @@ const useGeoLocation = (props) => {
           onChange == null ? void 0 : onChange({ position: point, coordinate });
         },
         (error) => {
-          console.log("watchPosition error = ", error);
+          spaceLog("watchPosition", "error.message = ", error.message);
           loading.value = false;
           errorRef.value = error;
           const position = props == null ? void 0 : props.geoDefaultPosition;
@@ -3985,14 +4091,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   } = useGeoLocation({
     geoDefaultPosition,
     onLoad: async (value) => {
-      console.log("useGeoLocation onLoad value = ", value);
       await readyPromise;
       centerSource.source = "geo";
       updatePlace(value.position);
       emit("loadGeoLocation", value);
     },
     onLoadDefault: async (value) => {
-      console.log("useGeoLocation onLoadDefault value = ", value);
       await readyPromise;
       const place = await defaultCenterPlacePromise;
       centerSource.source = "geo";
@@ -4086,7 +4190,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     } = props;
     const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.name;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
-    console.log("BusinessRecomendPlaceMap render geoLoading, isFirstWorkflowRecomendLoadingRef = ", geoLoading.value, isFirstWorkflowRecomendLoadingRef.value);
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,

package/dist/index.js

@@ -941,6 +941,11 @@ const isPlaceEqual = (p1, p2) => {
 const isPointEqual = (p1, p2) => {
   return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
 };
+const isGeoPositionEqual = (p1, p2) => {
+  if (!p2)
+    return false;
+  return p1.coords.longitude === p2.coords.longitude && p1.coords.latitude === p2.coords.latitude;
+};
 const toPlaceType = (maybePlace) => {
   const lng = Number(maybePlace.lng);
   if (isNaN(lng))
@@ -950,6 +955,21 @@ const toPlaceType = (maybePlace) => {
     throw new Error("MyError: expect lat to be number");
   return { lng, lat, name: maybePlace.name };
 };
+const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
+  const { longitude, latitude, accuracy } = res;
+  const speed = Number(res.speed);
+  const timestamp = Date.now();
+  const coords = {
+    accuracy: Number(accuracy),
+    altitude: null,
+    altitudeAccuracy: null,
+    heading: null,
+    latitude: Number(latitude),
+    longitude: Number(longitude),
+    speed
+  };
+  return { timestamp, coords };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
     return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
@@ -3034,6 +3054,90 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
+const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
+const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
+const takeIsForceBrowserGeo = () => {
+  const searchParam = new URLSearchParams(location.search);
+  return searchParam.has(`force-browser-geo`);
+};
+const sleep$1 = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
+const wxReady = () => new Promise((resolve, reject) => {
+  wx.ready(resolve);
+  wx.error(reject);
+});
+const detectPlatform = () => {
+  const useragent = navigator.userAgent.toLowerCase();
+  if (useragent.includes("micromessenger"))
+    return "wechat";
+  if (useragent.includes("alipay"))
+    return "alipay";
+  return "other";
+};
+function wechatWatchPosition(onSuccess, onError, option) {
+  const { timeout } = option;
+  let enable = true;
+  let interval = WX_GET_LOCATION_INTERVAL_STILL;
+  let prevGeoPosition = void 0;
+  const startWatch = async () => {
+    await wxReady();
+    do {
+      const geoPosition = await new Promise((resolve, reject) => {
+        let isHandled = false;
+        wx.getLocation({
+          type: "wgs84",
+          success(res) {
+            if (isHandled)
+              return;
+            isHandled = true;
+            const speed = Number(res.speed);
+            interval = speed === 0 ? WX_GET_LOCATION_INTERVAL_STILL : speed < 2 ? WX_GET_LOCATION_INTERVAL_SLOW : WX_GET_LOCATION_INTERVAL_FAST;
+            resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
+          },
+          fail(res) {
+            if (isHandled)
+              return;
+            isHandled = true;
+            const error = new Error(res.errMsg);
+            reject(error);
+            onError == null ? void 0 : onError(error);
+          }
+        });
+        if (!timeout)
+          return;
+        setTimeout(() => {
+          if (isHandled)
+            return;
+          interval = WX_GET_LOCATION_INTERVAL_SLOW;
+          resolve(void 0);
+        }, timeout);
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep$1(interval);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+  };
+}
+function compatibleWathPosition(onSuccess, onError, option) {
+  const isForceBrowserGeo = takeIsForceBrowserGeo();
+  if (isForceBrowserGeo) {
+    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId);
+  }
+  switch (detectPlatform()) {
+    case "wechat":
+      return wechatWatchPosition(onSuccess, onError, option);
+    default: {
+      const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+      return () => navigator.geolocation.clearWatch(watchId);
+    }
+  }
+}
 const isPlace = (place) => {
   return place.lng !== void 0 && place.lat !== void 0;
 };
@@ -3053,7 +3157,7 @@ class SingleGeoWatch {
     __publicField(this, "id", 0);
     __publicField(this, "listeners", /* @__PURE__ */ new Map());
     __publicField(this, "option", {});
-    __publicField(this, "singleWatchId");
+    __publicField(this, "unwatch");
     this.option = option != null ? option : {};
   }
   watchPosition(onSuccess, onError) {
@@ -3067,12 +3171,12 @@ class SingleGeoWatch {
     this.listeners.delete(id);
   }
   async start() {
-    const { listeners, option, singleWatchId } = this;
-    if (singleWatchId) {
-      navigator.geolocation.clearWatch(singleWatchId);
+    const { listeners, option, unwatch } = this;
+    if (unwatch) {
+      unwatch();
       await sleep(20);
     }
-    this.singleWatchId = navigator.geolocation.watchPosition(
+    this.unwatch = compatibleWathPosition(
       (position) => {
         for (const [onSuccess] of listeners.values()) {
           onSuccess(position);
@@ -3143,10 +3247,12 @@ const useGeoLocation = (props) => {
   watch(
     () => true,
     (_1, _2, onCleanup) => {
+      const logStartTime = Date.now();
       loading.value = true;
       const watchId = singleGeoWatch.watchPosition(
         async (position) => {
-          console.log("watchPosition success position = ", position);
+          const duration = Date.now() - logStartTime;
+          spaceLog("watchPosition", "success duration, position = ", duration, position);
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
           const point = await toGcj02(wgsPoint);
@@ -3160,7 +3266,7 @@ const useGeoLocation = (props) => {
           onChange == null ? void 0 : onChange({ position: point, coordinate });
         },
         (error) => {
-          console.log("watchPosition error = ", error);
+          spaceLog("watchPosition", "error.message = ", error.message);
           loading.value = false;
           errorRef.value = error;
           const position = props == null ? void 0 : props.geoDefaultPosition;
@@ -3983,14 +4089,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   } = useGeoLocation({
     geoDefaultPosition,
     onLoad: async (value) => {
-      console.log("useGeoLocation onLoad value = ", value);
       await readyPromise;
       centerSource.source = "geo";
       updatePlace(value.position);
       emit("loadGeoLocation", value);
     },
     onLoadDefault: async (value) => {
-      console.log("useGeoLocation onLoadDefault value = ", value);
       await readyPromise;
       const place = await defaultCenterPlacePromise;
       centerSource.source = "geo";
@@ -4084,7 +4188,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     } = props;
     const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.name;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
-    console.log("BusinessRecomendPlaceMap render geoLoading, isFirstWorkflowRecomendLoadingRef = ", geoLoading.value, isFirstWorkflowRecomendLoadingRef.value);
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,

package/dist/types/wx.d.ts

@@ -0,0 +1,21 @@
+export interface WxResponse {
+    errMsg: string;
+}
+export interface WxGetLocationSuccessResponse extends WxResponse {
+    latitude: string;
+    longitude: string;
+    speed: string;
+    accuracy: string;
+}
+interface WxGetLocationProps {
+    type: "wgs84" | "gcj02";
+    success: (response: WxGetLocationSuccessResponse) => void;
+    fail?: (response: WxResponse) => void;
+    complete?: (response: WxResponse) => void;
+}
+export interface Wx {
+    ready: (callback: () => void) => void;
+    error: (callback: (response: WxResponse) => void) => void;
+    getLocation: (props: WxGetLocationProps) => void;
+}
+export {};

package/dist/utils/{singleGeoWatch.d.ts → SingleGeoWatch.d.ts}

@@ -1,3 +1,4 @@
+import { type ClearWathPosition } from "./compatibleWatchPosition";
 /**
  * @note navigator.geolocation.watchPosition 期间，再调用 watchPosition 或  getCurrentPosition 会导致定位失败。
  */
@@ -5,7 +6,7 @@ export declare class SingleGeoWatch {
     id: number;
     listeners: Map<number, [PositionCallback, PositionErrorCallback | undefined]>;
     option: PositionOptions;
-    singleWatchId: number | undefined;
+    unwatch: ClearWathPosition | undefined;
     constructor(option?: PositionOptions);
     watchPosition(onSuccess: PositionCallback, onError?: PositionErrorCallback): number;
     clearWatch(id: number): void;

package/dist/utils/compatibleWatchPosition.d.ts

@@ -0,0 +1,2 @@
+export type ClearWathPosition = () => void;
+export declare function compatibleWathPosition(onSuccess: PositionCallback, onError: PositionErrorCallback, option: PositionOptions): ClearWathPosition;

package/dist/utils/transform.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="google.maps" />
 import type { Place, Point } from "../types/interface";
+import type { WxGetLocationSuccessResponse } from "../types/wx";
 export declare const vec2lnglat: ([lng, lat]: [number, number]) => google.maps.LatLngLiteral;
 export interface AsteriskItem {
     type: "normal" | "emphasize";
@@ -16,8 +17,10 @@ export declare const pipeDefer: <P extends any[], R>(fn: (...args: P) => R) => (
 export declare const pipeOnlyLastEffect: <P extends any[], R>(fn: (...arg: P) => Promise<R>) => (...args: P) => Promise<R>;
 export declare const isPlaceEqual: (p1: Place, p2?: Place) => boolean;
 export declare const isPointEqual: (p1: Point, p2?: Point) => boolean;
+export declare const isGeoPositionEqual: (p1: GeolocationPosition, p2?: GeolocationPosition) => boolean;
 export declare const toPlaceType: (maybePlace: {
     name: string;
     lng: string | number;
     lat: string | number;
 }) => Place;
+export declare const wxGetLocationSuccessResponse2GeolocationPosition: (res: WxGetLocationSuccessResponse) => GeolocationPosition;

package/package.json

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