@heycar/heycars-map 2.0.0-switchMap2 → 2.0.0-switchMap4

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

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { reactive, watch, watchEffect } from "vue-demi";
+import { reactive, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiMemoryShouldSkipByKey } from "../../api/memory.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
 import { createElement } from "../../demi-polyfill/demi-polyfill.js";
@@ -9,17 +9,18 @@ import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../../hooks/useMapDrag.js";
 import { useMapGeometry } from "../../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { useMapZoom } from "../../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { CenterPlaceStatus } from "../../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../../utils/helper.js";
 import { detectBrowserPlatform } from "../../utils/platform.js";
 import { place2point, isPlaceEqual, pipeOnlyLastEffect, isZoneEqual, geoPositionError2businessTimeout } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinatePointType, toCoordinateRecommendZonePlacesType } from "../../utils/typeChecking.js";
 import { AbsoluteAddressBox } from "../AbsoluteAddressBox/AbsoluteAddressBox.js";
-import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.39888296.js";
+import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.4befb6c7.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { GreenZone } from "../GreenZone/GreenZone.js";
 import { PassengerCircle } from "../PassengerCircle/PassengerCircle.js";
@@ -41,6 +42,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...EMPTY_PLACE
     }
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -68,6 +70,9 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     mapRef,
     defaultValue: DEFAULT_ZOOM
   });
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const defaultPlace = unCoordinatifyPlace(toCoordinatePlaceType(inputDefaultPlace));
   const centerPlace = reactive({
     lng: defaultPlace.lng,
@@ -148,19 +153,19 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -183,6 +188,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -202,7 +208,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -224,7 +230,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       }));
     }
   });
