@heycar/heycars-map 2.7.2 → 2.8.1

package/dist/v3/components/AmapMarker/AmapMarker.js

@@ -5,7 +5,6 @@ import { defineSetup } from "../../types/helper.js";
 import { watchNoneImmediatePostEffectForMapProperty, watchPostEffectForAMapEvent } from "../../utils/compare.js";
 import { detectTouchDevice } from "../../utils/platform.js";
 import { referenceCount } from "../../utils/referenceCount.js";
-import { useAmapFixBugOverlayDrag } from "../AmapPolygon/AmapPolygon.js";
 const isTouchDevice = detectTouchDevice();
 const shouldSkipByAmapClickDoubleTriggerBug = (e) => {
   return isTouchDevice && e.originEvent.type === "mouseup";
@@ -33,7 +32,6 @@ const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
     (_b = markerRef.value) == null ? void 0 : _b.destroy();
     markerRef.value = void 0;
   });
-  useAmapFixBugOverlayDrag(markerRef);
   watchPostEffect((onCleanup) => {
     var _a;
     const map = mapRef == null ? void 0 : mapRef.value;

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

@@ -27,6 +27,7 @@ export declare const useDeviationCorrectionDrivingRoute: (props?: UseDeviationCo
                 duration: number;
                 distance: number;
             }[];
+            trafficJams?: import("../types/interface").TrafficJams | undefined;
         };
         index: number;
         path: [number, number][];
@@ -38,6 +39,7 @@ export declare const useDeviationCorrectionDrivingRoute: (props?: UseDeviationCo
             duration: number;
             distance: number;
         }[];
+        trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
     angleRef: import("vue-demi").Ref<number>;
     graspRoadPathRef: import("vue-demi").Ref<Point[] | undefined>;

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/hooks/useDrivingRoute.d.ts

@@ -14,6 +14,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
             duration: number;
             distance: number;
         }[];
+        trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
     apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
 };
@@ -28,6 +29,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
             duration: number;
             distance: number;
         }[];
+        trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
     apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
 };
@@ -42,6 +44,7 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
             duration: number;
             distance: number;
         }[];
+        trafficJams?: import("../types/interface").TrafficJams | undefined;
     };
     apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
 };

package/dist/v3/hooks/useDrivingRoute.js

@@ -10,7 +10,8 @@ const useADrivingRoute = (props) => {
     distance: 0,
     duration: 0,
     tolls: void 0,
-    steps: []
+    steps: [],
+    trafficJams: void 0
   });
   const amapDriving = new AMap.Driving({});
   const apiMapDrivingRoute = (from, to) => {

package/dist/v3/hooks/useDrivingTrackCorrection.d.ts

@@ -14,5 +14,6 @@ export declare const useDrivingTrackCorrection: (props: UseDrivingTrackCorrectio
         duration: number;
         distance: number;
     }[];
+    trafficJams?: import("../types/interface").TrafficJams | undefined;
 };
 export {};

package/dist/v3/types/amap/driving.d.ts

