@heycar/heycars-map 2.17.0-curve9 → 2.19.0-drivingRouteFail

package/dist/v2/App.js

@@ -18,6 +18,7 @@ const App = defineComponent({
         "gmapKey": gmapApiKey,
         "language": "en",
         "supplier": supplierRef.value,
+        "gaodeRegeoProxyUrl": "/overseas/amap/regeo",
         "hkGovernRegeoProxyUrl": "/overseas/gov/hk/identify",
         "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
         "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",

package/dist/v2/Demo/DemoBusinessQuoting.js

@@ -47,7 +47,6 @@ const DemoBusinessQuoting = defineComponent({
       "class": demo,
       "attrs": {
         "from": from,
-        "isBezierCurve": true,
         "to": {
           displayName: "CDG Engie Charging Station",
           name: "21 Kent Ridge Rd, Singapore 119220",
@@ -65,7 +64,8 @@ const DemoBusinessQuoting = defineComponent({
       },
       "on": {
         "clickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
-        "clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
+        "clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place),
+        "drivingRouteDone": (hasRoute) => console.log("导航路线规划完成时触发 hasRoute = ", hasRoute)
       }
     }), h("div", ["经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:", toAmapCoordinateType([103.841974, 1.311295])])]);
   }

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

@@ -0,0 +1,7 @@
+export interface GaodeRegeoProps {
+    proxyUrl: string;
+    lng: number;
+    lat: number;
+    language: string;
+}
+export declare const apiGaodeRegeo: (props: GaodeRegeoProps) => Promise<any>;

package/dist/v2/api/gaodeRegeo.js

@@ -0,0 +1,28 @@
+import { isProxyServiceError } from "../utils/typeChecking.js";
+import { guid } from "../utils/helper.js";
+const apiGaodeRegeo = 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);
+  url.searchParams.set("language", language);
+  url.searchParams.set("location", `${lng.toString()},${lat.toString()}`);
+  url.searchParams.set("reqSid", guid());
+  const response = await fetch(url);
+  if (response.ok) {
+    const result = await response.json();
+    return result;
+  }
+  const error = await response.json();
+  if (isProxyServiceError(error)) {
+    const { code, msg } = error;
+    throw new Error(`apiGaodeRegeo proxy failed code: ${code}, msg: 
+${msg}`);
+  }
+  throw new Error(
+    `apiGaodeRegeo failed with unrecognized server response: ${JSON.stringify(error)}`
+  );
+};
+export {
+  apiGaodeRegeo
+};

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

@@ -1,4 +1,10 @@
-export declare const apiHongKongGovernDriving: (props: any) => Promise<{
+export interface HongKongGovernDrivingProps {
+    proxyUrl: string;
+    lng: number;
+    lat: number;
+    language: string;
+}
+export declare const apiHongKongGovernDriving: (props: HongKongGovernDrivingProps) => Promise<{
     result: any;
     origin: {
         x: number;

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

@@ -18,6 +18,7 @@ export type BusinessQuotingMapProps = CoordinatifyProps<Omit<HeycarMapProps, "ce
     }) => string | undefined;
     onClickStartPoint?: (value: CoordinatePlace) => void;
     onClickEndPoint?: (value: CoordinatePlace) => void;
+    onDrivingRouteDone?: (hasRoute: boolean) => void;
 };
-export declare const BusinessQuotingMapInner: import("vue/types/v3-define-component").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint", BusinessQuotingMapProps>;
-export declare const BusinessQuotingMap: import("vue/types/v3-define-component").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint", BusinessQuotingMapProps>;
+export declare const BusinessQuotingMapInner: import("vue/types/v3-define-component").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint" | "drivingRouteDone", BusinessQuotingMapProps>;
+export declare const BusinessQuotingMap: import("vue/types/v3-define-component").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint" | "drivingRouteDone", BusinessQuotingMapProps>;

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

@@ -120,30 +120,35 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
           distance: distance2,
           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: distance2,
