@heycar/heycars-map 2.12.0-color6 → 2.13.0-relay1

package/dist/v3/hooks/useDeviationCorrectionDrivingRoute.js

@@ -19,7 +19,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 };
@@ -67,20 +67,21 @@ const useDeviationCorrectionDrivingRoute = (props) => {
     }
     const { path: graspRoadPath } = await apiMapToGraspRoadPath(tracks);
     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 {
@@ -90,7 +91,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/v3/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: {
@@ -16,7 +17,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
 export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
     route: {
@@ -31,7 +32,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
 export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
     route: {
@@ -46,5 +47,5 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
-    apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
+    apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };

package/dist/v3/hooks/useDrivingRoute.js

@@ -14,18 +14,18 @@ const useADrivingRoute = (props) => {
     trafficJams: void 0
   });
   const amapDriving = new AMap.Driving({});
-  const apiMapDrivingRoute = (from, to) => {
-    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, amapDriving);
+  const apiMapDrivingRoute = (from, to, waypoints = []) => {
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
   };
   watchPostEffectForDeepOption(
     () => {
-      const { from, to } = props != null ? props : {};
-      return { from, to };
+      const { from, to, waypoints } = props != null ? props : {};
+      return { from, to, waypoints };
     },
-    async ({ from, to }) => {
+    async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to));
+      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };
@@ -34,18 +34,18 @@ const useGDrivingRoute = (props) => {
   const { gaodeDirectionDrivingProxyUrl, googleRoutesProxyUrl } = useMapSupplier();
   const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
   const gmapDirectionsService = new google.maps.DirectionsService();
-  const apiMapDrivingRoute = (from, to) => {
-    return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, gmapDirectionsService);
+  const apiMapDrivingRoute = (from, to, waypoints = []) => {
+    return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
   };
   watchPostEffectForDeepOption(
     () => {
-      const { from, to } = props != null ? props : {};
-      return { from, to };
+      const { from, to, waypoints } = props != null ? props : {};
+      return { from, to, waypoints };
     },
-    async ({ from, to }) => {
+    async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to));
+      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };

package/dist/v3/types/interface.d.ts

@@ -91,7 +91,7 @@ export interface CoordinateTrackPoint extends TrackPoint {
     type: CoordinateType;
 }
 export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
-export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
+export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "driverStartRelayService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
 export declare enum CenterPlaceStatus {
     GEO_LOADING = "GEO_LOADING",
     QUERYING_INFO = "QUERYING_INFO",

package/dist/v3/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/v3/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/v3/utils/log.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.12.0-color6",
+  "version": "2.13.0-relay1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",