@heycar/heycars-map 2.12.0-color7 → 2.13.0-relay2

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

@@ -1,7 +1,7 @@
 /// <reference types="google.maps" />
 import type { Point, Route } from "../types/interface";
-export declare function amapJsApiDrivingRoute(from: Point, to: Point, amapDriving: AMap.Driving): Promise<Route>;
-export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, proxyUrl: string): Promise<Route>;
-export declare function gmapJsApiDrivingRoute(from: Point, to: Point, gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
-export declare function googleServiceApiDrivingDirection(from: Point, to: Point, proxyUrl: string): Promise<Route>;
-export declare function googleServiceApiDrivingRoute(from: Point, to: Point, proxyUrl: string): Promise<Route>;
+export declare function amapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], amapDriving: AMap.Driving): Promise<Route>;
+export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
+export declare function gmapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
+export declare function googleServiceApiDrivingDirection(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
+export declare function googleServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;

package/dist/v2/utils/compatibleDrivingRoute.js

@@ -1,7 +1,7 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
 import { apiGoogleRoutes } from "../api/googleRoutes.js";
-import { amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
+import { vec2lnglat, amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
 const amapTmcs2trafficJams = (tmcs) => {
   const trafficJams = {};
   let prevStatus = "UNKNOWN";
@@ -20,12 +20,12 @@ const amapTmcs2trafficJams = (tmcs) => {
   }
   return trafficJams;
 };
-function amapJsApiDrivingRoute(from, to, amapDriving) {
+function amapJsApiDrivingRoute(from, to, waypoints, amapDriving) {
   return new Promise((resolve, reject) => {
     amapDriving.search(
       AMap.LngLat.from(from),
       AMap.LngLat.from(to),
-      { waypoints: [] },
+      { waypoints: waypoints.map((p) => AMap.LngLat.from(p)) },
       (status, result) => {
         const trafficJams = {};
         switch (status) {
@@ -67,11 +67,12 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
     );
   });
 }
-async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
+async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
   const { status, routes, error_message } = await apiGaodeDirectionDriving({
     proxyUrl,
     origin: [from],
-    destination: to
+    destination: to,
+    waypoints
   });
   const trafficJams = {};
   switch (status) {
@@ -107,13 +108,14 @@ async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
       throw Error(error_message);
   }
 }
-function gmapJsApiDrivingRoute(from, to, gmapDirectionsService) {
+function gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService) {
   return new Promise((resolve, reject) => {
     gmapDirectionsService.route(
       {
         origin: { lng: from[0], lat: from[1] },
         destination: { lng: to[0], lat: to[1] },
-        travelMode: google.maps.TravelMode.DRIVING
+        travelMode: google.maps.TravelMode.DRIVING,
+        waypoints: waypoints.map((p) => ({ location: vec2lnglat(p) }))
       },
       (result, status) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -151,12 +153,13 @@ function gmapJsApiDrivingRoute(from, to, gmapDirectionsService) {
     );
   });
 }
-async function googleServiceApiDrivingDirection(from, to, proxyUrl) {
+async function googleServiceApiDrivingDirection(from, to, waypoints, proxyUrl) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const { status, routes, error_message } = await apiGoogleDirections({
     proxyUrl,
     origin: from,
-    destination: to
+    destination: to,
+    waypoints
   });
   switch (status) {
     case "OK": {
@@ -189,7 +192,7 @@ async function googleServiceApiDrivingDirection(from, to, proxyUrl) {
       throw Error(error_message != null ? error_message : status);
   }
 }
-async function googleServiceApiDrivingRoute(from, to, proxyUrl) {
+async function googleServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
   var _a, _b, _c, _d, _e;
   const { routes } = await apiGoogleRoutes({
     proxyUrl,
@@ -207,8 +210,17 @@ async function googleServiceApiDrivingRoute(from, to, proxyUrl) {
           latitude: to[1],
           longitude: to[0]
         }
+      },
+      vehicleStopover: true
+    },
+    intermediates: waypoints.map((p) => ({
+      location: {
+        latLng: {
+          latitude: p[1],
+          longitude: p[0]
+        }
       }
-    }
+    }))
   });
   const firstRoute = routes == null ? void 0 : routes[0];
   if (!firstRoute)

package/dist/v2/utils/log.js

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

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

@@ -1,3 +1,7 @@
-export declare const DemoBusinessQuoting: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<unknown>, import("../types/helper").Empty, import("../types/helper").Empty, import("../types/helper").Empty, import("../types/helper").Empty, import("../types/helper").Empty, import("../types/helper").Empty, import("../types/helper").EmitByProps<unknown, Required<unknown>>, never, import("vue").PublicProps, unknown, unknown, import("vue").SlotsType<{} & {
-    default?: import("../demi-polyfill").Slot | undefined;
-}>>;
+import type { CoordinatePlace } from "../types/interface";
+export declare const DemoBusinessQuoting: import("vue-demi").DefineComponent<{}, {
+    mapContext: import("../hooks-business/useBusinessQuotingMap").BusinessQuotingContext;
+    toAmapCoordinateType: (point: import("../types/interface").Point) => import("../types/interface").CoordinateType;
+}, {
+    from: CoordinatePlace;
+}, {}, {}, import("vue-demi").ComponentOptionsMixin, import("vue-demi").ComponentOptionsMixin, {}, string, import("vue-demi").PublicProps, Readonly<import("vue-demi").ExtractPropTypes<{}>>, {}, {}>;

package/dist/v3/Demo/DemoBusinessQuoting.js

@@ -1,39 +1,69 @@
 import { createVNode, createTextVNode } from "vue";
+import { defineComponent } from "vue-demi";
 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 {
-    mapContext,
-    toAmapCoordinateType
-  } = useBusinessQuotingMap();
-  return () => createVNode("div", null, [createVNode(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 / 1e3}公里*  约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
-    "mapContext": mapContext,
-    "onClickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
-    "onClickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
-  }, null), createVNode("div", null, [createTextVNode("经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:"), toAmapCoordinateType([103.841974, 1.311295])])]);
+const DemoBusinessQuoting = /* @__PURE__ */ defineComponent({
+  name: "DemoBusinessQuoting",
+  setup() {
+    const {
+      mapContext,
+      toAmapCoordinateType
+    } = useBusinessQuotingMap();
+    return {
+      mapContext,
+      toAmapCoordinateType
+    };
+  },
+  data() {
+    return {
+      from: {
+        displayName: "my",
+        name: "my",
+        type: "wgs84",
+        lat: 1.311295,
+        lng: 103.841974
+      }
+    };
+  },
+  created() {
+    window.updateFrom = () => {
+      this.from = {
+        displayName: "The Malayan Council",
+        name: "10 Winstedt Rd, #01-17, Singapore 227977",
+        type: "wgs84",
+        lat: 1.311295,
+        lng: 103.841974
+      };
+    };
+  },
+  render() {
+    const {
+      mapContext,
+      toAmapCoordinateType,
+      from
+    } = this;
+    return createVNode("div", null, [createVNode(BusinessQuotingMap, {
+      "class": demo,
+      "from": from,
+      "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 / 1e3}公里*  约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
+      "mapContext": mapContext,
+      "onClickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
+      "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/DemoBusinessTaxiService.d.ts

@@ -4,6 +4,7 @@ export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent
 }, {
     from: Partial<CoordinatePlace>;
     to: Partial<CoordinatePlace>;
+    relayTo: Partial<CoordinatePlace>;
     status: DriverStatus;
     contentHeight: number;
 }, {}, {

package/dist/v3/Demo/DemoBusinessTaxiService.js

@@ -4,7 +4,26 @@ 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";
-const allDriverStatus = ["dispatching", "book-dispatching", "dispatched", "driverStartService", "book-driverStartService", "book-dispatched", "driverArrived", "inService", "canceled", "endService", "completed", "canceling", "banlanceRefund", "waitBanlanceRefund", "rechargePayed", "waitRechargePay", "payed", "waitpay", "refund", "confirmed", "assign"];
+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,
+  type: "gcj02"
+}, {
+  lng: 121.4036983,
+  lat: 31.216324,
+  angle: 30,
+  timestamp: 1698058439e3,
+  type: "gcj02"
+}, {
+  lng: 121.403581,
+  lat: 31.216415,
+  angle: 30,
+  timestamp: 1698058442e3,
+  type: "gcj02"
+}];
 const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
   name: "DemoBusinessTaxiService",
   setup() {
@@ -19,7 +38,8 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
     return {
       from: {},
       to: {},
-      status: "dispatched",
+      relayTo: {},
+      status: "driverStartRelayService",
       contentHeight: 200
     };
   },
@@ -37,6 +57,12 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
         type: "gcj02",
         name: "上海站"
       };
+      this.relayTo = {
+        lat: 31.209073221828284,
+        lng: 121.40366014486544,
+        type: "gcj02",
+        name: "上海金虹桥国际中心"
+      };
     }, 1e3);
     setTimeout(() => {
       this.contentHeight = 600;
@@ -46,31 +72,23 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
       const {
         value: status
       } = statusIterator.next();
-      this.status = status;
+      if (status)
+        this.status = status;
       return status;
     };
+    window.addDriverPosition = (lng, lat, type, angle = 0) => {
+      mockDriverTrackPoints.push({
+        lng,
+        lat,
+        angle,
+        timestamp: Date.now(),
+        type
+      });
+    };
   },
   methods: {
     getDriverPositionTrack() {
-      return Promise.resolve([{
-        lng: 121.4036983,
-        lat: 31.216324,
-        angle: 30,
-        timestamp: 1698058438e3,
-        type: "gcj02"
-      }, {
-        lng: 121.4036983,
-        lat: 31.216324,
-        angle: 30,
-        timestamp: 1698058439e3,
-        type: "gcj02"
-      }, {
-        lng: 121.403581,
-        lat: 31.216415,
-        angle: 30,
-        timestamp: 1698058442e3,
-        type: "gcj02"
-      }]);
+      return Promise.resolve(mockDriverTrackPoints);
     }
   },
   render() {
@@ -79,7 +97,8 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
       getDriverPositionTrack,
       from,
       to,
-      status
+      status,
+      relayTo
     } = this;
     const isReady = isCoordinatePoint(from) && isCoordinatePoint(to);
     if (!isReady)
@@ -93,7 +112,9 @@ const DemoBusinessTaxiService = /* @__PURE__ */ defineComponent({
       "class": adjustedDemo,
       "from": from,
       "to": to,
+      "relayTo": relayTo,
       "driverStatus": status,
+      "relayToTitle": "上个乘客将\n在这下车",
       "bookDispatchingTitle": "2月14日 11:00 用车",
       "bookDispatchedTitle": "*6月12日 11:00* 用车",
       "dispatchingTitle": "正在为您搜索附近司机",

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

@@ -1,8 +1,8 @@
 export declare const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
-export declare const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
 export declare const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
 export declare const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
 export declare const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
 export declare const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
 export declare const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
 export declare const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
+export declare const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";

package/dist/v3/api/cdn.js

@@ -1,18 +1,18 @@
 const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
-const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
 const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
 const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
 const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
 const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
 const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
 const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
+const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";
 export {
   AMAP_DEFAULT_MARKER_ICON_URL,
   ICON_DOT_LOADING_URL,
   ICON_END_POINT_EN_URL,
   ICON_END_POINT_ZH_TW_URL,
-  ICON_FULL_SCREEN_URL,
   ICON_LOAD_FAILED_URL,
   ICON_START_POINT_EN_URL,
-  ICON_TAXI_CAR_URL
+  ICON_TAXI_CAR_URL,
+  ICON_WAYPOINT_URL
 };

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

@@ -5,7 +5,7 @@ export declare const ANIMATION_DURATION_FOR_100VW = 100;
 export declare const ANIMATION_DURATION_PER_ZOOM = 200;
 export declare const BEIJIN_POINT: Point;
 export declare const MAX_DEVIATION_DISTANCE = 30;
-export declare const CAR_DISTANCE_MIN = 50;
+export declare const CAR_DISTANCE_MIN = 20;
 export declare const ZINDEX_BUBBLE_LAYER = 50;
 export declare const ZINDEX_START_END_LOGO_LAYER = 40;
 export declare const ZINDEX_PLACE_LAYER = 30;

package/dist/v3/api/contants.js

@@ -4,7 +4,7 @@ const ANIMATION_DURATION_FOR_100VW = 100;
 const ANIMATION_DURATION_PER_ZOOM = 200;
 const BEIJIN_POINT = [116.2317, 39.5427];
 const MAX_DEVIATION_DISTANCE = 30;
-const CAR_DISTANCE_MIN = 50;
+const CAR_DISTANCE_MIN = 20;
 const ZINDEX_BUBBLE_LAYER = 50;
 const ZINDEX_START_END_LOGO_LAYER = 40;
 const ZINDEX_PLACE_LAYER = 30;

package/dist/v3/business-components/AbsoluteAddressBox/AbsoluteAddressBox.js

@@ -5,6 +5,7 @@ import { ICON_DOT_LOADING_URL } from "../../api/cdn.js";
 import { i as imgAddressLocator } from "../../chunks/address-locator.4acf83cd.js";
 import { i as imgArrowRight } from "../../chunks/arrow-right.2c34874e.js";
 import { SvgInlineWebComponentTag } from "../../components/SvgInline/SvgInline.web-component.js";
+import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const imgBubbleRightArc = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMzIiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAxOCAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMCAwaDIuMTMxYTEwIDEwIDAgMDE5LjY5NiA3LjU1MkwxOCAzMkguMDQyTDAgMHoiIGZpbGw9InZhcigtLUhFWUNBUl9NQVBfQ1NTX1ZBUl9BYnNvbHV0ZUFkZHJlc3NCb3hfYm94SGVhZGVyX2JhY2tncm91bmQsICMyNTNFN0EpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiLz48L3N2Zz4=";
@@ -42,8 +43,13 @@ const MultilineTitle = defineSetup("MultilineTitle", function(props, {
 const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
   emit
 }) {
+  var _a;
   const handleClickText = () => emit("clickText");
   const handleClickPhoto = () => emit("clickPhoto");
+  const {
+    themeVariables
+  } = useMapSupplier();
+  const iconLoading = (_a = themeVariables == null ? void 0 : themeVariables.ICON_DOT_LOADING_URL) != null ? _a : ICON_DOT_LOADING_URL;
   return () => {
     const {
       type,
@@ -67,7 +73,7 @@ const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
         "onClick": handleClickText
       }, [createVNode("img", {
         "class": imgDotLoading,
-        "src": ICON_DOT_LOADING_URL
+        "src": iconLoading
       }, null)]), createVNode("i", {
         "class": straightLine
       }, null)]);

package/dist/v3/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.d.ts

@@ -4,6 +4,7 @@ export interface AuxiliaryGraspRoadProps {
     trackPoints: TrackPoint[];
     from: Place;
     to: Place;
+    relayTo?: Place;
 }
 export declare const AuxiliaryGraspRoad: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<AuxiliaryGraspRoadProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AuxiliaryGraspRoadProps, Required<AuxiliaryGraspRoadProps>>, never, import("vue").PublicProps, AuxiliaryGraspRoadProps, AuxiliaryGraspRoadProps, import("vue").SlotsType<{} & {
     default?: import("../../demi-polyfill").Slot | undefined;

package/dist/v3/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.js

@@ -2,7 +2,7 @@ import { createVNode } from "vue";
 import { CAR_DISTANCE_MIN, MAX_DEVIATION_DISTANCE } from "../../api/contants.js";
 import { useMapGeometry } from "../../hooks/useMapGeometry.js";
 import { defineSetup } from "../../types/helper.js";
-import { lnglat2point } from "../../utils/transform.js";
+import { place2point, lnglat2point } from "../../utils/transform.js";
 import { AuxiliaryCircle } from "../AuxiliaryCircle/AuxiliaryCircle.js";
 import { AuxiliaryLine } from "../AuxiliaryLine/AuxiliaryLine.js";
 import { DeviationCorrectionDrivingRoute } from "../DeviationCorrectionDrivingRoute/DeviationCorrectionDrivingRoute.js";
@@ -16,11 +16,13 @@ const AuxiliaryGraspRoad = defineSetup("AuxiliaryGraspRoad", function(props) {
       trackPoints,
       status,
       to,
-      from
+      from,
+      relayTo
     } = props;
-    if (status !== "inService" && status !== "driverStartService" && status !== "dispatched" && status !== "book-driverStartService")
+    if (status !== "inService" && status !== "driverStartRelayService" && status !== "driverStartService" && status !== "dispatched" && status !== "book-driverStartService")
       return;
     const destination = status === "inService" ? to : from;
+    const waypoints = status === "driverStartRelayService" && relayTo ? [place2point(relayTo)] : void 0;
     const lastTrackPoint = trackPoints[trackPoints.length - 1];
     if (!destination || !lastTrackPoint)
       return;
@@ -38,6 +40,7 @@ const AuxiliaryGraspRoad = defineSetup("AuxiliaryGraspRoad", function(props) {
     }, null), distance > CAR_DISTANCE_MIN ? createVNode(DeviationCorrectionDrivingRoute, {
       "tracks": trackPoints,
       "to": lnglat2point(destination),
+      "waypoints": waypoints,
       "deviation": MAX_DEVIATION_DISTANCE,
       "render": ({
         path,

package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts

@@ -6,6 +6,8 @@ export type BusinessTaxiServiceMapProps = CoordinatifyProps<Omit<HeycarMapProps,
     from: CoordinatePlace;
     to: CoordinatePlace;
     log?: boolean;
+    relayTo?: CoordinatePlace;
+    relayToTitle?: string;
     dispatchingTitle: string;
     bookDispatchingTitle: string;
     bookDispatchedTitle?: string;

package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js

@@ -15,8 +15,8 @@ import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
-import { SectionDispatching, SectionConfirmed, SectionDriverStartService, SectionBookDispatched, SectionInService, SectionDriverArrived, SectionCanceled, SectionEndService } from "./BusinessTaxiServiceSection.js";
-const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
+import { SectionDispatching, SectionConfirmed, SectionDriverStartRelayService, SectionDriverStartService, SectionBookDispatched, SectionInService, SectionDriverArrived, SectionCanceled, SectionEndService } from "./BusinessTaxiServiceSection.js";
+const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "driverStartRelayService", "inService", "driverArrived"];
 const BUSINESS_TAXI_SERVICE_FITVIEW_PANDING = [19, 36, 19, 26];
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
 const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", function(props, {
@@ -89,6 +89,8 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
       driverStatus,
       from: inputFrom,
       to: inputTo,
+      relayTo: inputRelayTo,
+      relayToTitle,
       dispatchingTitle,
       bookDispatchingTitle,
       bookDispatchedTitle,
@@ -96,6 +98,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     } = props;
     const from = unCoordinatifyPlace(toCoordinatePlaceType(inputFrom));
     const to = unCoordinatifyPlace(toCoordinatePlaceType(inputTo));
+    const relayTo = inputRelayTo ? unCoordinatifyPlace(toCoordinatePlaceType(inputRelayTo)) : void 0;
     const carPosition = carPositionRef.value;
     const carAngle = carAngleRef.value;
     const carTrackPositions = carTrackPositionsRef.value;
@@ -128,6 +131,21 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
           "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
           "registerOverlay": registerOverlay
         }, null)
+      }, null) : driverStatus === "driverStartRelayService" ? createVNode(DeviceOrientation, {
+        "elementRef": mapElementRef,
+        "disable": !passengerPosition,
+        "render": (orientation) => createVNode(SectionDriverStartRelayService, {
+          "from": from,
+          "relayTo": relayTo,
+          "carPosition": carPosition,
+          "carAngle": carAngle,
+          "carTrackPositions": carTrackPositions,
+          "passengerPosition": passengerPosition,
+          "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
+          "relayToTitle": relayToTitle,
+          "renderTitle": renderStartSerivceTitle,
+          "registerOverlay": registerOverlay
+        }, null)
       }, null) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? createVNode(DeviceOrientation, {
         "elementRef": mapElementRef,
         "disable": !passengerPosition,
@@ -211,7 +229,7 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
     attrs: props,
     key: `${payload.supplier}${instanceNo}`
   });
-}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
+}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
 export {
   BusinessTaxiServiceMap,
   BusinessTaxiServiceMapInner

package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts

@@ -17,6 +17,15 @@ type SectionConfirmedProps = Required<MROP> & {
 export declare const SectionConfirmed: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<SectionConfirmedProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<SectionConfirmedProps, Required<SectionConfirmedProps>>, never, import("vue").PublicProps, SectionConfirmedProps, SectionConfirmedProps, import("vue").SlotsType<{} & {
     default?: import("../../demi-polyfill").Slot | undefined;
 }>>;
+interface SectionDriverStartRelayServiceProps extends SectionDriverStartServiceProps {
+    relayTo?: Place;
+    relayToTitle?: string;
+}
+export declare const SectionDriverStartRelayService: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<SectionDriverStartRelayServiceProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<SectionDriverStartRelayServiceProps, Required<SectionDriverStartRelayServiceProps>>, never, import("vue").PublicProps, SectionDriverStartRelayServiceProps, SectionDriverStartRelayServiceProps, import("vue").SlotsType<{
+    renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
+} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;
 type SectionDriverStartServiceProps = Required<MROP> & {
     passengerPosition?: Point;
     passengerAngle?: string;