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

package/dist/v2/hooks-business/useBusinessTaxiServiceMap.js

@@ -1,14 +1,9 @@
-import { useGoogleConnection } from "../hooks/useGoogleConnection.js";
-import { useHeycarMap } from "../hooks/useHeycarMap.js";
-import { useMapFitView } from "../hooks/useMapFitView.js";
+import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
 const useBusinessTaxiServiceMap = () => {
-  const { mapRef, setMap } = useHeycarMap();
-  const { registerFitVeiw, setFitView } = useMapFitView({
-    mapRef,
-    padding: [19, 36, 19, 26]
-  });
-  const { googleConnectionStatus } = useGoogleConnection();
-  return { googleConnectionStatus, setMap, registerFitVeiw, setFitView };
+  const mapContext = {
+    setFitView: assertAssingedBeforeUsed
+  };
+  return { mapContext, ...proxyFunctionalProperty(mapContext) };
 };
 export {
   useBusinessTaxiServiceMap

package/dist/v2/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.87ea3b2f.js";
+import { B } from "./chunks/BusinessRecomendPlaceMap.5be4fdcf.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/v2/utils/compare.d.ts

@@ -19,4 +19,8 @@ export declare function watchPostEffectForAMapEvent<T extends AMap.Event, P, E e
 export declare function watchPostEffectForGMapEvent<T extends google.maps.MVCObject | google.maps.marker.AdvancedMarkerElement, P>(targetRef: ShallowRef<T | undefined> | Ref<T | undefined> | undefined, props: P, emit: EmitFn<EmitByProps<P>>, propertyNames: NamesRestrict<keyof P, string>[]): void;
 export declare const watchPostEffectOnce: (callback: WatchCallback) => void;
 export declare const computedByDeps: <T>(deps: (() => unknown)[] | (() => unknown), computedFn: () => T) => ComputedRef<T>;
+type EventNameRestrict<P, N extends keyof P = keyof P> = N extends `on${infer UE}` ? Uncapitalize<UE> : never;
+export declare function generateCreateElementV2PropsOn<P>(props: P, emit: EmitFn<EmitByProps<P>>, eventNames: EventNameRestrict<P>[]): {
+    [k: string]: (value: any) => void;
+};
 export {};

package/dist/v2/utils/compare.js

@@ -371,10 +371,16 @@ const computedByDeps = (deps, computedFn) => {
     return result;
   });
 };
