@heycar/heycars-map 2.21.0-gmapCost2 → 2.21.0-gmapCost4

package/dist/v2/App.js

@@ -1,14 +1,14 @@
 import { h } from "vue";
 import { defineComponent, ref } from "vue-demi";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
-import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
+import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
 const gmapApiKey = {}.VITE_GMAP_API_KEY;
 const gmapId = {}.VITE_GMAP_MAP_ID;
 const amapApiKey = {}.VITE_AMAP_API_KEY;
 const amapApiSecret = {}.VITE_AMAP_API_SECRET;
 const App = defineComponent({
   setup() {
-    const supplierRef = ref("amap");
+    const supplierRef = ref("gmap");
     window.supplierRef = supplierRef;
     return () => h(MapProvider, {
       "attrs": {
@@ -21,6 +21,7 @@ const App = defineComponent({
         "gaodeRegeoProxyUrl": "/overseas/amap/regeo",
         "googleRegeoProxyUrl": "/overseas/maps/regeo",
         "hkGovernRegeoProxyUrl": "/overseas/gov/hk/identify",
+        "gaodeDirectionDrivingProxyUrl": "/overseas/amap/driveGuide",
         "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
         "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
         "themeVariables": {
@@ -52,7 +53,7 @@ const App = defineComponent({
         "fail": () => console.log(`${supplierRef.value} load failed`),
         "downloadOptimizeEnd": () => console.log(`${supplierRef.value} load download optimize end`)
       }
-    }, [h(DemoBusinessRecomendPlace)]);
+    }, [h(DemoBusinessQuoting)]);
   }
 });
 export {

package/dist/v2/Demo/DemoBusinessQuoting.js

@@ -18,11 +18,11 @@ const DemoBusinessQuoting = defineComponent({
   data() {
     return {
       from: {
-        displayName: "my",
-        name: "my",
-        type: "gcj02",
-        lat: 31.205478,
-        lng: 121.409535
+        displayName: "铜锣湾花园",
+        name: "铜锣湾花园",
+        type: "wgs84",
+        lat: 22.283107097738952,
+        lng: 114.18577528478997
       }
     };
   },
@@ -51,8 +51,8 @@ const DemoBusinessQuoting = defineComponent({
           displayName: "CDG Engie Charging Station",
           name: "21 Kent Ridge Rd, Singapore 119220",
           type: "gcj02",
-          lat: 31.207082,
-          lng: 121.407967
+          lat: 22.244887,
+          lng: 114.294277
         },
         "fromDescription": "您将在此上车",
         "renderDescription": ({

package/dist/v2/hooks/useDrivingRoute.js

@@ -17,7 +17,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) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl, "amap") : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
   };
   watchPostEffectForDeepOption(
     () => {
@@ -48,7 +48,7 @@ const useGDrivingRoute = (props) => {
   });
   const gmapDirectionsService = new google.maps.DirectionsService();
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
-    return gaodeDirectionDrivingProxyUrl && !inTaiwan(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, "gmap") : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
   };
   watchPostEffectForDeepOption(
     () => {

package/dist/v2/hooks/useGeoLocation.js

@@ -7,7 +7,7 @@ const GEO_TIMEOUT = 5e3;
 const singleGeoWatch = new SingleGeoWatch({
   timeout: GEO_TIMEOUT,
   maximumAge: 0,
-  enableHighAccuracy: false
+  enableHighAccuracy: true
 });
 const useGeoLocation = (props) => {
   var _a, _b;

package/dist/v2/hooks/useMapGCJ02.js

@@ -1,5 +1,5 @@
 import { e as exported } from "../chunks/gcoord.esm-bundler.3f2f1369.js";
-import { inChina, inHongkong, inMacau } from "./useMapInChina.js";
+import { inChina, inDiffArea } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useAmapGCJ02 = () => {
   const toCoordinateType = (p) => {
@@ -48,11 +48,11 @@ const useAmapGCJ02 = () => {
 };
 const useGmapGCJ02 = () => {
   const toCoordinateType = (p) => {
-    return inChina(p) && !inHongkong(p) && !inMacau(p) ? "gcj02" : "wgs84";
+    return inChina(p) && !inDiffArea(p) ? "gcj02" : "wgs84";
   };
   const toLocalGcj02 = (point) => {
     try {
-      if (!inChina(point) || inHongkong(point) || inMacau(point))
+      if (!inChina(point) || inDiffArea(point))
         return point;
       return exported.transform(point, exported.WGS84, exported.GCJ02);
     } catch (err) {
@@ -65,7 +65,7 @@ const useGmapGCJ02 = () => {
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
   const toLocalWgs84 = (point) => {
     try {
-      if (inChina(point) && !inHongkong(point) && !inMacau(point))
+      if (inChina(point) && !inDiffArea(point))
         return point;
       return exported.transform(point, exported.GCJ02, exported.WGS1984);
     } catch (err) {

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

@@ -4,3 +4,4 @@ export declare const inHongkong: (point: Point) => boolean;
 export declare const inMacau: (point: Point) => boolean;
 export declare const inTaiwan: (point: Point) => boolean;
 export declare const inKorean: (point: Point) => boolean;
+export declare const inDiffArea: (p: Point) => boolean;

package/dist/v2/hooks/useMapInChina.js

@@ -2792,8 +2792,12 @@ const inTaiwan = (point) => {
 const inKorean = (point) => {
   return pointInPolygon(point, koreanBounds) >= 0;
 };
+const inDiffArea = (p) => {
+  return inHongkong(p) || inMacau(p);
+};
 export {
   inChina,
+  inDiffArea,
   inHongkong,
   inKorean,
   inMacau,

package/dist/v2/hooks/useMapPlace.js

@@ -173,7 +173,7 @@ const useGmapPlace = (props) => {
             };
             console.log("==港府接口返回结果==", JSON.stringify(addressInfo));
             resolve(addressInfo);
-          });
+          }).finally(() => clearTimeout(timer));
           await sleep(HK_GOVERN_API_TIMEOUT);
           if ((_a = props.findAttachedPlaceDone) == null ? void 0 : _a.value)
             return;
@@ -203,7 +203,7 @@ const useGmapPlace = (props) => {
             };
             console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
             resolve(addressInfo);
-          }).catch(handleFailed);
+          }).catch(handleFailed).finally(() => clearTimeout(timer));
         } else {
           const geocoder = new google.maps.Geocoder();
           geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {

package/dist/v2/index.js

@@ -32,7 +32,7 @@ import { useMapGeometry } from "./hooks/useMapGeometry.js";
 import { useMapPlace } from "./hooks/useMapPlace.js";
 import { useMapRecomendPlace } from "./hooks/useMapRecomendPlace.js";
 import { useWalkingRoute } from "./hooks/useWalkingRoute.js";
-import { inChina, inHongkong, inKorean, inMacau, inTaiwan } from "./hooks/useMapInChina.js";
+import { inChina, inDiffArea, inHongkong, inKorean, inMacau, inTaiwan } from "./hooks/useMapInChina.js";
 import { CenterPlaceStatus, PointSource } from "./types/interface.js";
 import { MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT, patchMiniprogramRedirectTo } from "./utils/patchMiniprogram.js";
 export {
@@ -59,6 +59,7 @@ export {
   WalkingRoute,
   WaveCircle,
   inChina,
+  inDiffArea,
   inHongkong,
   inKorean,
   inMacau,

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

@@ -1,7 +1,8 @@
 /// <reference types="google.maps" />
+import type { MapSupplier } from "../hooks/useMapLoader";
 import type { Point, Route } from "../types/interface";
 export declare function amapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], amapDriving: AMap.Driving): Promise<Route>;
-export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
+export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string, mapSupplier: MapSupplier): Promise<Route>;
 export declare function gmapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
 export declare function googleServiceApiDrivingDirection(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
 export declare function googleServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;

package/dist/v2/utils/compatibleDrivingRoute.js

@@ -1,7 +1,8 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
 import { apiGoogleRoutes } from "../api/googleRoutes.js";
-import { vec2lnglat, amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
+import { inDiffArea } from "../hooks/useMapInChina.js";
+import { toLocalWgs84Force, vec2lnglat, amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
 const amapTmcs2trafficJams = (tmcs) => {
   const trafficJams = {};
   let prevStatus = "UNKNOWN";
@@ -67,7 +68,7 @@ function amapJsApiDrivingRoute(from, to, waypoints, amapDriving) {
     );
   });
 }
-async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
+async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl, mapSupplier) {
   const { status, routes, error_message } = await apiGaodeDirectionDriving({
     proxyUrl,
     origin: [from],
@@ -85,7 +86,12 @@ async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
         return { path: [], distance: 0, duration: 0, steps: [] };
       for (const step of firstRoute.steps) {
         const basicStep = step;
-        const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
+        const stepPath = basicStep.path.map(({ lng, lat }) => {
+          const needTransform = mapSupplier === "gmap" && inDiffArea([lng, lat]);
+          if (needTransform)
+            return toLocalWgs84Force([lng, lat], "gcj02");
+          return [lng, lat];
+        });
         path = path.concat(stepPath);
         Object.assign(trafficJams, amapTmcs2trafficJams(basicStep.tmcs));
         routeSteps.push({

package/dist/v2/utils/log.js

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

package/dist/v3/App.js

@@ -1,14 +1,14 @@
 import { createVNode } from "vue";
 import { defineComponent, ref } from "vue-demi";
 import { MapProvider } from "./components/MapProvider/MapProvider.js";
-import { DemoBusinessRecomendPlace } from "./Demo/DemoBusinessRecomendPlace.js";
+import { DemoBusinessQuoting } from "./Demo/DemoBusinessQuoting.js";
 const gmapApiKey = {}.VITE_GMAP_API_KEY;
 const gmapId = {}.VITE_GMAP_MAP_ID;
 const amapApiKey = {}.VITE_AMAP_API_KEY;
 const amapApiSecret = {}.VITE_AMAP_API_SECRET;
 const App = /* @__PURE__ */ defineComponent({
   setup() {
-    const supplierRef = ref("amap");
+    const supplierRef = ref("gmap");
     window.supplierRef = supplierRef;
     return () => createVNode(MapProvider, {
       "amapKey": amapApiKey,
@@ -20,6 +20,7 @@ const App = /* @__PURE__ */ defineComponent({
       "gaodeRegeoProxyUrl": "/overseas/amap/regeo",
       "googleRegeoProxyUrl": "/overseas/maps/regeo",
       "hkGovernRegeoProxyUrl": "/overseas/gov/hk/identify",
+      "gaodeDirectionDrivingProxyUrl": "/overseas/amap/driveGuide",
       "googleSnapRoadProxyUrl": "/overseas/maps/snapToRoads",
       "googleRoutesProxyUrl": "/overseas/maps/routes/directions/v2",
       "themeVariables": {
@@ -49,7 +50,7 @@ const App = /* @__PURE__ */ defineComponent({
       "onDownloadOptimizeEnd": () => console.log(`${supplierRef.value} load download optimize end`),
       "reportLog": () => console.log("reportLog function is called")
     }, {
-      default: () => [createVNode(DemoBusinessRecomendPlace, null, null)]
+      default: () => [createVNode(DemoBusinessQuoting, null, null)]
     });
   }
 });

package/dist/v3/Demo/DemoBusinessQuoting.js

@@ -18,11 +18,11 @@ const DemoBusinessQuoting = /* @__PURE__ */ defineComponent({
   data() {
     return {
       from: {
-        displayName: "my",
-        name: "my",
-        type: "gcj02",
-        lat: 31.205478,
-        lng: 121.409535
+        displayName: "铜锣湾花园",
+        name: "铜锣湾花园",
+        type: "wgs84",
+        lat: 22.283107097738952,
+        lng: 114.18577528478997
       }
     };
   },
@@ -50,8 +50,8 @@ const DemoBusinessQuoting = /* @__PURE__ */ defineComponent({
         displayName: "CDG Engie Charging Station",
         name: "21 Kent Ridge Rd, Singapore 119220",
         type: "gcj02",
-        lat: 31.207082,
-        lng: 121.407967
+        lat: 22.244887,
+        lng: 114.294277
       },
       "fromDescription": "您将在此上车",
       "renderDescription": ({

package/dist/v3/hooks/useDrivingRoute.js

@@ -17,7 +17,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) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
+    return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gaodeDirectionDrivingProxyUrl ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl, "amap") : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
   };
   watchPostEffectForDeepOption(
     () => {
@@ -48,7 +48,7 @@ const useGDrivingRoute = (props) => {
   });
   const gmapDirectionsService = new google.maps.DirectionsService();
   const apiMapDrivingRoute = (from, to, waypoints = []) => {
-    return gaodeDirectionDrivingProxyUrl && !inTaiwan(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, "gmap") : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
   };
   watchPostEffectForDeepOption(
     () => {

package/dist/v3/hooks/useGeoLocation.js

@@ -7,7 +7,7 @@ const GEO_TIMEOUT = 5e3;
 const singleGeoWatch = new SingleGeoWatch({
   timeout: GEO_TIMEOUT,
   maximumAge: 0,
-  enableHighAccuracy: false
+  enableHighAccuracy: true
 });
 const useGeoLocation = (props) => {
   var _a, _b;

package/dist/v3/hooks/useMapGCJ02.js

@@ -1,5 +1,5 @@
 import { e as exported } from "../chunks/gcoord.esm-bundler.3f2f1369.js";
-import { inChina, inHongkong, inMacau } from "./useMapInChina.js";
+import { inChina, inDiffArea } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 const useAmapGCJ02 = () => {
   const toCoordinateType = (p) => {
@@ -48,11 +48,11 @@ const useAmapGCJ02 = () => {
 };
 const useGmapGCJ02 = () => {
   const toCoordinateType = (p) => {
-    return inChina(p) && !inHongkong(p) && !inMacau(p) ? "gcj02" : "wgs84";
+    return inChina(p) && !inDiffArea(p) ? "gcj02" : "wgs84";
   };
   const toLocalGcj02 = (point) => {
     try {
-      if (!inChina(point) || inHongkong(point) || inMacau(point))
+      if (!inChina(point) || inDiffArea(point))
         return point;
       return exported.transform(point, exported.WGS84, exported.GCJ02);
     } catch (err) {
@@ -65,7 +65,7 @@ const useGmapGCJ02 = () => {
   const toLocalGcj02Points = (points) => points.map(toLocalGcj02);
   const toLocalWgs84 = (point) => {
     try {
-      if (inChina(point) && !inHongkong(point) && !inMacau(point))
+      if (inChina(point) && !inDiffArea(point))
         return point;
       return exported.transform(point, exported.GCJ02, exported.WGS1984);
     } catch (err) {

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

@@ -4,3 +4,4 @@ export declare const inHongkong: (point: Point) => boolean;
 export declare const inMacau: (point: Point) => boolean;
 export declare const inTaiwan: (point: Point) => boolean;
 export declare const inKorean: (point: Point) => boolean;
+export declare const inDiffArea: (p: Point) => boolean;

package/dist/v3/hooks/useMapInChina.js

@@ -2792,8 +2792,12 @@ const inTaiwan = (point) => {
 const inKorean = (point) => {
   return pointInPolygon(point, koreanBounds) >= 0;
 };
+const inDiffArea = (p) => {
+  return inHongkong(p) || inMacau(p);
+};
 export {
   inChina,
+  inDiffArea,
   inHongkong,
   inKorean,
   inMacau,

package/dist/v3/hooks/useMapPlace.js

@@ -173,7 +173,7 @@ const useGmapPlace = (props) => {
             };
             console.log("==港府接口返回结果==", JSON.stringify(addressInfo));
             resolve(addressInfo);
-          });
+          }).finally(() => clearTimeout(timer));
           await sleep(HK_GOVERN_API_TIMEOUT);
           if ((_a = props.findAttachedPlaceDone) == null ? void 0 : _a.value)
             return;
@@ -203,7 +203,7 @@ const useGmapPlace = (props) => {
             };
             console.log("==谷歌逆地理返回结果==", JSON.stringify(addressInfo));
             resolve(addressInfo);
-          }).catch(handleFailed);
+          }).catch(handleFailed).finally(() => clearTimeout(timer));
         } else {
           const geocoder = new google.maps.Geocoder();
           geocoder.geocode({ language, location: { lng, lat } }).finally(() => clearTimeout(timer)).then(({ results }) => {

package/dist/v3/index.js

@@ -32,7 +32,7 @@ import { useMapGeometry } from "./hooks/useMapGeometry.js";
 import { useMapPlace } from "./hooks/useMapPlace.js";
 import { useMapRecomendPlace } from "./hooks/useMapRecomendPlace.js";
 import { useWalkingRoute } from "./hooks/useWalkingRoute.js";
-import { inChina, inHongkong, inKorean, inMacau, inTaiwan } from "./hooks/useMapInChina.js";
+import { inChina, inDiffArea, inHongkong, inKorean, inMacau, inTaiwan } from "./hooks/useMapInChina.js";
 import { CenterPlaceStatus, PointSource } from "./types/interface.js";
 import { MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT, patchMiniprogramRedirectTo } from "./utils/patchMiniprogram.js";
 export {
@@ -59,6 +59,7 @@ export {
   WalkingRoute,
   WaveCircle,
   inChina,
+  inDiffArea,
   inHongkong,
   inKorean,
   inMacau,

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

@@ -1,7 +1,8 @@
 /// <reference types="google.maps" />
+import type { MapSupplier } from "../hooks/useMapLoader";
 import type { Point, Route } from "../types/interface";
 export declare function amapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], amapDriving: AMap.Driving): Promise<Route>;
-export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
+export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string, mapSupplier: MapSupplier): Promise<Route>;
 export declare function gmapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
 export declare function googleServiceApiDrivingDirection(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
 export declare function googleServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;

package/dist/v3/utils/compatibleDrivingRoute.js

@@ -1,7 +1,8 @@
 import { apiGaodeDirectionDriving } from "../api/gaodeDirectionDriving.js";
 import { apiGoogleDirections } from "../api/googleDirections.js";
 import { apiGoogleRoutes } from "../api/googleRoutes.js";
-import { vec2lnglat, amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
+import { inDiffArea } from "../hooks/useMapInChina.js";
+import { toLocalWgs84Force, vec2lnglat, amapTraffic2trafficStatus, stringifyPoint } from "./transform.js";
 const amapTmcs2trafficJams = (tmcs) => {
   const trafficJams = {};
   let prevStatus = "UNKNOWN";
@@ -67,7 +68,7 @@ function amapJsApiDrivingRoute(from, to, waypoints, amapDriving) {
     );
   });
 }
-async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
+async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl, mapSupplier) {
   const { status, routes, error_message } = await apiGaodeDirectionDriving({
     proxyUrl,
     origin: [from],
@@ -85,7 +86,12 @@ async function gaodeServiceApiDrivingRoute(from, to, waypoints, proxyUrl) {
         return { path: [], distance: 0, duration: 0, steps: [] };
       for (const step of firstRoute.steps) {
         const basicStep = step;
-        const stepPath = basicStep.path.map(({ lng, lat }) => [lng, lat]);
+        const stepPath = basicStep.path.map(({ lng, lat }) => {
+          const needTransform = mapSupplier === "gmap" && inDiffArea([lng, lat]);
+          if (needTransform)
+            return toLocalWgs84Force([lng, lat], "gcj02");
+          return [lng, lat];
+        });
         path = path.concat(stepPath);
         Object.assign(trafficJams, amapTmcs2trafficJams(basicStep.tmcs));
         routeSteps.push({

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.21.0-gmapCost2";
+const pkgVersion = "2.21.0-gmapCost4";
 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.21.0-gmapCost2",
+  "version": "2.21.0-gmapCost4",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js",