@heycar/heycars-map 2.14.0-walkOptimize2 → 2.15.0-domestic2

package/README.md

@@ -133,6 +133,17 @@ export interface CoordinateTrackPoint {
   timestamp: number;
 }
 
+export interface CoordinateExternalRoute {
+  path: CoordinatePoint[];
+  duration: number;
+  distance: number;
+}
+
+export type GetDriverRouteOrTrackOutput = {
+  routes?: CoordinateExternalRoute;
+  tracks?: CoordinateTrackPoint[];
+};
+
 export enum CenterPlaceStatus {
   GEO_LOADING = "GEO_LOADING",
   QUERYING_INFO = "QUERYING_INFO",
@@ -195,6 +206,7 @@ export type DriverStatus =
   gmapKey={gmapApiKey}
   // 使用哪个地图供应商，目前两个供应商： amap 高德 / gmap 谷歌
   supplier={"amap"}
+  // 对于国内聚合，路径将 "/overseas/.*" 改为 "/now/.*"
   // 可选，高德驾车路线规划代理地址
   gaodeDirectionDrivingProxyUrl="/overseas/amap/driveGuide"
   // 可选，高德步行路线规划代理地址
@@ -349,6 +361,8 @@ export default defineComponent({
         queryingTitle={"正在获取地址信息"}
         recomendDescription={"您将在此处上车"}
         geoErrorOnceNotificationKey="BusinessReselectPlaceMap_GeoErrorOnceKey"
+        // 是否显示附近车辆
+        enableNearbyCars={true}
         defaultCenterPlace={(place) =>
           place ?? {
             lng: 139.777777,
@@ -358,17 +372,6 @@ export default defineComponent({
             displayName: "default place displayName",
           }
         }
-        // 可选，应用启动时是否跳过等待 GPS，默认 false
-        skipWaitGeo={
-          false ||
-          true || {
-            lng: 139.55555,
-            lat: 35.5555,
-            type: "wgs84",
-            name: "skip geo place name",
-            displayName: "skip geo place displayName",
-          }
-        }
         getAvailable={() => Promise.resolve(true)}
         getRecomendPlace={getRecomendPlace}
         getDefaultCenterPlace={getDefaultCenterPlace}
@@ -607,10 +610,6 @@ export default defineComponent({
           mapContext={mapContext}
           onClickStartPoint={(place) => console.log("点击起点时触发 palce = ", place)}
           onClickEndPoint={(place) => console.log("点击终点时触发 palce = ", place)}
-          onChangeGoogleConnection={(status) =>
-            // 根据目前的产品需求，连通性检测只会被检测一次。
-            console.log("谷歌连通性发生变化时触发，连通性状态是：", status)
-          }
         />
         <div>
           经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:
@@ -669,6 +668,18 @@ export default defineComponent({
         renderInServiceTitle={({ distance, duration }) =>
           `距离终点*${distance}*公里, 预计*${duration}*分钟`
         }
+        // 选填。 司机接单时，第三方指定的起点到终点的路径
+        confirmedPath={[
+         {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+         {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+         {lng: 121.401795, lat: 31.21654, type: "gcj02"},
+        ]}
+        // 选填。 订单结束时，实际行驶路径
+        endServicePath={[
+         {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+         {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+         {lng: 121.401795, lat: 31.21654, type: "gcj02"},
+        ]}
         getDriverPositionTrack={async () => {
           //  向后端请求司机的历史轨迹
           return Promise.resolve<TrackPoint[]>([
@@ -677,6 +688,21 @@ export default defineComponent({
             { lng: 121.403581, lat: 31.216415, type: "gcj02", angle: 30, timestamp: 1698058442000 },
           ]);
         }}
+        // getDriverRouteOrTrack 与 getDriverPositionTrack 二选一
+        getDriverRouteOrTrack={async () => {
+          //  后端返回司机的真实导航路径或者历史轨迹
+          return Promise.resolve<GetDriverRouteOrTrackOutput>({
+            routes: {
+              distance: 4270,
+              duration: 1310,
+              path: [
+                {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+                {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+                {lng: 121.401795, lat: 31.21654, type: "gcj02"},
+              ],
+            },
+          });
+        }}
         interval={5000}
         mapContext={mapContext}
       />
@@ -712,6 +738,12 @@ export default defineComponent({
           displayName: "长城美华 Coffee Shop (CCMW)",
           type: "wgs84",
         }}
+        // 选填。实际行驶路径
+        path={[
+          { lng: 103.996211, lat: 1.35202, type: "wgs84" },
+          { lng: 103.996469, lat: 1.352348, type: "wgs84" },
+          { lng: 103.996581, lat: 1.3526, type: "wgs84" },
+        ]}
       />
     );
   },

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { h } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.8a4a1015.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.eebd0822.js";
 import { useBusinessRecomendPlaceMap } from "../hooks-business/useBusinessRecomendPlaceMap.js";
 import { defineSetup } from "../types/helper.js";
 import { d as demo } from "../chunks/Demo.css.e921a2f6.js";
@@ -124,6 +124,7 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
           name: "default place name",
           displayName: "default place displayName"
         },
+        "enableNearbyCars": true,
         "getAvailable": () => Promise.resolve(true),
         "getRecomendPlace": getRecomendPlace,
         "renderPlacePhoto": (place) => {

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

@@ -1,6 +1,7 @@
-import { type CoordinatePlace } from "../types/interface";
+import { type CoordinatePlace, type CoordinatePoint } from "../types/interface";
 export declare const DemoBusinessTaxiEnd: import("vue-demi").DefineComponent<{}, unknown, {
     from: CoordinatePlace;
     to: CoordinatePlace;
+    path: CoordinatePoint[];
     contentHeight: number;
 }, {}, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue-demi").ExtractPropTypes<{}>>, {}>;

package/dist/v2/Demo/DemoBusinessTaxiEnd.js

@@ -2,6 +2,7 @@ import { h } from "vue";
 import { defineComponent } from "vue-demi";
 import { BusinessTaxiEndMap } from "../business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
 import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
+import { mockPath } from "./demo.data.mock.js";
 const DemoBusinessTaxiEnd = defineComponent({
   name: "DemoBusinessTaxiEnd",
   data() {
@@ -20,6 +21,7 @@ const DemoBusinessTaxiEnd = defineComponent({
         displayName: "",
         type: "wgs84"
       },
+      path: [],
       contentHeight: 200
     };
   },
@@ -43,12 +45,16 @@ const DemoBusinessTaxiEnd = defineComponent({
     setTimeout(() => {
       this.contentHeight = 600;
     }, 2500);
+    setTimeout(() => {
+      this.path = [...mockPath];
+    }, 3500);
   },
   render() {
     const {
       from,
       to,
-      contentHeight
+      contentHeight,
+      path
     } = this;
     return h("div", {
       "class": layout
@@ -56,7 +62,8 @@ const DemoBusinessTaxiEnd = defineComponent({
       "class": adjustedDemo,
       "attrs": {
         "from": from,
-        "to": to
+        "to": to,
+        "path": path
       }
     }), h("div", {
       "style": {

package/dist/v2/Demo/DemoBusinessTaxiService.d.ts

@@ -1,4 +1,4 @@
-import { type CoordinatePlace, type CoordinateTrackPoint, type DriverStatus } from "../types/interface";
+import { type CoordinatePlace, type CoordinatePoint, type CoordinateTrackPoint, type DriverStatus, type GetDriverRouteOrTrackOutput } from "../types/interface";
 export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent<Readonly<{}>, {
     mapContext: import("../hooks-business/useBusinessTaxiServiceMap").BusinessTaxiServiceContext;
 }, {
@@ -7,6 +7,9 @@ export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent
     relayTo: Partial<CoordinatePlace>;
     status: DriverStatus;
     contentHeight: number;
+    confirmedPath: CoordinatePoint[];
+    endServicePath: CoordinatePoint[];
 }, {}, {
     getDriverPositionTrack(): Promise<CoordinateTrackPoint[]>;
+    getDriverRouteOrTrack(): Promise<GetDriverRouteOrTrackOutput>;
 }, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue-demi").ExtractPropTypes<Readonly<{}>>>, {}>;

package/dist/v2/Demo/DemoBusinessTaxiService.js

@@ -4,7 +4,9 @@ import { BusinessTaxiServiceMap } from "../business-components/BusinessTaxiServi
 import { useBusinessTaxiServiceMap } from "../hooks-business/useBusinessTaxiServiceMap.js";
 import { isCoordinatePoint } from "../utils/typeChecking.js";
 import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
+import { mockConfirmedPath, mockExternalRoute } from "./demo.data.mock.js";
 const allDriverStatus = ["dispatching", "book-dispatching", "dispatched", "driverStartRelayService", "driverStartService", "book-driverStartService", "book-dispatched", "driverArrived", "inService", "canceled", "endService", "completed", "canceling", "banlanceRefund", "waitBanlanceRefund", "rechargePayed", "waitRechargePay", "payed", "waitpay", "refund", "confirmed", "assign"];
+const mockDriverRoute = mockExternalRoute;
 const mockDriverTrackPoints = [{
   lng: 121.4036983,
   lat: 31.216324,
@@ -40,7 +42,9 @@ const DemoBusinessTaxiService = defineComponent({
       to: {},
       relayTo: {},
       status: "driverStartRelayService",
-      contentHeight: 200
+      contentHeight: 200,
+      confirmedPath: [],
+      endServicePath: []
     };
   },
   created() {
@@ -85,10 +89,24 @@ const DemoBusinessTaxiService = defineComponent({
         type
       });
     };
+    window.updateDriverRoute = () => {
+      mockDriverRoute.path = mockDriverRoute.path.slice(5);
+    };
+    window.updateConfirmedPath = () => {
+      this.confirmedPath = [...mockConfirmedPath];
+    };
+    window.updateEndServicePath = () => {
+      this.endServicePath = [...mockConfirmedPath];
+    };
   },
   methods: {
     getDriverPositionTrack() {
       return Promise.resolve(mockDriverTrackPoints);
+    },
+    getDriverRouteOrTrack() {
+      return Promise.resolve({
+        routes: mockDriverRoute
+      });
     }
   },
   render() {

package/dist/v2/Demo/demo.data.mock.d.ts

@@ -0,0 +1,4 @@
+import type { CoordinateExternalRoute, CoordinatePoint } from "../types/interface";
+export declare const mockPath: CoordinatePoint[];
+export declare const mockExternalRoute: CoordinateExternalRoute;
+export declare const mockConfirmedPath: CoordinatePoint[];