@heycar/heycars-map 0.9.20-querying2 → 0.9.20-timeout

package/dist/index.cjs

@@ -163,7 +163,7 @@ const mockWxByUrl = () => {
 };
 mockWxByUrl();
 const name = "@heycar/heycars-map";
-const version = "0.9.20-querying2";
+const version = "0.9.20-timeout";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1559,6 +1559,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,6 +1583,8 @@ const ZINDEX_AUXILIARY_GRASP = 14;
 const ZINDEX_LINE_LAYER = 12;
 const ZINDEX_GREEN_ZONE = 10;
 const TRACKS_MATCH_MAX_LENGTH = 3;
+const REGEO_TIMEOUT = 2e3;
+const GET_RECOMMEND_PLACE_TIMEOUT = 2e3;
 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";
 const vec2lnglat = ([lng, lat]) => ({
@@ -6702,6 +6712,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 +6828,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 +6853,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,
@@ -7943,7 +7967,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "mapRef": setMap,
         "fallback": slots.fallback,
         "loading": slots.loading,
-        "outerArea": () => geoLoading.value ? null : Vue.h(AbsoluteAddressBox, {
+        "outerArea": () => Vue.h(AbsoluteAddressBox, {
           "attrs": {
             "title": title,
             "description": description,
@@ -8192,7 +8216,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
         "mapRef": setMap,
         "fallback": slots.fallback,
         "loading": slots.loading,
-        "outerArea": () => geoLoading.value ? null : Vue.h(AbsoluteAddressBox, {
+        "outerArea": () => Vue.h(AbsoluteAddressBox, {
           "attrs": {
             "title": title,
             "description": description,

package/dist/index.js

@@ -161,7 +161,7 @@ const mockWxByUrl = () => {
 };
 mockWxByUrl();
 const name = "@heycar/heycars-map";
-const version = "0.9.20-querying2";
+const version = "0.9.20-timeout";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1557,6 +1557,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,6 +1581,8 @@ const ZINDEX_AUXILIARY_GRASP = 14;
 const ZINDEX_LINE_LAYER = 12;
 const ZINDEX_GREEN_ZONE = 10;
 const TRACKS_MATCH_MAX_LENGTH = 3;
+const REGEO_TIMEOUT = 2e3;
+const GET_RECOMMEND_PLACE_TIMEOUT = 2e3;
 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";
 const vec2lnglat = ([lng, lat]) => ({
@@ -6700,6 +6710,12 @@ const useAmapPlace = (props) => {
           }
         }
       });
+      setTimeout(() => {
+        console.warn("高德逆地理请求超时!");
+        const name2 = emptyPlaceName;
+        const displayName = emptyPlaceName;
+        resolve({ lng, lat, name: name2, displayName });
+      }, REGEO_TIMEOUT);
     });
   };
   watch(
@@ -6810,7 +6826,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 +6851,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,
@@ -7941,7 +7965,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "mapRef": setMap,
         "fallback": slots.fallback,
         "loading": slots.loading,
-        "outerArea": () => geoLoading.value ? null : h(AbsoluteAddressBox, {
+        "outerArea": () => h(AbsoluteAddressBox, {
           "attrs": {
             "title": title,
             "description": description,
@@ -8190,7 +8214,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
         "mapRef": setMap,
         "fallback": slots.fallback,
         "loading": slots.loading,
-        "outerArea": () => geoLoading.value ? null : h(AbsoluteAddressBox, {
+        "outerArea": () => h(AbsoluteAddressBox, {
           "attrs": {
             "title": title,
             "description": description,

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 = 2000;
+export declare const GET_RECOMMEND_PLACE_TIMEOUT = 2000;
 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/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/package.json

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