@heycar/heycars-map 2.17.0-curve9 → 2.18.0-apiLocalization2

package/dist/v2/App.js

@@ -1,7 +1,7 @@
 import { h } from "vue";
 import { defineComponent, ref } from "vue-demi";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
-import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
+import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
 const gmapApiKey = {}.VITE_GMAP_API_KEY;
 const gmapId = {}.VITE_GMAP_MAP_ID;
 const amapApiKey = {}.VITE_AMAP_API_KEY;
@@ -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",
@@ -50,7 +51,7 @@ const App = defineComponent({
         "fail": () => console.log(`${supplierRef.value} load failed`),
         "downloadOptimizeEnd": () => console.log(`${supplierRef.value} load download optimize end`)
       }
-    }, [h(DemoBusinessQuoting)]);
+    }, [h(DemoBusinessRecomendPlace)]);
   }
 });
 export {

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/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.js

@@ -1,10 +1,10 @@
 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,
@@ -15,7 +15,7 @@ const useADrivingRoute = (props) => {
   });
   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(
     () => {

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.18.0-apiLocalization2";
 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,20 @@ 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 : "";
+    const _streetNumberStreet = typeof streetNumberStreet === "string" ? streetNumberStreet : "";
+    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

@@ -1,7 +1,7 @@
 import { createVNode } from "vue";
 import { defineComponent, ref } from "vue-demi";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
-import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
+import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
 const gmapApiKey = {}.VITE_GMAP_API_KEY;
 const gmapId = {}.VITE_GMAP_MAP_ID;
 const amapApiKey = {}.VITE_AMAP_API_KEY;
@@ -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",
@@ -47,7 +48,7 @@ const App = /* @__PURE__ */ defineComponent({
       "onDownloadOptimizeEnd": () => console.log(`${supplierRef.value} load download optimize end`),
       "reportLog": () => console.log("reportLog function is called")
     }, {
-      default: () => [createVNode(DemoBusinessQuoting, null, null)]
+      default: () => [createVNode(DemoBusinessRecomendPlace, null, null)]
     });
   }
 });

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/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.js

@@ -1,10 +1,10 @@
 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,
@@ -15,7 +15,7 @@ const useADrivingRoute = (props) => {
   });
   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(
     () => {

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.18.0-apiLocalization2";
 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,20 @@ 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 : "";
+    const _streetNumberStreet = typeof streetNumberStreet === "string" ? streetNumberStreet : "";
+    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.18.0-apiLocalization2",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",