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

package/dist/v3/hooks/useMapPlace.js

@@ -31,32 +31,37 @@ const useAmapPlace = (props) => {
   };
   const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
-      const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
-      const pipeTw = createPipeTw(language === "zh-TW");
-      const isChina = inChina([lng, lat]);
-      geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
-        switch (status) {
-          case "complete": {
-            const { formattedAddress, addressComponent } = result.regeocode;
-            const name = formattedAddress ? formattedAddress : emptyPlaceName;
-            const displayName = amapPlaceName2DisplayName(name, { isChina, ...addressComponent });
-            resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
-            return;
-          }
-          case "no_data":
-          case "error": {
-            const name = emptyPlaceName;
-            const displayName = emptyPlaceName;
-            resolve({ lng, lat, name, displayName });
-            return;
-          }
-        }
-      });
-      setTimeout(() => {
-        console.warn("高德逆地理请求超时!");
+      const handleFailed = () => {
         const name = emptyPlaceName;
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName });
+      };
+      readyPromise.then(() => {
+        const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
+        const pipeTw = createPipeTw(language === "zh-TW");
+        const isChina = inChina([lng, lat]);
+        geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
+          switch (status) {
+            case "complete": {
+              const { formattedAddress, addressComponent } = result.regeocode;
+              const name = formattedAddress ? formattedAddress : emptyPlaceName;
+              const displayName = amapPlaceName2DisplayName(name, {
+                isChina,
+                ...addressComponent
+              });
+              resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+              return;
+            }
+            case "no_data":
+            case "error": {
+              handleFailed();
+            }
+          }
+        });
+      }, handleFailed);
+      setTimeout(() => {
+        console.warn("高德逆地理请求超时!");
+        handleFailed();
       }, REGEO_TIMEOUT);
     });
   });
@@ -96,23 +101,25 @@ const useGmapPlace = (props) => {
   };
   const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
-      const geocoder = new google.maps.Geocoder();
-      const pipeTw = createPipeTw(language === "zh-TW");
-      geocoder.geocode({ language, location: { lng, lat } }).then(({ results }) => {
-        const name = results[0].formatted_address ? results[0].formatted_address : emptyPlaceName;
-        const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
-        resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
-      }).catch((err) => {
-        console.error(err);
+      const handleFailed = (err) => {
+        if (err)
+          console.error(err);
         const name = emptyPlaceName;
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName });
-      });
+      };
+      readyPromise.then(() => {
+        const geocoder = new google.maps.Geocoder();
+        const pipeTw = createPipeTw(language === "zh-TW");
+        geocoder.geocode({ language, location: { lng, lat } }).then(({ results }) => {
+          const name = results[0].formatted_address ? results[0].formatted_address : emptyPlaceName;
+          const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
+          resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+        }).catch(handleFailed);
+      }, handleFailed);
       setTimeout(() => {
         console.warn("谷歌逆地理请求超时!");
-        const name = emptyPlaceName;
-        const displayName = emptyPlaceName;
-        resolve({ lng, lat, name, displayName });
+        handleFailed();
       }, REGEO_TIMEOUT);
     });
   });

package/dist/v3/hooks/useMapRecomendPlace.js

@@ -3,7 +3,7 @@ import { GET_RECOMMEND_PLACE_TIMEOUT } from "../api/contants.js";
 import { logNoneManualAbortError } from "../utils/ManualAbortError.js";
 import { equalAssign, createAbortable, isPlacesInclude } from "../utils/helper.js";
 import { isZoneEqual, place2point, isPlaceEqual, businessCandidatesToAdsorptionPlace } from "../utils/transform.js";
