@heycar/heycars-map 2.7.1 → 2.8.0

package/dist/v3/components/Amap/Amap.d.ts

@@ -1,11 +1,10 @@
 import type { SetMap } from "../../hooks/useHeycarMap";
 import type { AmapMap } from "../../types/interface";
 import type { MapEventHandler } from "../../types/mapHelper";
-import { type VectorMapForeign } from "../../utils/transform";
 import { SafeAmap } from "./SafeAmap";
-export interface AmapProps extends Omit<AMap.MapOptions, "vectorMapForeign"> {
-    vectorMapForeign?: VectorMapForeign;
+export interface AmapProps extends Omit<AMap.MapOptions, "viewMode"> {
     mapRef?: SetMap<AmapMap>;
+    viewMode?: "2D" | "3D";
     dragEnable?: boolean;
     zoomEnable?: boolean;
     rotateEnable?: boolean;

package/dist/v3/components/Amap/Amap.js

@@ -14,15 +14,7 @@ import { SafeAmap } from "./SafeAmap.js";
 const Amap_css_ts_vanilla = "";
 var amap = "_1d8ur7t0";
 const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
-  const {
-    onDragStart,
-    onDragEnd,
-    onZoomEnd,
-    onResize,
-    mapRef: setMap,
-    vectorMapForeign = "style_zh_cn",
-    ...defaultOptions
-  } = props;
+  const { onDragStart, onDragEnd, onZoomEnd, onResize, mapRef: setMap, ...defaultOptions } = props;
   const statusOptions = computed(() => {
     const {
       dragEnable = true,
@@ -65,8 +57,7 @@ const Amap = defineSetup("Amap", function(props, { slots, emit, attrs }) {
     const map = new SafeAmap(elementRef.value, {
       ...defaultOptions,
       scrollWheel: defaultOptions.touchZoomCenter ? false : defaultOptions.scrollWheel,
-      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom,
-      vectorMapForeign
+      doubleClickZoom: defaultOptions.touchZoomCenter ? false : defaultOptions.doubleClickZoom
     });
     window.GlobalAmap = map;
     mapRef.value = map;

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

@@ -3,12 +3,22 @@ import { useAmap } from "../../hooks/useMap.js";
 import { useMapOverlay } from "../../hooks/useOverlay.js";
 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";
+};
 const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
   const { registerOverlay } = props;
   const markerRef = shallowRef();
   const mapRef = useAmap();
+  const emitClick = (_, e) => {
+    const event = e;
+    if (shouldSkipByAmapClickDoubleTriggerBug(event))
+      return;
+    emit("click", event);
+  };
   onMounted(() => {
     referenceCount.add();
     const { registerOverlay: registerOverlay2, onClick, ...option } = props;
@@ -22,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;
@@ -49,7 +58,7 @@ const AmapMarker = defineSetup("AmapMarker", function(props, { emit }) {
     { name: "title", defaultValue: "" },
     { name: "extData", defaultValue: "" }
   ]);
-  watchPostEffectForAMapEvent(markerRef, props, emit, ["onClick"]);
+  watchPostEffectForAMapEvent(markerRef, props, emitClick, ["onClick"]);
   return () => null;
 });
 export {

package/dist/v3/components/MapProvider/MapProvider.js

@@ -8,7 +8,7 @@ import { defineLagecySetup } from "../../types/helper.js";
 import "../../utils/alipayPolyfill.js";
 import { loadTraditionalChineseConvertOnce } from "../../utils/cn2tw.js";
 import { detectWebGL, WEBGL_STATUS, detectBrowserPlatform, OS_PLATFORM, BRWOSER_PLATFORM, detectOSPlatform } from "../../utils/platform.js";
-import { language2vectorMapForeign, vec2lnglat } from "../../utils/transform.js";
+import { vec2lnglat } from "../../utils/transform.js";
 import { Amap } from "../Amap/Amap.js";
 import { Gmap } from "../Gmap/Gmap.js";
 import { t as throttle } from "../../chunks/throttle.8bdd8d3b.js";
@@ -154,7 +154,7 @@ const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
           "style": attrs.style
         }, [createVNode(Amap, {
           "mapRef": setMap,
-          "vectorMapForeign": language2vectorMapForeign(language),
+          "showOversea": true,
           "center": center,
           "zoom": zoom,
           "dragEnable": touchEnable,

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/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/amap/index.d.ts

@@ -3,6 +3,7 @@ export type * from "./driving";
 export type * from "./geocoder";
 export type * from "./graspRoad";
 export type * from "./marker";
+export type * from "./options";
 export type * from "./place";
 export type * from "./plugin";
 export type * from "./walking";

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

@@ -0,0 +1,8 @@
+export {};
+declare global {
+    namespace AMap {
+        interface MapOptions {
+            showOversea?: boolean;
+        }
+    }
+}

package/dist/v3/types/amap/options.js

@@ -0,0 +1 @@
+

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,5 @@ export type ProxyServiceError = {
     code: number;
     msg: string;
 };
+export type TrafficStatus = "UNKNOWN" | "NORMAL" | "SLOW" | "TRAFFIC_JAM" | "HEAVY_TRAFFIC_JAM";
+export type TrafficJams = Record<`${number},${number}`, TrafficStatus>;

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -1,5 +1,18 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
+import { stringifyPoint, amapTraffic2trafficStatus } from "./transform.js";
+const amapTmcs2trafficJams = (tmcs) => {
+  const trafficJams = {};
+  for (const tmc of tmcs) {
+    const { path } = tmc;
+    if (!path)
+      continue;
+    for (const { lng, lat } of path) {
+      trafficJams[stringifyPoint([lng, lat])] = amapTraffic2trafficStatus(tmc.status);
+    }
+  }
+  return trafficJams;
+};
 function amapJsApiDrivingRoute(from, to, amapDriving) {
   return new Promise((resolve, reject) => {
     amapDriving.search(
@@ -7,6 +20,7 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
       AMap.LngLat.from(to),
       { waypoints: [] },
       (status, result) => {
+        const trafficJams = {};
         switch (status) {
           case "complete": {
             let path = [];
@@ -19,6 +33,7 @@ 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));
               routeSteps.push({
                 path: basicStep.path.map(({ lng, lat }) => [lng, lat]),
                 duration: basicStep.time,
@@ -30,7 +45,8 @@ function amapJsApiDrivingRoute(from, to, amapDriving) {
               distance: firstRoute.distance,
               duration: firstRoute.time,
               tolls: firstRoute.tolls,
-              steps: routeSteps
+              steps: routeSteps,
+              trafficJams
             });
           }
           case "no_data":
@@ -48,6 +64,7 @@ async function gaodeServiceApiDrivingRoute(from, to, proxyUrl) {
     origin: [from],
     destination: to
   });
+  const trafficJams = {};
   switch (status) {
     case "complete": {
       let path = [];
@@ -59,6 +76,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 +88,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.1";
+const pkgVersion = "2.8.0";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

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

@@ -28,3 +28,4 @@ export declare const detectOSPlatform: () => OS_PLATFORM;
  * Inspired from http://www.browserleaks.com/webgl#howto-detect-webgl
  */
 export declare function detectWebGL(): WEBGL_STATUS;
+export declare function detectTouchDevice(): boolean;

package/dist/v3/utils/platform.js

@@ -80,6 +80,9 @@ function detectWebGL() {
   }
   return "NOT_SUPPORTED";
 }
+function detectTouchDevice() {
+  return "ontouchend" in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
+}
 export {
   ALIPAY_WALLET,
   BRWOSER_PLATFORM,
@@ -88,5 +91,6 @@ export {
   detectAlipayWallet,
   detectBrowserPlatform,
   detectOSPlatform,
+  detectTouchDevice,
   detectWebGL
 };

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

@@ -1,5 +1,5 @@
 /// <reference types="google.maps" />
-import type { Language, 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 {
@@ -18,8 +19,6 @@ export interface AsteriskItem {
 export declare const decodeAsterisk: (encodedValue: string) => AsteriskItem[];
 export declare const property2emitEventName: (propertyName: string) => string;
 export declare const property2mapEventName: (propertyName: string) => string;
-export type VectorMapForeign = "style_en" | "style_local" | "style_zh_cn";
-export declare const language2vectorMapForeign: (lang: Language) => VectorMapForeign;
 export declare const place2point: (place: Place) => Point;
 export declare const combineHandler: <P extends any[], R>(fn1: ((...args: P) => any) | undefined, fn2: (...args: P) => R) => (...args: P) => R;
 export declare const pipeAsync: <P extends any[]>(fn?: ((...args: P) => any) | undefined) => (...args: P) => void;
@@ -47,4 +46,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("*");
@@ -61,15 +62,6 @@ const property2emitEventName = (propertyName) => {
 const property2mapEventName = (propertyName) => {
   return propertyName.slice(2).toLowerCase();
 };
-const language2vectorMapForeign = (lang) => {
-  switch (lang) {
-    case "en":
-      return "style_en";
-    case "zh-TW":
-    case "zh":
-      return "style_zh_cn";
-  }
-};
 const place2point = (place) => [Number(place.lng), Number(place.lat)];
 const combineHandler = (fn1, fn2) => {
   return (...args) => {
@@ -296,10 +288,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,
@@ -316,7 +324,6 @@ export {
   isPlaceEqual,
   isPointEqual,
   isZoneEqual,
-  language2vectorMapForeign,
   lnglat2point,
   maybeFunctionToFunction,
   pipeAsync,
@@ -326,6 +333,7 @@ export {
   property2emitEventName,
   property2mapEventName,
   signal2promise,
+  stringifyPoint,
   trackPoints2amapGraspRoadPoints,
   vec2lnglat,
   wxGetLocationSuccessResponse2GeolocationPosition

package/package.json

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