@heycar/heycars-map 1.0.0-coordinate7 → 2.0.0-switchMap10

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -1,8 +1,9 @@
 import { ref, reactive } from "vue-demi";
 import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
-import { equalAssign, isPlacesInclude } from "../utils/helper.js";
+import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
+import { equalAssign, createAbortable, isPlacesInclude } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
-import { useMapGeometry } from "./useMapGeometry.js";
+import { useMapGeometry, apiLocalIsPointInRing } from "./useMapGeometry.js";
 import { useMapPlace } from "./useMapPlace.js";
 function mergeGetRecommendPlaceAndGetAvailable(getRecomendPlace, getAvailable, timeout) {
   return function mergedGetRecommendPlace(place, context) {
@@ -11,9 +12,9 @@ function mergeGetRecommendPlaceAndGetAvailable(getRecomendPlace, getAvailable, t
       getAvailable == null ? void 0 : getAvailable(place).then((value) => {
         if (!value)
           resolve({ available: false });
-      }).catch((error) => console.error(error));
+      }).catch(logNoneManualAbortError);
       getRecomendPlace(place, context).then((result) => resolve(result != null ? result : { available })).catch((error) => {
-        console.error(error);
+        logNoneManualAbortError(error);
         resolve({ available });
       });
       setTimeout(() => resolve({ available }), timeout);
@@ -42,6 +43,7 @@ const useMapRecomendPlace = (props) => {
     context,
     emptyPlaceName,
     queryingPlaceName,
+    signal,
     onChange,
     onQueryingPlace,
     onChangePlace
@@ -50,10 +52,12 @@ const useMapRecomendPlace = (props) => {
   const forceRef = ref(false);
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
-  const { apiMapIsPointInRing, apiMapDistance } = useMapGeometry();
+  const abortable = createAbortable(signal);
+  const { apiMapDistance } = useMapGeometry();
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
-    pointRef: ref([...defaultPoint])
+    pointRef: ref([...defaultPoint]),
+    signal
   });
   const recomendPlace = reactive({
     lng: defaultPoint[0],
@@ -63,11 +67,11 @@ const useMapRecomendPlace = (props) => {
   });
   const isQueryingRef = ref(false);
   const getRecomendPlaceNoFail = mergeGetRecommendPlaceAndGetAvailable(
-    getRecomendPlace,
-    getAvailable,
+    abortable(getRecomendPlace),
+    abortable(getAvailable),
     GET_RECOMMEND_PLACE_TIMEOUT
   );
-  const findAttachedPlace = async (place) => {
+  const findAttachedPlace = abortable(async (place) => {
     const {
       places: placeCandidates,
       zone,
@@ -90,41 +94,43 @@ const useMapRecomendPlace = (props) => {
     const limit = getLimit(context);
     const resultPlace = zone || shortestDistance <= limit ? shortestPlace : place;
     return { place: { ...resultPlace }, zone, candidates: placeCandidates, available, force };
-  };
-  const getRecommendPlaceZoneState = async (point, prevState) => {
-    const [lng, lat] = point;
-    const zone = zoneRef.value;
-    if (!zone || !apiMapIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromise = getPlaceByRegeo(point);
-      const {
-        place: closestPlace,
-        candidates,
-        available,
-        force,
-        zone: zone2
-      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
-      if (isPlacesInclude(candidates, closestPlace)) {
-        return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
+  });
+  const getRecommendPlaceZoneState = abortable(
+    async (point, prevState) => {
+      const [lng, lat] = point;
+      const zone = zoneRef.value;
+      if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
+        const reGeoPlacePromise = getPlaceByRegeo(point);
+        const {
+          place: closestPlace,
+          candidates,
+          available,
+          force,
+          zone: zone2
+        } = await findAttachedPlace({ lng, lat, name: "", displayName: "" });
+        if (isPlacesInclude(candidates, closestPlace)) {
+          return { place: { ...closestPlace }, zone: zone2, available, candidates, force };
+        }
+        const regeoPlace = await reGeoPlacePromise;
+        return { place: { ...regeoPlace }, zone: zone2, available, candidates, force };
       }
-      const regeoPlace = await reGeoPlacePromise;
-      return { place: { ...regeoPlace }, zone: zone2, available, candidates, force };
+      const { shortestPlace: resultPlace } = findNearestPlace(
+        { lng, lat, name: "", displayName: "" },
+        prevState.candidates,
+        apiMapDistance
+      );
+      return {
+        place: { ...resultPlace },
+        zone,
+        available: prevState.available,
+        force: prevState.force,
+        candidates: prevState.candidates
+      };
     }
-    const { shortestPlace: resultPlace } = findNearestPlace(
-      { lng, lat, name: "", displayName: "" },
-      prevState.candidates,
-      apiMapDistance
-    );
-    return {
-      place: { ...resultPlace },
-      zone,
-      available: prevState.available,
-      force: prevState.force,
-      candidates: prevState.candidates
-    };
-  };
+  );
   const updateIntermediateQueryingState = (point) => {
     const zone = zoneRef.value;
-    if (zone && apiMapIsPointInRing(point, zone.path))
+    if (zone && apiLocalIsPointInRing(point, zone.path))
       return;
     const [lng, lat] = point;
     const intermediateQueryingPlace = {
@@ -141,7 +147,7 @@ const useMapRecomendPlace = (props) => {
     equalAssign(recomendPlace, { ...intermediateQueryingPlace });
     onQueryingPlace == null ? void 0 : onQueryingPlace({ ...intermediateQueryingPlace });
   };
-  const updatePlace = async (point) => {
+  const updatePlace = abortable(async (point) => {
     updateIntermediateQueryingState(point);
     const {
       place: resultPlace,
@@ -166,29 +172,31 @@ const useMapRecomendPlace = (props) => {
     onChangePlace == null ? void 0 : onChangePlace({ ...resultPlace });
     const inputPlace = { name: "", displayName: "", lng: point[0], lat: point[1] };
     onChange == null ? void 0 : onChange({ place: { ...resultPlace }, inputPlace, isInZone: !!zone, isSameZone });
-  };
-  const updatePlaceCandidates = async (place) => {
-    updateIntermediateQueryingState(place2point(place));
-    const {
-      places: placeCandidates,
-      zone,
-      available = false,
-      force = false
-    } = await getRecomendPlaceNoFail({ ...place }, context);
-    const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
-    isQueryingRef.value = false;
-    availableRef.value = !!available;
-    forceRef.value = !!force;
-    zoneRef.value = zone;
-    placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
-    return {
-      inputPlace: { ...place },
-      isInZone: !!zone,
-      place: { ...place },
-      isSameZone
-    };
-  };
-  const updateRecommendPlace = async (place) => {
+  });
+  const updatePlaceCandidates = abortable(
+    async (place) => {
+      updateIntermediateQueryingState(place2point(place));
+      const {
+        places: placeCandidates,
+        zone,
+        available = false,
+        force = false
+      } = await getRecomendPlaceNoFail({ ...place }, context);
+      const isSameZone = !!zone && isZoneEqual(zone, zoneRef.value);
+      isQueryingRef.value = false;
+      availableRef.value = !!available;
+      forceRef.value = !!force;
+      zoneRef.value = zone;
+      placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
+      return {
+        inputPlace: { ...place },
+        isInZone: !!zone,
+        place: { ...place },
+        isSameZone
+      };
+    }
+  );
+  const updateRecommendPlace = abortable(async (place) => {
     updateIntermediateQueryingState(place2point(place));
     const {
       place: resultPlace,
@@ -211,8 +219,8 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  };
-  const updateRecommendPlaceOnlyInZone = async (place) => {
+  });
+  const updateRecommendPlaceOnlyInZone = abortable(async (place) => {
     var _a;
     updateIntermediateQueryingState(place2point(place));
     const {
@@ -237,7 +245,7 @@ const useMapRecomendPlace = (props) => {
       isInZone: !!zone,
       isSameZone
     });
-  };
+  });
   const setPlaceCandidatesAndZone = ({ zone, places: placeCandidates }) => {
     availableRef.value = true;
     forceRef.value = !!zone;

package/dist/v2/hooks/useMapSupplier.d.ts

@@ -1,9 +1,17 @@
+import type { AnyFn } from "@vueuse/core";
+import type { ConnectionStatus } from "../types/interface";
 import type { Status, UseMapLoaderOutput, UseMapLoaderProps } from "./useMapLoader";
 export interface MapSupplierPayolad extends UseMapLoaderProps {
     gmapRasterId: string;
     gmapId: string;
     readyPromise: UseMapLoaderOutput["readyPromise"];
     status: Status;
+    pingStatus: ConnectionStatus;
+    renderLoadFailedTitle?: (status: Status) => string | undefined;
+    renderLoadFailedDescription?: (status: Status) => string | undefined;
 }
 export declare const useMapSupplier: () => MapSupplierPayolad;
 export declare const provideMapSupplier: (payload: MapSupplierPayolad) => void;
+export declare const useMapAssertSupplier: () => {
+    assertSupplier: <T extends AnyFn>(fn: T) => T;
+};

package/dist/v2/hooks/useMapSupplier.js

@@ -7,7 +7,24 @@ const useMapSupplier = () => {
   return payload;
 };
 const provideMapSupplier = (payload) => provide(context, payload);
+const useMapAssertSupplier = () => {
+  const payload = useMapSupplier();
+  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(
+        `MyError: expect instance supplier ${payload.supplier}, actual is ${instanceSupplier} 
+ You probably call the api (exposed by useBusinessXXX) before the Element <BusinessXXX /> rendering!`
+      );
+    };
+  }
+  return { assertSupplier };
+};
 export {
   provideMapSupplier,
+  useMapAssertSupplier,
   useMapSupplier
 };

package/dist/v2/hooks/usePingConnection.d.ts

@@ -0,0 +1,10 @@
+import { type PingConnectionOnChangeHandler } from "../api/pingConnection";
+export interface UsePingConnectionProps {
+    onChange?: PingConnectionOnChangeHandler;
+}
+export declare const usePingAmapConnection: (props?: UsePingConnectionProps) => {
+    connectionStatus: Readonly<import("vue-demi").Ref<import("..").ConnectionStatus>>;
+};
+export declare const usePingGmapConnection: (props?: UsePingConnectionProps) => {
+    connectionStatus: Readonly<import("vue-demi").Ref<import("..").ConnectionStatus>>;
+};

package/dist/v2/hooks/usePingConnection.js

@@ -0,0 +1,26 @@
+import { ref, onUnmounted, readonly } from "vue-demi";
+import { apiGetPingAmapStatus, apiSubscribePingAmapChange, apiGetPingGmapStatus, apiSubscribePingGmapChange } from "../api/pingConnection.js";
+const usePingAmapConnection = (props) => {
+  const statusRef = ref(apiGetPingAmapStatus());
+  const unsubscribe = apiSubscribePingAmapChange((status) => {
+    var _a;
+    statusRef.value = status;
+    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
+  });
+  onUnmounted(unsubscribe);
+  return { connectionStatus: readonly(statusRef) };
+};
+const usePingGmapConnection = (props) => {
+  const statusRef = ref(apiGetPingGmapStatus());
+  const unsubscribe = apiSubscribePingGmapChange((status) => {
+    var _a;
+    statusRef.value = status;
+    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
+  });
+  onUnmounted(unsubscribe);
+  return { connectionStatus: readonly(statusRef) };
+};
+export {
+  usePingAmapConnection,
+  usePingGmapConnection
+};

package/dist/v2/hooks-business/useBusinessAlarm.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @warning: 如果要支持动态地图切换， 外部引用 useBusinessAlarm 的组件必须利用 key={mapSupplier} 强制更新
+ */
 export interface useBusinessAlarmProps {
     emptyPlaceName: string;
 }