-              duration,
-              tolls
-            }),
-            "withArrow": !disableEndPoint,
-            "language": language
-          },
-          "on": {
-            "click": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
-          }
-        })]
+          trafficJams,
+          init
+        }) => {
+          if (!init)
+            emit("drivingRouteDone", path.length !== 0);
+          return [h(TrafficDrivingLine, {
+            "attrs": {
+              "path": path,
+              "trafficJams": trafficJams
+            }
+          }), h(StartEndPoint, {
+            "attrs": {
+              "type": "end",
+              "registerOverlay": fittableRegistryOverlay,
+              "position": to,
+              "title": toPlace.displayName,
+              "description": renderDescription({
+                distance: distance2,
+                duration,
+                tolls
+              }),
+              "withArrow": !disableEndPoint,
+              "language": language
+            },
+            "on": {
+              "click": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
+            }
+          })];
+        }
       }
     }), h(FitViewOnce, {
       "attrs": {
@@ -168,7 +173,7 @@ const BusinessQuotingMap = defineLagecySetup("BusinessQuotingMap", function(prop
     } : {},
     attrs: props,
     key: `${payload.supplier}${instanceNo}`,
-    on: generateCreateElementV2PropsOn(props, emit, ["clickStartPoint", "clickEndPoint"])
+    on: generateCreateElementV2PropsOn(props, emit, ["clickStartPoint", "clickEndPoint", "drivingRouteDone"])
   });
 }).props(["fallback", "from", "loading", "disableStartPoint", "disableEndPoint", "mapContext", "renderDescription", "to", "fromDescription", "log", "isBezierCurve"]);
 export {

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

@@ -8,6 +8,7 @@ export type DrivingRouteRenderProps = {
     duration: number;
     tolls?: number;
     trafficJams?: TrafficJams;
+    init: boolean;
 };
 export interface DrivingRouteProps extends UseDrivingRouteProps {
     render?: (props: DrivingRouteRenderProps) => VNodeChild;

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

@@ -15,7 +15,8 @@ const ADrivingRoute = defineSetup("ADrivingRoute", function(props, {
     distance,
     duration,
     tolls,
-    trafficJams
+    trafficJams,
+    init
   } = toRefs(useADrivingRoute(props).route);
   const {
     angleRef
@@ -31,7 +32,8 @@ const ADrivingRoute = defineSetup("ADrivingRoute", function(props, {
       distance,
       duration,
       tolls,
-      trafficJams
+      trafficJams,
+      init
     }))]);
   };
 });
@@ -42,7 +44,8 @@ const GDrivingRoute = defineSetup("GDrivingRoute", function(props, {
   const {
     path,
     distance,
-    duration
+    duration,
+    init
   } = toRefs(useGDrivingRoute(props).route);
   const {
     angleRef
@@ -56,7 +59,8 @@ const GDrivingRoute = defineSetup("GDrivingRoute", function(props, {
       path,
       angle: angleRef,
       distance,
-      duration
+      duration,
+      init
     }))]);
   };
 });

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" | "reportLog" | "hkGovernRegeoProxyUrl">;
+export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription" | "reportLog" | "hkGovernRegeoProxyUrl" | "gaodeRegeoProxyUrl">;
 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", "reportLog", "hkGovernRegeoProxyUrl"]);
+}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription", "reportLog", "hkGovernRegeoProxyUrl", "gaodeRegeoProxyUrl"]);
 const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
   slots,
   emit,

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

@@ -16,6 +16,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
@@ -31,6 +32,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
@@ -46,6 +48,7 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };

package/dist/v2/hooks/useDrivingRoute.js

@@ -1,21 +1,22 @@
 import { reactive } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
-import { googleServiceApiDrivingRoute, amapJsApiDrivingRoute, gaodeServiceApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
+import { googleServiceApiDrivingRoute, gaodeServiceApiDrivingRoute, amapJsApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
 import { inTaiwan, inKorean } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useADrivingRoute = (props) => {
-  const { googleRoutesProxyUrl } = useMapSupplier();
+  const { googleRoutesProxyUrl, gaodeDirectionDrivingProxyUrl } = useMapSupplier();
   const outputRoute = reactive({
     path: [],
     distance: 0,
     duration: 0,
     tolls: void 0,
     steps: [],
-    trafficJams: void 0
+    trafficJams: void 0,
+    init: true
   });
   const amapDriving = new AMap.Driving({ ferry: 1 });
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
-    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
   };
   watchPostEffectForDeepOption(
     () => {
@@ -25,14 +26,18 @@ const useADrivingRoute = (props) => {
     async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
+      try {
+        Object.assign(outputRoute, { init: false }, await apiMapDrivingRoute(from, to, waypoints));
+      } catch {
+        Object.assign(outputRoute, { init: false });
+      }
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };
 };
 const useGDrivingRoute = (props) => {
   const { gaodeDirectionDrivingProxyUrl, googleRoutesProxyUrl } = useMapSupplier();
-  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
+  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [], init: true });
   const gmapDirectionsService = new google.maps.DirectionsService();
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
     return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
@@ -45,7 +50,11 @@ const useGDrivingRoute = (props) => {
     async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
+      try {
+        Object.assign(outputRoute, { init: false }, await apiMapDrivingRoute(from, to, waypoints));
+      } catch {
+        Object.assign(outputRoute, { init: false });
+      }
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };

package/dist/v2/hooks/useMapPlace.js

@@ -9,11 +9,12 @@ import { inChina, inTaiwan, inHongkong } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 import { useMapGCJ02 } from "./useMapGCJ02.js";
+import { apiGaodeRegeo } from "../api/gaodeRegeo.js";
 const useAmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
-  const { readyPromise, language, hkGovernRegeoProxyUrl } = useMapSupplier();
+  const { readyPromise, language, hkGovernRegeoProxyUrl, gaodeRegeoProxyUrl } = useMapSupplier();
   const { toCoordinateType } = useMapGCJ02();
   const place = reactive({
     lng: pointRef.value[0],
@@ -41,7 +42,6 @@ const useAmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       };
       readyPromise.then(() => {
-        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]);
         const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
@@ -75,36 +75,68 @@ const useAmapPlace = (props) => {
             }
           });
         }
