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

package/README.md

@@ -120,6 +120,12 @@ export interface BusinessGeolocationPositionError extends GeolocationPositionErr
   gmapKey={gmapApiKey}
   // 使用哪个地图供应商，目前两个供应商： amap 高德 / gmap 谷歌
   supplier={"amap"}
+  // 地图加载失败时显示的标题
+  renderLoadFailedTitle={() => (supplier === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败")}
+  // 地图加载失败时显示的描述
+  renderLoadFailedDescription={() =>
+    supplier === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : undefined
+  }
 >
   ...
 </MapProvider>
@@ -134,6 +140,8 @@ export interface BusinessGeolocationPositionError extends GeolocationPositionErr
   :amap-key="amapApiKey"
   :amap-secret="amapApiSecret"
   supplier="amap"
+  render-load-failed-title='() => supplier === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败"'
+  render-load-failed-description='() => supplier === "gmap" ? "请确认您的网络能正常访问谷歌地图，\n或切回高德地图" : undefined'
 >
    ...
 </MapProvider>
@@ -168,7 +176,6 @@ export default defineComponent({
   setup() {
     const {
       centerPlace,
-      googleConnectionStatus,
       mapContext,
       setCenterPlaceByUserSpecified,
       setCenterPlaceByUserSpecifiedInZone,
@@ -271,10 +278,6 @@ export default defineComponent({
             isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈",
           );
         }}
-        onChangeGoogleConnection={(status) =>
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        }
       />
     );
   },
@@ -293,7 +296,6 @@ export default defineComponent({
   setup() {
     const {
       centerPlace,
-      googleConnectionStatus,
       mapContext,
       setCenterPlaceByUserSpecified,
       setCenterPlaceByUserSpecifiedInZone,
@@ -421,10 +423,6 @@ export default defineComponent({
             isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈",
           );
         }}
-        onChangeGoogleConnection={(status) =>
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        }
       />
     );
   },
@@ -441,37 +439,42 @@ import { BusinessQuotingMap, useBusinessQuotingMap } from "@heycar/heycars-map";
 
 export default defineComponent({
   setup() {
-    const { googleConnectionStatus, setMap, registerFitVeiw } = useBusinessQuotingMap();
+    const { mapContext, toAmapCoordinateType } = useBusinessQuotingMap();
     return () => (
-      <BusinessQuotingMap
-        class={"demo"}
-        from={{
-          displayName: "The Malayan Council",
-          name: "10 Winstedt Rd, #01-17, Singapore 227977",
-          type: "wgs84",
-          lat: 1.311295,
-          lng: 103.841974,
-        }}
-        to={{
-          displayName: "CDG Engie Charging Station",
-          name: "21 Kent Ridge Rd, Singapore 119220",
-          type: "wgs84",
-          lat: 1.2966426,
-          lng: 103.7763939,
-        }}
-        fromDescription={"您将在此上车"}
-        renderDescription={({ distance, duration, tolls }) =>
-          `全程 *${distance / 1000}公里*  约行驶 *${duration}* 高速费用 *${tolls ?? 0}*元`
-        }
-        mapRef={setMap}
-        registerOverlay={registerFitVeiw}
-        onClickStartPoint={(place) => console.log("点击起点时触发 palce = ", place)}
-        onClickEndPoint={(place) => console.log("点击终点时触发 palce = ", place)}
-        onChangeGoogleConnection={(status) =>
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        }
-      />
+      <div>
+        <BusinessQuotingMap
+          class={"demo"}
+          from={{
+            displayName: "The Malayan Council",
+            name: "10 Winstedt Rd, #01-17, Singapore 227977",
+            type: "wgs84",
+            lat: 1.311295,
+            lng: 103.841974,
+          }}
+          to={{
+            displayName: "CDG Engie Charging Station",
+            name: "21 Kent Ridge Rd, Singapore 119220",
+            type: "wgs84",
+            lat: 1.2966426,
+            lng: 103.7763939,
+          }}
+          fromDescription={"您将在此上车"}
+          renderDescription={({ distance, duration, tolls }) =>
+            `全程 *${distance / 1000}公里*  约行驶 *${duration}* 高速费用 *${tolls ?? 0}*元`
+          }
+          mapContext={mapContext}
+          onClickStartPoint={(place) => console.log("点击起点时触发 palce = ", place)}
+          onClickEndPoint={(place) => console.log("点击终点时触发 palce = ", place)}
+          onChangeGoogleConnection={(status) =>
+            // 根据目前的产品需求，连通性检测只会被检测一次。
+            console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
+          }
+        />
+        <div>
+          经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:
+          {toAmapCoordinateType([103.841974, 1.311295])}
+      </div>
+      <div>
     );
   },
 });
@@ -487,7 +490,7 @@ import { BusinessTaxiServiceMap, useBusinessTaxiServiceMap } from "@heycar/heyca
 
 export default defineComponent({
   setup() {
-    const { googleConnectionStatus, setMap, registerFitVeiw } = useBusinessTaxiServiceMap();
+    const { mapContext } = useBusinessTaxiServiceMap();
     return () => (
       <BusinessTaxiServiceMap
         class={css.adjustedDemo}
@@ -524,12 +527,7 @@ export default defineComponent({
           ]);
         }}
         interval={5000}
-        mapRef={setMap}
-        registerOverlay={registerFitVeiw}
-        onChangeGoogleConnection={(status) =>
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        }
+        mapContext={mapContext}
       />
     );
   },
@@ -546,7 +544,6 @@ import { BusinessTaxiEndMap } from "@heycar/heycars-map";
 
 export default defineComponent({
   setup() {
-    const { googleConnectionStatus } = useBusinessTaxiEndMap();
     return () => (
       <BusinessTaxiEndMap
         class={"demo"}
@@ -564,10 +561,6 @@ export default defineComponent({
           displayName: "长城美华 Coffee Shop (CCMW)",
           type: "wgs84",
         }}
-        onChangeGoogleConnection={(status) =>
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        }
       />
     );
   },

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/v2/App.js

@@ -1,6 +1,6 @@
 import { h } 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 = defineComponent({
   setup() {
+    const supplierRef = ref("amap");
+    window.supplierRef = supplierRef;
     return () => h(MapProvider, {
       "attrs": {
         "amapKey": amapApiKey,
@@ -17,9 +19,11 @@ const App = defineComponent({
         "gmapRasterId": gmapRasterId,
         "gmapKey": gmapApiKey,
         "language": "en",
-        "supplier": "amap"
+        "supplier": supplierRef.value,
+        "renderLoadFailedTitle": () => supplierRef.value === "gmap" ? "未能成功访问谷歌地图" : "高德地图加载失败",
+        "renderLoadFailedDescription": () => supplierRef.value === "gmap" ? "请确认您的网络能正常访问谷歌地图， \n或切回高德地图" : void 0
       }
-    }, [h(DemoBusinessTaxiEnd)]);
+    }, [h(DemoBusinessQuoting)]);
   }
 });
 export {

package/dist/v2/Demo/DemoBusinessQuoting.js

@@ -5,11 +5,10 @@ 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 () => h("div", [h("div", [googleConnectionStatus.value]), h(BusinessQuotingMap, {
+  return () => h("div", [h(BusinessQuotingMap, {
     "class": demo,
     "attrs": {
       "from": {
@@ -32,18 +31,13 @@ const DemoBusinessQuoting = defineSetup("DemoBusinessQuoting", function() {
         duration,
         tolls
       }) => `全程 *${distance / 1e3}公里*  约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
-      "mapRef": setMap,
-      "registerOverlay": registerFitVeiw
+      "mapContext": mapContext
     },
     "on": {
       "clickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
-      "clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place),
-      "changeGoogleConnection": (status) => (
-        // 根据目前的产品需求，连通性检测只会被检测一次。
-        console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-      )
+      "clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
     }
-  })]);
+  }), h("div", ["经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:", toAmapCoordinateType([103.841974, 1.311295])])]);
 });
 export {
   DemoBusinessQuoting

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.87ea3b2f.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.5be4fdcf.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 h("div", [h("div", [googleConnectionStatus.value]), h("div", [JSON.stringify(centerPlace)]), h("div", [JSON.stringify(geoPosition.value)]), h(BusinessRecomendPlaceMap, {
+    return h("div", [h("div", [JSON.stringify(centerPlace)]), h("div", [JSON.stringify(geoPosition.value)]), h(BusinessRecomendPlaceMap, {
       "class": demo,
       "attrs": {
         "geoLoadingTitle": "正在获取您当前的位置",
@@ -152,11 +151,7 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
         },
         "geoErrorOnce": (isBusinessTimeout) => {
           console.log("获取GPS失败时触发, 只触发一次, ", isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈");
-        },
-        "changeGoogleConnection": (status) => (
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        )
+        }
       }
     })]);
   };

package/dist/v2/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 h("div", [h("div", [googleConnectionStatus.value]), h("div", [JSON.stringify(centerPlace)]), h(BusinessReselectPlaceMap, {
+    return h("div", [h("div", [JSON.stringify(centerPlace)]), h(BusinessReselectPlaceMap, {
       "class": demo,
       "attrs": {
         "unavailableTitle": "当前区域暂未开通服务",
@@ -153,11 +152,7 @@ const DemoBusinessReselectPlace = defineSetup("DemoBusinessReselectPlace", funct
         },
         "geoErrorOnce": (isBusinessTimeout) => {
           console.log("获取GPS失败时触发, 只触发一次, ", isBusinessTimeout ? "给用户超时提示" : "给用户无权限反馈");
-        },
-        "changeGoogleConnection": (status) => (
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        )
+        }
       }
     })]);
   };

package/dist/v2/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<{}, unknown, {
     from: CoordinatePlace;
     to: CoordinatePlace;
     contentHeight: number;

package/dist/v2/Demo/DemoBusinessTaxiEnd.js

@@ -1,18 +1,9 @@
 import { h } 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 = defineComponent({
   name: "DemoBusinessTaxiEnd",
-  setup() {
-    const {
-      googleConnectionStatus
-    } = useBusinessTaxiEndMap();
-    return {
-      googleConnectionStatus
-    };
-  },
   data() {
     return {
       from: {
@@ -57,22 +48,15 @@ const DemoBusinessTaxiEnd = defineComponent({
     const {
       from,
       to,
-      contentHeight,
-      googleConnectionStatus
+      contentHeight
     } = this;
     return h("div", {
       "class": layout
-    }, [h("div", [googleConnectionStatus]), h("div", [JSON.stringify(from), " | ", JSON.stringify(to)]), h(BusinessTaxiEndMap, {
+    }, [h("div", [JSON.stringify(from), " | ", JSON.stringify(to)]), h(BusinessTaxiEndMap, {
       "class": adjustedDemo,
       "attrs": {
         "from": from,
         "to": to
-      },
-      "on": {
-        "changeGoogleConnection": (status) => (
-          // 根据目前的产品需求，连通性检测只会被检测一次。
-          console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-        )
       }
     }), h("div", {
       "style": {