@heycar/heycars-map 0.9.20-querying3 → 0.9.20-timeout1

package/dist/index.cjs

@@ -18,152 +18,8 @@ if (typeof GeolocationPositionError === "undefined") {
     TIMEOUT: 3
   };
 }
-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";
-  OS_PLATFORM2["OTHER"] = "OTHER";
-  return OS_PLATFORM2;
-})(OS_PLATFORM || {});
-var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
-  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
-  WEBGL_STATUS2["DISABLED"] = "DISABLED";
-  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";
-  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";
-  const userAgent = navigator.userAgent || navigator.vendor;
-  if (/android/i.test(userAgent)) {
-    return "ANDROID";
-  }
-  if (/iPad|iPhone|iPod/.test(userAgent) && !globalThis.MSStream) {
-    return "IOS";
-  }
-  return "OTHER";
-};
-function detectWebGL() {
-  if (typeof window === "undefined")
-    return "NOT_SUPPORTED";
-  if (window.WebGLRenderingContext) {
-    const canvas = document.createElement("canvas");
-    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
-    let context2 = null;
-    for (const name2 of names) {
-      try {
-        context2 = canvas.getContext(name2);
-        if (context2 && typeof context2.getParameter === "function") {
-          return "ENABLED";
-        }
-      } catch (e) {
-        console.error("MyError: detectWebGL catch e = ", e);
-        return "NOT_SUPPORTED";
-      }
-    }
-    return "DISABLED";
-  }
-  return "NOT_SUPPORTED";
-}
-const createMockWx = (opt) => {
-  const { timeout, lng, lat, status } = opt.getLocation;
-  const mockWx = {
-    ready(callback) {
-      callback();
-    },
-    error(callback) {
-      callback({ errCode: "mock error code", errMsg: "mock error message" });
-    },
-    getLocation(props) {
-      const { success, fail } = props;
-      if (status === "success") {
-        setTimeout(() => {
-          success({
-            longitude: String(lng),
-            latitude: String(lat),
-            accuracy: "30",
-            speed: "0",
-            errCode: "",
-            errMsg: ""
-          });
-        }, timeout);
-      }
-      if (status === "fail") {
-        setTimeout(() => {
-          fail == null ? void 0 : fail({ errCode: "mock error code", errMsg: "mock error message" });
-        }, timeout);
-      }
-    },
-    config() {
-      return;
-    },
-    miniProgram: {
-      redirectTo() {
-        return;
-      },
-      getEnv() {
-        const miniprogram = detectBrowserPlatform() === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM;
-        return { miniprogram };
-      }
-    }
-  };
-  return mockWx;
-};
-const mockWxByUrl = () => {
-  const searchParams = new URLSearchParams(location.search);
-  const enable = searchParams.has("enableMockWx");
-  if (!enable)
-    return;
-  const lng = Number(searchParams.get("lng"));
-  const lat = Number(searchParams.get("lat"));
-  const timeout = Number(searchParams.get("timeout")) * 1e3;
-  const status = searchParams.get("status");
-  if (status !== "success" && status !== "fail" || isNaN(timeout)) {
-    console.error("MyError: createMockWxByUrl: wrong parameter from url");
-    return;
-  }
-  const mockWx = createMockWx({ getLocation: { lng, lat, timeout, status } });
-  window.wx = mockWx;
-};
-mockWxByUrl();
 const name = "@heycar/heycars-map";
-const version = "0.9.20-querying3";
+const version = "0.9.20-timeout1";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1559,6 +1415,14 @@ const createAsyncNoFailNonNullable = (fn, defaultValue) => {
     return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
   };
 };
+const pipeTimeout = (fn, defaultValue, timeout) => {
+  return function pipedTimeoutedFunction(...args) {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => resolve(defaultValue), timeout);
+      fn(...args).then(resolve).catch(reject);
+    });
+  };
+};
 const MAX_ANIMATION_DISTANCE_VW = 300;
 const MIN_ANIMATION_DURATION = 300;
 const ANIMATION_DURATION_FOR_100VW = 200;