@@ -40,9 +40,10 @@ declare global {
             path: LngLat[];
         }
         interface TMC {
+            path?: LngLat[];
             lcode: string;
             distance: number;
-            status: string;
+            status: "未知" | "畅通" | "缓行" | "拥堵" | "严重拥堵";
         }
         interface DriveStepDetail {
             cities: ViaCity[];

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

@@ -78,6 +78,7 @@ export interface Route {
     duration: number;
     tolls?: number;
     steps: RouteStep[];
+    trafficJams?: TrafficJams;
 }
 export interface TrackPoint {
     lng: number;
@@ -105,3 +106,8 @@ export type ProxyServiceError = {
     code: number;
     msg: string;
 };
+export type TrafficStatus = "UNKNOWN" | "NORMAL" | "SLOW" | "TRAFFIC_JAM" | "HEAVY_TRAFFIC_JAM";
+export type TrafficJams = Record<`${number},${number}`, {
+    before: TrafficStatus;
+    after: TrafficStatus;
+}>;

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -1,5 +1,24 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.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) {
+      const status = amapTraffic2trafficStatus(tmc.status);
+      trafficJams[stringifyPoint([lng, lat])] = {
+        before: prevStatus,
+        after: status
+      };
+      prevStatus = status;
+    }
+  }
+  return trafficJams;
+};
 function amapJsApiDrivingRoute(from, to, amapDriving) {
   return new Promise((resolve, reject) => {
     amapDriving.search(
@@ -7,9 +26,11 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
       AMap.LngLat.from(to),
       { waypoints: [] },
       (status, result) => {
+        const trafficJams = {};
         switch (status) {
           case "complete": {
             let path = [];
+            let tmcs = [];
             const drivingResult = result;
             const routeSteps = [];
             const firstRoute = drivingResult.routes[0];
@@ -19,18 +40,21 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
               const basicStep = step;
               const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
               path = path.concat(stepPath);
+              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,
               duration: firstRoute.time,
               tolls: firstRoute.tolls,
-              steps: routeSteps
+              steps: routeSteps,
+              trafficJams
             });
           }
           case "no_data":
@@ -48,6 +72,7 @@ async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
     origin: [from],
     destination: to
   });
+  const trafficJams = {};
   switch (status) {
     case "complete": {
       let path = [];
@@ -59,6 +84,7 @@ async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
         const basicStep = step;
         const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
         path = path.concat(stepPath);
+        Object.assign(trafficJams, amapTmcs2trafficJams(basicStep.tmcs));
         routeSteps.push({
           path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
           duration: basicStep.time,
@@ -70,7 +96,8 @@ async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
         distance: firstRoute.distance,
         duration: firstRoute.time,
         tolls: firstRoute.tolls,
-        steps: routeSteps
+        steps: routeSteps,
+        trafficJams
       };
     }
     case "no_data":

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.7.2";
+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

@@ -1,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { LngLatLiterial, Place, Point, TrackPoint, Zone } from "../types/interface";
+import type { LngLatLiterial, Place, Point, TrackPoint, TrafficStatus, Zone } from "../types/interface";
 import type { AlipayMyGetLocationSuccessResponse } from "../types/my";
 import type { WxGetLocationSuccessResponse } from "../types/wx";
 import { BRWOSER_PLATFORM } from "./platform";
@@ -9,6 +9,7 @@ export declare const lnglat2point: ({ lng, lat }: {
     lng: number;
     lat: number;
 }) => Point;
+export declare const stringifyPoint: (p: Point) => `${number},${number}`;
 export declare const googlePointsStringify: (points: Point[]) => string;
 export declare const gaodePointsStringify: (points: Point[]) => string;
 export interface AsteriskItem {
@@ -24,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;
@@ -45,4 +47,5 @@ export declare const maybeFunctionToFunction: <T>(value: T) => MaybeFunctionToFu
 export declare const signal2promise: (signal?: AbortSignal) => Promise<any>;
 export declare const googleEncodedPolyline2googleLatLng: (value: string) => google.maps.LatLng[];
 export declare const gaodePolyline2amapLngLat: (value: string) => AMap.LngLat[];
+export declare const amapTraffic2trafficStatus: (value?: AMap.TMC["status"]) => TrafficStatus;
 export {};

package/dist/v3/utils/transform.js

@@ -42,8 +42,9 @@ const vec2lnglat = ([lng, lat]) => ({
   lat: Number(lat)
 });
 const lnglat2point = ({ lng, lat }) => [lng, lat];
+const stringifyPoint = (p) => `${p[0]},${p[1]}`;
 const googlePointsStringify = (points) => points.map(([lng, lat]) => `${lat},${lng}`).join("|");
-const gaodePointsStringify = (points) => points.map(([lng, lat]) => `${lng},${lat}`).join(";");
+const gaodePointsStringify = (points) => points.map(stringifyPoint).join(";");
 const decodeAsterisk = (encodedValue) => {
   const result = [];
   const tokens = encodedValue.split("*");
@@ -95,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]);
 };
@@ -287,10 +291,26 @@ const gaodePolyline2amapLngLat = (value) => {
     return { lng, lat };
   });
 };
+const amapTraffic2trafficStatus = (value) => {
+  switch (value) {
+    case void 0:
+    case "未知":
+      return "UNKNOWN";
+    case "畅通":
+      return "NORMAL";
+    case "缓行":
+      return "SLOW";
+    case "拥堵":
+      return "TRAFFIC_JAM";
+    case "严重拥堵":
+      return "HEAVY_TRAFFIC_JAM";
+  }
+};
 export {
   alipayMyGetLocationError2GeolocationPositionErrorCode,
   alipayMyGetLocationSuccessResponse2GeolocationPosition,
   amapPlaceName2DisplayName,
+  amapTraffic2trafficStatus,
   businessCandidatesToAdsorptionPlace,
   combineHandler,
   decodeAsterisk,
@@ -306,6 +326,7 @@ export {
   isGeoPositionEqual,
   isPlaceEqual,
   isPointEqual,
+  isPointExactEqual,
   isZoneEqual,
   lnglat2point,
   maybeFunctionToFunction,
@@ -316,6 +337,7 @@ export {
   property2emitEventName,
   property2mapEventName,
   signal2promise,
+  stringifyPoint,
   trackPoints2amapGraspRoadPoints,
   vec2lnglat,
   wxGetLocationSuccessResponse2GeolocationPosition

package/package.json

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