@heycar/heycars-map 0.9.14 → 0.9.15

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.14";
+const version = "0.9.15";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1343,11 +1343,11 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   return { timestamp, coords };
 };
 const alipayMyGetLocationSuccessResponse2GeolocationPosition = (res) => {
-  const { longitude, latitude, accuracy, altitude } = res;
+  const { longitude, latitude, accuracy } = res;
   const timestamp = Date.now();
   const coords = {
     accuracy: Number(accuracy),
-    altitude: Number(altitude),
+    altitude: null,
     altitudeAccuracy: null,
     heading: null,
     latitude: Number(latitude),
@@ -4243,7 +4243,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
-function alipayWatchPosition(onSuccess, onError, option) {
+function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
@@ -4256,7 +4256,7 @@ function alipayWatchPosition(onSuccess, onError, option) {
         continue;
       }
       const geoPosition = await new Promise((resolve) => {
-        my.getLocation({
+        getLocationFn({
           type: 0,
           cacheTimeout: timeout / 1e3,
           success(res) {
@@ -4291,6 +4291,10 @@ function alipayWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+const apGetLocation = ({ type: type2, cacheTimeout, success, fail }) => {
+  const apType = type2 >= 2 ? 0 : type2 === 0 ? 2 : 1;
+  ap.getLocation({ type: apType, cacheTimeout }).then(success).catch(fail);
+};
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
@@ -4347,8 +4351,11 @@ 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 && osPlatform === OS_PLATFORM.IOS && typeof ap !== "undefined") {
+    return alipayWatchPosition(onSuccess, onError, option, apGetLocation);
+  }
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
-    return alipayWatchPosition(onSuccess, onError, option);
+    return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
   if (osPlatform === OS_PLATFORM.ANDROID) {
     return androidWatchPosition(onSuccess, onError, option);
@@ -4434,9 +4441,9 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  const isIOSAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
+  const isAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
     detectBrowserPlatform()
-  ) && detectOSPlatform() === OS_PLATFORM.IOS;
+  );
   let isOnLoadTriggered = false;
   const loading = Vue.ref(false);
   const readyRef = Vue.ref(false);
@@ -4462,7 +4469,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 = isIOSAlipay ? wgsPoint : await toGcj02(wgsPoint);
+          const point = isAlipay ? wgsPoint : await toGcj02(wgsPoint);
           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.14";
+const version = "0.9.15";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1341,11 +1341,11 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   return { timestamp, coords };
 };
 const alipayMyGetLocationSuccessResponse2GeolocationPosition = (res) => {
-  const { longitude, latitude, accuracy, altitude } = res;
+  const { longitude, latitude, accuracy } = res;
   const timestamp = Date.now();
   const coords = {
     accuracy: Number(accuracy),
-    altitude: Number(altitude),
+    altitude: null,
     altitudeAccuracy: null,
     heading: null,
     latitude: Number(latitude),
@@ -4241,7 +4241,7 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
-function alipayWatchPosition(onSuccess, onError, option) {
+function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
@@ -4254,7 +4254,7 @@ function alipayWatchPosition(onSuccess, onError, option) {
         continue;
       }
       const geoPosition = await new Promise((resolve) => {
-        my.getLocation({
+        getLocationFn({
           type: 0,
           cacheTimeout: timeout / 1e3,
           success(res) {
@@ -4289,6 +4289,10 @@ function alipayWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+const apGetLocation = ({ type: type2, cacheTimeout, success, fail }) => {
+  const apType = type2 >= 2 ? 0 : type2 === 0 ? 2 : 1;
+  ap.getLocation({ type: apType, cacheTimeout }).then(success).catch(fail);
+};
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
@@ -4345,8 +4349,11 @@ 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 && osPlatform === OS_PLATFORM.IOS && typeof ap !== "undefined") {
+    return alipayWatchPosition(onSuccess, onError, option, apGetLocation);
+  }
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
-    return alipayWatchPosition(onSuccess, onError, option);
+    return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
   if (osPlatform === OS_PLATFORM.ANDROID) {
     return androidWatchPosition(onSuccess, onError, option);
@@ -4432,9 +4439,9 @@ const useGeoLocation = (props) => {
   var _a, _b;
   const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props != null ? props : {};
   const { toGcj02 } = useMapGCJ02();
-  const isIOSAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
+  const isAlipay = [BRWOSER_PLATFORM.ALIPAY, BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM].includes(
     detectBrowserPlatform()
-  ) && detectOSPlatform() === OS_PLATFORM.IOS;
+  );
   let isOnLoadTriggered = false;
   const loading = ref(false);
   const readyRef = ref(false);
@@ -4460,7 +4467,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 = isIOSAlipay ? wgsPoint : await toGcj02(wgsPoint);
+          const point = isAlipay ? wgsPoint : await toGcj02(wgsPoint);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           errorRef.value = void 0;

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

@@ -0,0 +1,16 @@
+export interface AlipayApGetLocationProps {
+    cacheTimeout?: number;
+    type?: number;
+}
+export interface AlipayApGetLocationSuccessResponse {
+    longitude: number;
+    latitude: number;
+    accuracy: number;
+}
+export interface AlipayApErrorResponse {
+    error: number;
+    errorMessage: string;
+}
+export interface AlipayAp {
+    getLocation: (props: AlipayApGetLocationProps) => Promise<AlipayApGetLocationSuccessResponse>;
+}

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

@@ -2,7 +2,7 @@ export interface AlipayMyGetLocationSuccessResponse {
     longitude: number;
     latitude: number;
     accuracy: number;
-    altitude: number;
+    altitude?: number;
 }
 export interface AlipayMyErrorResponse {
     error: number;

package/package.json

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