@@ -1575,8 +1439,93 @@ const ZINDEX_AUXILIARY_GRASP = 14;
 const ZINDEX_LINE_LAYER = 12;
 const ZINDEX_GREEN_ZONE = 10;
 const TRACKS_MATCH_MAX_LENGTH = 3;
+const REGEO_TIMEOUT = 5e3;
+const GET_RECOMMEND_PLACE_TIMEOUT = 5e3;
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = location.search.includes("enableAuxiliaryGraspRoad");
 const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
+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";
+  OS_PLATFORM2["OTHER"] = "OTHER";
+  return OS_PLATFORM2;
+})(OS_PLATFORM || {});
+var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
+  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
+  WEBGL_STATUS2["DISABLED"] = "DISABLED";
+  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";
+  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";
+  const userAgent = navigator.userAgent || navigator.vendor;
+  if (/android/i.test(userAgent)) {
+    return "ANDROID";
+  }
+  if (/iPad|iPhone|iPod/.test(userAgent) && !globalThis.MSStream) {
+    return "IOS";
+  }
+  return "OTHER";
+};
+function detectWebGL() {
+  if (typeof window === "undefined")
+    return "NOT_SUPPORTED";
+  if (window.WebGLRenderingContext) {
+    const canvas = document.createElement("canvas");
+    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
+    let context2 = null;
+    for (const name2 of names) {
+      try {
+        context2 = canvas.getContext(name2);
+        if (context2 && typeof context2.getParameter === "function") {
+          return "ENABLED";
+        }
+      } catch (e) {
+        console.error("MyError: detectWebGL catch e = ", e);
+        return "NOT_SUPPORTED";
+      }
+    }
+    return "DISABLED";
+  }
+  return "NOT_SUPPORTED";
+}
 const vec2lnglat = ([lng, lat]) => ({
   lng: Number(lng),
   lat: Number(lat)
@@ -4605,7 +4554,19 @@ function wechatWatchPosition(onSuccess, onError, option) {
   const isGeoWorkingRef = Vue.ref(true);
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
-    await wxReady();
+    try {
+      await wxReady();
+    } catch (err) {
+      console.error(err);
+      onError == null ? void 0 : onError(
+        createCustomGeolocationPositionError(
+          err.errMsg,
+          // 签名失败，也算无权限的一种
+          GeolocationPositionError.PERMISSION_DENIED
+        )
+      );
+      return;
+    }
     do {
       if (visibilityStateRef.value === "hidden") {
         await sleep(WX_GET_LOCATION_INTERVAL);
@@ -6702,6 +6663,12 @@ const useAmapPlace = (props) => {
           }
         }
       });
+      setTimeout(() => {
+        console.warn("高德逆地理请求超时!");
+        const name2 = emptyPlaceName;
+        const displayName = emptyPlaceName;
+        resolve({ lng, lat, name: name2, displayName });
+      }, REGEO_TIMEOUT);
     });
   };
   Vue.watch(
@@ -6812,7 +6779,11 @@ const useMapRecomendPlace = (props) => {
     );
   });
   const isQueryingRef = Vue.ref(false);
