@heycar/heycars-map 2.15.0-sgn1 → 2.17.0-curve1

package/README.md

@@ -204,7 +204,7 @@ export type DriverStatus =
   // 弃用，谷歌路线规划代理地址
   googleDirectionsProxyUrl="/overseas/maps/directions/json"
   // 可选，谷歌路由服务代理地址
-  googleRoutesProxyUrl="/overseas/maps/routes/directions"
+  googleRoutesProxyUrl="/overseas/maps/routes/directions/v2"
   // 可选，自定义地图颜色
   themeVariables={
     {

package/dist/v2/App.js

@@ -8,7 +8,7 @@ const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
 const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
 const App = defineComponent({
   setup() {
-    const supplierRef = ref("amap");
+    const supplierRef = ref("gmap");
     window.supplierRef = supplierRef;
     return () => h(MapProvider, {
       "attrs": {
@@ -19,7 +19,7 @@ const App = defineComponent({
         "language": "en",
         "supplier": supplierRef.value,
         "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
-        "googleRoutesProxyUrl": "/overseas/maps/routes/directions",
+        "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
         "themeVariables": {
           // 默认主题
           // TRAFFIC_UNKNOWN_BACKGROUND_COLOR: "#00C875",

package/dist/v2/api/googleRoutes.js

@@ -1,5 +1,6 @@
 import { googleEncodedPolyline2googleLatLng } from "../utils/transform.js";
 import { isProxyServiceError, createTypeError } from "../utils/typeChecking.js";
+const DEFAULT_GOOGLE_ROUTES_FIELDS = ["routes.polyline", "routes.legs"];
 const ALL_ROUTES_STATUS = [
   "OK",
   "CANCELLED",
@@ -104,6 +105,7 @@ async function apiGoogleRoutes(props) {
   const { protocol, host } = location;
   const baseUrl = proxyUrl.startsWith(protocol) ? void 0 : `${protocol}//${host}`;
   const url = new URL(proxyUrl, baseUrl);
+  url.searchParams.set("fields", DEFAULT_GOOGLE_ROUTES_FIELDS.join(","));
   const response = await fetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },

package/dist/v2/business-components/BusinessQuotingMap/BusinessQuotingMap.d.ts

@@ -14,7 +14,7 @@ export type BusinessQuotingMapProps = CoordinatifyProps<Omit<HeycarMapProps, "ce
         distance: number;
         duration: number;
         tolls?: number;
-    }) => string;
+    }) => string | undefined;
     onClickStartPoint?: (value: CoordinatePlace) => void;
     onClickEndPoint?: (value: CoordinatePlace) => void;
 };

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

@@ -9,10 +9,9 @@ import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
 import { toCoordinatePlaceType } from "../../utils/typeChecking.js";
-import { DrivingRoute } from "../DrivingRoute/DrivingRoute.js";
+import { DrivingQuadraticBezierCurve } from "../DrivingQuadraticBezierCurve/DrivingQuadraticBezierCurve.js";
 import { FitViewOnce, createFittableRegisterOverlay } from "../FitView/FitView.js";
 import { StartEndPoint } from "../StartEndPoint/StartEndPoint.js";
-import { TrafficDrivingLine } from "../TrafficDrivingLine/TrafficDrivingLine.js";
 const BUSINESS_QUOTING_FITVIEW_PANDING = [26, 26, 19, 26];
 const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(props, {
   emit,
@@ -85,39 +84,27 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
       "on": {
         "click": () => !disableStartPoint && emit("clickStartPoint", coordinatifyPlace(fromPlace))
       }
-    }), h(DrivingRoute, {
+    }), h(DrivingQuadraticBezierCurve, {
       "attrs": {
-        "to": to,
         "from": from,
-        "render": ({
-          path,
-          distance,
-          duration,
-          tolls,
-          trafficJams
-        }) => [h(TrafficDrivingLine, {
-          "attrs": {
-            "path": path,
-            "trafficJams": trafficJams
-          }
-        }), h(StartEndPoint, {
-          "attrs": {
-            "type": "end",
-            "registerOverlay": fittableRegistryOverlay,
-            "position": to,
-            "title": toPlace.displayName,
-            "description": renderDescription({
-              distance,
-              duration,
-              tolls
-            }),
-            "withArrow": !disableEndPoint,
-            "language": language
-          },
-          "on": {
-            "click": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
-          }
-        })]
+        "to": to
+      }
+    }), h(StartEndPoint, {
+      "attrs": {
+        "type": "end",
+        "registerOverlay": fittableRegistryOverlay,
+        "position": to,
+        "title": toPlace.displayName,
+        "description": renderDescription({
+          distance: 0,
+          duration: 0,
+          tolls: 0
+        }),
+        "withArrow": !disableEndPoint,
+        "language": language
+      },
+      "on": {
+        "click": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
       }
     }), h(FitViewOnce, {
       "attrs": {

package/dist/v2/business-components/DrivingQuadraticBezierCurve/DrivingQuadraticBezierCurve.d.ts

@@ -0,0 +1,10 @@
+import type { Point } from "../../types/interface";
+export interface DrivingQuadraticBezierCurveProps {
+    from: Point;
+    to: Point;
+    lineCap?: AMap.LineSharedOptions["lineCap"];
+    color?: string;
+}
+export declare const ADrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, DrivingQuadraticBezierCurveProps>;
+export declare const GDrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, DrivingQuadraticBezierCurveProps>;
+export declare const DrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, DrivingQuadraticBezierCurveProps>;

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

@@ -0,0 +1,100 @@
+import { h } from "vue";
+import { computed } from "vue-demi";
+import { ZINDEX_LINE_LAYER } from "../../api/contants.js";
+import { AmapBezierCurve } from "../../components/AmapBezierCurve/AmapBezierCurve.js";
+import { GmapPolyline } from "../../components/GmapPolyline/GmapPolyline.js";
+import { createElement } from "../../demi-polyfill/demi-polyfill.js";
+import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { defineSetup } from "../../types/helper.js";
+import { createQuadraticBezierCurvePoints, calculateLeftIsoscelesVertex } from "../../utils/geometryPolygon.js";
+import { vec2lnglat } from "../../utils/transform.js";
+const CONTROL_POINT_ANGLE = 30;
+const OUTLINE_COLOR = "#FFFFFF";
+const ADrivingQuadraticBezierCurve = defineSetup("ADrivingQuadraticBezierCurve", function(props) {
+  const pathRef = computed(() => {
+    const {
+      from,
+      to
+    } = props;
+    const controlPoint = calculateLeftIsoscelesVertex(from, to, CONTROL_POINT_ANGLE);
+    return [from, [...controlPoint, ...to]];
+  });
+  return () => {
+    const {
+      lineCap = "round",
+      color = "#4471FF"
+    } = props;
+    const vw = window.innerWidth * 0.01;
+    const strokeWidth = 1 * vw;
+    const borderWidth = 0.13 * vw;
+    const outlineWidth = 0.4 * vw;
+    return h("div", [h(AmapBezierCurve, {
+      "attrs": {
+        "path": pathRef.value,
+        "isOutline": true,
+        "borderWeight": outlineWidth,
+        "outlineColor": OUTLINE_COLOR,
+        "strokeWeight": strokeWidth + 2 * borderWidth,
+        "strokeOpacity": 1,
+        "strokeColor": color,
+        "lineJoin": "round",
+        "lineCap": lineCap,
+        "zIndex": ZINDEX_LINE_LAYER
+      }
+    })]);
+  };
+});
+const GDrivingQuadraticBezierCurve = defineSetup("GDrivingQuadraticBezierCurve", function(props) {
+  const pathRef = computed(() => {
+    const {
+      from,
+      to
+    } = props;
+    const controlPoint = calculateLeftIsoscelesVertex(from, to, CONTROL_POINT_ANGLE);
+    return createQuadraticBezierCurvePoints(from, to, controlPoint).map(vec2lnglat);
+  });
+  return () => {
+    const {
+      color = "#4471FF"
+    } = props;
+    const vw = window.innerWidth * 0.01;
+    const strokeWidth = 1.25 * vw * 0.65;
+    const borderWidth = 0.175 * vw * 0.65;
+    const outlineWidth = 0.45 * vw * 0.65;
+    return h("div", [h(GmapPolyline, {
+      "attrs": {
+        "path": pathRef.value,
+        "strokeWeight": strokeWidth + 2 * borderWidth + 2 * outlineWidth,
+        "strokeOpacity": 1,
+        "strokeColor": OUTLINE_COLOR,
+        "zIndex": ZINDEX_LINE_LAYER
+      }
+    }), h(GmapPolyline, {
+      "attrs": {
+        "path": pathRef.value,
+        "strokeWeight": strokeWidth + 2 * borderWidth,
+        "strokeOpacity": 1,
+        "strokeColor": color,
+        "zIndex": ZINDEX_LINE_LAYER
+      }
+    })]);
+  };
+});
+const DrivingQuadraticBezierCurve = defineSetup("DrivingQuadraticBezierCurve", function(props) {
+  const payload = useMapSupplier();
+  return () => {
+    var _a, _b;
+    const color = (_b = (_a = payload.themeVariables) == null ? void 0 : _a.TRAFFIC_UNKNOWN_BACKGROUND_COLOR) != null ? _b : props.color;
+    return createElement(payload.supplier === "gmap" ? GDrivingQuadraticBezierCurve : ADrivingQuadraticBezierCurve, {
+      attrs: {
+        ...props,
+        color
+      }
+    });
+  };
+});
+export {
+  ADrivingQuadraticBezierCurve,
+  DrivingQuadraticBezierCurve,
+  GDrivingQuadraticBezierCurve
+};

package/dist/v2/business-components/DrivingQuadraticBezierCurve/index.d.ts

@@ -0,0 +1 @@
+export * from "./DrivingQuadraticBezierCurve";

package/dist/v2/business-components/DrivingQuadraticBezierCurve/index.js

@@ -0,0 +1,6 @@
+import { ADrivingQuadraticBezierCurve, DrivingQuadraticBezierCurve, GDrivingQuadraticBezierCurve } from "./DrivingQuadraticBezierCurve.js";
+export {
+  ADrivingQuadraticBezierCurve,
+  DrivingQuadraticBezierCurve,
+  GDrivingQuadraticBezierCurve
+};

package/dist/v2/components/AmapBezierCurve/AmapBezierCurve.d.ts

@@ -0,0 +1,3 @@
+import { type AmapOverlay, type MapRegisterOverlayProps } from "../../hooks/useOverlay";
+export type AmapBezierCurveProps = AMap.BezierCurveOptions & MapRegisterOverlayProps<AmapOverlay>;
+export declare const AmapBezierCurve: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<AmapBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapBezierCurveProps, Required<AmapBezierCurveProps>>, never, AmapBezierCurveProps>;

package/dist/v2/components/AmapBezierCurve/AmapBezierCurve.js

@@ -0,0 +1,57 @@
+import { shallowRef, onMounted, onUnmounted, watchPostEffect } from "vue-demi";
+import { useAmap } from "../../hooks/useMap.js";
+import { useMapOverlay } from "../../hooks/useOverlay.js";
+import { defineSetup } from "../../types/helper.js";
+import { watchNoneImmediatePostEffectForMapProperty, watchNoneImmediatePostEffectForDeepOption } from "../../utils/compare.js";
+import { referenceCount } from "../../utils/referenceCount.js";
+const AmapBezierCurve = defineSetup(
+  "AmapBezierCurve",
+  function(props) {
+    const { registerOverlay } = props;
+    const bezierCurveRef = shallowRef();
+    const mapRef = useAmap();
+    onMounted(() => {
+      referenceCount.add();
+      const { registerOverlay: registerOverlay2, ...option } = props;
+      bezierCurveRef.value = new AMap.BezierCurve({ ...option });
+    });
+    useMapOverlay({ registerOverlay, overlayRef: bezierCurveRef });
+    onUnmounted(() => {
+      var _a, _b;
+      referenceCount.remove();
+      (_a = bezierCurveRef.value) == null ? void 0 : _a.setMap(null);
+      (_b = bezierCurveRef.value) == null ? void 0 : _b.destroy();
+      bezierCurveRef.value = void 0;
+    });
+    watchPostEffect((onCleanup) => {
+      var _a;
+      const map = mapRef == null ? void 0 : mapRef.value;
+      if (!(map == null ? void 0 : map.amap))
+        return;
+      (_a = bezierCurveRef.value) == null ? void 0 : _a.setMap(map.amap);
+      onCleanup(() => {
+        var _a2;
+        return (_a2 = bezierCurveRef.value) == null ? void 0 : _a2.setMap(null);
+      });
+    });
+    watchNoneImmediatePostEffectForMapProperty(bezierCurveRef, props, [
+      { name: "path", defaultValue: [[0, 0]] },
+      { name: "extData", defaultValue: void 0 },
+      { name: "draggable", defaultValue: false }
+    ]);
+    watchNoneImmediatePostEffectForDeepOption(
+      () => {
+        const { path, extData, draggable, ...otherOptions } = props;
+        return otherOptions;
+      },
+      (otherOptions) => {
+        var _a;
+        (_a = bezierCurveRef.value) == null ? void 0 : _a.setOptions({ ...otherOptions });
+      }
+    );
+    return () => null;
+  }
+);
+export {
+  AmapBezierCurve
+};

package/dist/v2/components/AmapBezierCurve/index.d.ts

@@ -0,0 +1 @@
+export * from "./AmapBezierCurve";

package/dist/v2/components/AmapBezierCurve/index.js

@@ -0,0 +1,4 @@
+import { AmapBezierCurve } from "./AmapBezierCurve.js";
+export {
+  AmapBezierCurve
+};

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

@@ -9,3 +9,31 @@ export declare const distanceBetweenTwoPoints: (from: Point, to: Point) => numbe
  * 计算折线（按顺序连接各点）总长度。
  */
 export declare const computeLineLength: (line: Point[]) => number;
+/**
+ * 计算从起点指向终点的初始方位角（heading）。
+ * 说明：
+ * - 基于球面大圆航线计算（WGS84 半径近似），与常见地图 SDK 的 heading 含义一致
+ * - 返回范围为 [-180, 180]（度）：0 表示正北，正值为东偏北，负值为西偏南
+ * - 起终点经纬完全相同返回 0
+ * @returns 初始方位角（度）
+ */
+export declare const computeLineAngle: (from: Point, to: Point) => number;
+/**
+ * 根据指定的基线 (A -> B) 和底角 (angle)，计算一个等腰三角形位于基线左侧的顶点。
+ *
+ * @param A 三角形基线的起始点, 格式为 [x, y]。
+ * @param B 三角形基线的终点, 格式为 [x, y]。
+ * @param angle 等腰三角形的底角 (∠PAB) 的大小，单位为角度 (degrees)。有效范围为 (-90, 90)。
+ * @returns 返回计算出的顶点 P 的坐标 [x, y]；如果输入无效（例如 A、B 为同一点或 angle 超出范围），则返回 null。
+ */
+export declare const calculateLeftIsoscelesVertex: (A: Point, B: Point, angle: number) => Point;
+/**
+ * 根据给定的起始点、结束点和控制点，生成二次贝塞尔曲线的模拟点。
+ *
+ * @param from 起始点
+ * @param to 结束点
+ * @param controlPoint 控制点
+ * @param amount 要生成的模拟点的数量
+ * @returns 返回一个包含模拟点坐标的数组
+ */
+export declare const createQuadraticBezierCurvePoints: (from: Point, to: Point, controlPoint: Point, amount?: number) => Point[];

package/dist/v2/utils/geometryPolygon.js

@@ -47,8 +47,65 @@ const computeLineLength = (line) => {
   }
   return totalLength;
 };
+const computeLineAngle = (from, to) => {
+  const [lng1, lat1] = from;
+  const [lng2, lat2] = to;
+  if (lng1 === lng2 && lat1 === lat2)
+    return 0;
+  const toRad = (deg) => deg * Math.PI / 180;
+  const toDeg = (rad) => rad * 180 / Math.PI;
+  const phi1 = toRad(lat1);
+  const phi2 = toRad(lat2);
+  const lambda1 = toRad(lng1);
+  const lambda2 = toRad(lng2);
+  const deltaLambda = lambda2 - lambda1;
+  const y = Math.sin(deltaLambda) * Math.cos(phi2);
+  const x = Math.cos(phi1) * Math.sin(phi2) - Math.sin(phi1) * Math.cos(phi2) * Math.cos(deltaLambda);
+  let heading = toDeg(Math.atan2(y, x));
+  heading = (heading + 540) % 360 - 180;
+  return heading;
+};
+const calculateLeftIsoscelesVertex = (A, B, angle) => {
+  const [x1, y1] = A;
+  const [x2, y2] = B;
+  const thetaInRadians = angle * Math.PI / 180;
+  const dx = x2 - x1;
+  const dy = y2 - y1;
+  if (dx === 0 && dy === 0)
+    return [x1, y1];
+  const midpointM = [(x1 + x2) / 2, (y1 + y2) / 2];
+  const tanTheta = Math.tan(thetaInRadians);
+  const vecMP_x = -0.5 * dy * tanTheta;
+  const vecMP_y = 0.5 * dx * tanTheta;
+  return [midpointM[0] + vecMP_x, midpointM[1] + vecMP_y];
+};
+const createQuadraticBezierCurvePoints = (from, to, controlPoint, amount = 50) => {
+  const points = [];
+  if (amount <= 0) {
+    return [];
+  }
+  if (amount === 1) {
+    return [from];
+  }
+  const [p0_x, p0_y] = from;
+  const [p1_x, p1_y] = controlPoint;
+  const [p2_x, p2_y] = to;
+  for (let i = 0; i < amount; i++) {
+    const t = i / (amount - 1);
+    const one_minus_t = 1 - t;
+    const t_squared = t * t;
+    const one_minus_t_squared = one_minus_t * one_minus_t;
+    const x = one_minus_t_squared * p0_x + 2 * one_minus_t * t * p1_x + t_squared * p2_x;
+    const y = one_minus_t_squared * p0_y + 2 * one_minus_t * t * p1_y + t_squared * p2_y;
+    points.push([x, y]);
+  }
+  return points;
+};
 export {
+  calculateLeftIsoscelesVertex,
+  computeLineAngle,
   computeLineLength,
+  createQuadraticBezierCurvePoints,
   distanceBetweenTwoPoints,
   pointInPolygon
 };

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.15.0-sgn1";
+const pkgVersion = "2.17.0-curve1";
 const spaceLogSessionKey = "wiajlf;jwiatitruiq3jrlw";
 const enableSessionLogKey = (key) => {
   const sessionParam = new URLSearchParams(sessionStorage.getItem(spaceLogSessionKey) || void 0);

package/dist/v3/App.js

@@ -8,7 +8,7 @@ const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
 const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
 const App = /* @__PURE__ */ defineComponent({
   setup() {
-    const supplierRef = ref("amap");
+    const supplierRef = ref("gmap");
     window.supplierRef = supplierRef;
     return () => createVNode(MapProvider, {
       "amapKey": amapApiKey,
@@ -18,7 +18,7 @@ const App = /* @__PURE__ */ defineComponent({
       "language": "en",
       "supplier": supplierRef.value,
       "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
-      "googleRoutesProxyUrl": "/overseas/maps/routes/directions",
+      "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
       "themeVariables": {
         // 默认主题
         // TRAFFIC_UNKNOWN_BACKGROUND_COLOR: "#00C875",

package/dist/v3/api/googleRoutes.js

@@ -1,5 +1,6 @@
 import { googleEncodedPolyline2googleLatLng } from "../utils/transform.js";
 import { isProxyServiceError, createTypeError } from "../utils/typeChecking.js";
+const DEFAULT_GOOGLE_ROUTES_FIELDS = ["routes.polyline", "routes.legs"];
 const ALL_ROUTES_STATUS = [
   "OK",
   "CANCELLED",
@@ -104,6 +105,7 @@ async function apiGoogleRoutes(props) {
   const { protocol, host } = location;
   const baseUrl = proxyUrl.startsWith(protocol) ? void 0 : `${protocol}//${host}`;
   const url = new URL(proxyUrl, baseUrl);
+  url.searchParams.set("fields", DEFAULT_GOOGLE_ROUTES_FIELDS.join(","));
   const response = await fetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },

package/dist/v3/business-components/BusinessQuotingMap/BusinessQuotingMap.d.ts

@@ -14,7 +14,7 @@ export type BusinessQuotingMapProps = CoordinatifyProps<Omit<HeycarMapProps, "ce
         distance: number;
         duration: number;
         tolls?: number;
-    }) => string;
+    }) => string | undefined;
     onClickStartPoint?: (value: CoordinatePlace) => void;
     onClickEndPoint?: (value: CoordinatePlace) => void;
 };
@@ -26,7 +26,7 @@ export declare const BusinessQuotingMapInner: import("@vue/runtime-core").Define
         distance: number;
         duration: number;
         tolls?: number;
-    }) => string;
+    }) => string | undefined;
 } & {
     default?: import("../../demi-polyfill").Slot | undefined;
 }>>;
@@ -38,7 +38,7 @@ export declare const BusinessQuotingMap: import("@vue/runtime-core").DefineCompo
         distance: number;
         duration: number;
         tolls?: number;
-    }) => string;
+    }) => string | undefined;
 } & {
     default?: import("../../demi-polyfill").Slot | undefined;
 }>>;

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

@@ -9,10 +9,9 @@ import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
 import { toCoordinatePlaceType } from "../../utils/typeChecking.js";
-import { DrivingRoute } from "../DrivingRoute/DrivingRoute.js";
+import { DrivingQuadraticBezierCurve } from "../DrivingQuadraticBezierCurve/DrivingQuadraticBezierCurve.js";
 import { FitViewOnce, createFittableRegisterOverlay } from "../FitView/FitView.js";
 import { StartEndPoint } from "../StartEndPoint/StartEndPoint.js";
-import { TrafficDrivingLine } from "../TrafficDrivingLine/TrafficDrivingLine.js";
 const BUSINESS_QUOTING_FITVIEW_PANDING = [26, 26, 19, 26];
 const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(props, {
   emit,
@@ -78,32 +77,22 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
         "withArrow": !disableStartPoint,
         "language": language,
         "onClick": () => !disableStartPoint && emit("clickStartPoint", coordinatifyPlace(fromPlace))
-      }, null), createVNode(DrivingRoute, {
-        "to": to,
+      }, null), createVNode(DrivingQuadraticBezierCurve, {
         "from": from,
-        "render": ({
-          path,
-          distance,
-          duration,
-          tolls,
-          trafficJams
-        }) => [createVNode(TrafficDrivingLine, {
-          "path": path,
-          "trafficJams": trafficJams
-        }, null), createVNode(StartEndPoint, {
-          "type": "end",
-          "registerOverlay": fittableRegistryOverlay,
-          "position": to,
-          "title": toPlace.displayName,
-          "description": renderDescription({
-            distance,
-            duration,
-            tolls
-          }),
-          "withArrow": !disableEndPoint,
-          "language": language,
-          "onClick": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
-        }, null)]
+        "to": to
+      }, null), createVNode(StartEndPoint, {
+        "type": "end",
+        "registerOverlay": fittableRegistryOverlay,
+        "position": to,
+        "title": toPlace.displayName,
+        "description": renderDescription({
+          distance: 0,
+          duration: 0,
+          tolls: 0
+        }),
+        "withArrow": !disableEndPoint,
+        "language": language,
+        "onClick": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
       }, null), createVNode(FitViewOnce, {
         "registerOverlay": registerOverlay,
         "immediate": true

package/dist/v3/business-components/DrivingQuadraticBezierCurve/DrivingQuadraticBezierCurve.d.ts

@@ -0,0 +1,16 @@
+import type { Point } from "../../types/interface";
+export interface DrivingQuadraticBezierCurveProps {
+    from: Point;
+    to: Point;
+    lineCap?: AMap.LineSharedOptions["lineCap"];
+    color?: string;
+}
+export declare const ADrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, import("vue-demi").PublicProps, DrivingQuadraticBezierCurveProps, DrivingQuadraticBezierCurveProps, import("vue-demi").SlotsType<{} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;
+export declare const GDrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, import("vue-demi").PublicProps, DrivingQuadraticBezierCurveProps, DrivingQuadraticBezierCurveProps, import("vue-demi").SlotsType<{} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;
+export declare const DrivingQuadraticBezierCurve: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<DrivingQuadraticBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<DrivingQuadraticBezierCurveProps, Required<DrivingQuadraticBezierCurveProps>>, never, import("vue-demi").PublicProps, DrivingQuadraticBezierCurveProps, DrivingQuadraticBezierCurveProps, import("vue-demi").SlotsType<{} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;

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

@@ -0,0 +1,94 @@
+import { createVNode } from "vue";
+import { computed } from "vue-demi";
+import { ZINDEX_LINE_LAYER } from "../../api/contants.js";
+import { AmapBezierCurve } from "../../components/AmapBezierCurve/AmapBezierCurve.js";
+import { GmapPolyline } from "../../components/GmapPolyline/GmapPolyline.js";
+import { createElement } from "../../demi-polyfill/demi-polyfill.js";
+import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { defineSetup } from "../../types/helper.js";
+import { createQuadraticBezierCurvePoints, calculateLeftIsoscelesVertex } from "../../utils/geometryPolygon.js";
+import { vec2lnglat } from "../../utils/transform.js";
+const CONTROL_POINT_ANGLE = 30;
+const OUTLINE_COLOR = "#FFFFFF";
+const ADrivingQuadraticBezierCurve = defineSetup("ADrivingQuadraticBezierCurve", function(props) {
+  const pathRef = computed(() => {
+    const {
+      from,
+      to
+    } = props;
+    const controlPoint = calculateLeftIsoscelesVertex(from, to, CONTROL_POINT_ANGLE);
+    return [from, [...controlPoint, ...to]];
+  });
+  return () => {
+    const {
+      lineCap = "round",
+      color = "#4471FF"
+    } = props;
+    const vw = window.innerWidth * 0.01;
+    const strokeWidth = 1 * vw;
+    const borderWidth = 0.13 * vw;
+    const outlineWidth = 0.4 * vw;
+    return createVNode("div", null, [createVNode(AmapBezierCurve, {
+      "path": pathRef.value,
+      "isOutline": true,
+      "borderWeight": outlineWidth,
+      "outlineColor": OUTLINE_COLOR,
+      "strokeWeight": strokeWidth + 2 * borderWidth,
+      "strokeOpacity": 1,
+      "strokeColor": color,
+      "lineJoin": "round",
+      "lineCap": lineCap,
+      "zIndex": ZINDEX_LINE_LAYER
+    }, null)]);
+  };
+});
+const GDrivingQuadraticBezierCurve = defineSetup("GDrivingQuadraticBezierCurve", function(props) {
+  const pathRef = computed(() => {
+    const {
+      from,
+      to
+    } = props;
+    const controlPoint = calculateLeftIsoscelesVertex(from, to, CONTROL_POINT_ANGLE);
+    return createQuadraticBezierCurvePoints(from, to, controlPoint).map(vec2lnglat);
+  });
+  return () => {
+    const {
+      color = "#4471FF"
+    } = props;
+    const vw = window.innerWidth * 0.01;
+    const strokeWidth = 1.25 * vw * 0.65;
+    const borderWidth = 0.175 * vw * 0.65;
+    const outlineWidth = 0.45 * vw * 0.65;
+    return createVNode("div", null, [createVNode(GmapPolyline, {
+      "path": pathRef.value,
+      "strokeWeight": strokeWidth + 2 * borderWidth + 2 * outlineWidth,
+      "strokeOpacity": 1,
+      "strokeColor": OUTLINE_COLOR,
+      "zIndex": ZINDEX_LINE_LAYER
+    }, null), createVNode(GmapPolyline, {
+      "path": pathRef.value,
+      "strokeWeight": strokeWidth + 2 * borderWidth,
+      "strokeOpacity": 1,
+      "strokeColor": color,
+      "zIndex": ZINDEX_LINE_LAYER
+    }, null)]);
+  };
+});
+const DrivingQuadraticBezierCurve = defineSetup("DrivingQuadraticBezierCurve", function(props) {
+  const payload = useMapSupplier();
+  return () => {
+    var _a, _b;
+    const color = (_b = (_a = payload.themeVariables) == null ? void 0 : _a.TRAFFIC_UNKNOWN_BACKGROUND_COLOR) != null ? _b : props.color;
+    return createElement(payload.supplier === "gmap" ? GDrivingQuadraticBezierCurve : ADrivingQuadraticBezierCurve, {
+      attrs: {
+        ...props,
+        color
+      }
+    });
+  };
+});
+export {
+  ADrivingQuadraticBezierCurve,
+  DrivingQuadraticBezierCurve,
+  GDrivingQuadraticBezierCurve
+};

package/dist/v3/business-components/DrivingQuadraticBezierCurve/index.d.ts

@@ -0,0 +1 @@
+export * from "./DrivingQuadraticBezierCurve";

package/dist/v3/business-components/DrivingQuadraticBezierCurve/index.js

@@ -0,0 +1,6 @@
+import { ADrivingQuadraticBezierCurve, DrivingQuadraticBezierCurve, GDrivingQuadraticBezierCurve } from "./DrivingQuadraticBezierCurve.js";
+export {
+  ADrivingQuadraticBezierCurve,
+  DrivingQuadraticBezierCurve,
+  GDrivingQuadraticBezierCurve
+};

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

@@ -0,0 +1,7 @@
+import { type AmapOverlay, type MapRegisterOverlayProps } from "../../hooks/useOverlay";
+export type AmapBezierCurveProps = AMap.BezierCurveOptions & MapRegisterOverlayProps<AmapOverlay>;
+export declare const AmapBezierCurve: import("vue-demi").DefineComponent<import("vue-demi").ComponentObjectPropsOptions<AmapBezierCurveProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapBezierCurveProps, Required<AmapBezierCurveProps>>, never, import("vue-demi").PublicProps, AmapBezierCurveProps, AmapBezierCurveProps, import("vue-demi").SlotsType<{
+    extData?: any;
+} & {
+    default?: import("../../demi-polyfill").Slot | undefined;
+}>>;

package/dist/v3/components/AmapBezierCurve/AmapBezierCurve.js

@@ -0,0 +1,57 @@
+import { shallowRef, onMounted, onUnmounted, watchPostEffect } from "vue-demi";
+import { useAmap } from "../../hooks/useMap.js";
+import { useMapOverlay } from "../../hooks/useOverlay.js";
+import { defineSetup } from "../../types/helper.js";
+import { watchNoneImmediatePostEffectForMapProperty, watchNoneImmediatePostEffectForDeepOption } from "../../utils/compare.js";
+import { referenceCount } from "../../utils/referenceCount.js";
+const AmapBezierCurve = defineSetup(
+  "AmapBezierCurve",
+  function(props) {
+    const { registerOverlay } = props;
+    const bezierCurveRef = shallowRef();
+    const mapRef = useAmap();
+    onMounted(() => {
+      referenceCount.add();
+      const { registerOverlay: registerOverlay2, ...option } = props;
+      bezierCurveRef.value = new AMap.BezierCurve({ ...option });
+    });
+    useMapOverlay({ registerOverlay, overlayRef: bezierCurveRef });
+    onUnmounted(() => {
+      var _a, _b;
+      referenceCount.remove();
+      (_a = bezierCurveRef.value) == null ? void 0 : _a.setMap(null);
+      (_b = bezierCurveRef.value) == null ? void 0 : _b.destroy();
+      bezierCurveRef.value = void 0;
+    });
+    watchPostEffect((onCleanup) => {
+      var _a;
+      const map = mapRef == null ? void 0 : mapRef.value;
+      if (!(map == null ? void 0 : map.amap))
+        return;
+      (_a = bezierCurveRef.value) == null ? void 0 : _a.setMap(map.amap);
+      onCleanup(() => {
+        var _a2;
+        return (_a2 = bezierCurveRef.value) == null ? void 0 : _a2.setMap(null);
+      });
+    });
+    watchNoneImmediatePostEffectForMapProperty(bezierCurveRef, props, [
+      { name: "path", defaultValue: [[0, 0]] },
+      { name: "extData", defaultValue: void 0 },
+      { name: "draggable", defaultValue: false }
+    ]);
+    watchNoneImmediatePostEffectForDeepOption(
+      () => {
+        const { path, extData, draggable, ...otherOptions } = props;
+        return otherOptions;
+      },
+      (otherOptions) => {
+        var _a;
+        (_a = bezierCurveRef.value) == null ? void 0 : _a.setOptions({ ...otherOptions });
+      }
+    );
+    return () => null;
+  }
+);
+export {
+  AmapBezierCurve
+};

package/dist/v3/components/AmapBezierCurve/index.d.ts

@@ -0,0 +1 @@
+export * from "./AmapBezierCurve";

package/dist/v3/components/AmapBezierCurve/index.js

@@ -0,0 +1,4 @@
+import { AmapBezierCurve } from "./AmapBezierCurve.js";
+export {
+  AmapBezierCurve
+};

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

@@ -9,3 +9,31 @@ export declare const distanceBetweenTwoPoints: (from: Point, to: Point) => numbe
  * 计算折线（按顺序连接各点）总长度。
  */
 export declare const computeLineLength: (line: Point[]) => number;
+/**
+ * 计算从起点指向终点的初始方位角（heading）。
+ * 说明：
+ * - 基于球面大圆航线计算（WGS84 半径近似），与常见地图 SDK 的 heading 含义一致
+ * - 返回范围为 [-180, 180]（度）：0 表示正北，正值为东偏北，负值为西偏南
+ * - 起终点经纬完全相同返回 0
+ * @returns 初始方位角（度）
+ */
+export declare const computeLineAngle: (from: Point, to: Point) => number;
+/**
+ * 根据指定的基线 (A -> B) 和底角 (angle)，计算一个等腰三角形位于基线左侧的顶点。
+ *
+ * @param A 三角形基线的起始点, 格式为 [x, y]。
+ * @param B 三角形基线的终点, 格式为 [x, y]。
+ * @param angle 等腰三角形的底角 (∠PAB) 的大小，单位为角度 (degrees)。有效范围为 (-90, 90)。
+ * @returns 返回计算出的顶点 P 的坐标 [x, y]；如果输入无效（例如 A、B 为同一点或 angle 超出范围），则返回 null。
+ */
+export declare const calculateLeftIsoscelesVertex: (A: Point, B: Point, angle: number) => Point;
+/**
+ * 根据给定的起始点、结束点和控制点，生成二次贝塞尔曲线的模拟点。
+ *
+ * @param from 起始点
+ * @param to 结束点
+ * @param controlPoint 控制点
+ * @param amount 要生成的模拟点的数量
+ * @returns 返回一个包含模拟点坐标的数组
+ */
+export declare const createQuadraticBezierCurvePoints: (from: Point, to: Point, controlPoint: Point, amount?: number) => Point[];

package/dist/v3/utils/geometryPolygon.js

@@ -47,8 +47,65 @@ const computeLineLength = (line) => {
   }
   return totalLength;
 };
+const computeLineAngle = (from, to) => {
+  const [lng1, lat1] = from;
+  const [lng2, lat2] = to;
+  if (lng1 === lng2 && lat1 === lat2)
+    return 0;
+  const toRad = (deg) => deg * Math.PI / 180;
+  const toDeg = (rad) => rad * 180 / Math.PI;
+  const phi1 = toRad(lat1);
+  const phi2 = toRad(lat2);
+  const lambda1 = toRad(lng1);
+  const lambda2 = toRad(lng2);
+  const deltaLambda = lambda2 - lambda1;
+  const y = Math.sin(deltaLambda) * Math.cos(phi2);
+  const x = Math.cos(phi1) * Math.sin(phi2) - Math.sin(phi1) * Math.cos(phi2) * Math.cos(deltaLambda);
+  let heading = toDeg(Math.atan2(y, x));
+  heading = (heading + 540) % 360 - 180;
+  return heading;
+};
+const calculateLeftIsoscelesVertex = (A, B, angle) => {
+  const [x1, y1] = A;
+  const [x2, y2] = B;
+  const thetaInRadians = angle * Math.PI / 180;
+  const dx = x2 - x1;
+  const dy = y2 - y1;
+  if (dx === 0 && dy === 0)
+    return [x1, y1];
+  const midpointM = [(x1 + x2) / 2, (y1 + y2) / 2];
+  const tanTheta = Math.tan(thetaInRadians);
+  const vecMP_x = -0.5 * dy * tanTheta;
+  const vecMP_y = 0.5 * dx * tanTheta;
+  return [midpointM[0] + vecMP_x, midpointM[1] + vecMP_y];
+};
+const createQuadraticBezierCurvePoints = (from, to, controlPoint, amount = 50) => {
+  const points = [];
+  if (amount <= 0) {
+    return [];
+  }
+  if (amount === 1) {
+    return [from];
+  }
+  const [p0_x, p0_y] = from;
+  const [p1_x, p1_y] = controlPoint;
+  const [p2_x, p2_y] = to;
+  for (let i = 0; i < amount; i++) {
+    const t = i / (amount - 1);
+    const one_minus_t = 1 - t;
+    const t_squared = t * t;
+    const one_minus_t_squared = one_minus_t * one_minus_t;
+    const x = one_minus_t_squared * p0_x + 2 * one_minus_t * t * p1_x + t_squared * p2_x;
+    const y = one_minus_t_squared * p0_y + 2 * one_minus_t * t * p1_y + t_squared * p2_y;
+    points.push([x, y]);
+  }
+  return points;
+};
 export {
+  calculateLeftIsoscelesVertex,
+  computeLineAngle,
   computeLineLength,
+  createQuadraticBezierCurvePoints,
   distanceBetweenTwoPoints,
   pointInPolygon
 };

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.15.0-sgn1";
+const pkgVersion = "2.17.0-curve1";
 const spaceLogSessionKey = "wiajlf;jwiatitruiq3jrlw";
 const enableSessionLogKey = (key) => {
   const sessionParam = new URLSearchParams(sessionStorage.getItem(spaceLogSessionKey) || void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.15.0-sgn1",
+  "version": "2.17.0-curve1",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",