@heycar/heycars-map 2.20.0-pointSource5 → 2.21.0-gmapCost

package/dist/v2/App.js

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

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

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

package/dist/v2/api/apiGoogleRegeo.js

@@ -0,0 +1,28 @@
+import { isProxyServiceError } from "../utils/typeChecking.js";
+import { guid } from "../utils/helper.js";
+import { createUrlObject } from "../utils/url.js";
+const apiGoogleRegeo = async (props) => {
+  const { proxyUrl, lng, lat, language } = props;
+  const url = createUrlObject(proxyUrl);
+  url.searchParams.set("lang", language);
+  url.searchParams.set("lng", lng.toString());
+  url.searchParams.set("lat", 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 {
+  apiGoogleRegeo
+};

package/dist/v2/api/googleRoutes.js

@@ -1,6 +1,7 @@
 import { googleEncodedPolyline2googleLatLng } from "../utils/transform.js";
 import { isProxyServiceError, createTypeError } from "../utils/typeChecking.js";
 import { createUrlObject } from "../utils/url.js";
+import { guid } from "../utils/helper.js";
 const DEFAULT_GOOGLE_ROUTES_FIELDS = ["routes.polyline", "routes.legs"];
 const ALL_ROUTES_STATUS = [
   "OK",
@@ -109,6 +110,7 @@ async function apiGoogleRoutes(props) {
   }
   const url = createUrlObject(proxyUrl);
   url.searchParams.set("fields", DEFAULT_GOOGLE_ROUTES_FIELDS.join(","));
+  url.searchParams.set("reqSid", guid());
   const response = await fetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -116,7 +118,8 @@ async function apiGoogleRoutes(props) {
   });
   if (response.ok) {
     const result = await response.json();
-    assertGoogleRoutesResponse(result);
+    if (!result.isCrossBorder)
+      assertGoogleRoutesResponse(result);
     return result;
   }
   const error = await response.json();

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

package/dist/v2/hooks/useDrivingRoute.js

@@ -1,7 +1,7 @@
 import { reactive } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { googleServiceApiDrivingRoute, gaodeServiceApiDrivingRoute, amapJsApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
-import { inTaiwan, inKorean } from "./useMapInChina.js";
+import { inTaiwan } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useADrivingRoute = (props) => {
   const { googleRoutesProxyUrl, gaodeDirectionDrivingProxyUrl } = useMapSupplier();
@@ -48,7 +48,7 @@ const useGDrivingRoute = (props) => {
   });
   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);
+    return gaodeDirectionDrivingProxyUrl && !inTaiwan(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
   };
   watchPostEffectForDeepOption(
     () => {

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

@@ -5,6 +5,7 @@ export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
     signal?: AbortSignal;
+    findAttachedPlaceDone?: Ref<boolean>;
     onChange?: (value: Place) => any;
 }
 export declare const useAmapPlace: (props: UseMapPlaceProps) => {

package/dist/v2/hooks/useMapPlace.js

@@ -5,18 +5,18 @@ import { PointSource } from "../types/interface.js";
 import { createPipeTw } from "../utils/cn2tw.js";
 import { equalAssign, AbortSignalAny, sleep } from "../utils/helper.js";
 import { getHKGovernResult } from "../utils/hongkongGovernGeoCoder.js";
-import { toLocalWgs84Force, amapPlaceName2DisplayName, signal2promise, gmapPlaceName2DisplayName } from "../utils/transform.js";
-import { inChina, inTaiwan, inHongkong } from "./useMapInChina.js";
+import { amapPlaceName2DisplayName, signal2promise, toLocalWgs84Force, gmapPlaceName2DisplayName } from "../utils/transform.js";
+import { inHongkong, inChina, inTaiwan } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 import { useMapGCJ02 } from "./useMapGCJ02.js";
 import { apiGaodeRegeo } from "../api/gaodeRegeo.js";
+import { apiGoogleRegeo } from "../api/apiGoogleRegeo.js";
 const useAmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language, hkGovernRegeoProxyUrl, gaodeRegeoProxyUrl } = useMapSupplier();
-  const { toCoordinateType } = useMapGCJ02();
   const place = reactive({
     lng: pointRef.value[0],
     lat: pointRef.value[1],
@@ -36,43 +36,20 @@ const useAmapPlace = (props) => {
   };
   const getPlaceByRegeo = ([lng, lat], opt) => {
     const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
+    const { getPlaceByRegeo: getPlaceByGmapRegeo } = useGmapPlace(props);
     const regeoPromise = new Promise((resolve) => {
       const handleFailed = () => {
         const name = emptyPlaceName;
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName, pointSource: PointSource.OTHERS });
       };
+      const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
+      if (isUseHKGovern) {
+        return getPlaceByGmapRegeo([lng, lat], opt).then((res) => resolve(res));
+      }
       readyPromise.then(() => {
         const pipeTw = createPipeTw(language === "zh-TW");
         const isChinese = inChina([lng, lat]) || inTaiwan([lng, lat]);
-        const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
-        const startTime = Date.now();
-        let hkReturned = !isUseHKGovern;
-        let amapReturned = false;
-        if (isUseHKGovern) {
-          const [finalLng, finalLat] = toLocalWgs84Force([lng, lat], toCoordinateType([lng, lat]));
-          console.log("lng:", lng, finalLng, "lat:", lat, finalLat);
-          apiHongKongGovernDriving({
-            proxyUrl: hkGovernRegeoProxyUrl,
-            lng: finalLng,
-            lat: finalLat,
-            language: language === "zh-TW" ? "zh" : language
-          }).then(({ result, origin }) => {
-            var _a, _b;
-            const hkGovernRes = getHKGovernResult((_b = (_a = result == null ? void 0 : result.data) == null ? void 0 : _a.rawResponse) == null ? void 0 : _b.results, origin);
-            if (!amapReturned && hkGovernRes) {
-              const name = language === "en" ? hkGovernRes.ename : hkGovernRes.cname;
-              hkReturned = true;
-              resolve({
-                lng,
-                lat,
-                name,
-                displayName: name,
-                pointSource: PointSource.HKGOV
-              });
-            }
-          });
-        }
         if (gaodeRegeoProxyUrl) {
           apiGaodeRegeo({
             proxyUrl: gaodeRegeoProxyUrl,
@@ -81,16 +58,6 @@ const useAmapPlace = (props) => {
             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;
-            }
             const { formatted_address, addressComponent } = result.regeocode;
             const _formmatted_address = typeof formatted_address === "string" ? formatted_address : "";
             const name = _formmatted_address || emptyPlaceName;
@@ -98,7 +65,6 @@ const useAmapPlace = (props) => {
               isChinese,
               ...addressComponent
             });
-            amapReturned = true;
             resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GAODE });
           }).catch(() => {
             handleFailed();
@@ -107,16 +73,6 @@ const useAmapPlace = (props) => {
           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;
@@ -125,7 +81,6 @@ const useAmapPlace = (props) => {
                   isChinese,
                   ...addressComponent
                 });
-                amapReturned = true;
                 resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GAODE });
                 return;
               }
@@ -159,7 +114,8 @@ const useGmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
-  const { readyPromise, language } = useMapSupplier();
+  const { readyPromise, language, googleRegeoProxyUrl, hkGovernRegeoProxyUrl } = useMapSupplier();
+  const { toCoordinateType } = useMapGCJ02();
   const { idx: placeKey, update } = useUpdate();
   const place = reactive({
     lng: pointRef.value[0],
@@ -178,6 +134,7 @@ const useGmapPlace = (props) => {
     place.displayName = value.displayName;
   };
   const getPlaceByRegeo = ([lng, lat], opt) => {
+    const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
     const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
     const regeoPromise = new Promise((resolve) => {
       const handleFailed = (err) => {
@@ -187,14 +144,84 @@ const useGmapPlace = (props) => {
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName, pointSource: PointSource.OTHERS });
       };
-      readyPromise.then(() => {
-        const geocoder = new google.maps.Geocoder();
+      readyPromise.then(async () => {
+        var _a;
         const pipeTw = createPipeTw(language === "zh-TW");
-        geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {
-          const name = results[0].formatted_address || emptyPlaceName;
-          const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
-          resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GOOGLE });
-        }).catch(handleFailed);
+        let hkReturned = false;
+        let mapReturned = false;
+        if (isUseHKGovern) {
+          const [finalLng, finalLat] = toLocalWgs84Force([lng, lat], toCoordinateType([lng, lat]));
+          console.log("lng:", lng, finalLng, "lat:", lat, finalLat);
+          apiHongKongGovernDriving({
+            proxyUrl: hkGovernRegeoProxyUrl,
+            lng: finalLng,
+            lat: finalLat,
+            language: language === "zh-TW" ? "zh" : language
+          }).then(({ result, origin }) => {
+            var _a2, _b;
+            const hkGovernRes = getHKGovernResult((_b = (_a2 = result == null ? void 0 : result.data) == null ? void 0 : _a2.rawResponse) == null ? void 0 : _b.results, origin);
+            if (mapReturned || !hkGovernRes)
+              return;
+            const name = language === "en" ? hkGovernRes.ename : hkGovernRes.cname;
+            hkReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name,
+              displayName: name,
+              pointSource: PointSource.HKGOV
+            };
+            console.log("==港府接口返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          });
+          await sleep(HK_GOVERN_API_TIMEOUT);
+          if ((_a = props.findAttachedPlaceDone) == null ? void 0 : _a.value)
+            return;
+          if (hkReturned)
+            return;
+          console.log("==1s后推荐点和港府均未返回,开始请求谷歌逆地理==");
+        }
+        if (googleRegeoProxyUrl) {
+          apiGoogleRegeo({
+            proxyUrl: googleRegeoProxyUrl,
+            lng,
+            lat,
+            language
+          }).then((results) => {
+            const name = results[0].formatted_address || emptyPlaceName;
+            const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
+            if (hkReturned)
+              return;
+            mapReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name: pipeTw(name),
+              displayName: pipeTw(displayName),
+              pointSource: PointSource.GOOGLE
+            };
+            console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          }).catch(handleFailed);
+        } else {
+          const geocoder = new google.maps.Geocoder();
+          geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {
+            const name = results[0].formatted_address || emptyPlaceName;
+            const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
+            if (hkReturned)
+              return;
+            mapReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name: pipeTw(name),
+              displayName: pipeTw(displayName),
+              pointSource: PointSource.GOOGLE
+            };
+            console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          }).catch(handleFailed);
+        }
       }, handleFailed);
       const timer = setTimeout(() => {
         console.warn("谷歌逆地理请求超时!");

package/dist/v2/hooks/useMapRecomendPlace.js

@@ -52,6 +52,7 @@ const useMapRecomendPlace = (props) => {
     onChangePlace
   } = props;
   const availableRef = ref(true);
+  const findAttachedPlaceDone = ref(false);
   const recommendTypeRef = ref(DEFAULT_RECOMMEND_TYPE);
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
@@ -60,7 +61,8 @@ const useMapRecomendPlace = (props) => {
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
     pointRef: ref([...defaultPoint]),
-    signal: inputSignal
+    signal: inputSignal,
+    findAttachedPlaceDone
   });
   const recomendPlace = reactive({
     lng: defaultPoint[0],
@@ -104,22 +106,30 @@ const useMapRecomendPlace = (props) => {
     const [lng, lat] = point;
     const { type, zone, available, candidates } = prevState;
     if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
-        getPlaceByRegeo(point, opt)
-      );
-      const {
-        place: closestPlace,
-        candidates: candidates2,
-        available: available2,
-        type: type2,
-        zone: zone2
-      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" }, opt);
-      if (isPlacesInclude(candidates2, closestPlace)) {
-        return { place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
-      }
-      const regeoPlace = await reGeoPlacePromiseIgnored.recover();
-      console.log("==RegeoPlace==", regeoPlace);
-      return { place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
+      return new Promise((resolve) => {
+        findAttachedPlaceDone.value = false;
+        const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
+          getPlaceByRegeo(point, opt)
+        );
+        findAttachedPlace({ lng, lat, name: "", displayName: "" }, opt).then(async ({
+          place: closestPlace,
+          candidates: candidates2,
+          available: available2,
+          type: type2,
+          zone: zone2
+        }) => {
+          findAttachedPlaceDone.value = true;
+          const adsorbed = isPlacesInclude(candidates2, closestPlace);
+          console.log("==推荐点接口==", `是否吸附：${adsorbed}`, `地址：${JSON.stringify(closestPlace)}`);
+          if (adsorbed) {
+            resolve({ place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 });
+          } else {
+            const regeoPlace = await reGeoPlacePromiseIgnored.recover();
+            console.log("==RegeoPlace==", regeoPlace);
+            resolve({ place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 });
+          }
+        });
+      });
     }
     if (type === "Forbidden") {
       const regeoPlace = await getPlaceByRegeo(point, opt);

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

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

package/dist/v2/utils/compatibleDrivingRoute.js

@@ -232,7 +232,11 @@ async function googleServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
   const routeSteps = [];
   for (const leg of firstRoute.legs) {
     distance += (_a = leg.distanceMeters) != null ? _a : 0;
-    duration += (_b = leg.durationSeconds) != null ? _b : 0;
+    if (isCrossBorder) {
+      duration += leg.duration ? parseInt(leg.duration) : 0;
+    } else {
+      duration += (_b = leg.durationSeconds) != null ? _b : 0;
+    }
     const staticRatio = leg.staticDurationSeconds ? ((_c = leg.durationSeconds) != null ? _c : 0) / leg.staticDurationSeconds : 1;
     for (const step of leg.steps) {
       const stepPath = step.path.map(({ lng, lat }) => [lng(), lat()]);

package/dist/v2/utils/log.js

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

package/dist/v3/App.js

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

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

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

package/dist/v3/api/apiGoogleRegeo.js

@@ -0,0 +1,28 @@
+import { isProxyServiceError } from "../utils/typeChecking.js";
+import { guid } from "../utils/helper.js";
+import { createUrlObject } from "../utils/url.js";
+const apiGoogleRegeo = async (props) => {
+  const { proxyUrl, lng, lat, language } = props;
+  const url = createUrlObject(proxyUrl);
+  url.searchParams.set("lang", language);
+  url.searchParams.set("lng", lng.toString());
+  url.searchParams.set("lat", 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 {
+  apiGoogleRegeo
+};

package/dist/v3/api/googleRoutes.js

@@ -1,6 +1,7 @@
 import { googleEncodedPolyline2googleLatLng } from "../utils/transform.js";
 import { isProxyServiceError, createTypeError } from "../utils/typeChecking.js";
 import { createUrlObject } from "../utils/url.js";
+import { guid } from "../utils/helper.js";
 const DEFAULT_GOOGLE_ROUTES_FIELDS = ["routes.polyline", "routes.legs"];
 const ALL_ROUTES_STATUS = [
   "OK",
@@ -109,6 +110,7 @@ async function apiGoogleRoutes(props) {
   }
   const url = createUrlObject(proxyUrl);
   url.searchParams.set("fields", DEFAULT_GOOGLE_ROUTES_FIELDS.join(","));
+  url.searchParams.set("reqSid", guid());
   const response = await fetch(url, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -116,7 +118,8 @@ async function apiGoogleRoutes(props) {
   });
   if (response.ok) {
     const result = await response.json();
-    assertGoogleRoutesResponse(result);
+    if (!result.isCrossBorder)
+      assertGoogleRoutesResponse(result);
     return result;
   }
   const error = await response.json();

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

package/dist/v3/hooks/useDrivingRoute.js

@@ -1,7 +1,7 @@
 import { reactive } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { googleServiceApiDrivingRoute, gaodeServiceApiDrivingRoute, amapJsApiDrivingRoute, gmapJsApiDrivingRoute } from "../utils/compatibleDrivingRoute.js";
-import { inTaiwan, inKorean } from "./useMapInChina.js";
+import { inTaiwan } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useADrivingRoute = (props) => {
   const { googleRoutesProxyUrl, gaodeDirectionDrivingProxyUrl } = useMapSupplier();
@@ -48,7 +48,7 @@ const useGDrivingRoute = (props) => {
   });
   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);
+    return gaodeDirectionDrivingProxyUrl && !inTaiwan(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
   };
   watchPostEffectForDeepOption(
     () => {

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

@@ -5,6 +5,7 @@ export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
     signal?: AbortSignal;
+    findAttachedPlaceDone?: Ref<boolean>;
     onChange?: (value: Place) => any;
 }
 export declare const useAmapPlace: (props: UseMapPlaceProps) => {

package/dist/v3/hooks/useMapPlace.js

@@ -5,18 +5,18 @@ import { PointSource } from "../types/interface.js";
 import { createPipeTw } from "../utils/cn2tw.js";
 import { equalAssign, AbortSignalAny, sleep } from "../utils/helper.js";
 import { getHKGovernResult } from "../utils/hongkongGovernGeoCoder.js";
-import { toLocalWgs84Force, amapPlaceName2DisplayName, signal2promise, gmapPlaceName2DisplayName } from "../utils/transform.js";
-import { inChina, inTaiwan, inHongkong } from "./useMapInChina.js";
+import { amapPlaceName2DisplayName, signal2promise, toLocalWgs84Force, gmapPlaceName2DisplayName } from "../utils/transform.js";
+import { inHongkong, inChina, inTaiwan } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 import { useMapGCJ02 } from "./useMapGCJ02.js";
 import { apiGaodeRegeo } from "../api/gaodeRegeo.js";
+import { apiGoogleRegeo } from "../api/apiGoogleRegeo.js";
 const useAmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language, hkGovernRegeoProxyUrl, gaodeRegeoProxyUrl } = useMapSupplier();
-  const { toCoordinateType } = useMapGCJ02();
   const place = reactive({
     lng: pointRef.value[0],
     lat: pointRef.value[1],
@@ -36,43 +36,20 @@ const useAmapPlace = (props) => {
   };
   const getPlaceByRegeo = ([lng, lat], opt) => {
     const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
+    const { getPlaceByRegeo: getPlaceByGmapRegeo } = useGmapPlace(props);
     const regeoPromise = new Promise((resolve) => {
       const handleFailed = () => {
         const name = emptyPlaceName;
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName, pointSource: PointSource.OTHERS });
       };
+      const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
+      if (isUseHKGovern) {
+        return getPlaceByGmapRegeo([lng, lat], opt).then((res) => resolve(res));
+      }
       readyPromise.then(() => {
         const pipeTw = createPipeTw(language === "zh-TW");
         const isChinese = inChina([lng, lat]) || inTaiwan([lng, lat]);
-        const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
-        const startTime = Date.now();
-        let hkReturned = !isUseHKGovern;
-        let amapReturned = false;
-        if (isUseHKGovern) {
-          const [finalLng, finalLat] = toLocalWgs84Force([lng, lat], toCoordinateType([lng, lat]));
-          console.log("lng:", lng, finalLng, "lat:", lat, finalLat);
-          apiHongKongGovernDriving({
-            proxyUrl: hkGovernRegeoProxyUrl,
-            lng: finalLng,
-            lat: finalLat,
-            language: language === "zh-TW" ? "zh" : language
-          }).then(({ result, origin }) => {
-            var _a, _b;
-            const hkGovernRes = getHKGovernResult((_b = (_a = result == null ? void 0 : result.data) == null ? void 0 : _a.rawResponse) == null ? void 0 : _b.results, origin);
-            if (!amapReturned && hkGovernRes) {
-              const name = language === "en" ? hkGovernRes.ename : hkGovernRes.cname;
-              hkReturned = true;
-              resolve({
-                lng,
-                lat,
-                name,
-                displayName: name,
-                pointSource: PointSource.HKGOV
-              });
-            }
-          });
-        }
         if (gaodeRegeoProxyUrl) {
           apiGaodeRegeo({
             proxyUrl: gaodeRegeoProxyUrl,
@@ -81,16 +58,6 @@ const useAmapPlace = (props) => {
             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;
-            }
             const { formatted_address, addressComponent } = result.regeocode;
             const _formmatted_address = typeof formatted_address === "string" ? formatted_address : "";
             const name = _formmatted_address || emptyPlaceName;
@@ -98,7 +65,6 @@ const useAmapPlace = (props) => {
               isChinese,
               ...addressComponent
             });
-            amapReturned = true;
             resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GAODE });
           }).catch(() => {
             handleFailed();
@@ -107,16 +73,6 @@ const useAmapPlace = (props) => {
           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;
@@ -125,7 +81,6 @@ const useAmapPlace = (props) => {
                   isChinese,
                   ...addressComponent
                 });
-                amapReturned = true;
                 resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GAODE });
                 return;
               }
@@ -159,7 +114,8 @@ const useGmapPlace = (props) => {
   const { signal: inputSignal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
-  const { readyPromise, language } = useMapSupplier();
+  const { readyPromise, language, googleRegeoProxyUrl, hkGovernRegeoProxyUrl } = useMapSupplier();
+  const { toCoordinateType } = useMapGCJ02();
   const { idx: placeKey, update } = useUpdate();
   const place = reactive({
     lng: pointRef.value[0],
@@ -178,6 +134,7 @@ const useGmapPlace = (props) => {
     place.displayName = value.displayName;
   };
   const getPlaceByRegeo = ([lng, lat], opt) => {
+    const isUseHKGovern = inHongkong([lng, lat]) && hkGovernRegeoProxyUrl;
     const signal = AbortSignalAny([opt == null ? void 0 : opt.signal, inputSignal]);
     const regeoPromise = new Promise((resolve) => {
       const handleFailed = (err) => {
@@ -187,14 +144,84 @@ const useGmapPlace = (props) => {
         const displayName = emptyPlaceName;
         resolve({ lng, lat, name, displayName, pointSource: PointSource.OTHERS });
       };
-      readyPromise.then(() => {
-        const geocoder = new google.maps.Geocoder();
+      readyPromise.then(async () => {
+        var _a;
         const pipeTw = createPipeTw(language === "zh-TW");
-        geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {
-          const name = results[0].formatted_address || emptyPlaceName;
-          const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
-          resolve({ lng, lat, name: pipeTw(name), displayName: pipeTw(displayName), pointSource: PointSource.GOOGLE });
-        }).catch(handleFailed);
+        let hkReturned = false;
+        let mapReturned = false;
+        if (isUseHKGovern) {
+          const [finalLng, finalLat] = toLocalWgs84Force([lng, lat], toCoordinateType([lng, lat]));
+          console.log("lng:", lng, finalLng, "lat:", lat, finalLat);
+          apiHongKongGovernDriving({
+            proxyUrl: hkGovernRegeoProxyUrl,
+            lng: finalLng,
+            lat: finalLat,
+            language: language === "zh-TW" ? "zh" : language
+          }).then(({ result, origin }) => {
+            var _a2, _b;
+            const hkGovernRes = getHKGovernResult((_b = (_a2 = result == null ? void 0 : result.data) == null ? void 0 : _a2.rawResponse) == null ? void 0 : _b.results, origin);
+            if (mapReturned || !hkGovernRes)
+              return;
+            const name = language === "en" ? hkGovernRes.ename : hkGovernRes.cname;
+            hkReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name,
+              displayName: name,
+              pointSource: PointSource.HKGOV
+            };
+            console.log("==港府接口返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          });
+          await sleep(HK_GOVERN_API_TIMEOUT);
+          if ((_a = props.findAttachedPlaceDone) == null ? void 0 : _a.value)
+            return;
+          if (hkReturned)
+            return;
+          console.log("==1s后推荐点和港府均未返回,开始请求谷歌逆地理==");
+        }
+        if (googleRegeoProxyUrl) {
+          apiGoogleRegeo({
+            proxyUrl: googleRegeoProxyUrl,
+            lng,
+            lat,
+            language
+          }).then((results) => {
+            const name = results[0].formatted_address || emptyPlaceName;
+            const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
+            if (hkReturned)
+              return;
+            mapReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name: pipeTw(name),
+              displayName: pipeTw(displayName),
+              pointSource: PointSource.GOOGLE
+            };
+            console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          }).catch(handleFailed);
+        } else {
+          const geocoder = new google.maps.Geocoder();
+          geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {
+            const name = results[0].formatted_address || emptyPlaceName;
+            const displayName = gmapPlaceName2DisplayName(name, results[0].address_components);
+            if (hkReturned)
+              return;
+            mapReturned = true;
+            const addressInfo = {
+              lng,
+              lat,
+              name: pipeTw(name),
+              displayName: pipeTw(displayName),
+              pointSource: PointSource.GOOGLE
+            };
+            console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
+            resolve(addressInfo);
+          }).catch(handleFailed);
+        }
       }, handleFailed);
       const timer = setTimeout(() => {
         console.warn("谷歌逆地理请求超时!");

package/dist/v3/hooks/useMapRecomendPlace.js

@@ -52,6 +52,7 @@ const useMapRecomendPlace = (props) => {
     onChangePlace
   } = props;
   const availableRef = ref(true);
+  const findAttachedPlaceDone = ref(false);
   const recommendTypeRef = ref(DEFAULT_RECOMMEND_TYPE);
   const placeCandidatesRef = ref([]);
   const zoneRef = ref();
@@ -60,7 +61,8 @@ const useMapRecomendPlace = (props) => {
   const { getPlaceByRegeo } = useMapPlace({
     emptyPlaceName,
     pointRef: ref([...defaultPoint]),
-    signal: inputSignal
+    signal: inputSignal,
+    findAttachedPlaceDone
   });
   const recomendPlace = reactive({
     lng: defaultPoint[0],
@@ -104,22 +106,30 @@ const useMapRecomendPlace = (props) => {
     const [lng, lat] = point;
     const { type, zone, available, candidates } = prevState;
     if (!zone || !apiLocalIsPointInRing(point, zone.path)) {
-      const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
-        getPlaceByRegeo(point, opt)
-      );
-      const {
-        place: closestPlace,
-        candidates: candidates2,
-        available: available2,
-        type: type2,
-        zone: zone2
-      } = await findAttachedPlace({ lng, lat, name: "", displayName: "" }, opt);
-      if (isPlacesInclude(candidates2, closestPlace)) {
-        return { place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
-      }
-      const regeoPlace = await reGeoPlacePromiseIgnored.recover();
-      console.log("==RegeoPlace==", regeoPlace);
-      return { place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 };
+      return new Promise((resolve) => {
+        findAttachedPlaceDone.value = false;
+        const reGeoPlacePromiseIgnored = recoverablyIgnoreManualAbortReject(
+          getPlaceByRegeo(point, opt)
+        );
+        findAttachedPlace({ lng, lat, name: "", displayName: "" }, opt).then(async ({
+          place: closestPlace,
+          candidates: candidates2,
+          available: available2,
+          type: type2,
+          zone: zone2
+        }) => {
+          findAttachedPlaceDone.value = true;
+          const adsorbed = isPlacesInclude(candidates2, closestPlace);
+          console.log("==推荐点接口==", `是否吸附：${adsorbed}`, `地址：${JSON.stringify(closestPlace)}`);
+          if (adsorbed) {
+            resolve({ place: { ...closestPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 });
+          } else {
+            const regeoPlace = await reGeoPlacePromiseIgnored.recover();
+            console.log("==RegeoPlace==", regeoPlace);
+            resolve({ place: { ...regeoPlace }, zone: zone2, available: available2, candidates: candidates2, type: type2 });
+          }
+        });
+      });
     }
     if (type === "Forbidden") {
       const regeoPlace = await getPlaceByRegeo(point, opt);

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

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

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -232,7 +232,11 @@ async function googleServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
   const routeSteps = [];
   for (const leg of firstRoute.legs) {
     distance += (_a = leg.distanceMeters) != null ? _a : 0;
-    duration += (_b = leg.durationSeconds) != null ? _b : 0;
+    if (isCrossBorder) {
+      duration += leg.duration ? parseInt(leg.duration) : 0;
+    } else {
+      duration += (_b = leg.durationSeconds) != null ? _b : 0;
+    }
     const staticRatio = leg.staticDurationSeconds ? ((_c = leg.durationSeconds) != null ? _c : 0) / leg.staticDurationSeconds : 1;
     for (const step of leg.steps) {
       const stepPath = step.path.map(({ lng, lat }) => [lng(), lat()]);

package/dist/v3/utils/log.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "2.20.0-pointSource5",
+  "version": "2.21.0-gmapCost",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",