-  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace));
+  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace).catch(throwNoneManualAbortError));
   watch(centerPlace, (place) => {
     equalAssign(mapContext.centerPlace, coordinatifyPlace({
       ...place
@@ -236,6 +242,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a;
     const {

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

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { ref, watch } from "vue-demi";
+import { ref, watch, onUnmounted } from "vue-demi";
 import { apiGetAuxiliaryGrapStatus } from "../../api/browser.js";
 import { setGlobalGoogleSnapRoadProxyUrl } from "../../api/googleSnapRoad.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
@@ -8,9 +8,10 @@ import { useGeoLocation } from "../../hooks/useGeoLocation.js";
 import { useHeycarMap } from "../../hooks/useHeycarMap.js";
 import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapFitView } from "../../hooks/useMapFitView.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
-import { assertNotEmptyArray } from "../../utils/helper.js";
+import { MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
+import { createAbortable, assertNotEmptyArray } from "../../utils/helper.js";
 import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
@@ -26,7 +27,6 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     interval,
     disablePassenger,
     mapContext,
-    getDriverPositionTrack,
     renderStartSerivceTitle,
     renderInServiceTitle
   } = props;
@@ -36,6 +36,12 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     setMap,
     mapElementRef
   } = useHeycarMap();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
+  const abortController = new AbortController();
+  const abortable = createAbortable(abortController.signal);
+  const getDriverPositionTrack = abortable(props.getDriverPositionTrack);
   const {
     unCoordinatifyPlace,
     unCoordinatifyTrackPoint
@@ -47,7 +53,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     mapRef,
     padding: BUSINESS_TAXI_SERVICE_FITVIEW_PANDING
   });
-  mapContext.setFitView = () => setFitView(false);
+  mapContext.setFitView = assertSupplier(() => setFitView(false));
   const deferedSetFitView = pipeDefer(() => registerOverlay.setFitView(true));
   const {
     geoLoading,
@@ -79,6 +85,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
   }, {
     immediate: true
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     const {
       driverStatus,

package/dist/v3/chunks/{BusinessRecomendPlaceMap.39888296.js → BusinessRecomendPlaceMap.4befb6c7.js}

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { computed, watch, watchEffect } from "vue-demi";
+import { computed, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiSaveCenterPlaceToCache } from "../api/browser.js";
 import { apiMemoryShouldSkipByKey } from "../api/memory.js";
 import { HeycarMap } from "../components/MapProvider/MapProvider.js";
@@ -10,10 +10,11 @@ import { useMapCoordinatify } from "../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../hooks/useMapDrag.js";
 import { useMapGeometry } from "../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../hooks/useMapSupplier.js";
+import { useMapSupplier, useMapAssertSupplier } from "../hooks/useMapSupplier.js";
 import { useMapZoom } from "../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../types/helper.js";
 import { CenterPlaceStatus } from "../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../utils/helper.js";
 import { detectBrowserPlatform } from "../utils/platform.js";
@@ -286,6 +287,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     getRecomendPlace,
     mapContext
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -314,8 +316,12 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     defaultValue: DEFAULT_ZOOM
   });
   const {
-    readyPromise
+    readyPromise,
+    supplier
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     centerPlace,
     isFirstLoad,
@@ -395,7 +401,8 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       if (!isFirstLoad)
         return;
       const [lng, lat] = value.position;
-      await readyPromise;
+      if (supplier === "amap")
+        await readyPromise;
       centerSource.source = "geo";
       centerPlace.lng = lng;
       centerPlace.lat = lat;
@@ -405,7 +412,8 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       emit("loadDefaultGeoLocation", coordinatifyGeoPosition(value));
       if (!isFirstLoad)
         return;
-      await readyPromise;
+      if (supplier === "amap")
+        await readyPromise;
       centerSource.source = "geo";
       updatePlace(value.position);
     },
@@ -418,19 +426,19 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -454,6 +462,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -473,7 +482,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -498,7 +507,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   const centerPlaceStatusRef = computed(() => isFirstLoad && geoLoading.value ? CenterPlaceStatus.GEO_LOADING : isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK);
   watchPostEffectOnce(() => {
     if (!isFirstLoad)
-      updateRecommendPlaceOnlyInZone(defaultCenterPlace);
+      updateRecommendPlaceOnlyInZone(defaultCenterPlace).catch(throwNoneManualAbortError);
   });
   watch(centerPlace, (place) => {
     if (centerPlaceStatusRef.value === CenterPlaceStatus.OK) {
@@ -516,6 +525,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = centerPlaceStatusRef.value;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a;
     const {

package/dist/v3/chunks/{Loading.98d687c0.js → Loading.32ae3c98.js}

@@ -1,17 +1,17 @@
-import "../css/Loading-0e058b68.css";
+import "../css/Loading-49e58ced.css";
 import { createVNode } from "vue";
 import { ICON_LOAD_FAILED_URL } from "../api/cdn.js";
 import { AbsoluteAddressBox } from "../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import { defineSetup } from "../types/helper.js";
 const imgGrid = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzg1IiBoZWlnaHQ9IjgxNyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBzdHJva2U9IiNEOERCRTIiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWRhc2hhcnJheT0iMSI+PHBhdGggZD0iTS41IDgxN1YwTTI0LjUgODE3VjBNNDguNSA4MTdWME03Mi41IDgxN1YwTTk2LjUgODE3VjBNMTIwLjUgODE3VjBNMTQ0LjUgODE3VjBNMTY4LjUgODE3VjBNMTkyLjUgODE3VjBNMjE2LjUgODE3VjBNMjQwLjUgODE3VjBNMjY0LjUgODE3VjBNMjg4LjUgODE3VjBNMzEyLjUgODE3VjBNMzM2LjUgODE3VjBNMzYwLjUgODE3VjBNMzg0LjUgODE3VjBNMCAuNWgzODVNMCAyNC41aDM4NU0wIDQ4LjVoMzg1TTAgNzIuNWgzODVNMCA5Ni41aDM4NU0wIDEyMC41aDM4NU0wIDE0NC41aDM4NU0wIDE2OC41aDM4NU0wIDE5Mi41aDM4NU0wIDIxNi41aDM4NU0wIDI0MC41aDM4NU0wIDI2NC41aDM4NU0wIDI4OC41aDM4NU0wIDMxMi41aDM4NU0wIDMzNi41aDM4NU0wIDM2MC41aDM4NU0wIDM4NC41aDM4NU0wIDQwOC41aDM4NU0wIDQzMi41aDM4NU0wIDQ1Ni41aDM4NU0wIDQ4MC41aDM4NU0wIDUwNC41aDM4NU0wIDUyOC41aDM4NU0wIDU1Mi41aDM4NU0wIDU3Ni41aDM4NU0wIDYwMC41aDM4NU0wIDYyNC41aDM4NU0wIDY0OC41aDM4NU0wIDY3Mi41aDM4NU0wIDY5Ni41aDM4NU0wIDcyMC41aDM4NU0wIDc0NC41aDM4NU0wIDc2OC41aDM4NU0wIDc5Mi41aDM4NU0wIDgxNi41aDM4NSIvPjwvZz48L3N2Zz4=";
 const Loading_css_ts_vanilla = "";
+var contentLayout = "_17ify492";
 var description = "_17ify496";
-var iconLayout = "_17ify492";
 var iconLoadFailed = "_17ify493";
 var loadingBg = "_17ify491";
 var loadingLayout = "_17ify490";
-var textLayout = "_17ify494";
 var title = "_17ify495";
+var verticalGap = "_17ify494";
 const Loading = defineSetup("Loading", function() {
   return () => createVNode("div", {
     "class": loadingLayout
@@ -30,17 +30,15 @@ const LoadFailed = defineSetup("LoadFailed", function(props) {
     "class": loadingBg,
     "src": imgGrid
   }, null), createVNode("div", {
-    "class": iconLayout
+    "class": contentLayout
   }, [createVNode("img", {
     "class": iconLoadFailed,
     "src": ICON_LOAD_FAILED_URL
-  }, null), createVNode("div", {
-    "class": textLayout
-  }, [createVNode("span", {
-    "class": title
+  }, null), createVNode("span", {
+    "class": `${title} ${verticalGap}`
   }, [props.title]), createVNode("span", {
-    "class": description
-  }, [props.description])])])]);
+    "class": `${description} ${verticalGap}`
+  }, [props.description])])]);
 });
 export {
   Loading as L,

package/dist/v3/components/Loading/Loading.css.d.ts

@@ -1,7 +1,7 @@
 export declare const loadingLayout: string;
 export declare const loadingBg: string;
-export declare const iconLayout: string;
+export declare const contentLayout: string;
 export declare const iconLoadFailed: string;
-export declare const textLayout: string;
+export declare const verticalGap: string;
 export declare const title: string;
 export declare const description: string;

package/dist/v3/components/Loading/Loading.js

@@ -1,6 +1,6 @@
 import "vue";
 import "../../api/cdn.js";
-import { a, L } from "../../chunks/Loading.98d687c0.js";
+import { a, L } from "../../chunks/Loading.32ae3c98.js";
 import "../../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import "../../types/helper.js";
 export {

package/dist/v3/components/Loading/index.js

@@ -1,4 +1,4 @@
-import { a, L } from "../../chunks/Loading.98d687c0.js";
+import { a, L } from "../../chunks/Loading.32ae3c98.js";
 export {
   a as LoadFailed,
   L as Loading

package/dist/v3/components/MapProvider/MapProvider.js

@@ -1,6 +1,6 @@
 import "../../css/MapProvider-156bfd53.css";
 import { createVNode, isVNode } from "vue";
-import { L as Loading, a as LoadFailed, i as imgGrid } from "../../chunks/Loading.98d687c0.js";
+import { L as Loading, a as LoadFailed, i as imgGrid } from "../../chunks/Loading.32ae3c98.js";
 import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
 import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineLagecySetup } from "../../types/helper.js";

package/dist/{v2/css/Loading-0e058b68.css → v3/css/Loading-49e58ced.css}

@@ -3,6 +3,7 @@
   background-color: #EDF1F5;
 }
 ._17ify491 {
+  position: absolute;
   width: 100%;
   height: 100%;
   object-fit: cover;
@@ -10,29 +11,24 @@
 ._17ify492 {
   position: absolute;
   margin: auto;
-  top: 0;
+  top: -5vh;
   left: 0;
   right: 0;
   bottom: 0;
   width: fit-content;
   height: fit-content;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 ._17ify493 {
   width: 40.8vw;
   height: 24.53vw;
 }
 ._17ify494 {
-  position: absolute;
-  top: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: max-content;
-  left: 50%;
-  transform: translate(-50%, 0);
+  margin-top: 1.6vw;
 }
 ._17ify495 {
-  margin-top: 1.6vw;
   font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 500;
   font-size: 4vw;
@@ -40,7 +36,6 @@
   line-height: 6.4vw;
 }
 ._17ify496 {
-  margin-top: 1.6vw;
   font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
   font-weight: 400;
   font-size: 3.73vw;

package/dist/v3/hooks/useMapGCJ02.js

@@ -565,7 +565,6 @@ const useAmapGCJ02 = () => {
   return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
 };
 const useGmapGCJ02 = () => {
-  const { readyPromise } = useMapSupplier();
   const toCoordinateType = (p) => {
     return inChina(p) && !inHongkong(p) && !inMacau(p) ? "gcj02" : "wgs84";
   };
@@ -583,11 +582,9 @@ const useGmapGCJ02 = () => {
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
   const toGcj02 = async (point) => {
-    await readyPromise;
     return toLocalGcj02Points([point])[0];
   };
   const toGcj02Points = async (points) => {
-    await readyPromise;
     return toLocalGcj02Points(points);
   };
   return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };

package/dist/v3/hooks/useMapGeometry.d.ts

@@ -1,19 +1,17 @@
 import type { Point } from "../types/interface";
+export declare const apiLocalIsPointInRing: (point: Point, path: Point[]) => boolean;
 export declare const useAmapGeometry: () => {
     apiMapDistance: (from: Point, to: Point) => number | undefined;
     apiMapDistanceToLine: (from: Point, line: Point[]) => number | undefined;
-    apiMapIsPointInRing: (point: Point, path: Point[]) => boolean;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };
 export declare const useGmapGeometry: () => {
     apiMapDistance: (from: Point, to: Point) => number | undefined;
     apiMapDistanceToLine: (from: Point, line: Point[]) => 0 | undefined;
-    apiMapIsPointInRing: (point: Point, path: Point[]) => boolean;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };
 export declare const useMapGeometry: () => {
     apiMapDistance: (from: Point, to: Point) => number | undefined;
     apiMapDistanceToLine: (from: Point, line: Point[]) => number | undefined;
-    apiMapIsPointInRing: (point: Point, path: Point[]) => boolean;
     apiMapDistanceOfLine: (line: Point[]) => number | undefined;
 };

package/dist/v3/hooks/useMapGeometry.js

@@ -2,6 +2,7 @@ import { pointInPolygon } from "../utils/geometryPolygon.js";
 import { vec2lnglat } from "../utils/transform.js";
 import { Status } from "./useMapLoader.js";
 import { useMapSupplier } from "./useMapSupplier.js";
+const apiLocalIsPointInRing = (point, path) => pointInPolygon(point, path) >= 0;
 const useAmapGeometry = () => {
   const payload = useMapSupplier();
   const apiMapDistance = (from, to) => {
@@ -19,8 +20,7 @@ const useAmapGeometry = () => {
       return void 0;
     return AMap.GeometryUtil.distanceOfLine(line);
   };
-  const apiMapIsPointInRing = (point, path) => pointInPolygon(point, path) >= 0;
-  return { apiMapDistance, apiMapDistanceToLine, apiMapIsPointInRing, apiMapDistanceOfLine };
+  return { apiMapDistance, apiMapDistanceToLine, apiMapDistanceOfLine };
 };
 const useGmapGeometry = () => {
   const payload = useMapSupplier();
@@ -39,14 +39,14 @@ const useGmapGeometry = () => {
       return void 0;
     return google.maps.geometry.spherical.computeLength(line.map(vec2lnglat));
   };
-  const apiMapIsPointInRing = (point, path) => pointInPolygon(point, path) >= 0;
-  return { apiMapDistance, apiMapDistanceToLine, apiMapIsPointInRing, apiMapDistanceOfLine };
+  return { apiMapDistance, apiMapDistanceToLine, apiMapDistanceOfLine };
 };
 const useMapGeometry = () => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap" ? useGmapGeometry() : useAmapGeometry();
 };
 export {
+  apiLocalIsPointInRing,
   useAmapGeometry,
   useGmapGeometry,
   useMapGeometry

package/dist/v3/hooks/useMapLoader.js

@@ -1,6 +1,7 @@
 import { shallowRef, computed, ref } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createRunOnce } from "../utils/helper.js";
+import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
 import { t as throttle } from "../chunks/throttle.8bdd8d3b.js";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var distExports = {};
@@ -639,11 +640,13 @@ const useGmapLoader = (props) => {
       if (statusRef.value === "SUCCESS")
         return;
       const loader = new Loader(options);
+      patchGoogleMapLoader(loader);
       clearTimeout(timerRef.value);
       timerRef.value = window.setTimeout(() => {
         statusRef.value = "TIMEOUT";
       }, GMAP_LOAD_TIMEOUT);
       if (loader.status !== LoaderStatus.INITIALIZED) {
+        window.google = void 0;
         loader.reset();
       }
       statusRef.value = "LOADING";

package/dist/v3/hooks/useMapPlace.d.ts

@@ -3,6 +3,7 @@ import type { Place, Point } from "../types/interface";
 export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
+    signal?: AbortSignal;
     onChange?: (value: Place) => any;
 }
 export declare const useAmapPlace: (props: UseMapPlaceProps) => {