@heycar/heycars-map 2.13.0-relay2 → 2.15.0-domestic1

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

@@ -5,7 +5,10 @@ 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 MAX_DEVIATION_DISTANCE_WALKING = 5;
 export declare const CAR_DISTANCE_MIN = 20;
+export declare const PASSENGER_DISTANCE_MAX = 2000;
+export declare const PASSENGER_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,10 @@ 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 MAX_DEVIATION_DISTANCE_WALKING = 5;
 const CAR_DISTANCE_MIN = 20;
+const PASSENGER_DISTANCE_MAX = 2e3;
+const PASSENGER_DISTANCE_MIN = 20;
 const ZINDEX_BUBBLE_LAYER = 50;
 const ZINDEX_START_END_LOGO_LAYER = 40;
 const ZINDEX_PLACE_LAYER = 30;
@@ -30,7 +33,10 @@ export {
   GET_RECOMMEND_PLACE_TIMEOUT,
   MAX_ANIMATION_DISTANCE_VW,
   MAX_DEVIATION_DISTANCE,
+  MAX_DEVIATION_DISTANCE_WALKING,
   MIN_ANIMATION_DURATION,
+  PASSENGER_DISTANCE_MAX,
+  PASSENGER_DISTANCE_MIN,
   REGEO_TIMEOUT,
   TRACKS_MATCH_MAX_LENGTH,
   ZINDEX_AUXILIARY_GRASP,

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

@@ -0,0 +1,8 @@
+import type { DriverStatus, Point } from "../../types/interface";
+export interface AuxiliaryPassangerProps {
+    status: DriverStatus;
+    passengerPosition?: Point;
+}
+export declare const AuxiliaryPassanger: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<AuxiliaryPassangerProps>, 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<AuxiliaryPassangerProps, Required<AuxiliaryPassangerProps>>, never, import("vue-demi").PublicProps, AuxiliaryPassangerProps, AuxiliaryPassangerProps, import("vue-demi").SlotsType<{} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;

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

@@ -0,0 +1,46 @@
+import { createVNode } from "vue";
+import { ref } from "vue-demi";
+import { MAX_DEVIATION_DISTANCE_WALKING } from "../../api/contants.js";
+import { defineSetup } from "../../types/helper.js";
+import { watchEffectForDeepOption } from "../../utils/compare.js";
+import { AuxiliaryCircle } from "../AuxiliaryCircle/AuxiliaryCircle.js";
+import { AuxiliaryLine } from "../AuxiliaryLine/AuxiliaryLine.js";
+const usePositionHistory = (source, capacity) => {
+  const history = ref([]);
+  watchEffectForDeepOption(source, (point) => {
+    if (!point)
+      return;
+    history.value.push([...point]);
+    if (history.value.length > capacity) {
+      history.value.shift();
+    }
+  });
+  return history;
+};
+const AuxiliaryPassanger = defineSetup("AuxiliaryPassanger", function(props) {
+  const passengerPositionHistory = usePositionHistory(() => props.passengerPosition, 20);
+  return () => {
+    const {
+      status,
+      passengerPosition
+    } = props;
+    console.log("passengerPositionHistory = ", passengerPositionHistory.value);
+    const prevPositions = passengerPositionHistory.value.slice(0, -1);
+    if (status !== "assign" && status !== "confirmed" && status !== "driverStartRelayService" && status !== "dispatched" && status !== "driverStartService" && status !== "book-driverStartService" && status !== "book-dispatched" && status !== "driverArrived")
+      return;
+    return createVNode("div", null, [!!passengerPosition && createVNode(AuxiliaryCircle, {
+      "center": passengerPosition,
+      "radius": MAX_DEVIATION_DISTANCE_WALKING,
+      "opacity": 0.2
+    }, null), prevPositions.length > 0 && createVNode(AuxiliaryLine, {
+      "path": prevPositions,
+      "type": "circle",
+      "color": "purple",
+      "scale": MAX_DEVIATION_DISTANCE_WALKING,
+      "opacity": 0.2
+    }, null)]);
+  };
+});
+export {
+  AuxiliaryPassanger
+};

package/dist/v3/business-components/AuxiliaryPassanger/index.d.ts

@@ -0,0 +1 @@
+export * from "./AuxiliaryPassanger";

package/dist/v3/business-components/AuxiliaryPassanger/index.js

@@ -0,0 +1,4 @@
+import { AuxiliaryPassanger } from "./AuxiliaryPassanger.js";
+export {
+  AuxiliaryPassanger
+};

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

@@ -28,6 +28,7 @@ export interface BusinessRecomendPlaceMapProps extends CoordinatifyProps<Omit<He
     emptyTitle: string;
     queryingTitle: string;
     recomendDescription: string;
+    enableNearbyCars?: boolean;
     disableLocator?: boolean;
     disableLocatorPhoto?: boolean;
     geoErrorOnceNotificationKey?: string;

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

@@ -26,8 +26,9 @@ import "../DeviceOrientation/DeviceOrientation.js";
 import "../GreenZone/GreenZone.js";
 import "../PassengerCircle/PassengerCircle.js";
 import "../PickupPoints/PickupPoints.js";
+import "../TaxiCar/RandomCars.js";
 import "./useCacheCenterPlace.js";
-import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.c71d0b97.js";
+import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.71c439c6.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

package/dist/v3/business-components/BusinessRecomendPlaceMap/index.js

@@ -1,4 +1,4 @@
-import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.c71d0b97.js";
+import { B, f, D, E, R, c, a, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.71c439c6.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

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

@@ -21,7 +21,7 @@ import { detectBrowserPlatform } from "../../utils/platform.js";
 import { place2point, isPlaceEqual, isZoneEqual, geoPositionError2businessTimeout, pipeDefer } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinatePointType, toCoordinateRecommendZonePlacesType } from "../../utils/typeChecking.js";
 import { AbsoluteAddressBox } from "../AbsoluteAddressBox/AbsoluteAddressBox.js";
-import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_DRAG_LIMIT, a as RECOMMEND_PLACE_LARGE_LIMIT, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM, Z as ZONE_FITVIEW_PANDING } from "../../chunks/BusinessRecomendPlaceMap.c71d0b97.js";
+import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_DRAG_LIMIT, a as RECOMMEND_PLACE_LARGE_LIMIT, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM, Z as ZONE_FITVIEW_PANDING } from "../../chunks/BusinessRecomendPlaceMap.71c439c6.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { GreenZone } from "../GreenZone/GreenZone.js";
 import { PassengerCircle } from "../PassengerCircle/PassengerCircle.js";

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

