@heycar/heycars-map 2.0.0-switchMap1 → 2.0.0-switchMap10

package/dist/v2/chunks/{BusinessRecomendPlaceMap.5be4fdcf.js → BusinessRecomendPlaceMap.b4d45108.js}

@@ -1,5 +1,5 @@
 import { h } 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,
@@ -296,7 +298,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     coordinatifyGeoPosition
   } = useMapCoordinatify();
   const pipedGetAvailable = getAvailable && pipeOnlyLastEffect((p) => getAvailable(coordinatifyPlace(p)));
-  const pipedGetRecomendPlace = pipeOnlyLastEffect((p) => getRecomendPlace(coordinatifyPlace(p)).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r))));
+  const pipedGetRecomendPlace = pipeOnlyLastEffect((p, context) => getRecomendPlace(coordinatifyPlace(p), context).then((r) => r && unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(r))));
   const {
     apiMapDistance
   } = useMapGeometry();
@@ -314,8 +316,12 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     defaultValue: DEFAULT_ZOOM
   });
   const {
-    readyPromise
+    readyPromise,
+    supplier
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     centerPlace,
     isFirstLoad,
@@ -327,7 +333,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     geoLoadingTitle
   });
   const centerSource = {
-    source: "geo"
+    source: "default"
   };
   const updateCenterPlaceByPoint = (point, context) => {
     var _a;
@@ -345,6 +351,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     place: inputPlace,
     recommends: inputRecommends
   }) => {
+    centerSource.source = "api";
     const place = unCoordinatifyPlace(toCoordinatePlaceType(inputPlace));
     const recommends = unCoordinatifyRecommendZonePlaces(toCoordinateRecommendZonePlacesType(inputRecommends));
     const isSameZone = recommends.zone && isZoneEqual(recommends.zone, zoneRef.value);
@@ -395,7 +402,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 +413,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 +427,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 +463,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -466,14 +476,15 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
         case "default":
           return RECOMMEND_PLACE_LARGE_LIMIT;
         default:
-          throw new Error(`MyError: should not call getLimit on source: ${source}`);
+          console.error(new Error(`MyError: should not call getLimit on source: ${source}`));
+          return RECOMMEND_PLACE_DRAG_LIMIT;
       }
     },
     onQueryingPlace: (place) => equalAssign(centerPlace, {
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -498,7 +509,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 +527,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = centerPlaceStatusRef.value;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a, _b, _c;
     const {
@@ -606,9 +618,9 @@ export {
   BusinessRecomendPlaceMap as B,
   DEFAULT_ZOOM as D,
   EMPTY_PLACE as E,
-  RECOMMEND_PLACE_LARGE_LIMIT as R,
+  RECOMMEND_PLACE_DRAG_LIMIT as R,
   ZONE_ZOOM as Z,
-  RECOMMEND_PLACE_DRAG_LIMIT as a,
+  RECOMMEND_PLACE_LARGE_LIMIT as a,
   RECOMMEND_PLACE_ZONE_ICON_MIN as b,
   RECOMMEND_PLACE_ICON_ZOOM_MIN as c,
   RECOMMEND_PLACE_ZONE_TEXT_MIN as d,

package/dist/v2/chunks/{Loading.fc6e75d0.js → Loading.492acbc2.js}

@@ -1,11 +1,17 @@
-import "../css/Loading-523061b9.css";
+import "../css/Loading-49e58ced.css";
 import { h } 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 iconLoadFailed = "_17ify493";
 var loadingBg = "_17ify491";
 var loadingLayout = "_17ify490";
+var title = "_17ify495";
+var verticalGap = "_17ify494";
 const Loading = defineSetup("Loading", function() {
   return () => h("div", {
     "class": loadingLayout
@@ -21,7 +27,29 @@ const Loading = defineSetup("Loading", function() {
     }
   })]);
 });
+const LoadFailed = defineSetup("LoadFailed", function(props) {
+  return () => h("div", {
+    "class": loadingLayout
+  }, [h("img", {
+    "class": loadingBg,
+    "attrs": {
+      "src": imgGrid
+    }
+  }), h("div", {
+    "class": contentLayout
+  }, [h("img", {
+    "class": iconLoadFailed,
+    "attrs": {
+      "src": ICON_LOAD_FAILED_URL
+    }
+  }), h("span", {
+    "class": `${title} ${verticalGap}`
+  }, [props.title]), h("span", {
+    "class": `${description} ${verticalGap}`
+  }, [props.description])])]);
+});
 export {
-  Loading as L,
+  LoadFailed as L,
+  Loading as a,
   imgGrid as i
 };

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

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

package/dist/v2/components/Loading/Loading.d.ts

@@ -1 +1,7 @@
 export declare const Loading: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<unknown>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<unknown, Required<unknown>>, never, unknown>;
+interface LoadFailedProps {
+    title?: string;
+    description?: string;
+}
+export declare const LoadFailed: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<LoadFailedProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<LoadFailedProps, Required<LoadFailedProps>>, never, LoadFailedProps>;
+export {};

package/dist/v2/components/Loading/Loading.js

@@ -1,7 +1,9 @@
 import "vue";
-import { L } from "../../chunks/Loading.fc6e75d0.js";
+import "../../api/cdn.js";
+import { L, a } from "../../chunks/Loading.492acbc2.js";
 import "../../business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import "../../types/helper.js";
 export {
-  L as Loading
+  L as LoadFailed,
+  a as Loading
 };

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

@@ -1,4 +1,5 @@
-import { L } from "../../chunks/Loading.fc6e75d0.js";
+import { L, a } from "../../chunks/Loading.492acbc2.js";
 export {
-  L as Loading
+  L as LoadFailed,
+  a as Loading
 };

package/dist/v2/components/MapProvider/MapProvider.d.ts

@@ -5,8 +5,8 @@ import { type GmapLoaderProps, type UseMapLoaderProps } from "../../hooks/useMap
 import { type MapSupplierPayolad } from "../../hooks/useMapSupplier";
 import type { AmapMap } from "../../types/interface";
 import { type AmapProps } from "../Amap";
-export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId">;
-export declare const MapProvider: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "change", MapProviderProps>;
+export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "renderLoadFailedTitle" | "renderLoadFailedDescription">;
+export declare const MapProvider: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<MapProviderProps, Required<MapProviderProps>>, "success" | "fail", MapProviderProps>;
 export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "loading">, Pick<AmapProps, "center" | "zoom"> {
     mapRef?: SetMap<AmapMap> | SetMap<google.maps.Map>;
     outerArea?: () => VueNode;

package/dist/v2/components/MapProvider/MapProvider.js

@@ -1,6 +1,6 @@
 import "../../css/MapProvider-156bfd53.css";
 import { h } from "vue";
-import { L as Loading, i as imgGrid } from "../../chunks/Loading.fc6e75d0.js";
+import { L as LoadFailed, a as Loading, i as imgGrid } from "../../chunks/Loading.492acbc2.js";
 import { useMapLoader, Status } from "../../hooks/useMapLoader.js";
 import { provideMapSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineLagecySetup } from "../../types/helper.js";
@@ -26,6 +26,8 @@ const MapProvider = defineLagecySetup("MapProvider", function(props, {
     get(target, name, receiver) {
       if (name === "status")
         return payload.statusRef.value;
+      if (name === "pingStatus")
+        return payload.pingStatusRef.value;
       if (name === "readyPromise")
         return payload.readyPromise;
       return Reflect.get(target, name, receiver);
@@ -36,7 +38,7 @@ const MapProvider = defineLagecySetup("MapProvider", function(props, {
     var _a;
     return h("div", [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
   };
-}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language"]);
+}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "renderLoadFailedTitle", "renderLoadFailedDescription"]);
 const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
   slots,
   emit,
@@ -64,13 +66,14 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
   const handleResize = () => emit("resize");
   loadTraditionalChineseConvertOnce(payload.language === "zh-TW");
   return () => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const {
       supplier,
       gmapId,
       gmapRasterId,
       language = "zh",
-      status
+      status,
+      pingStatus
     } = payload;
     const {
       mapRef: setMap,
@@ -79,16 +82,23 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
       touchEnable = true,
       touchZoomCenter
     } = props;
-    if (status === Status.LOADING) {
-      const node = (_a = slots.loading) == null ? void 0 : _a.call(slots);
-      return node ? h("div", [node]) : h(Loading);
+    if (status === Status.FAILURE || pingStatus === "unconnected") {
+      const node = (_a = slots.fallback) == null ? void 0 : _a.call(slots);
+      const title = (_b = payload.renderLoadFailedTitle) == null ? void 0 : _b.call(payload, status);
+      const description = (_c = payload.renderLoadFailedDescription) == null ? void 0 : _c.call(payload, status);
+      return node ? h("div", [node]) : h(LoadFailed, {
+        "attrs": {
+          "title": title,
+          "description": description
+        }
+      });
     }
-    if (status === Status.FAILURE) {
-      const node = (_b = slots.fallback) == null ? void 0 : _b.call(slots);
+    if (status === Status.LOADING || status === Status.SUCCESS && pingStatus === "pending") {
+      const node = (_d = slots.loading) == null ? void 0 : _d.call(slots);
       return node ? h("div", [node]) : h(Loading);
     }
-    const children = (_c = slots.default) == null ? void 0 : _c.call(slots);
-    const outArea = (_d = slots.outerArea) == null ? void 0 : _d.call(slots);
+    const children = (_e = slots.default) == null ? void 0 : _e.call(slots);
+    const outArea = (_f = slots.outerArea) == null ? void 0 : _f.call(slots);
     const mapId = patchGmapIdForAlipayCompatible({
       gmapId,
       gmapRasterId,
@@ -98,7 +108,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
     switch (supplier) {
       case "gmap":
         return h("div", {
-          "class": `${heycarMap} ${(_e = attrs.class) != null ? _e : ""}`,
+          "class": `${heycarMap} ${(_g = attrs.class) != null ? _g : ""}`,
           "attrs": {
             "lang": language
           },
@@ -129,7 +139,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
         }), outArea]);
       default:
         return h("div", {
-          "class": `${heycarMap} ${(_f = attrs.class) != null ? _f : ""}`,
+          "class": `${heycarMap} ${(_h = attrs.class) != null ? _h : ""}`,
           "attrs": {
             "lang": language
           },

package/dist/v2/css/Loading-49e58ced.css

@@ -0,0 +1,46 @@
+._17ify490 {
+  position: relative;
+  background-color: #EDF1F5;
+}
+._17ify491 {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+._17ify492 {
+  position: absolute;
+  margin: auto;
+  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 {
+  margin-top: 1.6vw;
+}
+._17ify495 {
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
+  font-weight: 500;
+  font-size: 4vw;
+  color: #1E1E1E;
+  line-height: 6.4vw;
+}
+._17ify496 {
+  font-family: var(--HEYCAR_MAP_CSS_VAR_FONT_REGULAR);
+  font-weight: 400;
+  font-size: 3.73vw;
+  color: #999BA1;
+  line-height: 6.4vw;
+  white-space: pre-line;
+  text-align: center;
+}

package/dist/v2/hooks/useDrivingRoute.js

@@ -23,6 +23,8 @@ const useADrivingRoute = (props) => {
               const drivingResult = result;
               const routeSteps = [];
               const firstRoute = drivingResult.routes[0];
+              if (!firstRoute)
+                return resolve({ path: [], distance: 0, duration: 0, steps: [] });
               for (const step of firstRoute.steps) {
                 const basicStep = step;
                 const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
@@ -83,6 +85,8 @@ const useGDrivingRoute = (props) => {
               let duration = 0;
               const routeSteps = [];
               const firstRoute = result.routes[0];
+              if (!firstRoute)
+                return resolve({ path: [], distance: 0, duration: 0, steps: [] });
               for (const leg of firstRoute.legs) {
                 distance += (_b = (_a = leg.distance) == null ? void 0 : _a.value) != null ? _b : 0;
                 duration += (_d = (_c = leg.duration) == null ? void 0 : _c.value) != null ? _d : 0;

package/dist/v2/hooks/useMapGCJ02.js

@@ -1,6 +1,4 @@
-import { AMAP_TO_GCJ02_TIMEOUT } from "../api/contants.js";
-import { lnglat2point } from "../utils/transform.js";
-import { useMapInChina } from "./useMapInChina.js";
+import { inChina, inHongkong, inMacau } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 /**
  * @preserve
@@ -514,8 +512,6 @@ const exported = Object.assign(Object.assign({}, CRSTypes), {
   transform
 });
 const useAmapGCJ02 = () => {
-  const { readyPromise } = useMapSupplier();
-  const { inChina } = useMapInChina();
   const toCoordinateType = (p) => {
     return inChina(p) ? "gcj02" : "wgs84";
   };
@@ -532,42 +528,15 @@ const useAmapGCJ02 = () => {
     }
   };
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
-  async function toGcj02Points(points) {
-    await readyPromise;
-    return new Promise((resolve) => {
-      let isHandled = false;
-      AMap.convertFrom(
-        [...points],
-        "gps",
-        (_, result) => {
-          if (isHandled)
-            return;
-          isHandled = true;
-          if (result.info === "ok") {
-            resolve(result.locations.map(lnglat2point));
-          } else {
-            console.warn("警告: 高德坐标转换请求失败，启用本地转换");
-            resolve(toLocalGcj02Points(points));
-          }
-        }
-      );
-      setTimeout(() => {
-        if (isHandled)
-          return;
-        isHandled = true;
-        console.warn("警告: 高德坐标转换请求超时，启用本地转换");
-        resolve(toLocalGcj02Points(points));
-      }, AMAP_TO_GCJ02_TIMEOUT);
-    });
-  }
+  const toGcj02Points = async (points) => {
+    return toLocalGcj02Points(points);
+  };
   function toGcj02(point) {
     return toGcj02Points([point]).then(([result]) => result);
   }
   return { toCoordinateType, toGcj02, toGcj02Points, toLocalGcj02, toLocalGcj02Points };
 };
 const useGmapGCJ02 = () => {
-  const { readyPromise } = useMapSupplier();
-  const { inChina, inHongkong, inMacau } = useMapInChina();
   const toCoordinateType = (p) => {
     return inChina(p) && !inHongkong(p) && !inMacau(p) ? "gcj02" : "wgs84";
   };
@@ -585,11 +554,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/v2/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/v2/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/v2/hooks/useMapGraspRoad.js

@@ -3,7 +3,7 @@ import { apiGoogleSnapRoad } from "../api/googleSnapRoad.js";
 import { watchEffectForDeepOption } from "../utils/compare.js";
 import { lnglat2point, trackPoints2amapGraspRoadPoints } from "../utils/transform.js";
 import { useMapAngle } from "./useMapAngle.js";
-import { useMapInChina } from "./useMapInChina.js";
+import { inChina } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const GRASP_ROAD_INPUT_MIN_AMOUNT = 2;
 const GRASP_ROAD_INPUT_MAX_AMOUNT = 500;
@@ -12,7 +12,6 @@ const useAmapGraspRoad = (props) => {
   const pathRef = ref([]);
   const angleRef = ref(0);
   const { apiMapComputeHeading } = useMapAngle();
-  const { inChina } = useMapInChina();
   const apiMapToGraspRoadPath = (tracks) => {
     return new Promise((resolve) => {
       var _a, _b, _c;

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

@@ -1,16 +1,4 @@
 import { type Point } from "../types/interface";
-export declare const useMapInChina: () => {
-    inChina: (point: Point) => boolean;
-    inHongkong: (point: Point) => boolean;
-    inMacau: (point: Point) => boolean;
-};
-export declare const useAmapInChina: () => {
-    inChina: (point: Point) => boolean;
-    inHongkong: (point: Point) => boolean;
-    inMacau: (point: Point) => boolean;
-};
-export declare const useGmapInChina: () => {
-    inChina: (point: Point) => boolean;
-    inHongkong: (point: Point) => boolean;
-    inMacau: (point: Point) => boolean;
-};
+export declare const inChina: (point: Point) => boolean;
+export declare const inHongkong: (point: Point) => boolean;
+export declare const inMacau: (point: Point) => boolean;

package/dist/v2/hooks/useMapInChina.js

@@ -2593,22 +2593,17 @@ const macauBounds = [
     22.19885
   ]
 ];
-const useMapInChina = () => {
-  const inChina = (point) => {
-    return pointInPolygon(point, chinaBounds) >= 0;
-  };
-  const inHongkong = (point) => {
-    return pointInPolygon(point, hongkongBounds) >= 0;
-  };
-  const inMacau = (point) => {
-    return pointInPolygon(point, macauBounds) >= 0;
-  };
-  return { inChina, inHongkong, inMacau };
+const inChina = (point) => {
+  return pointInPolygon(point, chinaBounds) >= 0;
+};
+const inHongkong = (point) => {
+  return pointInPolygon(point, hongkongBounds) >= 0;
+};
+const inMacau = (point) => {
+  return pointInPolygon(point, macauBounds) >= 0;
 };
-const useAmapInChina = useMapInChina;
-const useGmapInChina = useMapInChina;
 export {
-  useAmapInChina,
-  useGmapInChina,
-  useMapInChina
+  inChina,
+  inHongkong,
+  inMacau
 };