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

package/dist/v3/css/Loading-0e058b68.css

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

package/dist/v3/hooks/useDeviceOrientation.js

@@ -1,23 +1,7 @@
 import { reactive, watch } from "vue-demi";
 import { MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT } from "../utils/patchMiniprogram.js";
 import { OS_PLATFORM, detectOSPlatform } from "../utils/platform.js";
-import { i as isObject, d as debounce } from "../chunks/debounce.5afe7867.js";
-var FUNC_ERROR_TEXT = "Expected a function";
-function throttle(func, wait, options) {
-  var leading = true, trailing = true;
-  if (typeof func != "function") {
-    throw new TypeError(FUNC_ERROR_TEXT);
-  }
-  if (isObject(options)) {
-    leading = "leading" in options ? !!options.leading : leading;
-    trailing = "trailing" in options ? !!options.trailing : trailing;
-  }
-  return debounce(func, wait, {
-    "leading": leading,
-    "maxWait": wait,
-    "trailing": trailing
-  });
-}
+import { t as throttle } from "../chunks/throttle.8bdd8d3b.js";
 const DEVICE_ORIENTATION_INTERVAL = 200;
 const CSS_DEVICE_ORIENTATION_VAR_PREFIX = "--CSS_DEVICE_ORIENTATION_VAR_ROTATION_DEGREE_";
 const useDeviceOrientation = (props) => {

package/dist/v3/hooks/useMapGCJ02.js

@@ -1,6 +1,6 @@
 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
@@ -515,7 +515,6 @@ const exported = Object.assign(Object.assign({}, CRSTypes), {
 });
 const useAmapGCJ02 = () => {
   const { readyPromise } = useMapSupplier();
-  const { inChina } = useMapInChina();
   const toCoordinateType = (p) => {
     return inChina(p) ? "gcj02" : "wgs84";
   };
@@ -567,7 +566,6 @@ const useAmapGCJ02 = () => {
 };
 const useGmapGCJ02 = () => {
   const { readyPromise } = useMapSupplier();
-  const { inChina, inHongkong, inMacau } = useMapInChina();
   const toCoordinateType = (p) => {
     return inChina(p) && !inHongkong(p) && !inMacau(p) ? "gcj02" : "wgs84";
   };

package/dist/v3/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/v3/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/v3/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/v3/hooks/useMapLoader.d.ts

@@ -7,6 +7,7 @@ export declare const DEFAULT_AMAP_PLUGINS: AmapLoaderProps["plugins"];
 export declare const DEFAULT_GMAP_LIBRARIES: LoaderOptions["libraries"];
 export declare enum Status {
     LOADING = "LOADING",
+    TIMEOUT = "TIMEOUT",
     FAILURE = "FAILURE",
     SUCCESS = "SUCCESS"
 }
@@ -19,7 +20,7 @@ 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;
@@ -42,11 +43,13 @@ export interface GmapLoaderProps extends LoaderOptions {
      */
     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>;
@@ -64,7 +67,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 {};

package/dist/v3/hooks/useMapLoader.js

@@ -1,6 +1,7 @@
-import { shallowRef, computed } from "vue-demi";
+import { shallowRef, computed, ref } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createRunOnce } from "../utils/helper.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 = {};
 var dist = {
@@ -537,6 +538,8 @@ class Loader {
     }
   }
 }
+const MIN_MAP_RELOAD_INTERVAL = 5e3;
+const GMAP_LOAD_TIMEOUT = 1e4;
 const DEFAULT_AMAP_PLUGINS = [
   "AMap.Geocoder",
   "AMap.Driving",
@@ -546,12 +549,13 @@ const DEFAULT_AMAP_PLUGINS = [
 const DEFAULT_GMAP_LIBRARIES = ["marker", "geometry"];
 var Status = /* @__PURE__ */ ((Status2) => {
   Status2["LOADING"] = "LOADING";
+  Status2["TIMEOUT"] = "TIMEOUT";
   Status2["FAILURE"] = "FAILURE";
   Status2["SUCCESS"] = "SUCCESS";
   return Status2;
 })(Status || {});
 const useAmapLoader = (props) => {
-  const { disableRef, onChange } = props;
+  const { disableRef, onSuccess, onFail } = props;
   let resolveLoader;
   let rejectLoader;
   const readyPromise = new Promise((resolve, reject) => {
@@ -563,49 +567,58 @@ const useAmapLoader = (props) => {
     /* LOADING */
   );
   const optionsRef = computed(() => {
-    const { onChange: onChange2, loading, fallback, apiKey, apiSecret, apiServiceHost, version, ...options } = props;
+    const {
+      onSuccess: onSuccess2,
+      onFail: onFail2,
+      loading,
+      fallback,
+      apiKey,
+      apiSecret,
+      apiServiceHost,
+      version,
+      ...options
+    } = props;
     return { ...options, key: apiKey, version: version != null ? version : "2.0" };
   });
+  const defineSecurityOnce = createRunOnce(() => {
+    window._AMapSecurityConfig = props.apiServiceHost ? {
+      serviceHost: props.apiServiceHost
+    } : { securityJsCode: props.apiSecret };
+  });
+  const reload = throttle(
+    (options) => {
+      if (statusRef.value === "SUCCESS")
+        return;
+      statusRef.value = "LOADING";
+      defineSecurityOnce();
+      return distExports.load(options).then(
+        () => {
+          statusRef.value = "SUCCESS";
+          resolveLoader();
+          onSuccess == null ? void 0 : onSuccess();
+        },
+        () => {
+          statusRef.value = "FAILURE";
+          rejectLoader();
+          onFail == null ? void 0 : onFail();
+        }
+      );
+    },
+    MIN_MAP_RELOAD_INTERVAL,
+    { trailing: false }
+  );
   watchPostEffectForDeepOption(
     () => [optionsRef.value, disableRef == null ? void 0 : disableRef.value],
     ([options, disable]) => {
       if (disable)
         return;
-      const setStatusAndExecuteCallback = (status) => {
-        statusRef.value = status;
-        if (status === "SUCCESS")
-          resolveLoader();
-        if (status === "FAILURE")
-          rejectLoader();
-        onChange == null ? void 0 : onChange(statusRef.value);
-      };
-      setStatusAndExecuteCallback(
-        "LOADING"
-        /* LOADING */
-      );
-      window._AMapSecurityConfig = props.apiServiceHost ? {
-        serviceHost: props.apiServiceHost
-      } : { securityJsCode: props.apiSecret };
-      distExports.load(options).then(
-        () => setStatusAndExecuteCallback(
-          "SUCCESS"
-          /* SUCCESS */
-        ),
-        () => setStatusAndExecuteCallback(
-          "FAILURE"
-          /* FAILURE */
-        )
-      );
+      reload(options);
     }
   );
   return { statusRef, readyPromise };
 };
-const loadGmapOnce = createRunOnce((opts) => {
-  const loader = new Loader(opts);
-  return loader.load();
-});
 const useGmapLoader = (props) => {
-  const { disableRef, onChange } = props;
+  const { disableRef, onSuccess, onFail } = props;
   let resolveLoader;
   let rejectLoader;
   const readyPromise = new Promise((resolve, reject) => {
@@ -617,50 +630,62 @@ const useGmapLoader = (props) => {
     /* LOADING */
   );
   const optionsRef = computed(() => {
-    const { onChange: onChange2, fallback, loading, language, ...options } = props;
+    const { onSuccess: onSuccess2, onFail: onFail2, fallback, loading, language, ...options } = props;
     return options;
   });
+  const timerRef = ref();
+  const reload = throttle(
+    (options) => {
+      if (statusRef.value === "SUCCESS")
+        return;
+      const loader = new Loader(options);
+      clearTimeout(timerRef.value);
+      timerRef.value = window.setTimeout(() => {
+        statusRef.value = "TIMEOUT";
+      }, GMAP_LOAD_TIMEOUT);
+      if (loader.status !== LoaderStatus.INITIALIZED) {
+        loader.reset();
+      }
+      statusRef.value = "LOADING";
+      return loader.load().then(
+        () => {
+          clearTimeout(timerRef.value);
+          statusRef.value = "SUCCESS";
+          resolveLoader();
+          onSuccess == null ? void 0 : onSuccess();
+        },
+        () => {
+          clearTimeout(timerRef.value);
+          statusRef.value = "FAILURE";
+          rejectLoader();
+          onFail == null ? void 0 : onFail();
+        }
+      );
+    },
+    MIN_MAP_RELOAD_INTERVAL,
+    { trailing: false }
+  );
   watchPostEffectForDeepOption(
     () => [optionsRef.value, disableRef == null ? void 0 : disableRef.value],
     ([options, disable]) => {
       if (disable)
         return;
       const language = navigator.language;
-      const setStatusAndExecuteCallback = (status) => {
-        statusRef.value = status;
-        if (status === "SUCCESS")
-          resolveLoader();
-        if (status === "FAILURE")
-          rejectLoader();
-        onChange == null ? void 0 : onChange(statusRef.value);
-      };
-      setStatusAndExecuteCallback(
-        "LOADING"
-        /* LOADING */
-      );
-      loadGmapOnce({ ...options, language }).then(
-        () => setStatusAndExecuteCallback(
-          "SUCCESS"
-          /* SUCCESS */
-        ),
-        () => setStatusAndExecuteCallback(
-          "FAILURE"
-          /* FAILURE */
-        )
-      );
+      reload({ ...options, language });
     }
   );
   return { statusRef, readyPromise };
 };
 const useMapLoader = (props) => {
-  const { gmapKey, amapKey, amapSecret, amapServiceHost, language, onChange } = props;
+  const { gmapKey, amapKey, amapSecret, amapServiceHost, language, onSuccess, onFail } = props;
   const { statusRef: amapStatusRef, readyPromise: amapReadyPromise } = useAmapLoader({
     apiKey: amapKey,
     apiSecret: amapSecret,
     apiServiceHost: amapServiceHost,
     plugins: DEFAULT_AMAP_PLUGINS,
     disableRef: computed(() => props.supplier !== "amap"),
-    onChange
+    onSuccess,
+    onFail
   });
   const { statusRef: gmapStatusRef, readyPromise: gmapReadyPromise } = useGmapLoader({
     apiKey: gmapKey,
@@ -670,7 +695,8 @@ const useMapLoader = (props) => {
     // region: "CN",
     libraries: DEFAULT_GMAP_LIBRARIES,
     disableRef: computed(() => props.supplier !== "gmap"),
-    onChange
+    onSuccess,
+    onFail
   });
   return {
     get statusRef() {

package/dist/v3/hooks/useMapPlace.js

@@ -3,7 +3,7 @@ import { REGEO_TIMEOUT } from "../api/contants.js";
 import { createPipeTw } from "../utils/cn2tw.js";
 import { equalAssign } from "../utils/helper.js";
 import { amapPlaceName2DisplayName, gmapPlaceName2DisplayName } from "../utils/transform.js";
-import { useAmapInChina } from "./useMapInChina.js";
+import { inChina } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 const useAmapPlace = (props) => {
@@ -11,7 +11,6 @@ const useAmapPlace = (props) => {
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
-  const { inChina } = useAmapInChina();
   const place = reactive({
     lng: pointRef.value[0],
     lat: pointRef.value[1],

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

@@ -4,6 +4,8 @@ export interface MapSupplierPayolad extends UseMapLoaderProps {
     gmapId: string;
     readyPromise: UseMapLoaderOutput["readyPromise"];
     status: Status;
+    renderLoadFailedTitle?: (status: Status) => string | undefined;
+    renderLoadFailedDescription?: (status: Status) => string | undefined;
 }
 export declare const useMapSupplier: () => MapSupplierPayolad;
 export declare const provideMapSupplier: (payload: MapSupplierPayolad) => void;

package/dist/v3/hooks-business/useBusinessQuotingMap.d.ts

@@ -1,7 +1,9 @@
+import type { CoordinateType, Point } from "../types/interface";
 export type BusinessQuotingContext = {
     setFitView: () => void;
 };
 export declare const useBusinessQuotingMap: () => {
     setFitView: () => void;
     mapContext: BusinessQuotingContext;
+    toAmapCoordinateType: (point: Point) => CoordinateType;
 };

package/dist/v3/hooks-business/useBusinessQuotingMap.js

@@ -1,9 +1,14 @@
-import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
+import { inChina } from "../hooks/useMapInChina.js";
+import { proxyFunctionalProperty, assertAssingedBeforeUsed, assertPoint } from "../utils/helper.js";
 const useBusinessQuotingMap = () => {
   const mapContext = {
     setFitView: assertAssingedBeforeUsed
   };
-  return { mapContext, ...proxyFunctionalProperty(mapContext) };
+  const toAmapCoordinateType = (point) => {
+    assertPoint(point);
+    return inChina(point) ? "gcj02" : "wgs84";
+  };
+  return { mapContext, toAmapCoordinateType, ...proxyFunctionalProperty(mapContext) };
 };
 export {
   useBusinessQuotingMap

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-switchMap1";
+const pkgVersion = "2.0.0-switchMap2";
 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-switchMap1",
+  "version": "2.0.0-switchMap2",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",

package/dist/v2/css/Loading-523061b9.css

@@ -1,9 +0,0 @@
-._17ify490 {
-  position: relative;
-  background-color: #EDF1F5;
-}
-._17ify491 {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}

package/dist/v3/css/Loading-523061b9.css

@@ -1,9 +0,0 @@
-._17ify490 {
-  position: relative;
-  background-color: #EDF1F5;
-}
-._17ify491 {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-}