-        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;
-              const name = formattedAddress ? formattedAddress : emptyPlaceName;
-              const displayName = amapPlaceName2DisplayName(name, {
-                isChinese,
-                ...addressComponent
-              });
-              amapReturned = true;
-              resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
-              return;
+        if (gaodeRegeoProxyUrl) {
+          apiGaodeRegeo({
+            proxyUrl: gaodeRegeoProxyUrl,
+            lng,
+            lat,
+            language: language === "en" ? "en" : "zh_cn"
+          }).then(async (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;
             }
-            case "no_data":
-            case "error": {
-              handleFailed();
+            const { formatted_address, addressComponent } = result.regeocode;
+            const name = formatted_address || emptyPlaceName;
+            const displayName = amapPlaceName2DisplayName(name, {
+              isChinese,
+              ...addressComponent
+            });
+            amapReturned = true;
+            resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+          }).catch(() => {
+            handleFailed();
+          });
+        } else {
+          const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
+          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;
+                const name = formattedAddress ? formattedAddress : emptyPlaceName;
+                const displayName = amapPlaceName2DisplayName(name, {
+                  isChinese,
+                  ...addressComponent
+                });
+                amapReturned = true;
+                resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+                return;
+              }
+              case "no_data":
+              case "error": {
+                handleFailed();
+              }
+            }
+          });
+        }
       }, handleFailed);
       const timer = setTimeout(() => {
         console.warn("高德逆地理请求超时!");

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

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

package/dist/v2/hooks/useWalkingRoute.js

@@ -1,7 +1,7 @@
 import { shallowRef } from "vue-demi";
 import { MAX_DEVIATION_DISTANCE_WALKING } from "../api/contants.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
-import { googleServiceApiWalkingRoute, amapJsApiWalkingRoute, gaodeServiceApiWalkingRoute, gmapJsApiWalkingRoute } from "../utils/compatibleWalkingRoute.js";
+import { googleServiceApiWalkingRoute, gaodeServiceApiWalkingRoute, amapJsApiWalkingRoute, gmapJsApiWalkingRoute } from "../utils/compatibleWalkingRoute.js";
 import { findClosestPointInLine } from "../utils/geometry.js";
 import { distanceBetweenTwoPoints } from "../utils/geometryPolygon.js";
 import { spaceLog } from "../utils/log.js";
@@ -44,12 +44,12 @@ const findBestContinuation = (args, cacheEntries) => {
 const memoizeAmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
 const memoizeGmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
 const useAWalkingRoute = (props) => {
-  const { googleRoutesProxyUrl } = useMapSupplier();
+  const { googleRoutesProxyUrl, gaodeDirectionWalkingProxyUrl } = useMapSupplier();
   const pathRef = shallowRef([]);
   const amapWalking = new AMap.Walking({});
   const apiMapWalkingRoute = memoizeAmapWalkingRoute((from, to) => {
     spaceLog("apiMapWalkingRoute", `amap from = ${from} to = ${to}`);
-    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : amapJsApiWalkingRoute(from, to, amapWalking);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : gaodeDirectionWalkingProxyUrl ? gaodeServiceApiWalkingRoute(from, to, gaodeDirectionWalkingProxyUrl) : amapJsApiWalkingRoute(from, to, amapWalking);
   });
   watchPostEffectForDeepOption(
     () => {

package/dist/v2/utils/compatibleDrivingRoute.js

@@ -72,7 +72,8 @@ async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
     proxyUrl,
     origin: [from],
     destination: to,
-    waypoints
+    waypoints,
+    ferry: 1
   });
   const trafficJams = {};
   switch (status) {

package/dist/v2/utils/compatibleWatchPosition.js

@@ -219,6 +219,7 @@ function androidWatchPosition(onSuccess, onError, option, getLocationFn) {
             if (isHandled)
               return;
             isHandled = true;
+            console.log("==GeoLocation assert==", JSON.stringify(geoLocationPosition), typeof HEYCAR_GEOLOCATION_GET_CURRENT_POSITION === "function");
             geoErrorMessage = void 0;
             resolve(geoLocationPosition);
           },

package/dist/v2/utils/log.js

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

package/dist/v2/utils/transform.js

@@ -119,10 +119,22 @@ const amapPlaceName2DisplayName = (name, options) => {
 };
 function amapPlaceName2DisplayNameInChinese(name, options) {
   const { province, city, district, township, building, neighborhood } = options;
-  if (building)
-    return building;
-  if (neighborhood)
-    return neighborhood;
+  if (typeof building === "string") {
+    if (building)
+      return building;
+  } else {
+    const { name: name2 } = building;
+    if (typeof name2 === "string" && name2)
+      return name2;
+  }
+  if (typeof neighborhood === "string") {
+    if (neighborhood)
+      return neighborhood;
+  } else {
+    const { name: name2 } = neighborhood;
+    if (typeof name2 === "string" && name2)
+      return name2;
+  }
   let result = name;
   for (const item of [province, city, district]) {
     const replacedName2 = result.replace(item, "");
@@ -138,10 +150,19 @@ function amapPlaceName2DisplayNameInChinese(name, options) {
 const NOT_ONLY_NUMBERS_REGEX = /[^\d\s-]/;
 function amapPlaceName2DisplayNameOutChinese(name, options) {
   const { adcode, province, city, district, township, street, streetNumber } = options;
-  if (street === "Unnamed Road")
-    return name;
-  if (street || streetNumber)
-    return `${street} ${streetNumber}`;
+  if (typeof streetNumber === "string") {
+    if (street === "Unnamed Road")
+      return name;
+    if (street || streetNumber)
+      return `${street} ${streetNumber}`;
+  } else {
+    const { number, street: streetNumberStreet } = streetNumber;
+    if (streetNumberStreet === "Unnamed Road")
+      return name;
+    const streetNumberItem = typeof number === "string" ? number : "";
+    if (streetNumberStreet || streetNumberItem)
+      return `${streetNumberStreet} ${streetNumberItem}`;
+  }
   const idxs = [];
   for (const token of [adcode, province, city, district, township]) {
     if (!token)

package/dist/v2/utils/typeChecking.js

@@ -150,6 +150,7 @@ function toGeolocationGetCurrentPosition(fn, fnName = fn.name) {
         });
         return;
       }
+      console.log("==injected geoPosition==", JSON.stringify(position));
       onSuccess(position);
     };
     const asseertedOnError = (error) => onError(toGeolocationPositionError(error, prefix));

package/dist/v3/App.js

@@ -17,6 +17,7 @@ const App = /* @__PURE__ */ defineComponent({
       "gmapKey": gmapApiKey,
       "language": "en",
       "supplier": supplierRef.value,
+      "gaodeRegeoProxyUrl": "/overseas/amap/regeo",
       "hkGovernRegeoProxyUrl": "/overseas/gov/hk/identify",
       "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
       "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",

package/dist/v3/Demo/DemoBusinessQuoting.js

@@ -46,7 +46,6 @@ const DemoBusinessQuoting = /* @__PURE__ */ defineComponent({
     return createVNode("div", null, [createVNode(BusinessQuotingMap, {
       "class": demo,
       "from": from,
-      "isBezierCurve": true,
       "to": {
         displayName: "CDG Engie Charging Station",
         name: "21 Kent Ridge Rd, Singapore 119220",
@@ -62,7 +61,8 @@ const DemoBusinessQuoting = /* @__PURE__ */ defineComponent({
       }) => `全程 *${distance / 1e3}公里*  约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
       "mapContext": mapContext,
       "onClickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
-      "onClickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
+      "onClickEndPoint": (place) => console.log("点击终点时触发 palce = ", place),
+      "onDrivingRouteDone": (hasRoute) => console.log("导航路线规划完成时触发 hasRoute = ", hasRoute)
     }, null), createVNode("div", null, [createTextVNode("经度 103.841974， 纬度 1.311295 在高德地图上的坐标类型是:"), toAmapCoordinateType([103.841974, 1.311295])])]);
   }
 });

package/dist/v3/api/gaodeRegeo.d.ts

@@ -0,0 +1,7 @@
+export interface GaodeRegeoProps {
+    proxyUrl: string;
+    lng: number;
+    lat: number;
+    language: string;
+}
+export declare const apiGaodeRegeo: (props: GaodeRegeoProps) => Promise<any>;

package/dist/v3/api/gaodeRegeo.js

@@ -0,0 +1,28 @@
+import { isProxyServiceError } from "../utils/typeChecking.js";
+import { guid } from "../utils/helper.js";
+const apiGaodeRegeo = 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);
+  url.searchParams.set("language", language);
+  url.searchParams.set("location", `${lng.toString()},${lat.toString()}`);
+  url.searchParams.set("reqSid", guid());
+  const response = await fetch(url);
+  if (response.ok) {
+    const result = await response.json();
+    return result;
+  }
+  const error = await response.json();
+  if (isProxyServiceError(error)) {
+    const { code, msg } = error;
+    throw new Error(`apiGaodeRegeo proxy failed code: ${code}, msg: 
+${msg}`);
+  }
+  throw new Error(
+    `apiGaodeRegeo failed with unrecognized server response: ${JSON.stringify(error)}`
+  );
+};
+export {
+  apiGaodeRegeo
+};

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

@@ -1,4 +1,10 @@
-export declare const apiHongKongGovernDriving: (props: any) => Promise<{
+export interface HongKongGovernDrivingProps {
+    proxyUrl: string;
+    lng: number;
+    lat: number;
+    language: string;
+}
+export declare const apiHongKongGovernDriving: (props: HongKongGovernDrivingProps) => Promise<{
     result: any;
     origin: {
         x: number;

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

@@ -18,8 +18,9 @@ export type BusinessQuotingMapProps = CoordinatifyProps<Omit<HeycarMapProps, "ce
     }) => string | undefined;
     onClickStartPoint?: (value: CoordinatePlace) => void;
     onClickEndPoint?: (value: CoordinatePlace) => void;
+    onDrivingRouteDone?: (hasRoute: boolean) => void;
 };
-export declare const BusinessQuotingMapInner: import("@vue/runtime-core").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint", import("@vue/runtime-core").PublicProps, BusinessQuotingMapProps, BusinessQuotingMapProps, import("@vue/runtime-core").SlotsType<{
+export declare const BusinessQuotingMapInner: import("@vue/runtime-core").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint" | "drivingRouteDone", import("@vue/runtime-core").PublicProps, BusinessQuotingMapProps, BusinessQuotingMapProps, import("@vue/runtime-core").SlotsType<{
     fallback?: (() => import("vue").VNodeChild) | undefined;
     loading?: (() => import("vue").VNodeChild) | undefined;
     outerArea?: (() => import("vue").VNodeChild) | undefined;
@@ -31,7 +32,7 @@ export declare const BusinessQuotingMapInner: import("@vue/runtime-core").Define
 } & {
     default?: import("../../demi-polyfill").Slot | undefined;
 }>>;
-export declare const BusinessQuotingMap: import("@vue/runtime-core").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint", import("@vue/runtime-core").PublicProps, BusinessQuotingMapProps, BusinessQuotingMapProps, import("@vue/runtime-core").SlotsType<{
+export declare const BusinessQuotingMap: import("@vue/runtime-core").DefineComponent<import("@vue/runtime-core").ComponentObjectPropsOptions<BusinessQuotingMapProps>, 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<BusinessQuotingMapProps, Required<BusinessQuotingMapProps>>, "resize" | "dragEnd" | "zoomEnd" | "clickStartPoint" | "clickEndPoint" | "drivingRouteDone", import("@vue/runtime-core").PublicProps, BusinessQuotingMapProps, BusinessQuotingMapProps, import("@vue/runtime-core").SlotsType<{
     fallback?: (() => import("vue").VNodeChild) | undefined;
     loading?: (() => import("vue").VNodeChild) | undefined;
     outerArea?: (() => import("vue").VNodeChild) | undefined;

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

@@ -106,24 +106,29 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
           distance: distance2,
           duration,
           tolls,
-          trafficJams
-        }) => [createVNode(TrafficDrivingLine, {
-          "path": path,
-          "trafficJams": trafficJams
-        }, null), createVNode(StartEndPoint, {
-          "type": "end",
-          "registerOverlay": fittableRegistryOverlay,
-          "position": to,
-          "title": toPlace.displayName,
-          "description": renderDescription({
-            distance: distance2,
-            duration,
-            tolls
-          }),
-          "withArrow": !disableEndPoint,
-          "language": language,
-          "onClick": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
-        }, null)]
+          trafficJams,
+          init
+        }) => {
+          if (!init)
+            emit("drivingRouteDone", path.length !== 0);
+          return [createVNode(TrafficDrivingLine, {
+            "path": path,
+            "trafficJams": trafficJams
+          }, null), createVNode(StartEndPoint, {
+            "type": "end",
+            "registerOverlay": fittableRegistryOverlay,
+            "position": to,
+            "title": toPlace.displayName,
+            "description": renderDescription({
+              distance: distance2,
+              duration,
+              tolls
+            }),
+            "withArrow": !disableEndPoint,
+            "language": language,
+            "onClick": () => !disableEndPoint && emit("clickEndPoint", coordinatifyPlace(toPlace))
+          }, null)];
+        }
       }, null), createVNode(FitViewOnce, {
         "registerOverlay": registerOverlay,
         "immediate": true
@@ -146,7 +151,7 @@ const BusinessQuotingMap = defineLagecySetup("BusinessQuotingMap", function(prop
     } : {},
     attrs: props,
     key: `${payload.supplier}${instanceNo}`,
-    on: generateCreateElementV2PropsOn(props, emit, ["clickStartPoint", "clickEndPoint"])
+    on: generateCreateElementV2PropsOn(props, emit, ["clickStartPoint", "clickEndPoint", "drivingRouteDone"])
   });
 }).props(["fallback", "from", "loading", "disableStartPoint", "disableEndPoint", "mapContext", "renderDescription", "to", "fromDescription", "log", "isBezierCurve"]);
 export {

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

@@ -8,6 +8,7 @@ export type DrivingRouteRenderProps = {
     duration: number;
     tolls?: number;
     trafficJams?: TrafficJams;
+    init: boolean;
 };
 export interface DrivingRouteProps extends UseDrivingRouteProps {
     render?: (props: DrivingRouteRenderProps) => VNodeChild;

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

@@ -15,7 +15,8 @@ const ADrivingRoute = defineSetup("ADrivingRoute", function(props, {
     distance,
     duration,
     tolls,
-    trafficJams
+    trafficJams,
+    init
   } = toRefs(useADrivingRoute(props).route);
   const {
     angleRef
@@ -31,7 +32,8 @@ const ADrivingRoute = defineSetup("ADrivingRoute", function(props, {
       distance,
       duration,
       tolls,
-      trafficJams
+      trafficJams,
+      init
     }))]);
   };
 });
@@ -42,7 +44,8 @@ const GDrivingRoute = defineSetup("GDrivingRoute", function(props, {
   const {
     path,
     distance,
-    duration
+    duration,
+    init
   } = toRefs(useGDrivingRoute(props).route);
   const {
     angleRef
@@ -56,7 +59,8 @@ const GDrivingRoute = defineSetup("GDrivingRoute", function(props, {
       path,
       angle: angleRef,
       distance,
-      duration
+      duration,
+      init
     }))]);
   };
 });

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

@@ -5,7 +5,7 @@ import { Status, type GmapLoaderProps, type UseMapLoaderProps } from "../../hook
 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" | "reportLog" | "hkGovernRegeoProxyUrl">;
+export type MapProviderProps = UseMapLoaderProps & Pick<MapSupplierPayolad, "gmapId" | "gmapRasterId" | "gaodeDirectionDrivingProxyUrl" | "gaodeDirectionWalkingProxyUrl" | "googleDirectionsProxyUrl" | "googleRoutesProxyUrl" | "googleSnapRoadProxyUrl" | "themeVariables" | "renderLoadFailedTitle" | "renderLoadFailedDescription" | "reportLog" | "hkGovernRegeoProxyUrl" | "gaodeRegeoProxyUrl">;
 export declare const MapProvider: import("vue-demi").DefineComponent<import("vue-demi").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", import("vue-demi").PublicProps, MapProviderProps, MapProviderProps, import("vue-demi").SlotsType<{
     renderLoadFailedTitle?: ((status: Status) => string | undefined) | undefined;
     renderLoadFailedDescription?: ((status: Status) => string | undefined) | undefined;

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

@@ -53,7 +53,7 @@ const MapProvider = defineLagecySetup("MapProvider", function(props, {
     var _a;
     return createVNode("div", null, [(_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", "reportLog", "hkGovernRegeoProxyUrl"]);
+}).props(["amapKey", "amapSecret", "amapServiceHost", "gmapId", "gmapRasterId", "gmapKey", "supplier", "language", "gaodeDirectionDrivingProxyUrl", "gaodeDirectionWalkingProxyUrl", "googleDirectionsProxyUrl", "googleRoutesProxyUrl", "googleSnapRoadProxyUrl", "themeVariables", "renderLoadFailedTitle", "renderLoadFailedDescription", "reportLog", "hkGovernRegeoProxyUrl", "gaodeRegeoProxyUrl"]);
 const HeycarMap = defineLagecySetup("HeycarMap", function(props, {
   slots,
   emit,

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

@@ -16,6 +16,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
@@ -31,6 +32,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };
@@ -46,6 +48,7 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
             distance: number;
         }[];
         trafficJams?: import("../types/interface").TrafficJams | undefined;
+        init: boolean;
     };
     apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
 };

package/dist/v3/hooks/useDrivingRoute.js

@@ -1,21 +1,22 @@
 import { reactive } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
-import { googleServiceApiDrivingRoute, amapJsApiDrivingRoute, gaodeServiceApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
+import { googleServiceApiDrivingRoute, gaodeServiceApiDrivingRoute, amapJsApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
 import { inTaiwan, inKorean } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useADrivingRoute = (props) => {
-  const { googleRoutesProxyUrl } = useMapSupplier();
+  const { googleRoutesProxyUrl, gaodeDirectionDrivingProxyUrl } = useMapSupplier();
   const outputRoute = reactive({
     path: [],
     distance: 0,
     duration: 0,
     tolls: void 0,
     steps: [],
-    trafficJams: void 0
+    trafficJams: void 0,
+    init: true
   });
   const amapDriving = new AMap.Driving({ ferry: 1 });
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
-    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
   };
   watchPostEffectForDeepOption(
     () => {
@@ -25,14 +26,18 @@ const useADrivingRoute = (props) => {
     async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
+      try {
+        Object.assign(outputRoute, { init: false }, await apiMapDrivingRoute(from, to, waypoints));
+      } catch {
+        Object.assign(outputRoute, { init: false });
+      }
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };
 };
 const useGDrivingRoute = (props) => {
   const { gaodeDirectionDrivingProxyUrl, googleRoutesProxyUrl } = useMapSupplier();
-  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
+  const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [], init: true });
   const gmapDirectionsService = new google.maps.DirectionsService();
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
     return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
@@ -45,7 +50,11 @@ const useGDrivingRoute = (props) => {
     async ({ from, to, waypoints }) => {
       if (!from || !to)
         return;
-      Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
+      try {
+        Object.assign(outputRoute, { init: false }, await apiMapDrivingRoute(from, to, waypoints));
+      } catch {
+        Object.assign(outputRoute, { init: false });
+      }
     }
   );
   return { route: outputRoute, apiMapDrivingRoute };

package/dist/v3/hooks/useMapPlace.js

@@ -9,11 +9,12 @@ import { inChina, inTaiwan, inHongkong } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 import { useMapGCJ02 } from "./useMapGCJ02.js";
+import { apiGaodeRegeo } from "../api/gaodeRegeo.js";
 const useAmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
-  const { readyPromise, language, hkGovernRegeoProxyUrl } = useMapSupplier();
+  const { readyPromise, language, hkGovernRegeoProxyUrl, gaodeRegeoProxyUrl } = useMapSupplier();
   const { toCoordinateType } = useMapGCJ02();
   const place = reactive({
     lng: pointRef.value[0],
@@ -41,7 +42,6 @@ const useAmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       };
       readyPromise.then(() => {
-        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]);
         const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
@@ -75,36 +75,68 @@ const useAmapPlace = (props) => {
             }
           });
         }
-        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;
-              const name = formattedAddress ? formattedAddress : emptyPlaceName;
-              const displayName = amapPlaceName2DisplayName(name, {
-                isChinese,
-                ...addressComponent
-              });
-              amapReturned = true;
-              resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
-              return;
+        if (gaodeRegeoProxyUrl) {
+          apiGaodeRegeo({
+            proxyUrl: gaodeRegeoProxyUrl,
+            lng,
+            lat,
+            language: language === "en" ? "en" : "zh_cn"
+          }).then(async (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;
             }
-            case "no_data":
-            case "error": {
-              handleFailed();
+            const { formatted_address, addressComponent } = result.regeocode;
+            const name = formatted_address || emptyPlaceName;
+            const displayName = amapPlaceName2DisplayName(name, {
+              isChinese,
+              ...addressComponent
+            });
+            amapReturned = true;
+            resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+          }).catch(() => {
+            handleFailed();
+          });
+        } else {
+          const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
+          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;
+                const name = formattedAddress ? formattedAddress : emptyPlaceName;
+                const displayName = amapPlaceName2DisplayName(name, {
+                  isChinese,
+                  ...addressComponent
+                });
+                amapReturned = true;
+                resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName) });
+                return;
+              }
+              case "no_data":
+              case "error": {
+                handleFailed();
+              }
+            }
+          });
+        }
       }, handleFailed);
       const timer = setTimeout(() => {
         console.warn("高德逆地理请求超时!");

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

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

package/dist/v3/hooks/useWalkingRoute.js

@@ -1,7 +1,7 @@
 import { shallowRef } from "vue-demi";
 import { MAX_DEVIATION_DISTANCE_WALKING } from "../api/contants.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
-import { googleServiceApiWalkingRoute, amapJsApiWalkingRoute, gaodeServiceApiWalkingRoute, gmapJsApiWalkingRoute } from "../utils/compatibleWalkingRoute.js";
+import { googleServiceApiWalkingRoute, gaodeServiceApiWalkingRoute, amapJsApiWalkingRoute, gmapJsApiWalkingRoute } from "../utils/compatibleWalkingRoute.js";
 import { findClosestPointInLine } from "../utils/geometry.js";
 import { distanceBetweenTwoPoints } from "../utils/geometryPolygon.js";
 import { spaceLog } from "../utils/log.js";
@@ -44,12 +44,12 @@ const findBestContinuation = (args, cacheEntries) => {
 const memoizeAmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
 const memoizeGmapWalkingRoute = createMemoizeWithTTL(WALKING_ROUTE_CACHE_TTL, findBestContinuation);
 const useAWalkingRoute = (props) => {
-  const { googleRoutesProxyUrl } = useMapSupplier();
+  const { googleRoutesProxyUrl, gaodeDirectionWalkingProxyUrl } = useMapSupplier();
   const pathRef = shallowRef([]);
   const amapWalking = new AMap.Walking({});
   const apiMapWalkingRoute = memoizeAmapWalkingRoute((from, to) => {
     spaceLog("apiMapWalkingRoute", `amap from = ${from} to = ${to}`);
-    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : amapJsApiWalkingRoute(from, to, amapWalking);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiWalkingRoute(from, to, googleRoutesProxyUrl) : gaodeDirectionWalkingProxyUrl ? gaodeServiceApiWalkingRoute(from, to, gaodeDirectionWalkingProxyUrl) : amapJsApiWalkingRoute(from, to, amapWalking);
   });
   watchPostEffectForDeepOption(
     () => {

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -72,7 +72,8 @@ async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
     proxyUrl,
     origin: [from],
     destination: to,
-    waypoints
+    waypoints,
+    ferry: 1
   });
   const trafficJams = {};
   switch (status) {

package/dist/v3/utils/compatibleWatchPosition.js

@@ -219,6 +219,7 @@ function androidWatchPosition(onSuccess, onError, option, getLocationFn) {
             if (isHandled)
               return;
             isHandled = true;
+            console.log("==GeoLocation assert==", JSON.stringify(geoLocationPosition), typeof HEYCAR_GEOLOCATION_GET_CURRENT_POSITION === "function");
             geoErrorMessage = void 0;
             resolve(geoLocationPosition);
           },

package/dist/v3/utils/log.js

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

package/dist/v3/utils/transform.js

@@ -119,10 +119,22 @@ const amapPlaceName2DisplayName = (name, options) => {
 };
 function amapPlaceName2DisplayNameInChinese(name, options) {
   const { province, city, district, township, building, neighborhood } = options;
-  if (building)
-    return building;
-  if (neighborhood)
-    return neighborhood;
+  if (typeof building === "string") {
+    if (building)
+      return building;
+  } else {
+    const { name: name2 } = building;
+    if (typeof name2 === "string" && name2)
+      return name2;
+  }
+  if (typeof neighborhood === "string") {
+    if (neighborhood)
+      return neighborhood;
+  } else {
+    const { name: name2 } = neighborhood;
+    if (typeof name2 === "string" && name2)
+      return name2;
+  }
   let result = name;
   for (const item of [province, city, district]) {
     const replacedName2 = result.replace(item, "");
@@ -138,10 +150,19 @@ function amapPlaceName2DisplayNameInChinese(name, options) {
 const NOT_ONLY_NUMBERS_REGEX = /[^\d\s-]/;
 function amapPlaceName2DisplayNameOutChinese(name, options) {
   const { adcode, province, city, district, township, street, streetNumber } = options;
-  if (street === "Unnamed Road")
-    return name;
-  if (street || streetNumber)
-    return `${street} ${streetNumber}`;
+  if (typeof streetNumber === "string") {
+    if (street === "Unnamed Road")
+      return name;
+    if (street || streetNumber)
+      return `${street} ${streetNumber}`;
+  } else {
+    const { number, street: streetNumberStreet } = streetNumber;
+    if (streetNumberStreet === "Unnamed Road")
+      return name;
+    const streetNumberItem = typeof number === "string" ? number : "";
+    if (streetNumberStreet || streetNumberItem)
+      return `${streetNumberStreet} ${streetNumberItem}`;
+  }
   const idxs = [];
   for (const token of [adcode, province, city, district, township]) {
     if (!token)

package/dist/v3/utils/typeChecking.js

@@ -150,6 +150,7 @@ function toGeolocationGetCurrentPosition(fn, fnName = fn.name) {
         });
         return;
       }
+      console.log("==injected geoPosition==", JSON.stringify(position));
       onSuccess(position);
     };
     const asseertedOnError = (error) => onError(toGeolocationPositionError(error, prefix));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.17.0-curve9",
+  "version": "2.19.0-drivingRouteFail",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",