@@ -1,7 +1,8 @@
-import type { Place } from "../../types/interface";
+import type { CoordinatePlace, CoordinatePoint } from "../../types/interface";
 export interface BusinessTaxiEndMapProps {
-    from: Partial<Place>;
-    to: Partial<Place>;
+    from: Partial<CoordinatePlace>;
+    to: Partial<CoordinatePlace>;
+    path?: CoordinatePoint[];
 }
 export declare const BusinessTaxiEndMapInner: import("@vue/runtime-core").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessTaxiEndMapProps>, 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<BusinessTaxiEndMapProps, Required<BusinessTaxiEndMapProps>>, never, import("@vue/runtime-core").PublicProps, BusinessTaxiEndMapProps, BusinessTaxiEndMapProps, import("@vue/runtime-core").SlotsType<{} & {
     default?: import("../../demi-polyfill").Slot | undefined;

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

@@ -8,7 +8,7 @@ import { useMapFitView } from "../../hooks/useMapFitView.js";
 import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
-import { isCoordinatePoint, toCoordinatePlaceType } from "../../utils/typeChecking.js";
+import { isCoordinatePoint, toCoordinatePlaceType, toCoordinatePointType } from "../../utils/typeChecking.js";
 import { SectionEndService } from "../BusinessTaxiServiceMap/BusinessTaxiServiceSection.js";
 const BusinessTaxiEndMapInner = defineSetup("BusinessTaxiEndMapInner", function(props, {
   attrs
@@ -18,6 +18,7 @@ const BusinessTaxiEndMapInner = defineSetup("BusinessTaxiEndMapInner", function(
     setMap
   } = useHeycarMap();
   const {
+    unCoordinatifyPoint,
     unCoordinatifyPlace
   } = useMapCoordinatify();
   const {
@@ -31,11 +32,13 @@ const BusinessTaxiEndMapInner = defineSetup("BusinessTaxiEndMapInner", function(
   return () => {
     const {
       from: inputFrom,
-      to: inputTo
+      to: inputTo,
+      path: inputPath
     } = props;
     const isReady = isCoordinatePoint(inputFrom) && isCoordinatePoint(inputTo);
     const from = unCoordinatifyPlace(toCoordinatePlaceType(inputFrom));
     const to = unCoordinatifyPlace(toCoordinatePlaceType(inputTo));
+    const path = inputPath == null ? void 0 : inputPath.map((p) => unCoordinatifyPoint(toCoordinatePointType(p)));
     const center = isReady ? place2point(from) : [...BEIJIN_POINT];
     return createVNode(HeycarMap, {
       "class": attrs.class,
@@ -49,6 +52,7 @@ const BusinessTaxiEndMapInner = defineSetup("BusinessTaxiEndMapInner", function(
       default: () => [isReady && createVNode(SectionEndService, {
         "from": from,
         "to": to,
+        "routePath": path,
         "registerOverlay": registerFitVeiw
       }, null)]
     });

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

@@ -1,7 +1,7 @@
 import { type HeycarMapProps } from "../../components/MapProvider";
 import type { BusinessTaxiServiceContext } from "../../hooks-business/useBusinessTaxiServiceMap";
 import type { CoordinatifyProps } from "../../types/coordinatify";
-import type { CoordinatePlace, CoordinateTrackPoint, DriverStatus } from "../../types/interface";
+import type { CoordinatePlace, CoordinatePoint, CoordinateTrackPoint, DriverStatus, GetDriverRouteOrTrackOutput } from "../../types/interface";
 export type BusinessTaxiServiceMapProps = CoordinatifyProps<Omit<HeycarMapProps, "center" | "zoom" | "mapRef">> & {
     from: CoordinatePlace;
     to: CoordinatePlace;
@@ -15,6 +15,8 @@ export type BusinessTaxiServiceMapProps = CoordinatifyProps<Omit<HeycarMapProps,
     driverStatus: DriverStatus;
     interval: number;
     disablePassenger?: boolean;
+    confirmedPath?: CoordinatePoint[];
+    endServicePath?: CoordinatePoint[];
     mapContext: CoordinatifyProps<BusinessTaxiServiceContext>;
     renderStartSerivceTitle: (titleProps: {
         distance: number;
@@ -25,6 +27,7 @@ export type BusinessTaxiServiceMapProps = CoordinatifyProps<Omit<HeycarMapProps,
         duration: number;
     }) => string;
     getDriverPositionTrack?: () => Promise<CoordinateTrackPoint[]>;
+    getDriverRouteOrTrack?: () => Promise<GetDriverRouteOrTrackOutput>;
 };
 export declare const BusinessTaxiServiceMapInner: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<BusinessTaxiServiceMapProps>, 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<BusinessTaxiServiceMapProps, Required<BusinessTaxiServiceMapProps>>, "resize" | "dragEnd" | "zoomEnd", import("vue-demi").PublicProps, BusinessTaxiServiceMapProps, BusinessTaxiServiceMapProps, import("vue-demi").SlotsType<{
     fallback?: (() => import("vue-demi").VNodeChild) | undefined;

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

@@ -10,10 +10,12 @@ import { useMapFitView } from "../../hooks/useMapFitView.js";
 import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
+import { computeLineAngle } from "../../utils/geometryPolygon.js";
 import { createAbortable, assertNotEmptyArray } from "../../utils/helper.js";
 import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
-import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
+import { toCoordinatePlaceType, toCoordinatePointType, createTypeError, toCoordinateExternalRoute, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
+import { AuxiliaryPassanger } from "../AuxiliaryPassanger/AuxiliaryPassanger.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 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"];
@@ -22,6 +24,7 @@ const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
 const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", function(props, {
   attrs
 }) {
+  var _a;
   const {
     interval,
     disablePassenger,
@@ -39,10 +42,17 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
   } = useMapAssertSupplier();
   const abortController = new AbortController();
   const abortable = createAbortable(abortController.signal);
-  const getDriverPositionTrack = abortable(props.getDriverPositionTrack);
+  const getDriverRouteOrTrack = abortable((_a = props.getDriverRouteOrTrack) != null ? _a : async () => {
+    var _a2;
+    return {
+      tracks: await ((_a2 = props.getDriverPositionTrack) == null ? void 0 : _a2.call(props))
+    };
+  });
   const {
+    unCoordinatifyPoint,
     unCoordinatifyPlace,
-    unCoordinatifyTrackPoint
+    unCoordinatifyTrackPoint,
+    unCoordinatifyExternalRoute
   } = useMapCoordinatify();
   const {
     registerFitVeiw: registerOverlay,
@@ -63,11 +73,27 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
   const carPositionRef = ref();
   const carAngleRef = ref();
   const carTrackPositionsRef = ref([]);
+  const carRouteRef = ref();
   watch(() => props.driverStatus, (status, _, onCleanup) => {
     if (!STATUS_NEED_CAR_POSITION.includes(status))
       return;
     const update = async () => {
-      const tracks = await (getDriverPositionTrack == null ? void 0 : getDriverPositionTrack());
+      const output = await (getDriverRouteOrTrack == null ? void 0 : getDriverRouteOrTrack());
+      if (!("tracks" in output) && !("routes" in output)) {
+        throw createTypeError("GetDriverRouteOrTrackOutput", output);
+      }
+      if ("routes" in output) {
+        const routes = unCoordinatifyExternalRoute(toCoordinateExternalRoute(output.routes));
+        assertNotEmptyArray(routes.path, "routes.path");
+        carPositionRef.value = routes.path[0];
+        carAngleRef.value = computeLineAngle(routes.path[0], routes.path[1]);
+        carTrackPositionsRef.value = [];
+        carRouteRef.value = routes;
+        return;
+      }
+      const {
+        tracks
+      } = output;
       assertNotEmptyArray(tracks, "tracks");
       const trackPositions = tracks.map((p) => unCoordinatifyTrackPoint(toCoordinateTrackPoint(p)));
       const [{
@@ -76,6 +102,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
       carPositionRef.value = lnglat2point(trackPositions[trackPositions.length - 1]);
       carAngleRef.value = angle;
       carTrackPositionsRef.value = trackPositions;
+      carRouteRef.value = void 0;
     };
     const timer = setInterval(update, interval);
     update();
@@ -94,16 +121,21 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
       dispatchingTitle,
       bookDispatchingTitle,
       bookDispatchedTitle,
-      driverArrivedTitle
+      driverArrivedTitle,
+      confirmedPath: inputConfirmedPath,
+      endServicePath: inputEndServicePath
     } = props;
     const from = unCoordinatifyPlace(toCoordinatePlaceType(inputFrom));
     const to = unCoordinatifyPlace(toCoordinatePlaceType(inputTo));
     const relayTo = inputRelayTo ? unCoordinatifyPlace(toCoordinatePlaceType(inputRelayTo)) : void 0;
+    const confirmedPath = inputConfirmedPath == null ? void 0 : inputConfirmedPath.map((p) => unCoordinatifyPoint(toCoordinatePointType(p)));
+    const endServicePath = inputEndServicePath == null ? void 0 : inputEndServicePath.map((p) => unCoordinatifyPoint(toCoordinatePointType(p)));
     const carPosition = carPositionRef.value;
     const carAngle = carAngleRef.value;
     const carTrackPositions = carTrackPositionsRef.value;
     const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);
     const passengerPosition = disablePassenger || geoLoading.value || geoError.value ? void 0 : geoPosition.value;
+    const carRoute = carRouteRef.value;
     return createVNode(HeycarMap, {
       "class": attrs.class,
       "style": attrs.style,
@@ -127,6 +159,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
         "render": (orientation) => createVNode(SectionConfirmed, {
           "from": from,
           "to": to,
+          "routePath": confirmedPath,
           "passengerPosition": passengerPosition,
           "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
           "registerOverlay": registerOverlay
@@ -140,6 +173,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
           "carPosition": carPosition,
           "carAngle": carAngle,
           "carTrackPositions": carTrackPositions,
+          "carRoute": carRoute,
           "passengerPosition": passengerPosition,
           "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
           "relayToTitle": relayToTitle,
@@ -154,6 +188,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
           "carPosition": carPosition,
           "carAngle": carAngle,
           "carTrackPositions": carTrackPositions,
+          "carRoute": carRoute,
           "passengerPosition": passengerPosition,
           "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
           "renderTitle": renderStartSerivceTitle,
@@ -166,6 +201,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
           "from": from,
           "to": to,
           "title": bookDispatchedTitle,
+          "routePath": confirmedPath,
           "passengerPosition": passengerPosition,
           "passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
           "registerOverlay": registerOverlay
@@ -175,6 +211,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
         "carPosition": carPosition,
         "carAngle": carAngle,
         "carTrackPositions": carTrackPositions,
+        "carRoute": carRoute,
         "renderTitle": renderInServiceTitle,
         "registerOverlay": registerOverlay,
         "key": `${to.lng},${to.lat}`
@@ -197,19 +234,24 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
       }, null) : driverStatus === "endService" || driverStatus === "completed" || driverStatus === "banlanceRefund" || driverStatus === "waitBanlanceRefund" || driverStatus === "rechargePayed" || driverStatus === "waitRechargePay" || driverStatus === "payed" || driverStatus === "waitpay" || driverStatus === "refund" ? createVNode(SectionEndService, {
         "from": from,
         "to": to,
+        "routePath": endServicePath,
         "registerOverlay": registerOverlay
       }, null) : (
         // 匹配不到就显示灰色路线
         createVNode(SectionEndService, {
           "from": from,
           "to": to,
+          "routePath": endServicePath,
           "registerOverlay": registerOverlay
         }, null)
-      ), IS_ENABLE_AUXILIARY_GRASP_ROAD && createVNode(AuxiliaryGraspRoad, {
+      ), IS_ENABLE_AUXILIARY_GRASP_ROAD && !carRoute && createVNode(AuxiliaryGraspRoad, {
         "status": driverStatus,
         "trackPoints": carTrackPositions,
         "from": from,
         "to": to
+      }, null), IS_ENABLE_AUXILIARY_GRASP_ROAD && createVNode(AuxiliaryPassanger, {
+        "status": driverStatus,
+        "passengerPosition": passengerPosition
       }, null)]
     });
   };
@@ -229,7 +271,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", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
+}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "getDriverRouteOrTrack", "interval", "disablePassenger", "loading", "mapContext", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "confirmedPath", "endServicePath", "to"]);
 export {
   BusinessTaxiServiceMap,
   BusinessTaxiServiceMapInner

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

@@ -1,5 +1,5 @@
 import type { MROP } from "../../hooks/useOverlay";
-import type { Place, Point, TrackPoint } from "../../types/interface";
+import type { ExternalRoute, Place, Point, TrackPoint } from "../../types/interface";
 import { type DrivingRouteRenderProps } from "../DrivingRoute";
 type SectionDispatchingProps = Required<MROP> & {
     title: string;
@@ -13,6 +13,7 @@ type SectionConfirmedProps = Required<MROP> & {
     passengerAngle?: string;
     from: Place;
     to: Place;
+    routePath?: Point[];
 };
 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;
@@ -32,6 +33,7 @@ type SectionDriverStartServiceProps = Required<MROP> & {
     carPosition?: Point;
     carAngle?: number;
     carTrackPositions?: TrackPoint[];
+    carRoute?: ExternalRoute;
     from: Place;
     renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
 };
@@ -45,6 +47,7 @@ type SectionBookDispatchedProps = Required<MROP> & {
     passengerAngle?: string;
     from: Place;
     to: Place;
+    routePath?: Point[];
     title?: string;
 };
 export declare const SectionBookDispatched: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<SectionBookDispatchedProps>, 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<SectionBookDispatchedProps, Required<SectionBookDispatchedProps>>, never, import("vue").PublicProps, SectionBookDispatchedProps, SectionBookDispatchedProps, import("vue").SlotsType<{} & {
@@ -66,6 +69,7 @@ type SectionInServiceProps = Required<MROP> & {
     carPosition?: Point;
     carAngle?: number;
     carTrackPositions?: TrackPoint[];
+    carRoute?: ExternalRoute;
     renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
 };
 export declare const SectionInService: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<SectionInServiceProps>, 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<SectionInServiceProps, Required<SectionInServiceProps>>, never, import("vue").PublicProps, SectionInServiceProps, SectionInServiceProps, import("vue").SlotsType<{
@@ -83,6 +87,7 @@ export declare const SectionCanceled: import("vue").DefineComponent<import("vue"
 export type SectionEndServiceProps = Required<MROP> & {
     from: Place;
     to: Place;
+    routePath?: Point[];
 };
 export declare const SectionEndService: import("vue").DefineComponent<import("vue").ComponentObjectPropsOptions<SectionEndServiceProps>, 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<SectionEndServiceProps, Required<SectionEndServiceProps>>, never, import("vue").PublicProps, SectionEndServiceProps, SectionEndServiceProps, import("vue").SlotsType<{} & {
     default?: import("../../demi-polyfill").Slot | undefined;