+function generateCreateElementV2PropsOn(props, emit, eventNames) {
+  return Object.fromEntries(
+    eventNames.map((name) => [name, (value) => emit(name, value)])
+  );
+}
 export {
   computedByDeps,
   createDeepCompareMemoize,
   deepCompareEqualsForMaps,
+  generateCreateElementV2PropsOn,
   watchEffectForDeepOption,
   watchNoneImmediatePostEffectForDeepOption,
   watchNoneImmediatePostEffectForMapProperty,

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

@@ -29,4 +29,8 @@ export declare const retryUntilSuccess: <P extends any[], R>(fn: (...args: P) =>
 export declare const equalAssign: <T extends {
     [k: string]: any;
 }>(base: T, target: T) => T;
+export declare const assertAssingedBeforeUsed: () => never;
+type PickFunctionalPropertyName<T, K extends keyof T = keyof T> = K extends any ? T[K] extends (...args: any) => any ? K : never : never;
+type PickFunctionalProperty<T> = Pick<T, PickFunctionalPropertyName<T>>;
+export declare const proxyFunctionalProperty: <T extends object>(target: T) => PickFunctionalProperty<T>;
 export {};

package/dist/v2/utils/helper.js

@@ -135,8 +135,21 @@ const equalAssign = (base, target) => {
   }
   return base;
 };
+const assertAssingedBeforeUsed = () => {
+  throw Error("MyError: used before assigned");
+};
+const proxyFunctionalProperty = (target) => {
+  const result = {};
+  for (const key of Object.keys(target)) {
+    if (typeof target[key] !== "function")
+      continue;
+    result[key] = (...args) => target[key](...args);
+  }
+  return result;
+};
 export {
   assertAngle,
+  assertAssingedBeforeUsed,
   assertNotEmptyArray,
   assertPoint,
   assertZone,
@@ -149,6 +162,7 @@ export {
   isPlacesInclude,
   pausableSleep,
   pipeTimeout,
+  proxyFunctionalProperty,
   resettableSleep,
   retryUntilSuccess,
   sleep

package/dist/v2/utils/log.js

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

package/dist/v3/App.js

@@ -1,6 +1,6 @@
 import { createVNode } from "vue";
-import { defineComponent } from "vue-demi";
-import { DemoBusinessTaxiEnd } from "./Demo/DemoBusinessTaxiEnd.js";
+import { defineComponent, ref } from "vue-demi";
+import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
 const gmapApiKey = "AIzaSyCRtkaNSWMOhOXDOUpJK4OVbm5RIstYj-I";
 const gmapId = "d0af0c05331af64a";
@@ -9,6 +9,8 @@ const amapApiKey = "81ed1d2b5b77187683717a5f2f19591a";
 const amapApiSecret = "1dfe626553258a9f91d7c4552c0816d2";
 const App = /* @__PURE__ */ defineComponent({
   setup() {
+    const supplierRef = ref("amap");
+    window.supplierRef = supplierRef;
     return () => createVNode(MapProvider, {
       "amapKey": amapApiKey,
       "amapSecret": amapApiSecret,
@@ -16,9 +18,11 @@ const App = /* @__PURE__ */ defineComponent({
       "gmapRasterId": gmapRasterId,
       "gmapKey": gmapApiKey,
       "language": "en",
-      "supplier": "amap"
+      "supplier": supplierRef.value,
+      "renderLoadFailedTitle": () => supplierRef.value === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败",
+      "renderLoadFailedDescription": () => supplierRef.value === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : void 0
     }, {
-      default: () => [createVNode(DemoBusinessTaxiEnd, null, null)]
+      default: () => [createVNode(DemoBusinessQuoting, null, null)]
     });
   }
 });

package/dist/v3/Demo/DemoBusinessQuoting.js

@@ -1,15 +1,14 @@
-import { createVNode } from "vue";
+import { createVNode, createTextVNode } from "vue";
 import { BusinessQuotingMap } from "../business-components/BusinessQuotingMap/BusinessQuotingMap.js";
 import { useBusinessQuotingMap } from "../hooks-business/useBusinessQuotingMap.js";
 import { defineSetup } from "../types/helper.js";
 import { d as demo } from "../chunks/Demo.css.e921a2f6.js";
 const DemoBusinessQuoting = defineSetup("DemoBusinessQuoting", function() {
   const {
-    googleConnectionStatus,
-    setMap,
-    registerFitVeiw
+    mapContext,
+    toAmapCoordinateType
   } = useBusinessQuotingMap();
-  return () => createVNode("div", null, [createVNode("div", null, [googleConnectionStatus.value]), createVNode(BusinessQuotingMap, {
+  return () => createVNode("div", null, [createVNode(BusinessQuotingMap, {
     "class": demo,
     "from": {
       displayName: "The Malayan Council",
@@ -31,15 +30,10 @@ const DemoBusinessQuoting = defineSetup("DemoBusinessQuoting", function() {
       duration,
       tolls
     }) => `全程 *${distance / 1e3}公里*  约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
-    "mapRef": setMap,
-    "registerOverlay": registerFitVeiw,
+    "mapContext": mapContext,
     "onClickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
-    "onClickEndPoint": (place) => console.log("点击终点时触发 palce = ", place),
-    "onChangeGoogleConnection": (status) => (
-      // 根据目前的产品需求，连通性检测只会被检测一次。
-      console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-    )
-  }, null)]);
+    "onClickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
+  }, null), createVNode("div", null, [createTextVNode("经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:"), toAmapCoordinateType([103.841974, 1.311295])])]);
 });
 export {
   DemoBusinessQuoting

package/dist/v3/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.57b15c64.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.39888296.js";
 import { useBusinessRecomendPlaceMap } from "../hooks-business/useBusinessRecomendPlaceMap.js";
 import { defineSetup } from "../types/helper.js";
 import { d as demo } from "../chunks/Demo.css.e921a2f6.js";
@@ -53,7 +53,6 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
     centerPlace,
     mapContext,
     geoPosition,
-    googleConnectionStatus,
     setCenterPlaceByUserSpecified,
     setCenterPlaceByUserSpecifiedInZone
   } = useBusinessRecomendPlaceMap();
@@ -105,7 +104,7 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
     }
   });
   return () => {
-    return createVNode("div", null, [createVNode("div", null, [googleConnectionStatus.value]), createVNode("div", null, [JSON.stringify(centerPlace)]), createVNode("div", null, [JSON.stringify(geoPosition.value)]), createVNode(BusinessRecomendPlaceMap, {
+    return createVNode("div", null, [createVNode("div", null, [JSON.stringify(centerPlace)]), createVNode("div", null, [JSON.stringify(geoPosition.value)]), createVNode(BusinessRecomendPlaceMap, {
       "class": demo,
       "geoLoadingTitle": "正在获取您当前的位置",
       "unavailableTitle": "当前区域暂未开通服务",
@@ -149,11 +148,7 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
       },
       "onGeoErrorOnce": (isBusinessTimeout) => {
         console.log("获取GPS失败时触发, 只触发一次, ", isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈");
-      },
-      "onChangeGoogleConnection": (status) => (
-        // 根据目前的产品需求，连通性检测只会被检测一次。
-        console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-      )
+      }
     }, null)]);
   };
 });

package/dist/v3/Demo/DemoBusinessReselectPlace.js

@@ -52,7 +52,6 @@ const DemoBusinessReselectPlace = defineSetup("DemoBusinessReselectPlace", funct
   const {
     centerPlace,
     mapContext,
-    googleConnectionStatus,
     setCenterPlaceByUserSpecified,
     setCenterPlaceByUserSpecifiedInZone
   } = useBusinessRecomendPlaceMap();
@@ -110,7 +109,7 @@ const DemoBusinessReselectPlace = defineSetup("DemoBusinessReselectPlace", funct
     }
   });
   return () => {
-    return createVNode("div", null, [createVNode("div", null, [googleConnectionStatus.value]), createVNode("div", null, [JSON.stringify(centerPlace)]), createVNode(BusinessReselectPlaceMap, {
+    return createVNode("div", null, [createVNode("div", null, [JSON.stringify(centerPlace)]), createVNode(BusinessReselectPlaceMap, {
       "class": demo,
       "unavailableTitle": "当前区域暂未开通服务",
       "emptyTitle": "当前位置",
@@ -150,11 +149,7 @@ const DemoBusinessReselectPlace = defineSetup("DemoBusinessReselectPlace", funct
       },
       "onGeoErrorOnce": (isBusinessTimeout) => {
         console.log("获取GPS失败时触发, 只触发一次, ", isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈");
-      },
-      "onChangeGoogleConnection": (status) => (
-        // 根据目前的产品需求，连通性检测只会被检测一次。
-        console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-      )
+      }
     }, null)]);
   };
 });

package/dist/v3/Demo/DemoBusinessTaxiEnd.d.ts

@@ -1,7 +1,5 @@
 import { type CoordinatePlace } from "../types/interface";
-export declare const DemoBusinessTaxiEnd: import("vue-demi").DefineComponent<{}, {
-    googleConnectionStatus: Readonly<import("vue-demi").Ref<import("../types/interface").GoogleConnectionStatus>>;
-}, {
+export declare const DemoBusinessTaxiEnd: import("vue-demi").DefineComponent<{}, {}, {
     from: CoordinatePlace;
     to: CoordinatePlace;
     contentHeight: number;

package/dist/v3/Demo/DemoBusinessTaxiEnd.js

@@ -1,18 +1,9 @@
 import { createVNode, createTextVNode } from "vue";
 import { defineComponent } from "vue-demi";
 import { BusinessTaxiEndMap } from "../business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
-import { useBusinessTaxiEndMap } from "../hooks-business/useBusinessTaxiEndMap.js";
 import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
 const DemoBusinessTaxiEnd = /* @__PURE__ */ defineComponent({
   name: "DemoBusinessTaxiEnd",
-  setup() {
-    const {
-      googleConnectionStatus
-    } = useBusinessTaxiEndMap();
-    return {
-      googleConnectionStatus
-    };
-  },
   data() {
     return {
       from: {
@@ -57,19 +48,14 @@ const DemoBusinessTaxiEnd = /* @__PURE__ */ defineComponent({
     const {
       from,
       to,
-      contentHeight,
-      googleConnectionStatus
+      contentHeight
     } = this;
     return createVNode("div", {
       "class": layout
-    }, [createVNode("div", null, [googleConnectionStatus]), createVNode("div", null, [JSON.stringify(from), createTextVNode(" | "), JSON.stringify(to)]), createVNode(BusinessTaxiEndMap, {
+    }, [createVNode("div", null, [JSON.stringify(from), createTextVNode(" | "), JSON.stringify(to)]), createVNode(BusinessTaxiEndMap, {
       "class": adjustedDemo,
       "from": from,
-      "to": to,
-      "onChangeGoogleConnection": (status) => (
-        // 根据目前的产品需求，连通性检测只会被检测一次。
-        console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-      )
+      "to": to
     }, null), createVNode("div", {
       "style": {
         height: `${contentHeight}px`