@heycar/heycars-map 0.10.2 → 0.10.3-relay1

package/README.md

@@ -431,6 +431,13 @@ export default defineComponent({
           lat: 1.2966426,
           lng: 103.7763939,
         }}
+        relayTo={{
+          displayName: "UFOU沃达迈Waldmann(虹桥南丰城南区店)",
+          name: "虹桥南丰城南区2楼208号",
+          lat: 31.207145,
+          lng: 121.407842,
+        }}
+        relayToTitle="上个乘客将\n在这下车"
         driverStatus={"driverArrived"}
         bookDispatchingTitle="2月14日 11:00 用车"
         dispatchingTitle="正在为您搜索附近司机"

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

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

package/dist/v2/Demo/DemoBusinessTaxiService.js

@@ -4,7 +4,23 @@ 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";
-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
+}, {
+  lng: 121.4036983,
+  lat: 31.216324,
+  angle: 30,
+  timestamp: 1698058439e3
+}, {
+  lng: 121.403581,
+  lat: 31.216415,
+  angle: 30,
+  timestamp: 1698058442e3
+}];
 const DemoBusinessTaxiService = defineComponent({
   name: "DemoBusinessTaxiService",
   setup() {
@@ -21,7 +37,8 @@ const DemoBusinessTaxiService = defineComponent({
     return {
       from: {},
       to: {},
-      status: "dispatched",
+      relayTo: {},
+      status: "driverStartRelayService",
       contentHeight: 200
     };
   },
@@ -37,6 +54,11 @@ const DemoBusinessTaxiService = defineComponent({
         lng: 121.3995217963426,
         name: "上海站"
       };
+      this.relayTo = {
+        lat: 31.207145,
+        lng: 121.407842,
+        name: "UFOU沃达迈Waldmann(虹桥南丰城南区店)"
+      };
     }, 1e3);
     setTimeout(() => {
       this.contentHeight = 600;
@@ -46,28 +68,23 @@ const DemoBusinessTaxiService = defineComponent({
       const {
         value: status
       } = statusIterator.next();
-      this.status = status;
+      if (status) {
+        this.status = status;
+      }
       return status;
     };
+    window.addDriverPosition = (lng, lat, angle = 0) => {
+      mockDriverTrackPoints.push({
+        lng,
+        lat,
+        angle,
+        timestamp: Date.now()
+      });
+    };
   },
   methods: {
     getDriverPositionTrack() {
-      return Promise.resolve([{
-        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
-      }]);
+      return Promise.resolve(mockDriverTrackPoints);
     }
   },
   render() {
@@ -77,6 +94,7 @@ const DemoBusinessTaxiService = defineComponent({
       registerFitVeiw,
       from,
       to,
+      relayTo,
       status
     } = this;
     const isReady = isPlace(from) && isPlace(to);
@@ -92,7 +110,9 @@ const DemoBusinessTaxiService = defineComponent({
       "attrs": {
         "from": from,
         "to": to,
+        "relayTo": relayTo,
         "driverStatus": status,
+        "relayToTitle": "上个乘客将\n在这下车",
         "bookDispatchingTitle": "2月14日 11:00 用车",
         "dispatchingTitle": "正在为您搜索附近司机",
         "driverArrivedTitle": "司机已等待 00:35",

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

@@ -5,3 +5,4 @@ export declare const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/he
 export declare const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/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_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/waypoint.svg";

package/dist/v2/api/cdn.js

@@ -5,6 +5,7 @@ const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/en
 const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/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_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/waypoint.svg";
 export {
   AMAP_DEFAULT_MARKER_ICON_URL,
   ICON_DOT_LOADING_URL,
@@ -12,5 +13,6 @@ export {
   ICON_END_POINT_ZH_TW_URL,
   ICON_FULL_SCREEN_URL,
   ICON_START_POINT_EN_URL,
-  ICON_TAXI_CAR_URL
+  ICON_TAXI_CAR_URL,
+  ICON_WAYPOINT_URL
 };

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

@@ -5,6 +5,8 @@ export type BusinessTaxiServiceMapProps = Omit<HeycarMapProps, "center" | "zoom"
     from: Place;
     to: Place;
     log?: boolean;
+    relayTo?: Place;
+    relayToTitle?: string;
     dispatchingTitle: string;
     bookDispatchingTitle: string;
     driverArrivedTitle: string;

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

@@ -9,8 +9,8 @@ import { assertNotEmptyArray } from "../../utils/helper.js";
 import { toPlaceType, place2point, combineHandler, pipeDefer, toTrackPoints, lnglat2point } from "../../utils/transform.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", "driverStartRelayService", "driverStartService", "inService", "driverArrived"];
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
 const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", function(props, {
   attrs
@@ -64,12 +64,15 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
       driverStatus,
       from: inputFrom,
       to: inputTo,
+      relayTo: inputRelayTo,
+      relayToTitle,
       dispatchingTitle,
       bookDispatchingTitle,
       driverArrivedTitle
     } = props;
     const from = toPlaceType(inputFrom);
     const to = toPlaceType(inputTo);
+    const relayTo = inputRelayTo ? toPlaceType(inputRelayTo) : void 0;
     const carPosition = carPositionRef.value;
     const carAngle = carAngleRef.value;
     const carTrackPositions = carTrackPositionsRef.value;
@@ -113,6 +116,25 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
           }
         })
       }
+    }) : driverStatus === "driverStartRelayService" ? h(DeviceOrientation, {
+      "attrs": {
+        "elementRef": mapElementRef,
+        "disable": !passengerPosition,
+        "render": (orientation) => h(SectionDriverStartRelayService, {
+          "attrs": {
+            "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
+          }
+        })
+      }
     }) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? h(DeviceOrientation, {
       "attrs": {
         "elementRef": mapElementRef,
@@ -199,7 +221,7 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
       }
     })]);
   };