-  const getRecomendPlaceNoFail = createAsyncNoFailNonNullable(getRecomendPlace, {});
+  const getRecomendPlaceNoFail = pipeTimeout(
+    createAsyncNoFailNonNullable(getRecomendPlace, {}),
+    { available: true },
+    GET_RECOMMEND_PLACE_TIMEOUT
+  );
   const findAttachedPlace = async (place) => {
     const inputRecommendZonePlaces = await getRecomendPlaceNoFail({ ...place }, context2);
     const {
@@ -6833,18 +6804,22 @@ const useMapRecomendPlace = (props) => {
     return { place: { ...resultPlace }, zone, candidates: placeCandidates, available };
   };
   const getRecommendPlaceZoneState = async (point, prevState) => {
+    const [lng, lat] = point;
     const zone = zoneRef.value;
     if (!zone || !apiMapIsPointInRing(point, zone.path)) {
-      const reGeoPlace = await getPlaceByRegeo(point);
+      const reGeoPlacePromise = getPlaceByRegeo(point);
       const {
-        place: resultPlace2,
+        place: closestPlace,
         candidates,
         available,
         zone: zone2
-      } = await findAttachedPlace(reGeoPlace);
-      return { place: { ...resultPlace2 }, zone: zone2, available, candidates };
+      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
+      if (!isPointEqual(place2point(closestPlace), point)) {
+        return { place: { ...closestPlace }, zone: zone2, available, candidates };
+      }
+      const regeoPlace = await reGeoPlacePromise;
+      return { place: { ...regeoPlace }, zone: zone2, available, candidates };
     }
-    const [lng, lat] = point;
     const { shortestPlace: resultPlace } = findNearestPlace(
       { lng, lat, name: "", displayName: "" },
       prevState.candidates,

package/dist/index.js

@@ -16,152 +16,8 @@ if (typeof GeolocationPositionError === "undefined") {
     TIMEOUT: 3
   };
 }
-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";
-  OS_PLATFORM2["OTHER"] = "OTHER";
-  return OS_PLATFORM2;
-})(OS_PLATFORM || {});
-var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
-  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
-  WEBGL_STATUS2["DISABLED"] = "DISABLED";
-  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";
-  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";
-  const userAgent = navigator.userAgent || navigator.vendor;
-  if (/android/i.test(userAgent)) {
-    return "ANDROID";
-  }
-  if (/iPad|iPhone|iPod/.test(userAgent) && !globalThis.MSStream) {
-    return "IOS";
-  }
-  return "OTHER";
-};
-function detectWebGL() {
-  if (typeof window === "undefined")
-    return "NOT_SUPPORTED";
-  if (window.WebGLRenderingContext) {
-    const canvas = document.createElement("canvas");
-    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
-    let context2 = null;
-    for (const name2 of names) {
-      try {
-        context2 = canvas.getContext(name2);
-        if (context2 && typeof context2.getParameter === "function") {
-          return "ENABLED";
-        }
-      } catch (e) {
-        console.error("MyError: detectWebGL catch e = ", e);
-        return "NOT_SUPPORTED";
-      }
-    }
-    return "DISABLED";
-  }
-  return "NOT_SUPPORTED";
-}
-const createMockWx = (opt) => {
-  const { timeout, lng, lat, status } = opt.getLocation;
-  const mockWx = {
-    ready(callback) {
-      callback();
-    },
-    error(callback) {
-      callback({ errCode: "mock error code", errMsg: "mock error message" });
-    },
-    getLocation(props) {
-      const { success, fail } = props;
-      if (status === "success") {
-        setTimeout(() => {
-          success({
-            longitude: String(lng),
-            latitude: String(lat),
-            accuracy: "30",
-            speed: "0",
-            errCode: "",
-            errMsg: ""
-          });
-        }, timeout);
-      }
-      if (status === "fail") {
-        setTimeout(() => {
-          fail == null ? void 0 : fail({ errCode: "mock error code", errMsg: "mock error message" });
-        }, timeout);
-      }
-    },
-    config() {
-      return;
-    },
-    miniProgram: {
-      redirectTo() {
-        return;
-      },
-      getEnv() {
-        const miniprogram = detectBrowserPlatform() === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM;
-        return { miniprogram };
-      }
-    }
-  };
-  return mockWx;
-};
-const mockWxByUrl = () => {
-  const searchParams = new URLSearchParams(location.search);
-  const enable = searchParams.has("enableMockWx");
-  if (!enable)
-    return;
-  const lng = Number(searchParams.get("lng"));
-  const lat = Number(searchParams.get("lat"));
-  const timeout = Number(searchParams.get("timeout")) * 1e3;
-  const status = searchParams.get("status");
-  if (status !== "success" && status !== "fail" || isNaN(timeout)) {
-    console.error("MyError: createMockWxByUrl: wrong parameter from url");
-    return;
-  }
-  const mockWx = createMockWx({ getLocation: { lng, lat, timeout, status } });
-  window.wx = mockWx;
-};
-mockWxByUrl();
 const name = "@heycar/heycars-map";