-import { useMapGeometry } from "./useMapGeometry.js";
+import { useMapGeometry, apiLocalIsPointInRing } from "./useMapGeometry.js";
 import { useMapPlace } from "./useMapPlace.js";
 function mergeGetRecommendPlaceAndGetAvailable(getRecomendPlace, getAvailable, timeout) {
   return function mergedGetRecommendPlace(place, context) {
@@ -53,7 +53,7 @@ const useMapRecomendPlace = (props) => {
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
   const abortable = createAbortable(signal);
-  const { apiMapIsPointInRing, apiMapDistance } = useMapGeometry();
+  const { apiMapDistance } = useMapGeometry();
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
     pointRef: ref([...defaultPoint]),
@@ -99,7 +99,7 @@ const useMapRecomendPlace = (props) => {
     async (point, prevState) => {
       const [lng, lat] = point;
       const zone = zoneRef.value;
-      if (!zone || !apiMapIsPointInRing(point, zone.path)) {
+      if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
         const reGeoPlacePromise = getPlaceByRegeo(point);
         const {
           place: closestPlace,
@@ -130,7 +130,7 @@ const useMapRecomendPlace = (props) => {
   );
   const updateIntermediateQueryingState = (point) => {
     const zone = zoneRef.value;
-    if (zone && apiMapIsPointInRing(point, zone.path))
+    if (zone && apiLocalIsPointInRing(point, zone.path))
       return;
     const [lng, lat] = point;
     const intermediateQueryingPlace = {

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

@@ -1,10 +1,12 @@
 import type { AnyFn } from "@vueuse/core";
+import type { ConnectionStatus } from "../types/interface";
 import type { Status, UseMapLoaderOutput, UseMapLoaderProps } from "./useMapLoader";
 export interface MapSupplierPayolad extends UseMapLoaderProps {
     gmapRasterId: string;
     gmapId: string;
     readyPromise: UseMapLoaderOutput["readyPromise"];
     status: Status;
+    pingStatus: ConnectionStatus;
     renderLoadFailedTitle?: (status: Status) => string | undefined;
     renderLoadFailedDescription?: (status: Status) => string | undefined;
 }

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

@@ -0,0 +1,10 @@
+import { type PingConnectionOnChangeHandler } from "../api/pingConnection";
+export interface UsePingConnectionProps {
+    onChange?: PingConnectionOnChangeHandler;
+}
+export declare const usePingAmapConnection: (props?: UsePingConnectionProps) => {
+    connectionStatus: Readonly<import("vue-demi").Ref<import("..").ConnectionStatus>>;
+};
+export declare const usePingGmapConnection: (props?: UsePingConnectionProps) => {
+    connectionStatus: Readonly<import("vue-demi").Ref<import("..").ConnectionStatus>>;
+};

package/dist/v3/hooks/usePingConnection.js

@@ -0,0 +1,26 @@
+import { ref, onUnmounted, readonly } from "vue-demi";
+import { apiGetPingAmapStatus, apiSubscribePingAmapChange, apiGetPingGmapStatus, apiSubscribePingGmapChange } from "../api/pingConnection.js";
+const usePingAmapConnection = (props) => {
+  const statusRef = ref(apiGetPingAmapStatus());
+  const unsubscribe = apiSubscribePingAmapChange((status) => {
+    var _a;
+    statusRef.value = status;
+    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
+  });
+  onUnmounted(unsubscribe);
+  return { connectionStatus: readonly(statusRef) };
+};
+const usePingGmapConnection = (props) => {
+  const statusRef = ref(apiGetPingGmapStatus());
+  const unsubscribe = apiSubscribePingGmapChange((status) => {
+    var _a;
+    statusRef.value = status;
+    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
+  });
+  onUnmounted(unsubscribe);
+  return { connectionStatus: readonly(statusRef) };
+};
+export {
+  usePingAmapConnection,
+  usePingGmapConnection
+};

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

@@ -1,5 +1,5 @@
 import { reactive, ref, readonly } from "vue-demi";
-import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.86e9c287.js";
+import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.4befb6c7.js";
 import { CenterPlaceStatus } from "../types/interface.js";
 import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
 const useBusinessRecomendPlaceMap = () => {

package/dist/v3/index.js

@@ -2,7 +2,7 @@ import "./utils/alipayPolyfill.js";
 import { AbsoluteAddressBox } from "./business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import { AddressBox } from "./business-components/AddressBox/AddressBox.js";
 import { BusinessQuotingMap } from "./business-components/BusinessQuotingMap/BusinessQuotingMap.js";
-import { B } from "./chunks/BusinessRecomendPlaceMap.86e9c287.js";
+import { B } from "./chunks/BusinessRecomendPlaceMap.4befb6c7.js";
 import { BusinessReselectPlaceMap } from "./business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js";
 import { BusinessTaxiEndMap } from "./business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
 import { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js";

package/dist/v3/types/global.d.ts

@@ -20,3 +20,6 @@ declare global {
         deviceorientationabsolute: DeviceOrientationEvent;
     }
 }
+declare module "@amap/amap-jsapi-loader" {
+    const reset: () => void;
+}

package/dist/v3/types/interface.d.ts

@@ -93,7 +93,7 @@ export declare enum CenterPlaceStatus {
     SERVICE_UNAVAILABLE = "SERVICE_UNAVAILABLE",
     OK = "OK"
 }
-export type GoogleConnectionStatus = "pending" | "connected" | "unconnected";
+export type ConnectionStatus = "pending" | "connected" | "unconnected";
 export interface BusinessGeolocationPositionError extends GeolocationPositionError {
     isBusinessTimeout: boolean;
 }

package/dist/v3/utils/helper.d.ts

@@ -22,6 +22,7 @@ export declare const pausableSleep: (milliSeconds: number) => {
     restart: () => void;
 };
 export declare const createRunOnce: <P extends any[], R>(fn: (...args: P) => R) => (...args: P) => R;
+export declare const createOneConcurrent: <P extends any[], R>(fn: (...args: P) => Promise<R>) => (...args: P) => Promise<R> | undefined;
 export declare const createReadOnce: <T>(value: T) => () => T | undefined;
 export declare const createAsyncNoFailNonNullable: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: NonNullable<R>) => (...args: P) => Promise<NonNullable<R>>;
 export declare const pipeTimeout: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: R, timeout: number) => (...args: P) => Promise<R>;

package/dist/v3/utils/helper.js

@@ -93,6 +93,17 @@ const createRunOnce = (fn) => {
     return result;
   };
 };
+const createOneConcurrent = (fn) => {
+  let isRunning = false;
+  return function runOneConcurrent(...args) {
+    if (isRunning)
+      return;
+    isRunning = true;
+    const result = fn(...args);
+    result.finally(() => isRunning = false);
+    return result;
+  };
+};
 const createReadOnce = (value) => {
   let isRead = false;
   return function read() {
@@ -171,6 +182,7 @@ export {
   assertZone,
   createAbortable,
   createAsyncNoFailNonNullable,
+  createOneConcurrent,
   createReadOnce,
   createRunOnce,
   defered,

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

package/dist/v2/api/googleConnection.d.ts

@@ -1,5 +0,0 @@
-import type { GoogleConnectionStatus } from "../types/interface";
-export type GoogleConnectionOnChangeHandler = (status: GoogleConnectionStatus) => void;
-export type GoogleConnectionOnChangeCleanup = () => void;
-export declare const apiGoogleConnectionStatus: () => GoogleConnectionStatus;
-export declare const apiSubscribeGoogleConnectionChange: (handler: GoogleConnectionOnChangeHandler) => GoogleConnectionOnChangeCleanup;

package/dist/v2/api/googleConnection.js

@@ -1,51 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-const GOOGLE_DNS_RESOLVER = "https://dns.google/resolve?name=maps.googleapis.com&type=A";
-const GOOGLE_CONNECTION_DEFAULT_TIMEOUT = 5e3;
-const noop = () => {
-};
-class GoogleConnection {
-  constructor() {
-    __publicField(this, "status", "pending");
-    __publicField(this, "listeners", /* @__PURE__ */ new Set());
-    this.start();
-  }
-  async start() {
-    const status = await this.check();
-    this.status = status;
-    for (const handler of this.listeners) {
-      try {
-        handler(status);
-      } catch (err) {
-        console.error(err);
-      }
-    }
-  }
-  check(timeout = GOOGLE_CONNECTION_DEFAULT_TIMEOUT) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeout);
-    return fetch(GOOGLE_DNS_RESOLVER, { signal: controller.signal }).then(() => "connected").catch(() => "unconnected").finally(() => clearTimeout(timer));
-  }
-  onChange(handler) {
-    if (typeof handler !== "function")
-      return noop;
-    this.listeners.add(handler);
-    const clear = () => {
-      this.listeners.delete(handler);
-    };
-    return clear;
-  }
-}
-const googleConnection = new GoogleConnection();
-const apiGoogleConnectionStatus = () => {
-  return googleConnection.status;
-};
-const apiSubscribeGoogleConnectionChange = (handler) => googleConnection.onChange(handler);
-export {
-  apiGoogleConnectionStatus,
-  apiSubscribeGoogleConnectionChange
-};

package/dist/v2/chunks/throttle.8bdd8d3b.js

@@ -1,20 +0,0 @@
-import { i as isObject, d as debounce } from "./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
-  });
-}
-export {
-  throttle as t
-};

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

@@ -1,7 +0,0 @@
-import { type GoogleConnectionOnChangeHandler } from "../api/googleConnection";
-export interface UseGoogleConnectionProps {
-    onChange?: GoogleConnectionOnChangeHandler;
-}
-export declare const useGoogleConnection: (props?: UseGoogleConnectionProps) => {
-    googleConnectionStatus: Readonly<import("vue-demi").Ref<import("..").GoogleConnectionStatus>>;
-};

package/dist/v2/hooks/useGoogleConnection.js

@@ -1,15 +0,0 @@
-import { ref, onUnmounted, readonly } from "vue-demi";
-import { apiGoogleConnectionStatus, apiSubscribeGoogleConnectionChange } from "../api/googleConnection.js";
-const useGoogleConnection = (props) => {
-  const statusRef = ref(apiGoogleConnectionStatus());
-  const unsubscribe = apiSubscribeGoogleConnectionChange((status) => {
-    var _a;
-    statusRef.value = status;
-    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
-  });
-  onUnmounted(unsubscribe);
-  return { googleConnectionStatus: readonly(statusRef) };
-};
-export {
-  useGoogleConnection
-};

package/dist/v3/api/googleConnection.d.ts

@@ -1,5 +0,0 @@
-import type { GoogleConnectionStatus } from "../types/interface";
-export type GoogleConnectionOnChangeHandler = (status: GoogleConnectionStatus) => void;
-export type GoogleConnectionOnChangeCleanup = () => void;
-export declare const apiGoogleConnectionStatus: () => GoogleConnectionStatus;
-export declare const apiSubscribeGoogleConnectionChange: (handler: GoogleConnectionOnChangeHandler) => GoogleConnectionOnChangeCleanup;

package/dist/v3/api/googleConnection.js

@@ -1,51 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-const GOOGLE_DNS_RESOLVER = "https://dns.google/resolve?name=maps.googleapis.com&type=A";
-const GOOGLE_CONNECTION_DEFAULT_TIMEOUT = 5e3;
-const noop = () => {
-};
-class GoogleConnection {
-  constructor() {
-    __publicField(this, "status", "pending");
-    __publicField(this, "listeners", /* @__PURE__ */ new Set());
-    this.start();
-  }
-  async start() {
-    const status = await this.check();
-    this.status = status;
-    for (const handler of this.listeners) {
-      try {
-        handler(status);
-      } catch (err) {
-        console.error(err);
-      }
-    }
-  }
-  check(timeout = GOOGLE_CONNECTION_DEFAULT_TIMEOUT) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeout);
-    return fetch(GOOGLE_DNS_RESOLVER, { signal: controller.signal }).then(() => "connected").catch(() => "unconnected").finally(() => clearTimeout(timer));
-  }
-  onChange(handler) {
-    if (typeof handler !== "function")
-      return noop;
-    this.listeners.add(handler);
-    const clear = () => {
-      this.listeners.delete(handler);
-    };
-    return clear;
-  }
-}
-const googleConnection = new GoogleConnection();
-const apiGoogleConnectionStatus = () => {
-  return googleConnection.status;
-};
-const apiSubscribeGoogleConnectionChange = (handler) => googleConnection.onChange(handler);
-export {
-  apiGoogleConnectionStatus,
-  apiSubscribeGoogleConnectionChange
-};

package/dist/v3/chunks/throttle.8bdd8d3b.js

@@ -1,20 +0,0 @@
-import { i as isObject, d as debounce } from "./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
-  });
-}
-export {
-  throttle as t
-};

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

@@ -1,7 +0,0 @@
-import { type GoogleConnectionOnChangeHandler } from "../api/googleConnection";
-export interface UseGoogleConnectionProps {
-    onChange?: GoogleConnectionOnChangeHandler;
-}
-export declare const useGoogleConnection: (props?: UseGoogleConnectionProps) => {
-    googleConnectionStatus: Readonly<import("vue-demi").Ref<import("..").GoogleConnectionStatus>>;
-};

package/dist/v3/hooks/useGoogleConnection.js

@@ -1,15 +0,0 @@
-import { ref, onUnmounted, readonly } from "vue-demi";
-import { apiGoogleConnectionStatus, apiSubscribeGoogleConnectionChange } from "../api/googleConnection.js";
-const useGoogleConnection = (props) => {
-  const statusRef = ref(apiGoogleConnectionStatus());
-  const unsubscribe = apiSubscribeGoogleConnectionChange((status) => {
-    var _a;
-    statusRef.value = status;
-    (_a = props == null ? void 0 : props.onChange) == null ? void 0 : _a.call(props, status);
-  });
-  onUnmounted(unsubscribe);
-  return { googleConnectionStatus: readonly(statusRef) };
-};
-export {
-  useGoogleConnection
-};