@heycar/heycars-map 2.8.0 → 2.8.1

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

@@ -20,7 +20,7 @@ import { WalkingRoute } from "../WalkingRoute/WalkingRoute.js";
 import { WaveCircle } from "../WaveCircle/WaveCircle.js";
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
 const PASSENGER_DISTANCE_MAX = 2e3;
-const PASSENGER_DISTANCE_MIN = 10;
+const PASSENGER_DISTANCE_MIN = 20;
 const AUTO_FIT_VIEW_INTERVAL = IS_ENABLE_AUXILIARY_GRASP_ROAD ? 24 * 3600 * 1e3 : 15e3;
 const carDurationWithinMinDistance = (distance) => Math.floor(distance / 5);
 const SectionDispatching = defineSetup("SectionDispatching", function(props) {

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

@@ -1,12 +1,22 @@
 import { h } from "vue";
 import { defineSetup } from "../../types/helper.js";
-import { stringifyPoint } from "../../utils/transform.js";
+import { stringifyPoint, isPointExactEqual } from "../../utils/transform.js";
 import { DrivingLine } from "../DrivingLine/DrivingLine.js";
-const justifyFirstPointStatus = (firstPointStatus, secondPointStatus) => {
-  return (firstPointStatus === void 0 || firstPointStatus === "UNKNOWN") && !!secondPointStatus && secondPointStatus !== "UNKNOWN" ? secondPointStatus : firstPointStatus != null ? firstPointStatus : "UNKNOWN";
+const toHalfPath = (path, isFromStart = true) => {
+  if (path.length < 2)
+    return path;
+  const [[x0, y0], [x1, y1]] = path;
+  const mid = [(x0 + x1) / 2, (y0 + y1) / 2];
+  return isFromStart ? [[x0, y0], mid] : [mid, [x1, y1]];
+};
+const isSlowOrJam = (status) => {
+  return status === "SLOW" || status === "TRAFFIC_JAM" || status === "HEAVY_TRAFFIC_JAM";
+};
+const justifyFirstPointStatus = (firstPointStatus, secondPointBeforeStatus) => {
+  return (firstPointStatus === void 0 || firstPointStatus === "UNKNOWN") && !!secondPointBeforeStatus && secondPointBeforeStatus !== "UNKNOWN" ? secondPointBeforeStatus : firstPointStatus != null ? firstPointStatus : "UNKNOWN";
 };
 const createMulitpleLineByTrafficJams = (path, trafficJams) => {
-  var _a;
+  var _a, _b, _c, _d;
   if (!trafficJams)
     return [{
       path,
@@ -18,12 +28,13 @@ const createMulitpleLineByTrafficJams = (path, trafficJams) => {
   const multipleLines = [];
   let line = {
     path: [firstPoint],
-    status: justifyFirstPointStatus(trafficJams[stringifyPoint(firstPoint)], trafficJams[stringifyPoint(path[1])])
+    status: justifyFirstPointStatus((_a = trafficJams[stringifyPoint(firstPoint)]) == null ? void 0 : _a.after, (_b = trafficJams[stringifyPoint(path[1])]) == null ? void 0 : _b.before)
   };
-  for (let idx = 2; idx < path.length; idx++) {
+  for (let idx = 1; idx < path.length; idx++) {
     const point = path[idx];
-    const traffic = (_a = trafficJams[stringifyPoint(point)]) != null ? _a : "UNKNOWN";
-    line.path.push(point);
+    const traffic = (_d = (_c = trafficJams[stringifyPoint(point)]) == null ? void 0 : _c.after) != null ? _d : "UNKNOWN";
+    if (!isPointExactEqual(point, path[idx - 1]))
+      line.path.push(point);
     if (traffic === line.status)
       continue;
     multipleLines.push(line);
@@ -48,27 +59,41 @@ const beautifyMultipleLines = (lines) => {
     status: "NORMAL",
     lineCap: "round"
   };
-  const coveredLines = [];
+  const roundCoveredLines = [];
+  const buttCoveredLines = [];
   for (const line of lines) {
     const {
       path,
       status
     } = line;
-    if (status !== "SLOW" && status !== "TRAFFIC_JAM" && status !== "HEAVY_TRAFFIC_JAM")
+    if (!isSlowOrJam(status))
       continue;
-    coveredLines.push({
+    buttCoveredLines.push({
       status,
       path,
       lineCap: "butt"
     });
   }
   const first = lines[0];
+  const last = lines[lines.length - 1];
   const ignoredLine = {
     status: first.status,
     path: first.path.slice(0, 2),
     lineCap: "butt"
   };
-  return [ignoredLine, totalLine, ...coveredLines];
+  if (isSlowOrJam(first.status))
+    roundCoveredLines.push({
+      status: first.status,
+      path: toHalfPath(first.path.slice(0, 2)),
+      lineCap: "round"
+    });
+  if (isSlowOrJam(last.status))
+    roundCoveredLines.push({
+      status: last.status,
+      path: toHalfPath(last.path.slice(-2), false),
+      lineCap: "round"
+    });
+  return [ignoredLine, totalLine, ...roundCoveredLines, ...buttCoveredLines];
 };
 const TrafficDrivingLine = defineSetup("TrafficDrivingLine", function(props) {
   return () => {
@@ -77,7 +102,6 @@ const TrafficDrivingLine = defineSetup("TrafficDrivingLine", function(props) {
       trafficJams
     } = props;
     const multipleLines = createMulitpleLineByTrafficJams(path, trafficJams);
-    console.log("multipleLines = ", multipleLines);
     const beautifiedLines = beautifyMultipleLines(multipleLines);
     return h("div", [beautifiedLines.map((line) => h(DrivingLine, {
       "attrs": {

package/dist/v2/hooks/useDeviationCorrectionDrivingRoute.js

@@ -134,7 +134,12 @@ const createSubRouteByPoint = (route, point, distanceOfLineFn) => {
     count += step.path.length;
     if (count <= index)
       continue;
-    const firstStepPath = [point, ...step.path.slice(index - count + 1)];
+    if (step.path.length + index - count + 1 < 0) {
+      console.error(
+        "`MyError: createSubRouteByPoint unexpected condition: step.path.length + index - count + 1 < 0"
+      );
+    }
+    const firstStepPath = [point, ...step.path.slice(step.path.length + index - count + 1)];
     const totalStepDistanceByMeasure = distanceOfLineFn(step.path);
     const stepDistanceByMeasure = (_a = distanceOfLineFn(firstStepPath)) != null ? _a : 0;
     const firstStepDistance = totalStepDistanceByMeasure ? step.distance * stepDistanceByMeasure / totalStepDistanceByMeasure : stepDistanceByMeasure;
@@ -153,7 +158,6 @@ const createSubRouteByPoint = (route, point, distanceOfLineFn) => {
     distance += step.distance;
     duration += step.duration;
   }
-  console.log("point, index, distance, steps, route = ", point, index, distance, steps, route);
   return { path, duration, distance, steps, index, baseRoute: route };
 };
 const createEmptySubRoute = () => {

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

@@ -107,4 +107,7 @@ export type ProxyServiceError = {
     msg: string;
 };
 export type TrafficStatus = "UNKNOWN" | "NORMAL" | "SLOW" | "TRAFFIC_JAM" | "HEAVY_TRAFFIC_JAM";
-export type TrafficJams = Record<`${number},${number}`, TrafficStatus>;
+export type TrafficJams = Record<`${number},${number}`, {
+    before: TrafficStatus;
+    after: TrafficStatus;
+}>;

package/dist/v2/utils/compatibleDrivingRoute.js

@@ -1,14 +1,20 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
-import { stringifyPoint, amapTraffic2trafficStatus } from "./transform.js";
+import { amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
 const amapTmcs2trafficJams = (tmcs) => {
   const trafficJams = {};
+  let prevStatus = "UNKNOWN";
   for (const tmc of tmcs) {
     const { path } = tmc;
     if (!path)
       continue;
     for (const { lng, lat } of path) {
-      trafficJams[stringifyPoint([lng, lat])] = amapTraffic2trafficStatus(tmc.status);
+      const status = amapTraffic2trafficStatus(tmc.status);
+      trafficJams[stringifyPoint([lng, lat])] = {
+        before: prevStatus,
+        after: status
+      };
+      prevStatus = status;
     }
   }
   return trafficJams;
@@ -24,6 +30,7 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
         switch (status) {
           case "complete": {
             let path = [];
+            let tmcs = [];
             const drivingResult = result;
             const routeSteps = [];
             const firstRoute = drivingResult.routes[0];
@@ -33,13 +40,14 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
               const basicStep = step;
               const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
               path = path.concat(stepPath);
-              Object.assign(trafficJams, amapTmcs2trafficJams(basicStep.tmcs));
+              tmcs = tmcs.concat(basicStep.tmcs);
               routeSteps.push({
                 path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
                 duration: basicStep.time,
                 distance: basicStep.distance
               });
             }
+            Object.assign(trafficJams, amapTmcs2trafficJams(tmcs));
             return resolve({
               path,
               distance: firstRoute.distance,

package/dist/v2/utils/log.js

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

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

@@ -25,6 +25,7 @@ export declare const pipeAsync: <P extends any[]>(fn?: ((...args: P) => any) | u
 export declare const pipeDefer: <P extends any[], R>(fn: (...args: P) => R) => (...args: P) => Promise<R>;
 export declare const pipeOnlyLastEffect: <P extends any[], R>(fn: (...arg: P) => Promise<R>) => (...args: P) => Promise<R>;
 export declare const isPlaceEqual: (p1: Place, p2?: Place) => boolean;
+export declare const isPointExactEqual: (p1: Point, p2?: Point) => boolean;
 export declare const isPointEqual: (p1: Point, p2?: Point) => boolean;
 export declare const isGeoPositionEqual: (p1: GeolocationPosition, p2?: GeolocationPosition) => boolean;
 export declare const isZoneEqual: (z1: Zone, z2?: Zone) => boolean;

package/dist/v2/utils/transform.js

@@ -96,6 +96,9 @@ const pipeOnlyLastEffect = (fn) => {
 const isPlaceEqual = (p1, p2) => {
   return isAccuryEqual(p1.lng, p2 == null ? void 0 : p2.lng) && isAccuryEqual(p1.lat, p2 == null ? void 0 : p2.lat);
 };
+const isPointExactEqual = (p1, p2) => {
+  return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
+};
 const isPointEqual = (p1, p2) => {
   return isAccuryEqual(p1[0], p2 == null ? void 0 : p2[0]) && isAccuryEqual(p1[1], p2 == null ? void 0 : p2[1]);
 };
@@ -323,6 +326,7 @@ export {
   isGeoPositionEqual,
   isPlaceEqual,
   isPointEqual,
+  isPointExactEqual,
   isZoneEqual,
   lnglat2point,
   maybeFunctionToFunction,

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

@@ -20,7 +20,7 @@ import { WalkingRoute } from "../WalkingRoute/WalkingRoute.js";
 import { WaveCircle } from "../WaveCircle/WaveCircle.js";
 const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
 const PASSENGER_DISTANCE_MAX = 2e3;
-const PASSENGER_DISTANCE_MIN = 10;
+const PASSENGER_DISTANCE_MIN = 20;
 const AUTO_FIT_VIEW_INTERVAL = IS_ENABLE_AUXILIARY_GRASP_ROAD ? 24 * 3600 * 1e3 : 15e3;
 const carDurationWithinMinDistance = (distance) => Math.floor(distance / 5);
 const SectionDispatching = defineSetup("SectionDispatching", function(props) {

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

@@ -1,12 +1,22 @@
 import { createVNode } from "vue";
 import { defineSetup } from "../../types/helper.js";
-import { stringifyPoint } from "../../utils/transform.js";
+import { stringifyPoint, isPointExactEqual } from "../../utils/transform.js";
 import { DrivingLine } from "../DrivingLine/DrivingLine.js";
-const justifyFirstPointStatus = (firstPointStatus, secondPointStatus) => {
-  return (firstPointStatus === void 0 || firstPointStatus === "UNKNOWN") && !!secondPointStatus && secondPointStatus !== "UNKNOWN" ? secondPointStatus : firstPointStatus != null ? firstPointStatus : "UNKNOWN";
+const toHalfPath = (path, isFromStart = true) => {
+  if (path.length < 2)
+    return path;
+  const [[x0, y0], [x1, y1]] = path;
+  const mid = [(x0 + x1) / 2, (y0 + y1) / 2];
+  return isFromStart ? [[x0, y0], mid] : [mid, [x1, y1]];
+};
+const isSlowOrJam = (status) => {
+  return status === "SLOW" || status === "TRAFFIC_JAM" || status === "HEAVY_TRAFFIC_JAM";
+};
+const justifyFirstPointStatus = (firstPointStatus, secondPointBeforeStatus) => {
+  return (firstPointStatus === void 0 || firstPointStatus === "UNKNOWN") && !!secondPointBeforeStatus && secondPointBeforeStatus !== "UNKNOWN" ? secondPointBeforeStatus : firstPointStatus != null ? firstPointStatus : "UNKNOWN";
 };
 const createMulitpleLineByTrafficJams = (path, trafficJams) => {
-  var _a;
+  var _a, _b, _c, _d;
   if (!trafficJams)
     return [{
       path,
@@ -18,12 +28,13 @@ const createMulitpleLineByTrafficJams = (path, trafficJams) => {
   const multipleLines = [];
   let line = {
     path: [firstPoint],
-    status: justifyFirstPointStatus(trafficJams[stringifyPoint(firstPoint)], trafficJams[stringifyPoint(path[1])])
+    status: justifyFirstPointStatus((_a = trafficJams[stringifyPoint(firstPoint)]) == null ? void 0 : _a.after, (_b = trafficJams[stringifyPoint(path[1])]) == null ? void 0 : _b.before)
   };
-  for (let idx = 2; idx < path.length; idx++) {
+  for (let idx = 1; idx < path.length; idx++) {
     const point = path[idx];
-    const traffic = (_a = trafficJams[stringifyPoint(point)]) != null ? _a : "UNKNOWN";
-    line.path.push(point);
+    const traffic = (_d = (_c = trafficJams[stringifyPoint(point)]) == null ? void 0 : _c.after) != null ? _d : "UNKNOWN";
+    if (!isPointExactEqual(point, path[idx - 1]))
+      line.path.push(point);
     if (traffic === line.status)
       continue;
     multipleLines.push(line);
@@ -48,27 +59,41 @@ const beautifyMultipleLines = (lines) => {
     status: "NORMAL",
     lineCap: "round"
   };
-  const coveredLines = [];
+  const roundCoveredLines = [];
+  const buttCoveredLines = [];
   for (const line of lines) {
     const {
       path,
       status
     } = line;
-    if (status !== "SLOW" && status !== "TRAFFIC_JAM" && status !== "HEAVY_TRAFFIC_JAM")
+    if (!isSlowOrJam(status))
       continue;
-    coveredLines.push({
+    buttCoveredLines.push({
       status,
       path,
       lineCap: "butt"
     });
   }
   const first = lines[0];
+  const last = lines[lines.length - 1];
   const ignoredLine = {
     status: first.status,
     path: first.path.slice(0, 2),
     lineCap: "butt"
   };
-  return [ignoredLine, totalLine, ...coveredLines];
+  if (isSlowOrJam(first.status))
+    roundCoveredLines.push({
+      status: first.status,
+      path: toHalfPath(first.path.slice(0, 2)),
+      lineCap: "round"
+    });
+  if (isSlowOrJam(last.status))
+    roundCoveredLines.push({
+      status: last.status,
+      path: toHalfPath(last.path.slice(-2), false),
+      lineCap: "round"
+    });
+  return [ignoredLine, totalLine, ...roundCoveredLines, ...buttCoveredLines];
 };
 const TrafficDrivingLine = defineSetup("TrafficDrivingLine", function(props) {
   return () => {
@@ -77,7 +102,6 @@ const TrafficDrivingLine = defineSetup("TrafficDrivingLine", function(props) {
       trafficJams
     } = props;
     const multipleLines = createMulitpleLineByTrafficJams(path, trafficJams);
-    console.log("multipleLines = ", multipleLines);
     const beautifiedLines = beautifyMultipleLines(multipleLines);
     return createVNode("div", null, [beautifiedLines.map((line) => createVNode(DrivingLine, {
       "path": line.path,

package/dist/v3/hooks/useDeviationCorrectionDrivingRoute.js

@@ -134,7 +134,12 @@ const createSubRouteByPoint = (route, point, distanceOfLineFn) => {
     count += step.path.length;
     if (count <= index)
       continue;
-    const firstStepPath = [point, ...step.path.slice(index - count + 1)];
+    if (step.path.length + index - count + 1 < 0) {
+      console.error(
+        "`MyError: createSubRouteByPoint unexpected condition: step.path.length + index - count + 1 < 0"
+      );
+    }
+    const firstStepPath = [point, ...step.path.slice(step.path.length + index - count + 1)];
     const totalStepDistanceByMeasure = distanceOfLineFn(step.path);
     const stepDistanceByMeasure = (_a = distanceOfLineFn(firstStepPath)) != null ? _a : 0;
     const firstStepDistance = totalStepDistanceByMeasure ? step.distance * stepDistanceByMeasure / totalStepDistanceByMeasure : stepDistanceByMeasure;
@@ -153,7 +158,6 @@ const createSubRouteByPoint = (route, point, distanceOfLineFn) => {
     distance += step.distance;
     duration += step.duration;
   }
-  console.log("point, index, distance, steps, route = ", point, index, distance, steps, route);
   return { path, duration, distance, steps, index, baseRoute: route };
 };
 const createEmptySubRoute = () => {

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

@@ -107,4 +107,7 @@ export type ProxyServiceError = {
     msg: string;
 };
 export type TrafficStatus = "UNKNOWN" | "NORMAL" | "SLOW" | "TRAFFIC_JAM" | "HEAVY_TRAFFIC_JAM";
-export type TrafficJams = Record<`${number},${number}`, TrafficStatus>;
+export type TrafficJams = Record<`${number},${number}`, {
+    before: TrafficStatus;
+    after: TrafficStatus;
+}>;

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -1,14 +1,20 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
-import { stringifyPoint, amapTraffic2trafficStatus } from "./transform.js";
+import { amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
 const amapTmcs2trafficJams = (tmcs) => {
   const trafficJams = {};
+  let prevStatus = "UNKNOWN";
   for (const tmc of tmcs) {
     const { path } = tmc;
     if (!path)
       continue;
     for (const { lng, lat } of path) {
-      trafficJams[stringifyPoint([lng, lat])] = amapTraffic2trafficStatus(tmc.status);
+      const status = amapTraffic2trafficStatus(tmc.status);
+      trafficJams[stringifyPoint([lng, lat])] = {
+        before: prevStatus,
+        after: status
+      };
+      prevStatus = status;
     }
   }
   return trafficJams;
@@ -24,6 +30,7 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
         switch (status) {
           case "complete": {
             let path = [];
+            let tmcs = [];
             const drivingResult = result;
             const routeSteps = [];
             const firstRoute = drivingResult.routes[0];
@@ -33,13 +40,14 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
               const basicStep = step;
               const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
               path = path.concat(stepPath);
-              Object.assign(trafficJams, amapTmcs2trafficJams(basicStep.tmcs));
+              tmcs = tmcs.concat(basicStep.tmcs);
               routeSteps.push({
                 path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
                 duration: basicStep.time,
                 distance: basicStep.distance
               });
             }
+            Object.assign(trafficJams, amapTmcs2trafficJams(tmcs));
             return resolve({
               path,
               distance: firstRoute.distance,

package/dist/v3/utils/log.js

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

package/dist/v3/utils/transform.d.ts

@@ -25,6 +25,7 @@ export declare const pipeAsync: <P extends any[]>(fn?: ((...args: P) => any) | u
 export declare const pipeDefer: <P extends any[], R>(fn: (...args: P) => R) => (...args: P) => Promise<R>;
 export declare const pipeOnlyLastEffect: <P extends any[], R>(fn: (...arg: P) => Promise<R>) => (...args: P) => Promise<R>;
 export declare const isPlaceEqual: (p1: Place, p2?: Place) => boolean;
+export declare const isPointExactEqual: (p1: Point, p2?: Point) => boolean;
 export declare const isPointEqual: (p1: Point, p2?: Point) => boolean;
 export declare const isGeoPositionEqual: (p1: GeolocationPosition, p2?: GeolocationPosition) => boolean;
 export declare const isZoneEqual: (z1: Zone, z2?: Zone) => boolean;

package/dist/v3/utils/transform.js

@@ -96,6 +96,9 @@ const pipeOnlyLastEffect = (fn) => {
 const isPlaceEqual = (p1, p2) => {
   return isAccuryEqual(p1.lng, p2 == null ? void 0 : p2.lng) && isAccuryEqual(p1.lat, p2 == null ? void 0 : p2.lat);
 };
+const isPointExactEqual = (p1, p2) => {
+  return p1[0] === (p2 == null ? void 0 : p2[0]) && p1[1] === (p2 == null ? void 0 : p2[1]);
+};
 const isPointEqual = (p1, p2) => {
   return isAccuryEqual(p1[0], p2 == null ? void 0 : p2[0]) && isAccuryEqual(p1[1], p2 == null ? void 0 : p2[1]);
 };
@@ -323,6 +326,7 @@ export {
   isGeoPositionEqual,
   isPlaceEqual,
   isPointEqual,
+  isPointExactEqual,
   isZoneEqual,
   lnglat2point,
   maybeFunctionToFunction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",