-const version = "0.9.20-querying3";
+const version = "0.9.20-timeout1";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1557,6 +1413,14 @@ const createAsyncNoFailNonNullable = (fn, defaultValue) => {
     return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
   };
 };
+const pipeTimeout = (fn, defaultValue, timeout) => {
+  return function pipedTimeoutedFunction(...args) {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => resolve(defaultValue), timeout);
+      fn(...args).then(resolve).catch(reject);
+    });
+  };
+};
 const MAX_ANIMATION_DISTANCE_VW = 300;
 const MIN_ANIMATION_DURATION = 300;
 const ANIMATION_DURATION_FOR_100VW = 200;
@@ -1573,8 +1437,93 @@ const ZINDEX_AUXILIARY_GRASP = 14;
 const ZINDEX_LINE_LAYER = 12;
 const ZINDEX_GREEN_ZONE = 10;
 const TRACKS_MATCH_MAX_LENGTH = 3;
+const REGEO_TIMEOUT = 5e3;
+const GET_RECOMMEND_PLACE_TIMEOUT = 5e3;
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = location.search.includes("enableAuxiliaryGraspRoad");
 const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
+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";
+  OS_PLATFORM2["OTHER"] = "OTHER";
+  return OS_PLATFORM2;
+})(OS_PLATFORM || {});
+var WEBGL_STATUS = /* @__PURE__ */ ((WEBGL_STATUS2) => {
+  WEBGL_STATUS2["NOT_SUPPORTED"] = "NOT_SUPPORTED";
+  WEBGL_STATUS2["DISABLED"] = "DISABLED";
+  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";
+  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";
+  const userAgent = navigator.userAgent || navigator.vendor;
+  if (/android/i.test(userAgent)) {
+    return "ANDROID";
+  }
+  if (/iPad|iPhone|iPod/.test(userAgent) && !globalThis.MSStream) {
+    return "IOS";
+  }
+  return "OTHER";
+};
+function detectWebGL() {
+  if (typeof window === "undefined")
+    return "NOT_SUPPORTED";
+  if (window.WebGLRenderingContext) {
+    const canvas = document.createElement("canvas");
+    const names = ["webgl", "experimental-webgl", "moz-webgl", "webkit-3d"];
+    let context2 = null;
+    for (const name2 of names) {
+      try {
+        context2 = canvas.getContext(name2);
+        if (context2 && typeof context2.getParameter === "function") {
+          return "ENABLED";
+        }
+      } catch (e) {
+        console.error("MyError: detectWebGL catch e = ", e);
+        return "NOT_SUPPORTED";
+      }
+    }
+    return "DISABLED";
+  }
+  return "NOT_SUPPORTED";
+}
 const vec2lnglat = ([lng, lat]) => ({
   lng: Number(lng),
   lat: Number(lat)
@@ -4603,7 +4552,19 @@ function wechatWatchPosition(onSuccess, onError, option) {
   const isGeoWorkingRef = ref(true);
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
-    await wxReady();
+    try {
+      await wxReady();
+    } catch (err) {
+      console.error(err);
+      onError == null ? void 0 : onError(
+        createCustomGeolocationPositionError(
+          err.errMsg,
+          // 签名失败，也算无权限的一种
+          GeolocationPositionError.PERMISSION_DENIED
+        )
+      );
+      return;
+    }
     do {
       if (visibilityStateRef.value === "hidden") {
         await sleep(WX_GET_LOCATION_INTERVAL);
@@ -6700,6 +6661,12 @@ const useAmapPlace = (props) => {
           }
         }
       });
+      setTimeout(() => {
+        console.warn("高德逆地理请求超时!");
+        const name2 = emptyPlaceName;
+        const displayName = emptyPlaceName;
+        resolve({ lng, lat, name: name2, displayName });
+      }, REGEO_TIMEOUT);
     });
   };
   watch(
@@ -6810,7 +6777,11 @@ const useMapRecomendPlace = (props) => {
     );
   });
   const isQueryingRef = ref(false);
