@heycar/heycars-map 2.16.0-downgrade2 → 2.16.0-downgrade4

package/README.md

@@ -583,6 +583,7 @@ export default defineComponent({
       <div>
         <BusinessQuotingMap
           class={"demo"}
+          isBezierCurve
           from={{
             displayName: "The Malayan Council",
             name: "10 Winstedt Rd, #01-17, Singapore 227977",

package/dist/v2/App.js

@@ -1,14 +1,14 @@
 import { h } from "vue";
 import { defineComponent, ref } from "vue-demi";
-import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
-const gmapApiKey = "AIzaSyCCOe8MAeS3EYvSraKsBX6ztVyLxj69z94";
-const gmapId = "d0af0c05331af64a";
-const amapApiKey = "fcb7b14c930354a248e21f4031dfa179";
-const amapApiSecret = "11ad0e3d585b80d18b1ada5b0d947c4a";
+import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
+const gmapApiKey = {}.VITE_GMAP_API_KEY;
+const gmapId = {}.VITE_GMAP_MAP_ID;
+const amapApiKey = {}.VITE_AMAP_API_KEY;
+const amapApiSecret = {}.VITE_AMAP_API_SECRET;
 const App = defineComponent({
   setup() {
-    const supplierRef = ref("gmap");
+    const supplierRef = ref("amap");
     window.supplierRef = supplierRef;
     return () => h(MapProvider, {
       "attrs": {
@@ -18,6 +18,7 @@ const App = defineComponent({
         "gmapKey": gmapApiKey,
         "language": "en",
         "supplier": supplierRef.value,
+        "hkGovernRegeoProxyUrl": "/overseas/gov/hk/identify",
         "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
         "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
         "themeVariables": {

package/dist/v2/Demo/DemoBusinessQuoting.js

@@ -20,9 +20,9 @@ const DemoBusinessQuoting = defineComponent({
       from: {
         displayName: "my",
         name: "my",
-        type: "wgs84",
-        lat: 1.311295,
-        lng: 103.841974
+        type: "gcj02",
+        lat: 31.205478,
+        lng: 121.409535
       }
     };
   },
@@ -47,12 +47,13 @@ const DemoBusinessQuoting = defineComponent({
       "class": demo,
       "attrs": {
         "from": from,
+        "isBezierCurve": true,
         "to": {
           displayName: "CDG Engie Charging Station",
           name: "21 Kent Ridge Rd, Singapore 119220",
-          type: "wgs84",
-          lat: 1.2966426,
-          lng: 103.7763939
+          type: "gcj02",
+          lat: 31.207082,
+          lng: 121.407967
         },
         "fromDescription": "您将在此上车",
         "renderDescription": ({

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

@@ -60,8 +60,8 @@ const DemoBusinessRecomendPlace = defineSetup("DemoBusinessRecomendPlace", funct
     setCenterPlaceByUserSpecifiedInZone
   } = useBusinessRecomendPlaceMap();
   window.changeUserSpecifiedPlace = () => setCenterPlaceByUserSpecified({
-    lng: 139.55,
-    lat: 35.55,
+    lng: 114.226288,
+    lat: 22.27965,
     type: "gcj02",
     name: "user specified place",
     displayName: "user specified place"

package/dist/v2/api/contants.d.ts

@@ -17,8 +17,10 @@ export declare const ZINDEX_PASSENGER_LAYER = 20;
 export declare const ZINDEX_AUXILIARY_GRASP = 14;
 export declare const ZINDEX_LINE_LAYER = 12;
 export declare const ZINDEX_GREEN_ZONE = 10;
+export declare const HK_GOVERN_API_DISTANCE_MAX = 20;
 export declare const TRACKS_MATCH_MAX_LENGTH = 3;
 export declare const REGEO_TIMEOUT = 5000;
+export declare const HK_GOVERN_API_TIMEOUT = 1000;
 export declare const GET_RECOMMEND_PLACE_TIMEOUT = 5000;
 export declare const GET_DEFAULT_CENTER_PLACE_TIMEOUT = 5000;
 export declare const AMAP_TO_GCJ02_TIMEOUT = 2000;

package/dist/v2/api/contants.js

@@ -16,8 +16,10 @@ const ZINDEX_PASSENGER_LAYER = 20;
 const ZINDEX_AUXILIARY_GRASP = 14;
 const ZINDEX_LINE_LAYER = 12;
 const ZINDEX_GREEN_ZONE = 10;
+const HK_GOVERN_API_DISTANCE_MAX = 20;
 const TRACKS_MATCH_MAX_LENGTH = 3;
 const REGEO_TIMEOUT = 5e3;
+const HK_GOVERN_API_TIMEOUT = 1e3;
 const GET_RECOMMEND_PLACE_TIMEOUT = 5e3;
 const GET_DEFAULT_CENTER_PLACE_TIMEOUT = 5e3;
 const AMAP_TO_GCJ02_TIMEOUT = 2e3;
@@ -31,6 +33,8 @@ export {
   CAR_DISTANCE_MIN,
   GET_DEFAULT_CENTER_PLACE_TIMEOUT,
   GET_RECOMMEND_PLACE_TIMEOUT,
+  HK_GOVERN_API_DISTANCE_MAX,
+  HK_GOVERN_API_TIMEOUT,
   MAX_ANIMATION_DISTANCE_VW,
   MAX_DEVIATION_DISTANCE,
   MAX_DEVIATION_DISTANCE_WALKING,

package/dist/v2/api/hongkongGovernDriving.d.ts

@@ -0,0 +1,7 @@
+export declare const apiHongKongGovernDriving: (props: any) => Promise<{
+    result: any;
+    origin: {
+        x: number;
+        y: number;
+    };
+}>;

package/dist/v2/api/hongkongGovernDriving.js

@@ -0,0 +1,31 @@
+import { isProxyServiceError } from "../utils/typeChecking.js";
+import { guid } from "../utils/helper.js";
+import { wgs84ToHK80 } from "../utils/transform.js";
+const apiHongKongGovernDriving = async (props) => {
+  const { proxyUrl, lng, lat, language } = props;
+  const { protocol, host } = location;
+  const baseUrl = proxyUrl.startsWith(protocol) ? void 0 : `${protocol}//${host}`;
+  const url = new URL(proxyUrl, baseUrl);
+  const hk80Coord = wgs84ToHK80(lat, lng);
+  url.searchParams.set("lang", language);
+  url.searchParams.set("x", hk80Coord.x.toString());
+  url.searchParams.set("y", hk80Coord.y.toString());
+  url.searchParams.set("reqSid", guid());
+  const response = await fetch(url);
+  if (response.ok) {
+    const result = await response.json();
+    return { result, origin: hk80Coord };
+  }
+  const error = await response.json();
+  if (isProxyServiceError(error)) {
+    const { code, msg } = error;
+    throw new Error(`apiHongKongGovernDriving proxy failed code: ${code}, msg: 
+${msg}`);
+  }
+  throw new Error(
+    `apiHongKongGovernDriving failed with unrecognized server response: ${JSON.stringify(error)}`
+  );
+};
+export {
+  apiHongKongGovernDriving
+};

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

@@ -7,6 +7,7 @@ export type BusinessQuotingMapProps = CoordinatifyProps<Omit<HeycarMapProps, "ce
     to: CoordinatePlace;
     fromDescription: string;
     log?: boolean;
+    isBezierCurve?: boolean;
     disableStartPoint?: boolean;
     disableEndPoint?: boolean;
     mapContext: CoordinatifyProps<BusinessQuotingContext>;
@@ -14,7 +15,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

@@ -7,8 +7,10 @@ import { useMapFitView } from "../../hooks/useMapFitView.js";
 import { useMapSupplier, useMapAssertSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { generateCreateElementV2PropsOn } from "../../utils/compare.js";
+import { distanceBetweenTwoPoints } from "../../utils/geometryPolygon.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
 import { toCoordinatePlaceType } from "../../utils/typeChecking.js";
+import { DrivingQuadraticBezierCurve } from "../DrivingQuadraticBezierCurve/DrivingQuadraticBezierCurve.js";
 import { DrivingRoute } from "../DrivingRoute/DrivingRoute.js";
 import { FitViewOnce, createFittableRegisterOverlay } from "../FitView/FitView.js";
 import { StartEndPoint } from "../StartEndPoint/StartEndPoint.js";
@@ -55,12 +57,14 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
       to: inputToPlace,
       fromDescription,
       disableStartPoint,
-      disableEndPoint
+      disableEndPoint,
+      isBezierCurve
     } = props;
     const fromPlace = unCoordinatifyPlace(toCoordinatePlaceType(inputFromPlace));
     const toPlace = unCoordinatifyPlace(toCoordinatePlaceType(inputToPlace));
     const from = place2point(fromPlace);
     const to = place2point(toPlace);
+    const distance = distanceBetweenTwoPoints(from, to);
     return h(HeycarMap, {
       "class": attrs.class,
       "style": attrs.style,
@@ -85,13 +89,35 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
       "on": {
         "click": () => !disableStartPoint && emit("clickStartPoint", coordinatifyPlace(fromPlace))
       }
-    }), h(DrivingRoute, {
+    }), isBezierCurve && h(DrivingQuadraticBezierCurve, {
+      "attrs": {
+        "from": from,
+        "to": to
+      }
+    }), isBezierCurve ? h(StartEndPoint, {
+      "attrs": {
+        "type": "end",
+        "registerOverlay": fittableRegistryOverlay,
+        "position": to,
+        "title": toPlace.displayName,
+        "description": renderDescription({
+          distance,
+          duration: 0,
+          tolls: 0
+        }),
+        "withArrow": !disableEndPoint,
+        "language": language
+      },
+      "on": {
+        "click": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
+      }
+    }) : h(DrivingRoute, {
       "attrs": {
         "to": to,
         "from": from,
         "render": ({
           path,
-          distance,
+          distance: distance2,
           duration,
           tolls,
           trafficJams
@@ -107,7 +133,7 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
             "position": to,
             "title": toPlace.displayName,
             "description": renderDescription({
-              distance,
+              distance: distance2,
               duration,
               tolls
             }),
@@ -144,7 +170,7 @@ const BusinessQuotingMap = defineLagecySetup("BusinessQuotingMap", function(prop
     key: `${payload.supplier}${instanceNo}`,
     on: generateCreateElementV2PropsOn(props, emit, ["clickStartPoint", "clickEndPoint"])
   });
-}).props(["fallback", "from", "loading", "disableStartPoint", "disableEndPoint", "mapContext", "renderDescription", "to", "fromDescription", "log"]);
+}).props(["fallback", "from", "loading", "disableStartPoint", "disableEndPoint", "mapContext", "renderDescription", "to", "fromDescription", "log", "isBezierCurve"]);
 export {
   BusinessQuotingMap,
   BusinessQuotingMapInner

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 createQuadraticBezierCurvePoints(from, to, controlPoint);
+  });
+  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/components/MapProvider/MapProvider.d.ts

@@ -5,7 +5,7 @@ import { type GmapLoaderProps, type UseMapLoaderProps } from "../../hooks/useMap
 import { type MapSupplierPayolad } from "../../hooks/useMapSupplier";
 import type { AmapMap } from "../../types/interface";
 import { type AmapProps } from "../Amap";
-export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription">;
+export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription" | "hkGovernRegeoProxyUrl">;
 export declare const MapProvider: import("vue-demi").DefineComponent<import("vue3").ComponentObjectPropsOptions<MapProviderProps>, 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<MapProviderProps, Required<MapProviderProps>>, "success" | "fail" | "downloadOptimizeEnd", MapProviderProps>;
 export interface HeycarMapProps extends Pick<GmapLoaderProps, "fallback" | "loading">, Pick<AmapProps, "center" | "zoom"> {
     mapRef?: SetMap<AmapMap> | SetMap<google.maps.Map>;

package/dist/v2/components/MapProvider/MapProvider.js

@@ -50,7 +50,7 @@ const MapProvider = defineLagecySetup("MapProvider", function(props, {
     var _a;
     return h("div", [(_a = slots.default) == null ? void 0 : _a.call(slots)]);
   };
-}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription"]);
+}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription", "hkGovernRegeoProxyUrl"]);
 const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
   slots,
   emit,

package/dist/v2/hooks/useMapPlace.js

@@ -1,16 +1,20 @@
 import { ref, reactive, watch } from "vue-demi";
-import { REGEO_TIMEOUT } from "../api/contants.js";
+import { REGEO_TIMEOUT, HK_GOVERN_API_TIMEOUT } from "../api/contants.js";
+import { apiHongKongGovernDriving } from "../api/hongkongGovernDriving.js";
 import { createPipeTw } from "../utils/cn2tw.js";
-import { equalAssign, AbortSignalAny } from "../utils/helper.js";
-import { amapPlaceName2DisplayName, signal2promise, gmapPlaceName2DisplayName } from "../utils/transform.js";
-import { inChina, inTaiwan } from "./useMapInChina.js";
+import { equalAssign, AbortSignalAny, sleep } from "../utils/helper.js";
+import { getHKGovernResult } from "../utils/hongkongGovernGeoCoder.js";
+import { toLocalWgs84Force, amapPlaceName2DisplayName, signal2promise, gmapPlaceName2DisplayName } from "../utils/transform.js";
+import { inChina, inTaiwan, inHongkong } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
+import { useMapGCJ02 } from "./useMapGCJ02.js";
 const useAmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
-  const { readyPromise, language } = useMapSupplier();
+  const { readyPromise, language, hkGovernRegeoProxyUrl } = useMapSupplier();
+  const { toCoordinateType } = useMapGCJ02();
   const place = reactive({
     lng: pointRef.value[0],
     lat: pointRef.value[1],
@@ -40,8 +44,49 @@ const useAmapPlace = (props) => {
         const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
         const pipeTw = createPipeTw(language === "zh-TW");
         const isChinese = inChina([lng, lat]) || inTaiwan([lng, lat]);
-        geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
+        const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
+        const startTime = Date.now();
+        let hkReturned = !isUseHKGovern;
+        let amapReturned = false;
+        if (isUseHKGovern) {
+          const [finalLng, finalLat] = toLocalWgs84Force([lng, lat], toCoordinateType([lng, lat]));
+          console.log("lng:", lng, finalLng);
+          console.log("lat:", lat, finalLat);
+          apiHongKongGovernDriving({
+            proxyUrl: hkGovernRegeoProxyUrl,
+            lng: finalLng,
+            lat: finalLat,
+            language: language === "zh-TW" ? "zh" : language
+          }).then(({ result, origin }) => {
+            var _a, _b;
+            const hkGovernRes = getHKGovernResult((_b = (_a = result == null ? void 0 : result.data) == null ? void 0 : _a.rawResponse) == null ? void 0 : _b.results, origin);
+            const diff = Date.now() - startTime;
+            console.log("==return value of hkGovernApi==", hkGovernRes);
+            console.log("==time of hkGovernApi==", diff);
+            if (!amapReturned && hkGovernRes) {
+              const name = language === "en" ? hkGovernRes.ename : hkGovernRes.cname;
+              hkReturned = true;
+              resolve({
+                lng,
+                lat,
+                name,
+                displayName: name
+              });
+            }
+          });
+        }
+        geocoder.getAddress(new AMap.LngLat(lng, lat), async (status, result) => {
           clearTimeout(timer);
+          if (isUseHKGovern) {
+            const diff = Date.now() - startTime;
+            console.log("==time of AmapReGeo==", diff);
+            const rest = HK_GOVERN_API_TIMEOUT - diff;
+            if (rest >= 0)
+              await sleep(rest);
+            console.log("==time of AmapReGeoWaitEnd==", Date.now() - startTime);
+            if (hkReturned)
+              return;
+          }
           switch (status) {
             case "complete": {
               const { formattedAddress, addressComponent } = result.regeocode;
@@ -50,6 +95,7 @@ const useAmapPlace = (props) => {
                 isChinese,
                 ...addressComponent
               });
+              amapReturned = true;
               resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
               return;
             }

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -117,6 +117,7 @@ const useMapRecomendPlace = (props) => {
         return { place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
       }
       const regeoPlace = await reGeoPlacePromiseIgnored.recover();
+      console.log(54566544, regeoPlace);
       return { place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
     }
     if (type === "Forbidden") {

package/dist/v2/hooks/useMapSupplier.d.ts

@@ -12,6 +12,7 @@ export interface MapSupplierPayolad extends UseMapLoaderProps {
     googleDirectionsProxyUrl?: string;
     googleRoutesProxyUrl?: string;
     googleSnapRoadProxyUrl?: string;
+    hkGovernRegeoProxyUrl?: string;
     themeVariables?: MapThemeVariables;
     renderLoadFailedTitle?: (status: Status) => string | undefined;
     renderLoadFailedDescription?: (status: Status) => string | undefined;

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

@@ -5,7 +5,36 @@ import type { Point } from "../types/interface";
  */
 export declare function pointInPolygon(point: Point, polygon: Point[]): 1 | 0 | -1;
 export declare const distanceBetweenTwoPoints: (from: Point, to: Point) => number;
+export declare const distanceTwoHK80Points: (from: Point, to: Point) => number;
 /**
  * 计算折线（按顺序连接各点）总长度。
  */
 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[];