-}).props(["bookDispatchingTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapRef", "renderInServiceTitle", "renderStartSerivceTitle", "to", "registerOverlay"]);
+}).props(["bookDispatchingTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapRef", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "to", "registerOverlay"]);
 export {
   BusinessTaxiServiceMap
 };

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

@@ -13,6 +13,11 @@ type SectionConfirmedProps = Required<MROP> & {
     to: Place;
 };
 export declare const SectionConfirmed: import("vue").DefineComponent<import("vue3").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, SectionConfirmedProps>;
+interface SectionDriverStartRelayServiceProps extends SectionDriverStartServiceProps {
+    relayTo?: Place;
+    relayToTitle?: string;
+}
+export declare const SectionDriverStartRelayService: import("vue").DefineComponent<import("vue3").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, SectionDriverStartRelayServiceProps>;
 type SectionDriverStartServiceProps = Required<MROP> & {
     passengerPosition?: Point;
     passengerAngle?: string;

package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js

@@ -141,6 +141,146 @@ const SectionConfirmed = defineSetup("SectionConfirmed", function(props) {
     })]);
   };
 });
+const SectionDriverStartRelayService = defineSetup("SectionDriverStartRelayService", function(props) {
+  const {
+    registerOverlay
+  } = props;
+  const fittableRegistryOverlay = createFittableRegisterOverlay({
+    registerOverlay,
+    immediate: true
+  });
+  const {
+    language
+  } = useMapSupplier();
+  const {
+    apiMapDistance
+  } = useMapGeometry();
+  return () => {
+    const {
+      from: fromPlace,
+      relayTo: relayToPlace,
+      carPosition,
+      carAngle,
+      carTrackPositions,
+      passengerPosition,
+      passengerAngle,
+      relayToTitle,
+      renderTitle
+    } = props;
+    const from = place2point(fromPlace);
+    const relayTo = relayToPlace ? place2point(relayToPlace) : void 0;
+    const waypoints = relayTo ? [relayTo] : void 0;
+    const passengerDistance = passengerPosition ? apiMapDistance(passengerPosition, from) : void 0;
+    const carDistance = carPosition ? apiMapDistance(carPosition, from) : void 0;
+    return h("div", [h(ConditionalFittablePassengerCircle, {
+      "attrs": {
+        "position": passengerPosition,
+        "angle": passengerAngle,
+        "condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
+        "registerOverlay": registerOverlay
+      }
+    }), h(StartEndPoint, {
+      "attrs": {
+        "type": "start",
+        "position": from,
+        "registerOverlay": registerOverlay,
+        "language": language
+      }
+    }), h(PlaceCircle, {
+      "attrs": {
+        "position": from,
+        "label": fromPlace.displayName,
+        "hideIcon": true
+      }
+    }), !!relayTo && h(StartEndPoint, {
+      "attrs": {
+        "type": "waypoint",
+        "position": relayTo,
+        "registerOverlay": registerOverlay,
+        "language": language
+      }
+    }), !!relayTo && !!relayToTitle && h(PlaceCircle, {
+      "attrs": {
+        "position": relayTo,
+        "label": relayToTitle,
+        "hideIcon": true
+      }
+    }), !(carTrackPositions == null ? void 0 : carTrackPositions.length) || !carDistance ? null : carDistance > CAR_DISTANCE_MIN ? h(DeviationCorrectionDrivingRoute, {
+      "attrs": {
+        "tracks": carTrackPositions,
+        "to": from,
+        "waypoints": waypoints,
+        "deviation": MAX_DEVIATION_DISTANCE,
+        "render": ({
+          path,
+          angle,
+          distance,
+          duration
+        }) => {
+          var _a;
+          return [h(DrivingLine, {
+            "attrs": {
+              "path": path
+            }
+          }), h(TaxiCar, {
+            "attrs": {
+              "position": (_a = path[0]) != null ? _a : carPosition,
+              "angle": angle != null ? angle : carAngle,
+              "title": renderTitle({
+                distance,
+                duration
+              }),
+              "registerOverlay": fittableRegistryOverlay
+            }
+          })];
+        }
+      }
+    }) : h(GraspRoad, {
+      "attrs": {
+        "tracks": carTrackPositions,
+        "render": ({
+          path: graspRoadPath,
+          angle
+        }) => {
+          var _a;
+          return h(TaxiCar, {
+            "attrs": {
+              "position": (_a = graspRoadPath[graspRoadPath.length - 1]) != null ? _a : carPosition,
+              "angle": angle != null ? angle : carAngle,
+              "title": renderTitle({
+                distance: carDistance,
+                duration: carDurationWithinMinDistance(carDistance)
+              }),
+              "registerOverlay": fittableRegistryOverlay
+            }
+          });
+        }
+      }
+    }), !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX && passengerDistance > PASSENGER_DISTANCE_MIN && h(WalkingRoute, {
+      "attrs": {
+        "from": passengerPosition,
+        "to": from,
+        "render": ({
+          path
+        }) => h(WalkingLine, {
+          "attrs": {
+            "path": path
+          }
+        })
+      }
+    }), h(FitViewOnce, {
+      "attrs": {
+        "registerOverlay": registerOverlay,
+        "immediate": true
+      }
+    }), h(InterruptableIntervalFitView, {
+      "attrs": {
+        "interval": AUTO_FIT_VIEW_INTERVAL,
+        "registerOverlay": registerOverlay
+      }
+    })]);
+  };
+});
 const SectionDriverStartService = defineSetup("SectionDriverStartService", function(props) {
   const {
     registerOverlay
@@ -651,6 +791,7 @@ export {
   SectionConfirmed,
   SectionDispatching,
   SectionDriverArrived,
+  SectionDriverStartRelayService,
   SectionDriverStartService,
   SectionEndService,
   SectionInService

package/dist/v2/business-components/PlaceCircle/PlaceCircle.js

@@ -1,4 +1,4 @@
-import "../../css/PlaceCircle-3c051f4e.css";
+import "../../css/PlaceCircle-fe58915a.css";
 import { h } from "vue";
 import { computed } from "vue-demi";
 import { ZINDEX_PLACE_LAYER } from "../../api/contants.js";

package/dist/v2/business-components/StartEndPoint/StartEndPoint.css.d.ts

@@ -16,6 +16,11 @@ export declare const pointIcon: import("@vanilla-extract/recipes").RuntimeFn<{
             width: "6.192vw";
             height: "7.998vw";
         };
+        waypoint: {
+            marginTop: "1.33vw";
+            width: "6.192vw";
+            height: "7.998vw";
+        };
     };
 }>;
 export declare const textLayout: import("@vanilla-extract/recipes").RuntimeFn<{

package/dist/v2/business-components/StartEndPoint/StartEndPoint.d.ts

@@ -2,7 +2,7 @@ import type { GmapOverlay, MapRegisterOverlayProps } from "../../hooks/useOverla
 import type { Language, Point } from "../../types/interface";
 export interface StartEndPointProps<T> extends MapRegisterOverlayProps<T> {
     language: Language;
-    type: "start" | "end";
+    type: "start" | "end" | "waypoint";
     position: [number, number];
     title?: string;
     description?: string;

package/dist/v2/business-components/StartEndPoint/StartEndPoint.js

@@ -1,6 +1,6 @@
 import { h } from "vue";
 import { computed } from "vue-demi";
-import { ICON_START_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_END_POINT_EN_URL } from "../../api/cdn.js";
+import { ICON_WAYPOINT_URL, ICON_START_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_END_POINT_EN_URL } from "../../api/cdn.js";
 import { ZINDEX_START_END_LOGO_LAYER } from "../../api/contants.js";
 import { i as imgArrowRight } from "../../chunks/arrow-right.eedc7433.js";
 import { AmapMarker } from "../../components/AmapMarker/AmapMarker.js";
@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.38f98dca.js";
 const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSI3Mi4zMzklIiB5MT0iNTAlIiB4Mj0iMCUiIHkyPSI1MCUiIGlkPSJwcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9IiNGRjg0NDciIG9mZnNldD0iMCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkY4QjRBIiBvZmZzZXQ9IjUwLjU5NiUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRkZBOTVBIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyNy4wMDZjMi4xMjggMC0uOS0zLjc0MyA1LjYyMS02LjY0M0MxOS44NDIgMTguNDUzIDIyIDE0Ljk1MyAyMiAxMC45NSAyMiA0LjkwMiAxNy4wNzUgMCAxMSAwUzAgNC45MDIgMCAxMC45NWMwIDMuOTE4IDIuMDY4IDcuMzU2IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjg0IDkuMDYgMjcuMDA3IDExIDI3LjAwN3oiIHN0cm9rZT0iI0ZGRiIgZmlsbD0idXJsKCNwcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
 const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IHgxPSIwJSIgeTE9IjUwJSIgeDI9IjEyOS41OTklIiB5Mj0iNTAlIiBpZD0icHJlZml4X19hIj48c3RvcCBzdG9wLWNvbG9yPSIjMzZBOEZGIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0iIzQ4NzFGMSIgb2Zmc2V0PSIxMDAlIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBkPSJNMTIgMzAuMjE1YzEuOTUgMCAzLjUzMi0uODE2IDMuNTMyLTEuODIzIDAtMS4wMDctMS41ODEtMS44MjMtMy41MzItMS44MjMtMS45NSAwLTMuNTMyLjgxNi0zLjUzMiAxLjgyMyAwIDEuMDA3IDEuNTgxIDEuODIzIDMuNTMyIDEuODIzeiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0iIzQzNDg1QSIvPjxwYXRoIGQ9Ik0xMSAyN2MyLjEyOCAwLS45LTMuNzQyIDUuNjIxLTYuNjQxIDMuMjIxLTEuOTEgNS4zNzktNS40MSA1LjM3OS05LjQxMkMyMiA0LjkwMSAxNy4wNzUgMCAxMSAwUzAgNC45MDEgMCAxMC45NDdjMCAzLjkxOCAyLjA2OCA3LjM1NSA1LjE3NyA5LjI5QzExLjc1IDIzLjI3NyA5LjA2IDI3IDExIDI3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI3ByZWZpeF9fYSkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIi8+PHRleHQgZm9udC1mYW1pbHk9IlBpbmdGYW5nU0MtU2VtaWJvbGQsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmb250LXdlaWdodD0iNTAwIiBmaWxsPSIjRkZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSI+PHRzcGFuIHg9IjUiIHk9IjE1LjYyNCI+6LW3PC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg==";
 const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
@@ -24,7 +24,7 @@ const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
       type,
       language
     } = props;
-    const icon = type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? ICON_END_POINT_ZH_TW_URL : ICON_END_POINT_EN_URL;
+    const icon = type === "waypoint" ? ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? ICON_END_POINT_ZH_TW_URL : ICON_END_POINT_EN_URL;
     const descriptionRow = !description ? "" : decodeAsterisk(description).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
     if (!description && !title)
       return `<img class="AStartEndPoint ${pointIcon({

package/dist/v2/business-components/TaxiCar/TaxiCar.js

@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup } from "../../types/helper.js";
 import { createDom } from "../../utils/dom.js";
 import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
-import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.8242788c.js";
+import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.38f98dca.js";
 import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const TaxiCar_css_ts_vanilla = "";
 var carIcon = "_65j3sr1";

package/dist/v2/chunks/{StartEndPoint.css.8242788c.js → StartEndPoint.css.38f98dca.js}

@@ -1,15 +1,15 @@
-import "../css/StartEndPoint-d7806e8e.css";
+import "../css/StartEndPoint-5bf29d8c.css";
 import { c as createRuntimeFn } from "./vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
 const StartEndPoint_css_ts_vanilla = "";
-var arrowRight = createRuntimeFn({ defaultClassName: "_4a4ovka", variantClassNames: { withArrow: { true: "_4a4ovkb", false: "_4a4ovkc" } }, defaultVariants: {}, compoundVariants: [] });
-var pointIcon = createRuntimeFn({ defaultClassName: "", variantClassNames: { type: { start: "_4a4ovk6", end: "_4a4ovk7" } }, defaultVariants: {}, compoundVariants: [] });
+var arrowRight = createRuntimeFn({ defaultClassName: "_4a4ovkb", variantClassNames: { withArrow: { true: "_4a4ovkc", false: "_4a4ovkd" } }, defaultVariants: {}, compoundVariants: [] });
+var pointIcon = createRuntimeFn({ defaultClassName: "", variantClassNames: { type: { start: "_4a4ovk6", end: "_4a4ovk7", waypoint: "_4a4ovk8" } }, defaultVariants: {}, compoundVariants: [] });
 var pointInfoBox = "_4a4ovk1";
 var pointInfoBoxDescription = "_4a4ovk4";
 var pointInfoBoxEmphasize = "_4a4ovk5";
 var pointInfoBoxTitle = "_4a4ovk3";
 var pointLayout = "_4a4ovk0";
 var pointSingleInfoBox = "_4a4ovk2";
-var textLayout = createRuntimeFn({ defaultClassName: "", variantClassNames: { withArrow: { true: "_4a4ovk8", false: "_4a4ovk9" } }, defaultVariants: {}, compoundVariants: [] });
+var textLayout = createRuntimeFn({ defaultClassName: "", variantClassNames: { withArrow: { true: "_4a4ovk9", false: "_4a4ovka" } }, defaultVariants: {}, compoundVariants: [] });
 export {
   pointIcon as a,
   pointLayout as b,

package/dist/{v3/css/PlaceCircle-3c051f4e.css → v2/css/PlaceCircle-fe58915a.css}

@@ -43,6 +43,7 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   overflow: hidden;
+  white-space: pre-line;
 }
 .fhyw8d {
   position: absolute;

package/dist/v2/css/{StartEndPoint-d7806e8e.css → StartEndPoint-5bf29d8c.css}

@@ -58,13 +58,18 @@
   height: 7.998vw;
 }
 ._4a4ovk8 {
+  margin-top: 1.33vw;
+  width: 6.192vw;
+  height: 7.998vw;
+}
+._4a4ovk9 {
   padding-right: 2.67vw;
 }
-._4a4ovka {
+._4a4ovkb {
   width: 1.758vw;
   height: 2.93vw;
   filter: invert(1);
 }
-._4a4ovkc {
+._4a4ovkd {
   display: none;
 }

package/dist/v2/hooks/useDeviationCorrectionDrivingRoute.d.ts

@@ -2,6 +2,7 @@ import type { Point, Route, TrackPoint } from "../types/interface";
 export interface UseDeviationCorrectionDrivingRouteProps {
     tracks: TrackPoint[];
     to: Point;
+    waypoints?: Point[];
     deviation: number;
 }
 interface SubRoute extends Route {
@@ -44,6 +45,6 @@ export declare const useDeviationCorrectionDrivingRoute: (props?: UseDeviationCo
     trackIntersectionPathRef: import("vue-demi").Ref<Point[] | undefined>;
     routeIntersectionPathRef: import("vue-demi").Ref<Point[] | undefined>;
     extendedIntersectionPointRef: import("vue-demi").Ref<Point | undefined>;
-    apiMapDeviationCorrectionDrivingRoute: (tracks: TrackPoint[], to: Point, deviation: number, preRoute: SubRoute) => Promise<ApiMapDeviationCorrectionDrivingRouteOutput>;
+    apiMapDeviationCorrectionDrivingRoute: (tracks: TrackPoint[], to: Point, deviation: number, preRoute: SubRoute, waypoints?: Point[]) => Promise<ApiMapDeviationCorrectionDrivingRouteOutput>;
 };
 export {};

package/dist/v2/hooks/useDeviationCorrectionDrivingRoute.js

@@ -21,7 +21,7 @@ const useDeviationCorrectionDrivingRoute = (props) => {
   const { apiMapToGraspRoadPath } = useMapGraspRoad();
   const { apiMapDistance, apiMapDistanceOfLine } = useMapGeometry();
   const { apiMapComputeHeading } = useMapAngle();
-  const apiMapDeviationCorrectionDrivingRoute = async (tracks, to, deviation, preRoute) => {
+  const apiMapDeviationCorrectionDrivingRoute = async (tracks, to, deviation, preRoute, waypoints = []) => {
     var _a, _b;
     if (tracks.length === 0) {
       return { ...createEmptySubRoute(), angle: 0 };
@@ -69,20 +69,21 @@ const useDeviationCorrectionDrivingRoute = (props) => {
     }
     const { path: graspRoadPath } = inChina(position) ? await apiMapToGraspRoadPath(tracks) : { path: tracks.map(lnglat2point) };
     const from = graspRoadPath[graspRoadPath.length - 1];
-    const route = await apiMapDrivingRoute(from, to);
+    const route = await apiMapDrivingRoute(from, to, waypoints);
     const angle = (_b = apiMapComputeHeading(route.path[0], route.path[1])) != null ? _b : 0;
     return { ...route, angle, graspRoadPath, baseRoute: route, index: 0 };
   };
   watchEffectForDeepOption(
     () => {
-      const { tracks, to, deviation = MAX_DEVIATION_DISTANCE } = props != null ? props : {};
+      const { tracks, to, waypoints = [], deviation = MAX_DEVIATION_DISTANCE } = props != null ? props : {};
       return {
         tracks: tracks ? [...tracks] : void 0,
         to: to ? [...to] : void 0,
+        waypoints,
         deviation
       };
     },
-    async ({ tracks, to, deviation }) => {
+    async ({ tracks, to, waypoints, deviation }) => {
       if (!tracks || !to)
         return;
       const {
@@ -92,7 +93,13 @@ const useDeviationCorrectionDrivingRoute = (props) => {
         routeIntersectionPath,
         extendedIntersectionPoint,
         ...subRoute
-      } = await apiMapDeviationCorrectionDrivingRoute(tracks, to, deviation, drivingRoute);
+      } = await apiMapDeviationCorrectionDrivingRoute(
+        tracks,
+        to,
+        deviation,
+        drivingRoute,
+        waypoints
+      );
       Object.assign(drivingRoute, subRoute);
       angleRef.value = angle;
       trackIntersectionPathRef.value = trackIntersectionPath;

package/dist/v2/hooks/useDrivingRoute.d.ts

@@ -2,6 +2,7 @@ import type { Point, Route } from "../types/interface";
 export interface UseDrivingRouteProps {
     from: Point;
     to: Point;
+    waypoints?: Point[];
 }
 export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
     route: {
@@ -15,7 +16,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
 export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
     route: {
@@ -29,7 +30,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
 export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
     route: {
@@ -43,5 +44,5 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };