@heycar/heycars-map 0.7.7-animate2 → 0.7.8

package/dist/index.cjs

@@ -1937,6 +1937,15 @@ const useMapLoader = (props) => {
     onChange
   });
 };
+var BRWOSER_PLATFORM = /* @__PURE__ */ ((BRWOSER_PLATFORM2) => {
+  BRWOSER_PLATFORM2["WECHAT"] = "WECHAT";
+  BRWOSER_PLATFORM2["WECHAT_MINIPROGRAM"] = "WECHAT_MINIPROGRAM";
+  BRWOSER_PLATFORM2["ALIPAY"] = "ALIPAY";
+  BRWOSER_PLATFORM2["ALIPAY_MINIPROGRAM"] = "ALIPAY_MINIPROGRAM";
+  BRWOSER_PLATFORM2["H5"] = "H5";
+  BRWOSER_PLATFORM2["NODE_JS"] = "NODE_JS";
+  return BRWOSER_PLATFORM2;
+})(BRWOSER_PLATFORM || {});
 var OS_PLATFORM = /* @__PURE__ */ ((OS_PLATFORM2) => {
   OS_PLATFORM2["IOS"] = "IOS";
   OS_PLATFORM2["ANDROID"] = "ANDROID";
@@ -1949,6 +1958,18 @@ var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
   WEBGL_STATUS2["ENABLED"] = "ENABLED";
   return WEBGL_STATUS2;
 })(WEBGL_STATUS || {});
+const detectBrowserPlatform = () => {
+  if (typeof navigator === "undefined")
+    return "NODE_JS";
+  const useragent = navigator.userAgent.toLowerCase();
+  if (useragent.includes("micromessenger")) {
+    return useragent.includes("miniprogram") ? "WECHAT_MINIPROGRAM" : "WECHAT";
+  }
+  if (useragent.includes("alipay")) {
+    return useragent.includes("miniprogram") ? "ALIPAY_MINIPROGRAM" : "ALIPAY";
+  }
+  return "H5";
+};
 const detectOSPlatform = () => {
   if (typeof navigator === "undefined")
     return "OTHER";
@@ -3510,6 +3531,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(
+    detectBrowserPlatform()
+  ) && detectOSPlatform() === OS_PLATFORM.IOS;
   let isOnLoadTriggered = false;
   const loading = Vue.ref(false);
   const readyRef = Vue.ref(false);
@@ -3535,7 +3559,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 = await toGcj02(wgsPoint);
+          const point = isIOSAlipay ? wgsPoint : await toGcj02(wgsPoint);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           errorRef.value = void 0;
@@ -6987,9 +7011,6 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   });
   const carPositionRef = Vue.ref();
   const carAngleRef = Vue.ref();
-  const {
-    toGcj02
-  } = useMapGCJ02();
   Vue.watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
@@ -7000,7 +7021,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }) => {
         assertPoint(position);
         assertAngle(angle);
-        carPositionRef.value = position ? await toGcj02(position) : void 0;
+        carPositionRef.value = position != null ? position : void 0;
         carAngleRef.value = angle;
       });
     };

package/dist/index.js

@@ -1935,6 +1935,15 @@ const useMapLoader = (props) => {
     onChange
   });
 };
+var BRWOSER_PLATFORM = /* @__PURE__ */ ((BRWOSER_PLATFORM2) => {
+  BRWOSER_PLATFORM2["WECHAT"] = "WECHAT";
+  BRWOSER_PLATFORM2["WECHAT_MINIPROGRAM"] = "WECHAT_MINIPROGRAM";
+  BRWOSER_PLATFORM2["ALIPAY"] = "ALIPAY";
+  BRWOSER_PLATFORM2["ALIPAY_MINIPROGRAM"] = "ALIPAY_MINIPROGRAM";
+  BRWOSER_PLATFORM2["H5"] = "H5";
+  BRWOSER_PLATFORM2["NODE_JS"] = "NODE_JS";
+  return BRWOSER_PLATFORM2;
+})(BRWOSER_PLATFORM || {});
 var OS_PLATFORM = /* @__PURE__ */ ((OS_PLATFORM2) => {
   OS_PLATFORM2["IOS"] = "IOS";
   OS_PLATFORM2["ANDROID"] = "ANDROID";
@@ -1947,6 +1956,18 @@ var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
   WEBGL_STATUS2["ENABLED"] = "ENABLED";
   return WEBGL_STATUS2;
 })(WEBGL_STATUS || {});
+const detectBrowserPlatform = () => {
+  if (typeof navigator === "undefined")
+    return "NODE_JS";
+  const useragent = navigator.userAgent.toLowerCase();
+  if (useragent.includes("micromessenger")) {
+    return useragent.includes("miniprogram") ? "WECHAT_MINIPROGRAM" : "WECHAT";
+  }
+  if (useragent.includes("alipay")) {
+    return useragent.includes("miniprogram") ? "ALIPAY_MINIPROGRAM" : "ALIPAY";
+  }
+  return "H5";
+};
 const detectOSPlatform = () => {
   if (typeof navigator === "undefined")
     return "OTHER";
@@ -3508,6 +3529,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(
+    detectBrowserPlatform()
+  ) && detectOSPlatform() === OS_PLATFORM.IOS;
   let isOnLoadTriggered = false;
   const loading = ref(false);
   const readyRef = ref(false);
@@ -3533,7 +3557,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 = await toGcj02(wgsPoint);
+          const point = isIOSAlipay ? wgsPoint : await toGcj02(wgsPoint);
           coordinateRef.value = coordinate;
           positionRef.value = point;
           errorRef.value = void 0;
@@ -6985,9 +7009,6 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
   });
   const carPositionRef = ref();
   const carAngleRef = ref();
-  const {
-    toGcj02
-  } = useMapGCJ02();
   watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
@@ -6998,7 +7019,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
       }) => {
         assertPoint(position);
         assertAngle(angle);
-        carPositionRef.value = position ? await toGcj02(position) : void 0;
+        carPositionRef.value = position != null ? position : void 0;
         carAngleRef.value = angle;
       });
     };

package/package.json

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