@heycar/heycars-map 0.9.15 → 0.9.16

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.15";
+const version = "0.9.16";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -2311,6 +2311,22 @@ var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
   WEBGL_STATUS2["ENABLED"] = "ENABLED";
   return WEBGL_STATUS2;
 })(WEBGL_STATUS || {});
+var ALIPAY_WALLET = /* @__PURE__ */ ((ALIPAY_WALLET2) => {
+  ALIPAY_WALLET2["TNGD"] = "TNGD";
+  ALIPAY_WALLET2["TMN"] = "TMN";
+  return ALIPAY_WALLET2;
+})(ALIPAY_WALLET || {});
+const detectAlipayWallet = () => {
+  if (!navigator)
+    return void 0;
+  const useragent = navigator.userAgent.toLowerCase();
+  if (!useragent.includes("alipay"))
+    return void 0;
+  if (useragent.includes("tngkit"))
+    return "TNGD";
+  if (useragent.includes("truemoney"))
+    return "TMN";
+};
 const detectBrowserPlatform = () => {
   if (typeof navigator === "undefined")
     return "NODE_JS";
@@ -4248,6 +4264,7 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let prevGeoPosition = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
   const isGeoWorkingRef = Vue.ref(true);
+  const lastSuccessfulResponseRef = Vue.ref();
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4256,14 +4273,22 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
         continue;
       }
       const geoPosition = await new Promise((resolve) => {
+        const handleSuccess = (res) => {
+          lastSuccessfulResponseRef.value = res;
+          isGeoWorkingRef.value = true;
+          resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
+        };
         getLocationFn({
           type: 0,
           cacheTimeout: timeout / 1e3,
-          success(res) {
-            isGeoWorkingRef.value = true;
-            resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
-          },
+          success: handleSuccess,
           fail(res) {
+            if (res.error === 13 && lastSuccessfulResponseRef.value) {
+              console.warn(
+                "MyWarning: my.getLocation failed with errcode 13 which has been bypassed"
+              );
+              return handleSuccess(lastSuccessfulResponseRef.value);
+            }
             const isGeoWorking = isGeoWorkingRef.value;
             isGeoWorkingRef.value = false;
             resolve(void 0);
@@ -4363,6 +4388,16 @@ function compatibleWathPosition(onSuccess, onError, option) {
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
+function compatibleGeoPositionTransform(position, transform) {
+  const os = detectOSPlatform();
+  const platform = detectBrowserPlatform();
+  const wallet = detectAlipayWallet();
+  if ((wallet === ALIPAY_WALLET.TNGD || wallet === ALIPAY_WALLET.TMN) && os === OS_PLATFORM.ANDROID)
+    return transform(position);
+  if (platform === BRWOSER_PLATFORM.ALIPAY || platform === BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM)
+    return position;
+  return transform(position);
+}
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -4441,9 +4476,6 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  const isAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
-    detectBrowserPlatform()
-  );
   let isOnLoadTriggered = false;
   const loading = Vue.ref(false);
   const readyRef = Vue.ref(false);
@@ -4469,7 +4501,7 @@ const useGeoLocation = (props) => {
           spaceLog("watchPosition", "success duration, position = ", duration, position);
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
-          const point = isAlipay ? wgsPoint : await toGcj02(wgsPoint);
+          const point = await compatibleGeoPositionTransform(wgsPoint, toGcj02);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           errorRef.value = void 0;

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.15";
+const version = "0.9.16";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -2309,6 +2309,22 @@ var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
   WEBGL_STATUS2["ENABLED"] = "ENABLED";
   return WEBGL_STATUS2;
 })(WEBGL_STATUS || {});
+var ALIPAY_WALLET = /* @__PURE__ */ ((ALIPAY_WALLET2) => {
+  ALIPAY_WALLET2["TNGD"] = "TNGD";
+  ALIPAY_WALLET2["TMN"] = "TMN";
+  return ALIPAY_WALLET2;
+})(ALIPAY_WALLET || {});
+const detectAlipayWallet = () => {
+  if (!navigator)
+    return void 0;
+  const useragent = navigator.userAgent.toLowerCase();
+  if (!useragent.includes("alipay"))
+    return void 0;
+  if (useragent.includes("tngkit"))
+    return "TNGD";
+  if (useragent.includes("truemoney"))
+    return "TMN";
+};
 const detectBrowserPlatform = () => {
   if (typeof navigator === "undefined")
     return "NODE_JS";
@@ -4246,6 +4262,7 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let prevGeoPosition = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
   const isGeoWorkingRef = ref(true);
+  const lastSuccessfulResponseRef = ref();
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4254,14 +4271,22 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
         continue;
       }
       const geoPosition = await new Promise((resolve) => {
+        const handleSuccess = (res) => {
+          lastSuccessfulResponseRef.value = res;
+          isGeoWorkingRef.value = true;
+          resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
+        };
         getLocationFn({
           type: 0,
           cacheTimeout: timeout / 1e3,
-          success(res) {
-            isGeoWorkingRef.value = true;
-            resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
-          },
+          success: handleSuccess,
           fail(res) {
+            if (res.error === 13 && lastSuccessfulResponseRef.value) {
+              console.warn(
+                "MyWarning: my.getLocation failed with errcode 13 which has been bypassed"
+              );
+              return handleSuccess(lastSuccessfulResponseRef.value);
+            }
             const isGeoWorking = isGeoWorkingRef.value;
             isGeoWorkingRef.value = false;
             resolve(void 0);
@@ -4361,6 +4386,16 @@ function compatibleWathPosition(onSuccess, onError, option) {
   const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
   return () => navigator.geolocation.clearWatch(watchId);
 }
+function compatibleGeoPositionTransform(position, transform) {
+  const os = detectOSPlatform();
+  const platform = detectBrowserPlatform();
+  const wallet = detectAlipayWallet();
+  if ((wallet === ALIPAY_WALLET.TNGD || wallet === ALIPAY_WALLET.TMN) && os === OS_PLATFORM.ANDROID)
+    return transform(position);
+  if (platform === BRWOSER_PLATFORM.ALIPAY || platform === BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM)
+    return position;
+  return transform(position);
+}
 class SingleGeoWatch {
   constructor(option) {
     __publicField(this, "id", 0);
@@ -4439,9 +4474,6 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  const isAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
-    detectBrowserPlatform()
-  );
   let isOnLoadTriggered = false;
   const loading = ref(false);
   const readyRef = ref(false);
@@ -4467,7 +4499,7 @@ const useGeoLocation = (props) => {
           spaceLog("watchPosition", "success duration, position = ", duration, position);
           const coordinate = position.coords;
           const wgsPoint = [position.coords.longitude, position.coords.latitude];
-          const point = isAlipay ? wgsPoint : await toGcj02(wgsPoint);
+          const point = await compatibleGeoPositionTransform(wgsPoint, toGcj02);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           errorRef.value = void 0;

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

@@ -1,2 +1,11 @@
+import type { Point } from "../types/interface";
 export type ClearWathPosition = () => void;
 export declare function compatibleWathPosition(onSuccess: PositionCallback, onError: PositionErrorCallback, option: PositionOptions): ClearWathPosition;
+type AsyncPointTransformer = (p: Point) => Promise<Point>;
+/**
+ * 统一客户端加偏转换
+ * @param position 经纬度
+ * @param transform 加偏转换 wgs84 -> gcj02
+ */
+export declare function compatibleGeoPositionTransform(position: Point, transform: AsyncPointTransformer): Point | Promise<Point>;
+export {};

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

@@ -16,6 +16,11 @@ export declare enum WEBGL_STATUS {
     DISABLED = "DISABLED",
     ENABLED = "ENABLED"
 }
+export declare enum ALIPAY_WALLET {
+    TNGD = "TNGD",
+    TMN = "TMN"
+}
+export declare const detectAlipayWallet: () => ALIPAY_WALLET | undefined;
 export declare const detectBrowserPlatform: () => BRWOSER_PLATFORM;
 export declare const detectOSPlatform: () => OS_PLATFORM;
 /**

package/package.json

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