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

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";
@@ -21,16 +21,15 @@ if (detectWebGL() === WEBGL_STATUS.ENABLED) {
 const MapProvider = defineLagecySetup("MapProvider", function(props, {
   slots
 }) {
-  const {
-    statusRef,
-    readyPromise
-  } = useMapLoader(props);
+  const payload = useMapLoader(props);
   const context = new Proxy(props, {
     get(target, name, receiver) {
       if (name === "status")
-        return statusRef.value;
+        return payload.statusRef.value;
+      if (name === "pingStatus")
+        return payload.pingStatusRef.value;
       if (name === "readyPromise")
-        return readyPromise;
+        return payload.readyPromise;
       return Reflect.get(target, name, receiver);
     }
   });
@@ -39,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,
@@ -73,7 +72,8 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
       gmapId,
       gmapRasterId,
       language = "zh",
-      status
+      status,
+      pingStatus
     } = payload;
     const {
       mapRef: setMap,
@@ -82,10 +82,21 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
       touchEnable = true,
       touchZoomCenter
     } = props;
-    if (status === Status.LOADING)
-      return (_b = (_a = slots.loading) == null ? void 0 : _a.call(slots)) != null ? _b : h(Loading);
-    if (status === Status.FAILURE)
-      return (_d = (_c = slots.fallback) == null ? void 0 : _c.call(slots)) != null ? _d : 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.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 = (_e = slots.default) == null ? void 0 : _e.call(slots);
     const outArea = (_f = slots.outerArea) == null ? void 0 : _f.call(slots);
     const mapId = patchGmapIdForAlipayCompatible({

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/demi-polyfill/demi-polyfill.d.ts

@@ -6,6 +6,7 @@ import type { Slot as Slot_V2 } from "vue2/types/v3-setup-context";
 import type { ScopedSlot as ScopedSlot_V2 } from "vue2/types/vnode";
 import type { DefineComponent as DefineComponent_V3, HTMLAttributes as HTMLAttributes_V3, ImgHTMLAttributes as ImgHTMLAttributes_V3, Ref as Ref_V3, Slot as Slot_V3, StyleValue as StyleValue_V3, VNodeArrayChildren as VNodeArrayChildren_V3, VNodeChild as VNodeChild_V3, VNode as VNode_V3, WatchOptions as WatchOptions_V3 } from "vue3";
 export * from "vue-demi";
+export type { StyleValue_V2 };
 export type { Data } from "vue2";
 export type { EmitFn } from "vue2/types/v3-setup-context";
 export type { ComponentObjectPropsOptions, ObjectEmitsOptions, PublicProps, SlotsType } from "vue3";

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
 };

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

@@ -1,8 +1,8 @@
 import { load as loadAmap } from "@amap/amap-jsapi-loader";
 import { type LoaderOptions } from "@googlemaps/js-api-loader";
 import { type Ref } from "vue-demi";
-import type { VueNode } from "../demi-polyfill";
-import type { Language } from "../types/interface";
+import type { VNodeChild } from "../demi-polyfill";
+import type { ConnectionStatus, Language } from "../types/interface";
 export declare const DEFAULT_AMAP_PLUGINS: AmapLoaderProps["plugins"];
 export declare const DEFAULT_GMAP_LIBRARIES: LoaderOptions["libraries"];
 export declare enum Status {
@@ -19,40 +19,47 @@ declare global {
         };
     }
 }
-export interface AmapLoaderProps extends Pick<GmapLoaderProps, "fallback" | "loading" | "onChange">, Omit<AMapLoaderOptions, "key" | "version" | "plugins"> {
+export interface AmapLoaderProps extends Pick<GmapLoaderProps, "fallback" | "loading" | "onSuccess" | "onFail">, Omit<AMapLoaderOptions, "key" | "version" | "plugins"> {
     apiKey: string;
     apiSecret?: string;
     apiServiceHost?: string;
     version?: string;
     plugins?: `AMap.${AMap.PluginName}`[];
+    disableRef?: Ref<boolean>;
 }
 export declare const useAmapLoader: (props: AmapLoaderProps) => {
     statusRef: import("vue-demi").ShallowRef<Status>;
+    pingStatusRef: import("vue-demi").ShallowRef<ConnectionStatus>;
     readyPromise: Promise<undefined>;
 };
 export interface GmapLoaderProps extends LoaderOptions {
+    disableRef?: Ref<boolean>;
     /**
      * Render prop used to switch to loading component.
      */
-    loading?: () => VueNode;
+    loading?: () => VNodeChild;
     /**
      * Render prop used to switch to error fallback component.
      */
-    fallback?: () => VueNode;
+    fallback?: () => VNodeChild;
     /**
-     * Callback prop used to access `@googlemaps/js-api-loader` and `Status`.
-     *
-     * Note: The callback be executed multiple times in the lifecycle of the component.
+     * 成功回调只会触发一次
      */
-    onChange?: (status: Status) => void;
+    onSuccess?: () => void;
+    /**
+     * 失败回调可能会触发多次
+     */
+    onFail?: () => void;
 }
 export declare const useGmapLoader: (props: GmapLoaderProps) => {
     statusRef: import("vue-demi").ShallowRef<Status>;
+    pingStatusRef: import("vue-demi").ShallowRef<ConnectionStatus>;
     readyPromise: Promise<undefined>;
 };
 export type MapSupplier = "gmap" | "amap";
 export interface UseMapLoaderOutput {
     statusRef: Ref<Status>;
+    pingStatusRef: Ref<ConnectionStatus>;
     readyPromise: Promise<undefined>;
 }
 export interface UseMapLoaderProps {
@@ -62,7 +69,8 @@ export interface UseMapLoaderProps {
     amapServiceHost?: string;
     supplier: MapSupplier;
     language: Language;
-    onChange?: (status: Status) => any;
+    onSuccess?: () => void;
+    onFail?: () => void;
 }
 export declare const useMapLoader: (props: UseMapLoaderProps) => UseMapLoaderOutput;
 export {};