@heycar/heycars-map 0.9.12 → 0.9.14

package/dist/index.cjs

@@ -12,7 +12,7 @@ if (typeof window !== "undefined" && typeof globalThis === "undefined") {
   window.globalThis = window;
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.12";
+const version = "0.9.14";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1342,6 +1342,20 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   };
   return { timestamp, coords };
 };
+const alipayMyGetLocationSuccessResponse2GeolocationPosition = (res) => {
+  const { longitude, latitude, accuracy, altitude } = res;
+  const timestamp = Date.now();
+  const coords = {
+    accuracy: Number(accuracy),
+    altitude: Number(altitude),
+    altitudeAccuracy: null,
+    heading: null,
+    latitude: Number(latitude),
+    longitude: Number(longitude),
+    speed: null
+  };
+  return { timestamp, coords };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) && isLatLngLiteral(b)) {
     return isPlaceEqual(a, b);
@@ -4153,6 +4167,8 @@ const watchVisibilityState = () => {
 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 ALIPAY_GET_LOCATION_INTERVAL = 1 * 1e3;
+const ALIPAY_GEO_CACHE_TIMEOUT = 5e3;
 const ANDROID_GET_LOCATION_INTERVAL = 1 * 1e3;
 const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
@@ -4227,6 +4243,54 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+function alipayWatchPosition(onSuccess, onError, option) {
+  let enable = true;
+  let prevGeoPosition = void 0;
+  const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
+  const isGeoWorkingRef = Vue.ref(true);
+  const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const startWatch = async () => {
+    do {
+      if (visibilityStateRef.value === "hidden") {
+        await sleep(ALIPAY_GET_LOCATION_INTERVAL);
+        continue;
+      }
+      const geoPosition = await new Promise((resolve) => {
+        my.getLocation({
+          type: 0,
+          cacheTimeout: timeout / 1e3,
+          success(res) {
+            isGeoWorkingRef.value = true;
+            resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
+          },
+          fail(res) {
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            const { error, errorMessage } = res;
+            console.warn(
+              "MyWarning: my.getLocation failed errcode, errmsg = ",
+              error,
+              errorMessage
+            );
+            onError == null ? void 0 : onError(new Error(errorMessage));
+          }
+        });
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep(ALIPAY_GET_LOCATION_INTERVAL);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+    unwatchVisibilityState();
+  };
+}
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
@@ -4283,31 +4347,15 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.WECHAT || browserPlatform === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM) {
     return wechatWatchPosition(onSuccess, onError, option);
   }
+  if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
+    return alipayWatchPosition(onSuccess, onError, option);
+  }
   if (osPlatform === OS_PLATFORM.ANDROID) {
     return androidWatchPosition(onSuccess, onError, option);
   }
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
-window.efg = () => my.getLocation({
-  type: 0,
-  cacheTimeout: 1,
-  success(res) {
-    console.log("my.getLocation success = ", JSON.stringify(res, null, 2));
-  },
-  fail(res) {
-    console.log("my.getLocation fail = ", JSON.stringify(res, null, 2));
-  }
-});
-window.abc = () => wx.getLocation({
-  type: "wgs84",
-  success(res) {
-    console.log("wx.getLocation success = ", JSON.stringify(res, null, 2));
-  },
-  fail(res) {
-    console.log("wx.getLocation fail = ", JSON.stringify(res, null, 2));
-  }
-});
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -6380,6 +6428,22 @@ const useMapRecomendPlace = (props) => {
       isSameZone
     });
   };
+  const updateRecommendPlaceOnlyInZone = async (place) => {
+    const { place: foundPlace, candidates, available, zone } = await findAttachedPlace(place);
+    const resultPlace = zone ? foundPlace : place;
+    const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
+    availableRef.value = available;
+    zoneRef.value = zone;
+    placeCandidatesRef.value = candidates;
+    Object.assign(recomendPlace, { ...resultPlace });
+    onChangePlace == null ? void 0 : onChangePlace({ ...resultPlace });
+    onChange == null ? void 0 : onChange({
+      place: { ...resultPlace },
+      inputPlace: { ...place },
+      isInZone: !!zone,
+      isSameZone
+    });
+  };
   const setPlaceCandidatesAndZone = ({
     zone,
     places: inputPlaceCandidates
@@ -6396,6 +6460,7 @@ const useMapRecomendPlace = (props) => {
     availableRef,
     isElectedRef,
     updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     updatePlaceCandidates,
     updatePlace,
     setPlaceCandidatesAndZone
@@ -7170,7 +7235,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerSource.source = "api";
     const place = toPlaceType(input);
     Object.assign(centerPlace, place);
-    updateRecommendPlace(place);
+    updateRecommendPlaceOnlyInZone(place);
   };
   const setCenterPlaceByUserSpecifiedInZone = async ({
     place: inputPlace,
@@ -7266,7 +7331,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   });
   const {
     updatePlace,
-    updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     setPlaceCandidatesAndZone,
     placeCandidates,
     zoneRef,
@@ -7420,7 +7485,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerSource.source = "api";
     const place = toPlaceType(input);
     Object.assign(centerPlace, place);
-    updateRecommendPlace(place);
+    updateRecommendPlaceOnlyInZone(place);
   };
   const setCenterPlaceByUserSpecifiedInZone = async ({
     place: inputPlace,
@@ -7488,7 +7553,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   const {
     updatePlace,
-    updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     updatePlaceCandidates,
     setPlaceCandidatesAndZone,
     placeCandidates,

package/dist/index.js

@@ -10,7 +10,7 @@ if (typeof window !== "undefined" && typeof globalThis === "undefined") {
   window.globalThis = window;
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.12";
+const version = "0.9.14";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1340,6 +1340,20 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   };
   return { timestamp, coords };
 };
+const alipayMyGetLocationSuccessResponse2GeolocationPosition = (res) => {
+  const { longitude, latitude, accuracy, altitude } = res;
+  const timestamp = Date.now();
+  const coords = {
+    accuracy: Number(accuracy),
+    altitude: Number(altitude),
+    altitudeAccuracy: null,
+    heading: null,
+    latitude: Number(latitude),
+    longitude: Number(longitude),
+    speed: null
+  };
+  return { timestamp, coords };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
   if (isLatLngLiteral(a) && isLatLngLiteral(b)) {
     return isPlaceEqual(a, b);
@@ -4151,6 +4165,8 @@ const watchVisibilityState = () => {
 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 ALIPAY_GET_LOCATION_INTERVAL = 1 * 1e3;
+const ALIPAY_GEO_CACHE_TIMEOUT = 5e3;
 const ANDROID_GET_LOCATION_INTERVAL = 1 * 1e3;
 const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
@@ -4225,6 +4241,54 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+function alipayWatchPosition(onSuccess, onError, option) {
+  let enable = true;
+  let prevGeoPosition = void 0;
+  const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
+  const isGeoWorkingRef = ref(true);
+  const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const startWatch = async () => {
+    do {
+      if (visibilityStateRef.value === "hidden") {
+        await sleep(ALIPAY_GET_LOCATION_INTERVAL);
+        continue;
+      }
+      const geoPosition = await new Promise((resolve) => {
+        my.getLocation({
+          type: 0,
+          cacheTimeout: timeout / 1e3,
+          success(res) {
+            isGeoWorkingRef.value = true;
+            resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
+          },
+          fail(res) {
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            const { error, errorMessage } = res;
+            console.warn(
+              "MyWarning: my.getLocation failed errcode, errmsg = ",
+              error,
+              errorMessage
+            );
+            onError == null ? void 0 : onError(new Error(errorMessage));
+          }
+        });
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep(ALIPAY_GET_LOCATION_INTERVAL);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+    unwatchVisibilityState();
+  };
+}
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
@@ -4281,31 +4345,15 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.WECHAT || browserPlatform === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM) {
     return wechatWatchPosition(onSuccess, onError, option);
   }
+  if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
+    return alipayWatchPosition(onSuccess, onError, option);
+  }
   if (osPlatform === OS_PLATFORM.ANDROID) {
     return androidWatchPosition(onSuccess, onError, option);
   }
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
-window.efg = () => my.getLocation({
-  type: 0,
-  cacheTimeout: 1,
-  success(res) {
-    console.log("my.getLocation success = ", JSON.stringify(res, null, 2));
-  },
-  fail(res) {
-    console.log("my.getLocation fail = ", JSON.stringify(res, null, 2));
-  }
-});
-window.abc = () => wx.getLocation({
-  type: "wgs84",
-  success(res) {
-    console.log("wx.getLocation success = ", JSON.stringify(res, null, 2));
-  },
-  fail(res) {
-    console.log("wx.getLocation fail = ", JSON.stringify(res, null, 2));
-  }
-});
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -6378,6 +6426,22 @@ const useMapRecomendPlace = (props) => {
       isSameZone
     });
   };
+  const updateRecommendPlaceOnlyInZone = async (place) => {
+    const { place: foundPlace, candidates, available, zone } = await findAttachedPlace(place);
+    const resultPlace = zone ? foundPlace : place;
+    const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
+    availableRef.value = available;
+    zoneRef.value = zone;
+    placeCandidatesRef.value = candidates;
+    Object.assign(recomendPlace, { ...resultPlace });
+    onChangePlace == null ? void 0 : onChangePlace({ ...resultPlace });
+    onChange == null ? void 0 : onChange({
+      place: { ...resultPlace },
+      inputPlace: { ...place },
+      isInZone: !!zone,
+      isSameZone
+    });
+  };
   const setPlaceCandidatesAndZone = ({
     zone,
     places: inputPlaceCandidates
@@ -6394,6 +6458,7 @@ const useMapRecomendPlace = (props) => {
     availableRef,
     isElectedRef,
     updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     updatePlaceCandidates,
     updatePlace,
     setPlaceCandidatesAndZone
@@ -7168,7 +7233,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerSource.source = "api";
     const place = toPlaceType(input);
     Object.assign(centerPlace, place);
-    updateRecommendPlace(place);
+    updateRecommendPlaceOnlyInZone(place);
   };
   const setCenterPlaceByUserSpecifiedInZone = async ({
     place: inputPlace,
@@ -7264,7 +7329,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   });
   const {
     updatePlace,
-    updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     setPlaceCandidatesAndZone,
     placeCandidates,
     zoneRef,
@@ -7418,7 +7483,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerSource.source = "api";
     const place = toPlaceType(input);
     Object.assign(centerPlace, place);
-    updateRecommendPlace(place);
+    updateRecommendPlaceOnlyInZone(place);
   };
   const setCenterPlaceByUserSpecifiedInZone = async ({
     place: inputPlace,
@@ -7486,7 +7551,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
   });
   const {
     updatePlace,
-    updateRecommendPlace,
+    updateRecommendPlaceOnlyInZone,
     updatePlaceCandidates,
     setPlaceCandidatesAndZone,
     placeCandidates,

package/dist/src/hooks/useMapRecomendPlace.d.ts

@@ -32,6 +32,7 @@ export declare const useMapRecomendPlace: <C>(props: UseMapRecomendPlaceProps<C>
     availableRef: import("vue-demi").Ref<boolean>;
     isElectedRef: import("vue-demi").ComputedRef<boolean>;
     updateRecommendPlace: (place: Place) => Promise<void>;
+    updateRecommendPlaceOnlyInZone: (place: Place) => Promise<void>;
     updatePlaceCandidates: (place: Place) => Promise<ValueOfOnChangeRecommendPlace>;
     updatePlace: (point: Point) => Promise<void>;
     setPlaceCandidatesAndZone: ({ zone, places: inputPlaceCandidates, }: RecommendZonePlaces) => void;

package/dist/src/types/my.d.ts

@@ -1,21 +1,20 @@
-interface MyGetLocationSuccessResponse {
+export interface AlipayMyGetLocationSuccessResponse {
     longitude: number;
     latitude: number;
     accuracy: number;
     altitude: number;
 }
-interface MyErrorResponse {
+export interface AlipayMyErrorResponse {
     error: number;
     errorMessage: string;
 }
-interface MyGetLocationProps {
+export interface AlipayMyGetLocationProps {
     type: 0 | 1 | 2 | 3;
     cacheTimeout: number;
-    success: (response: MyGetLocationSuccessResponse) => void;
-    fail?: (response: MyErrorResponse) => void;
+    success: (response: AlipayMyGetLocationSuccessResponse) => void;
+    fail?: (response: AlipayMyErrorResponse) => void;
     complete?: () => void;
 }
-export interface My {
-    getLocation: (props: MyGetLocationProps) => void;
+export interface AlipayMy {
+    getLocation: (props: AlipayMyGetLocationProps) => void;
 }
-export {};

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

@@ -1,5 +1,6 @@
 /// <reference types="google.maps" />
 import type { Place, Point, RecommendZonePlaces, Zone } from "../types/interface";
+import type { AlipayMyGetLocationSuccessResponse } from "../types/my";
 import type { WxGetLocationSuccessResponse } from "../types/wx";
 export declare const vec2lnglat: ([lng, lat]: [number, number]) => google.maps.LatLngLiteral;
 export interface AsteriskItem {
@@ -47,4 +48,5 @@ interface MaybeRecomendZonePlaces {
 }
 export declare const toRecommendZonePlacesType: (maybeRecomendZonePlaces: MaybeRecomendZonePlaces) => RecommendZonePlaces;
 export declare const wxGetLocationSuccessResponse2GeolocationPosition: (res: WxGetLocationSuccessResponse) => GeolocationPosition;
+export declare const alipayMyGetLocationSuccessResponse2GeolocationPosition: (res: AlipayMyGetLocationSuccessResponse) => GeolocationPosition;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"

package/todo.md

@@ -6,6 +6,10 @@ https://dawchihliou.github.io/articles/building-custom-google-maps-marker-react-
 4. 手机缩放导致 onPlaceChange 触发，并且 getRecommendPlace 也被调用了
 5. 绿区内拖动问题
 
+v3.8
+
+- BusinessReselectPlaceMap 加一个初始化 绿区吸附的功能
+
 ### log
 
 手机关闭位置信息 errMsg: "getLocation:gps closed"