@heycar/heycars-map 2.5.0 → 2.5.1

package/README.md

@@ -236,7 +236,8 @@ export default defineComponent({
       <BusinessRecomendPlaceMap
         class={"demo"}
         geoLoadingTitle={"正在获取您当前的位置"}
-        unavailableTitle={"当前区域不可叫车"}
+        unavailableTitle={"当前区域暂未开通服务"}
+        forbiddenTitle={"当前区域不可叫车"}
         emptyTitle={"当前位置"}
         queryingTitle={"正在获取地址信息"}
         recomendDescription={"您将在此处上车"}
@@ -358,6 +359,7 @@ export default defineComponent({
       <BusinessReselectPlaceMap
         class={"demo"}
         unavailableTitle={"当前区域暂未开通服务"}
+        forbiddenTitle={"当前区域不可叫车"}
         emptyTitle={"当前位置"}
         queryingTitle={"正在获取地址信息"}
         recomendDescription={"您将在此处上车"}

package/dist/v2/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js

@@ -227,6 +227,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       place,
       inputPlace,
       type,
+      zone,
       isSameZone
     }) => {
       var _a;
@@ -242,6 +243,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
         place,
         inputPlace,
         type,
+        zone,
         isSameZone
       }));
     }

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -1,6 +1,6 @@
 import { ref, reactive } from "vue-demi";
 import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
-import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
+import { recoverablyIgnoreManualAbortReject, logNoneManualAbortError } from "../utils/ManualAbortError.js";
 import { createAbortableOneConcurrent, AbortSignalAny, equalAssign, isPlacesInclude, createAbortable } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
 import { assertNoConflictTypeAndZone } from "../utils/typeChecking.js";
