@heycar/heycars-map 0.10.6-googleRoute1 → 0.10.7-externalRoute2

package/README.md

@@ -66,6 +66,25 @@ export enum CenterPlaceStatus {
   SERVICE_UNAVAILABLE = "SERVICE_UNAVAILABLE",
   OK = "OK",
 }
+
+export type ExternalRoute = {
+  path: Point[];
+  duration: number;
+  distance: number;
+};
+
+export interface TrackPoint {
+  lng: number;
+  lat: number;
+  angle?: number;
+  speed?: number;
+  timestamp: number;
+}
+
+export type GetDriverRouteOrTrackOutput = {
+  routes?: ExternalRoute;
+  tracks?: TrackPoint[];
+};
 ```
 
 #### 在 入口文件添加 `MapProvider`
@@ -456,13 +475,43 @@ export default defineComponent({
         renderInServiceTitle={({ distance, duration }) =>
           `距离终点*${distance}*公里, 预计*${duration}*分钟`
         }
-        getDriverPositionTrack={async () => {
-          //  向后端请求司机的历史轨迹
-          return Promise.resolve<TrackPoint[]>([
-            { lng: 121.4036983, lat: 31.216324, angle: 30, timestamp: 1698058438000 },
-            { lng: 121.4036983, lat: 31.216324, angle: 30, timestamp: 1698058439000 },
-            { lng: 121.403581, lat: 31.216415, angle: 30, timestamp: 1698058442000 },
-          ]);
+        // 司机接单时，第三方指定的起点到终点的路径
+        // confirmedPath={[
+        //  [121.401554, 31.21653],
+        //   [121.401554, 31.21653],
+        //  [121.401795, 31.21654],
+        // ]}
+
+        // 订单结束时，第三方提供的实际行驶路径
+        // endServicePath={[
+        //  [121.401554, 31.21653],
+        //  [121.401554, 31.21653],
+        //  [121.401795, 31.21654],
+        // ]}
+        getDriverRouteOrTrack={async () => {
+          //  后端返回司机的真实导航路径或者历史轨迹
+          return (
+            Promise.resolve <
+            GetDriverRouteOrTrackOutput >
+            {
+              routes: {
+                distance: 4270,
+                duration: 1310,
+                path: [
+                  [121.401554, 31.21653],
+                  [121.401554, 31.21653],
+                  [121.401795, 31.21654],
+                ],
+              },
+            }
+          );
+          // return Promise.resolve<GetDriverRouteOrTrackOutput>({
+          //   tracks: [
+          //     { lng: 121.4036983, lat: 31.216324, angle: 30, timestamp: 1698058438000 },
+          //     { lng: 121.4036983, lat: 31.216324, angle: 30, timestamp: 1698058439000 },
+          //     { lng: 121.403581, lat: 31.216415, angle: 30, timestamp: 1698058442000 },
+          //   ]
+          // });
         }}
         interval={5000}
         mapRef={setMap}
@@ -498,6 +547,11 @@ export default defineComponent({
           lat: 1.2966426,
           lng: 103.7763939,
         }}
+        path={{[
+          [103.996211, 1.35202],
+          [103.996469, 1.352348],
+          [103.996581, 1.3526],
+        ]}}
       />
     );
   },

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

@@ -11,5 +11,6 @@ export declare const DemoBusinessTaxiEnd: import("vue-demi").DefineComponent<{},
         name: string;
         displayName: string;
     };
+    path: import("..").Point[];
     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() {
@@ -18,10 +19,14 @@ const DemoBusinessTaxiEnd = defineComponent({
         name: "",
         displayName: ""
       },
+      path: [...mockPath],
       contentHeight: 200
     };
   },
   created() {
+    window.updatePath = () => {
+      this.path = mockPath.slice(100);
+    };
     setTimeout(() => {
       this.from = {
         displayName: "樟宜机场",
@@ -44,7 +49,8 @@ const DemoBusinessTaxiEnd = defineComponent({
     const {
       from,
       to,
-      contentHeight
+      contentHeight,
+      path
     } = this;
     return h("div", {
       "class": layout
@@ -52,7 +58,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,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { DriverStatus, Place, TrackPoint } from "../types/interface";
+import type { DriverStatus, GetDriverRouteOrTrackOutput, Place, Point } from "../types/interface";
 export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent<Readonly<{}>, {
     setMap: import("../hooks/useHeycarMap").SetMap<import("../components/Amap/SafeAmap").SafeAmap> | import("../hooks/useHeycarMap").SetMap<google.maps.Map>;
     registerFitVeiw: import("../types/interface").RegisterOverlay<({
@@ -2396,7 +2396,8 @@ export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent
     to: Partial<Place>;
     relayTo: Partial<Place>;
     status: DriverStatus;
+    confirmedPath: Point[];
     contentHeight: number;
 }, {}, {
-    getDriverPositionTrack(): Promise<TrackPoint[]>;
+    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,31 +4,9 @@ import { BusinessTaxiServiceMap } from "../business-components/BusinessTaxiServi
 import { useBusinessTaxiServiceMap } from "../hooks-business/useBusinessTaxiServiceMap.js";
 import { isPlace } from "../utils/helper.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 mockDriverTrackPoints = [
-  {
-    lng: 121.4036983,
-    lat: 31.216324,
-    angle: 30,
-    timestamp: 1698058438e3
-  },
-  {
-    lng: 121.4036983,
-    lat: 31.216324,
-    angle: 30,
-    timestamp: 1698058439e3
-  },
-  {
-    lng: 121.403581,
-    lat: 31.216415,
-    angle: 30,
-    timestamp: 1698058442e3
-  }
-  // 台湾
-  // { lng: 121.565839, lat: 25.040161, angle: 30, timestamp: 1698058438000 },
-  // { lng: 121.565839, lat: 25.040661, angle: 30, timestamp: 1698058439000 },
-  // { lng: 121.565839, lat: 25.041161, angle: 30, timestamp: 1698058442000 },
-];
+let mockDriverRoute = mockExternalRoute;
 const DemoBusinessTaxiService = defineComponent({
   name: "DemoBusinessTaxiService",
   setup() {
@@ -47,6 +25,7 @@ const DemoBusinessTaxiService = defineComponent({
       to: {},
       relayTo: {},
       status: "driverStartRelayService",
+      confirmedPath: [],
       contentHeight: 200
     };
   },
@@ -82,23 +61,28 @@ const DemoBusinessTaxiService = defineComponent({
       return status;
     };
     window.addDriverPosition = (lng, lat, angle = 0) => {
-      mockDriverTrackPoints.push({
-        lng,
-        lat,
-        angle,
-        timestamp: Date.now()
-      });
+    };
+    window.updateDriverRoute = () => {
+      mockDriverRoute = {
+        ...mockDriverRoute,
+        path: mockDriverRoute.path.slice(5)
+      };
+    };
+    window.updateConfirmedPath = () => {
+      this.confirmedPath = mockConfirmedPath;
     };
   },
   methods: {
-    getDriverPositionTrack() {
-      return Promise.resolve(mockDriverTrackPoints);
+    getDriverRouteOrTrack() {
+      return Promise.resolve({
+        routes: mockDriverRoute
+      });
     }
   },
   render() {
     const {
       setMap,
-      getDriverPositionTrack,
+      getDriverRouteOrTrack,
       registerFitVeiw,
       from,
       to,
@@ -132,7 +116,7 @@ const DemoBusinessTaxiService = defineComponent({
           distance,
           duration
         }) => `距离终点*${distance / 1e3}*公里, 预计*${duration}*分钟`,
-        "getDriverPositionTrack": getDriverPositionTrack,
+        "getDriverRouteOrTrack": getDriverRouteOrTrack,
         "interval": 5e3,
         "mapRef": setMap,
         "registerOverlay": registerFitVeiw

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

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