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

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-color7";
+const pkgVersion = "2.13.0-relay2";
 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-color7",
+  "version": "2.13.0-relay2",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",