@heycar/heycars-map 2.0.0-switchMap5 → 2.0.0-switchMap7

package/dist/index.d.ts

@@ -1 +1 @@
-export * from "./v2"
+export * from "./v3"

package/dist/index.js

@@ -1 +1 @@
-export * from "./v2"
+export * from "./v3"

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,5 +1,3 @@
-import { AMAP_TO_GCJ02_TIMEOUT } from "../api/contants.js";
-import { lnglat2point } from "../utils/transform.js";
 import { inChina, inHongkong, inMacau } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 /**
@@ -514,7 +512,6 @@ const exported = Object.assign(Object.assign({}, CRSTypes), {
   transform
 });
 const useAmapGCJ02 = () => {
-  const { readyPromise } = useMapSupplier();
   const toCoordinateType = (p) => {
     return inChina(p) ? "gcj02" : "wgs84";
   };
@@ -531,34 +528,9 @@ 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);
   }

package/dist/v2/hooks/useMapLoader.js

@@ -602,6 +602,14 @@ const useAmapLoader = (props) => {
     );
   });
   const keepRetry = createOneConcurrent(async () => {
+    if (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value === "SUCCESS") {
+      pingStatusRef.value = "pending";
+      while (!(disableRef == null ? void 0 : disableRef.value) && pingStatusRef.value !== "connected") {
+        if (pingStatusRef.value === "unconnected")
+          await sleep(MIN_MAP_RELOAD_INTERVAL);
+        pingStatusRef.value = await apiPingAmap();
+      }
+    }
     const options = optionsRef.value;
     while (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value !== "SUCCESS") {
       if (statusRef.value === "LOADING") {
@@ -662,9 +670,9 @@ const useGmapLoader = (props) => {
     return Promise.race([abortPromise, loadPromise]);
   });
   const keepRetry = createOneConcurrent(async () => {
-    if (statusRef.value === "SUCCESS") {
+    if (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value === "SUCCESS") {
       pingStatusRef.value = "pending";
-      while (pingStatusRef.value !== "connected") {
+      while (!(disableRef == null ? void 0 : disableRef.value) && pingStatusRef.value !== "connected") {
         if (pingStatusRef.value === "unconnected")
           await sleep(MIN_MAP_RELOAD_INTERVAL);
         pingStatusRef.value = await apiPingGmap();

package/dist/v2/utils/log.js

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

package/dist/v3/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/v3/hooks/useMapGCJ02.js

@@ -1,5 +1,3 @@
-import { AMAP_TO_GCJ02_TIMEOUT } from "../api/contants.js";
-import { lnglat2point } from "../utils/transform.js";
 import { inChina, inHongkong, inMacau } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 /**
@@ -514,7 +512,6 @@ const exported = Object.assign(Object.assign({}, CRSTypes), {
   transform
 });
 const useAmapGCJ02 = () => {
-  const { readyPromise } = useMapSupplier();
   const toCoordinateType = (p) => {
     return inChina(p) ? "gcj02" : "wgs84";
   };
@@ -531,34 +528,9 @@ 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);
   }

package/dist/v3/hooks/useMapLoader.js

@@ -602,6 +602,14 @@ const useAmapLoader = (props) => {
     );
   });
   const keepRetry = createOneConcurrent(async () => {
+    if (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value === "SUCCESS") {
+      pingStatusRef.value = "pending";
+      while (!(disableRef == null ? void 0 : disableRef.value) && pingStatusRef.value !== "connected") {
+        if (pingStatusRef.value === "unconnected")
+          await sleep(MIN_MAP_RELOAD_INTERVAL);
+        pingStatusRef.value = await apiPingAmap();
+      }
+    }
     const options = optionsRef.value;
     while (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value !== "SUCCESS") {
       if (statusRef.value === "LOADING") {
@@ -662,9 +670,9 @@ const useGmapLoader = (props) => {
     return Promise.race([abortPromise, loadPromise]);
   });
   const keepRetry = createOneConcurrent(async () => {
-    if (statusRef.value === "SUCCESS") {
+    if (!(disableRef == null ? void 0 : disableRef.value) && statusRef.value === "SUCCESS") {
       pingStatusRef.value = "pending";
-      while (pingStatusRef.value !== "connected") {
+      while (!(disableRef == null ? void 0 : disableRef.value) && pingStatusRef.value !== "connected") {
         if (pingStatusRef.value === "unconnected")
           await sleep(MIN_MAP_RELOAD_INTERVAL);
         pingStatusRef.value = await apiPingGmap();

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.0.0-switchMap5";
+const pkgVersion = "2.0.0-switchMap7";
 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.0.0-switchMap5",
+  "version": "2.0.0-switchMap7",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",