-  const getRecomendPlaceNoFail = createAsyncNoFailNonNullable(getRecomendPlace, {});
+  const getRecomendPlaceNoFail = pipeTimeout(
+    createAsyncNoFailNonNullable(getRecomendPlace, {}),
+    { available: true },
+    GET_RECOMMEND_PLACE_TIMEOUT
+  );
   const findAttachedPlace = async (place) => {
     const inputRecommendZonePlaces = await getRecomendPlaceNoFail({ ...place }, context2);
     const {
@@ -6831,18 +6802,22 @@ const useMapRecomendPlace = (props) => {
     return { place: { ...resultPlace }, zone, candidates: placeCandidates, available };
   };
   const getRecommendPlaceZoneState = async (point, prevState) => {
+    const [lng, lat] = point;
     const zone = zoneRef.value;
     if (!zone || !apiMapIsPointInRing(point, zone.path)) {
-      const reGeoPlace = await getPlaceByRegeo(point);
+      const reGeoPlacePromise = getPlaceByRegeo(point);
       const {
-        place: resultPlace2,
+        place: closestPlace,
         candidates,
         available,
         zone: zone2
-      } = await findAttachedPlace(reGeoPlace);
-      return { place: { ...resultPlace2 }, zone: zone2, available, candidates };
+      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
+      if (!isPointEqual(place2point(closestPlace), point)) {
+        return { place: { ...closestPlace }, zone: zone2, available, candidates };
+      }
+      const regeoPlace = await reGeoPlacePromise;
+      return { place: { ...regeoPlace }, zone: zone2, available, candidates };
     }
-    const [lng, lat] = point;
     const { shortestPlace: resultPlace } = findNearestPlace(
       { lng, lat, name: "", displayName: "" },
       prevState.candidates,

package/dist/src/api/contants.d.ts

@@ -15,5 +15,7 @@ export declare const ZINDEX_AUXILIARY_GRASP = 14;
 export declare const ZINDEX_LINE_LAYER = 12;
 export declare const ZINDEX_GREEN_ZONE = 10;
 export declare const TRACKS_MATCH_MAX_LENGTH = 3;
+export declare const REGEO_TIMEOUT = 5000;
+export declare const GET_RECOMMEND_PLACE_TIMEOUT = 5000;
 export declare const IS_ENABLE_AUXILIARY_GRASP_ROAD: boolean;
 export declare const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";

package/dist/src/index.d.ts

@@ -1,6 +1,5 @@
 import "./style.css";
 import "./utils/alipayPolyfill";
-import "./utils/mockWx";
 export { AbsoluteAddressBox } from "./business-components/AbsoluteAddressBox";
 export { AddressBox } from "./business-components/AddressBox";
 export { BusinessQuotingMap } from "./business-components/BusinessQuotingMap";

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

@@ -23,4 +23,5 @@ export declare const pausableSleep: (milliSeconds: number) => {
 };
 export declare const createRunOnce: <P extends any[], R>(fn: (...args: P) => R) => (...args: P) => R;
 export declare const createAsyncNoFailNonNullable: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: NonNullable<R>) => (...args: P) => Promise<NonNullable<R>>;
+export declare const pipeTimeout: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: R, timeout: number) => (...args: P) => Promise<R>;
 export {};

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

@@ -1,5 +1,6 @@
 import type { Wx } from "../types/wx";
 interface CreateMockWxProps {
+    configOk: boolean;
     getLocation: {
         timeout: number;
         lng?: number;

package/package.json

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