@@ -103,7 +103,9 @@ const useMapRecomendPlace = (props) => {
     const [lng, lat] = point;
     const { type, zone, available, candidates } = prevState;
     if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromise = getPlaceByRegeo(point, opt);
+      const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
+        getPlaceByRegeo(point, opt)
+      );
       const {
         place: closestPlace,
         candidates: candidates2,
@@ -114,7 +116,7 @@ const useMapRecomendPlace = (props) => {
       if (isPlacesInclude(candidates2, closestPlace)) {
         return { place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
       }
-      const regeoPlace = await reGeoPlacePromise;
+      const regeoPlace = await reGeoPlacePromiseIgnored.recover();
       return { place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
     }
     if (type === "Forbidden") {

package/dist/v2/hooks/useMapSupplier.js

@@ -12,7 +12,6 @@ const useMapAssertSupplier = () => {
   const instanceSupplier = payload.supplier;
   function assertSupplier(fn) {
     return function fnWithAssertSupplier(...args) {
-      console.log("instanceSupplier, payload.supplier = ", instanceSupplier, payload.supplier);
       if (instanceSupplier === payload.supplier)
         return fn(...args);
       throw Error(

package/dist/v2/hooks/useWalkingRoute.js

@@ -1,6 +1,7 @@
 import { shallowRef } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { useMapSupplier } from "./useMapSupplier.js";
+const isIgnoredAmapWalkingRouteError = (err) => err === "RETURN_TIMEOUT";
 const useAWalkingRoute = (props) => {
   const pathRef = shallowRef([]);
   const amapWalking = new AMap.Walking({});
@@ -30,6 +31,11 @@ const useAWalkingRoute = (props) => {
             pathRef.value = [];
             return;
           default:
+            if (isIgnoredAmapWalkingRouteError(result)) {
+              console.warn(result);
+              pathRef.value = [];
+              return;
+            }
             throw result;
         }
       });

package/dist/v2/utils/ManualAbortError.d.ts

@@ -1,3 +1,6 @@
 export declare const MANUAL_ABORT_MESSAGE = "MANUAL_ABORT_MESSAGE";
 export declare const throwNoneManualAbortError: (e: unknown) => void;
 export declare const logNoneManualAbortError: (e: unknown) => void;
+export declare const recoverablyIgnoreManualAbortReject: <T>(promise: Promise<T>) => {
+    recover: () => Promise<T>;
+};

package/dist/v2/utils/ManualAbortError.js

@@ -7,8 +7,30 @@ const logNoneManualAbortError = (e) => {
   if (e !== MANUAL_ABORT_MESSAGE)
     console.error(e);
 };
+function recoverablyIgnoreReject(promise, ignoreFilter) {
+  let isValid = true;
+  let error;
+  const ignoredPromise = promise.catch((err) => {
+    if (!isValid || !ignoreFilter(err))
+      throw err;
+    isValid = false;
+    error = err;
+    return void 0;
+  });
+  const recover = () => {
+    if (!isValid)
+      return Promise.reject(error);
+    isValid = false;
+    return ignoredPromise;
+  };
+  return { recover };
+}
+const recoverablyIgnoreManualAbortReject = (promise) => {
+  return recoverablyIgnoreReject(promise, (e) => e === MANUAL_ABORT_MESSAGE);
+};
 export {
   MANUAL_ABORT_MESSAGE,
   logNoneManualAbortError,
+  recoverablyIgnoreManualAbortReject,
   throwNoneManualAbortError
 };

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.5.0";
+const pkgVersion = "2.5.1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v3/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js

@@ -227,6 +227,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       place,
       inputPlace,
       type,
+      zone,
       isSameZone
     }) => {
       var _a;
@@ -242,6 +243,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
         place,
         inputPlace,
         type,
+        zone,
         isSameZone
       }));
     }

package/dist/v3/hooks/useMapRecomendPlace.js

@@ -1,6 +1,6 @@
 import { ref, reactive } from "vue-demi";
 import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
-import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
+import { recoverablyIgnoreManualAbortReject, logNoneManualAbortError } from "../utils/ManualAbortError.js";
 import { createAbortableOneConcurrent, AbortSignalAny, equalAssign, isPlacesInclude, createAbortable } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
 import { assertNoConflictTypeAndZone } from "../utils/typeChecking.js";
@@ -103,7 +103,9 @@ const useMapRecomendPlace = (props) => {
     const [lng, lat] = point;
     const { type, zone, available, candidates } = prevState;
     if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromise = getPlaceByRegeo(point, opt);
+      const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
+        getPlaceByRegeo(point, opt)
+      );
       const {
         place: closestPlace,
         candidates: candidates2,
@@ -114,7 +116,7 @@ const useMapRecomendPlace = (props) => {
       if (isPlacesInclude(candidates2, closestPlace)) {
         return { place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
       }
-      const regeoPlace = await reGeoPlacePromise;
+      const regeoPlace = await reGeoPlacePromiseIgnored.recover();
       return { place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
     }
     if (type === "Forbidden") {

package/dist/v3/hooks/useMapSupplier.js

@@ -12,7 +12,6 @@ const useMapAssertSupplier = () => {
   const instanceSupplier = payload.supplier;
   function assertSupplier(fn) {
     return function fnWithAssertSupplier(...args) {
-      console.log("instanceSupplier, payload.supplier = ", instanceSupplier, payload.supplier);
       if (instanceSupplier === payload.supplier)
         return fn(...args);
       throw Error(

package/dist/v3/hooks/useWalkingRoute.js

@@ -1,6 +1,7 @@
 import { shallowRef } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { useMapSupplier } from "./useMapSupplier.js";
+const isIgnoredAmapWalkingRouteError = (err) => err === "RETURN_TIMEOUT";
 const useAWalkingRoute = (props) => {
   const pathRef = shallowRef([]);
   const amapWalking = new AMap.Walking({});
@@ -30,6 +31,11 @@ const useAWalkingRoute = (props) => {
             pathRef.value = [];
             return;
           default:
+            if (isIgnoredAmapWalkingRouteError(result)) {
+              console.warn(result);
+              pathRef.value = [];
+              return;
+            }
             throw result;
         }
       });

package/dist/v3/utils/ManualAbortError.d.ts

@@ -1,3 +1,6 @@
 export declare const MANUAL_ABORT_MESSAGE = "MANUAL_ABORT_MESSAGE";
 export declare const throwNoneManualAbortError: (e: unknown) => void;
 export declare const logNoneManualAbortError: (e: unknown) => void;
+export declare const recoverablyIgnoreManualAbortReject: <T>(promise: Promise<T>) => {
+    recover: () => Promise<T>;
+};

package/dist/v3/utils/ManualAbortError.js

@@ -7,8 +7,30 @@ const logNoneManualAbortError = (e) => {
   if (e !== MANUAL_ABORT_MESSAGE)
     console.error(e);
 };
+function recoverablyIgnoreReject(promise, ignoreFilter) {
+  let isValid = true;
+  let error;
+  const ignoredPromise = promise.catch((err) => {
+    if (!isValid || !ignoreFilter(err))
+      throw err;
+    isValid = false;
+    error = err;
+    return void 0;
+  });
+  const recover = () => {
+    if (!isValid)
+      return Promise.reject(error);
+    isValid = false;
+    return ignoredPromise;
+  };
+  return { recover };
+}
+const recoverablyIgnoreManualAbortReject = (promise) => {
+  return recoverablyIgnoreReject(promise, (e) => e === MANUAL_ABORT_MESSAGE);
+};
 export {
   MANUAL_ABORT_MESSAGE,
   logNoneManualAbortError,
+  recoverablyIgnoreManualAbortReject,
   throwNoneManualAbortError
 };

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.5.0";
+const pkgVersion = "2.5.1";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/package.json

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