@heycar/heycars-map 2.25.0-gaodeRegeo → 2.26.0-setLimitBounds

package/README.md

@@ -133,6 +133,19 @@ export interface CoordinateTrackPoint {
   timestamp: number;
 }
 
+export interface CoordinateExternalRoute {
+  path: CoordinatePoint[];
+  duration: number;
+  distance: number;
+}
+
+export type GetDriverRouteOrTrackOutput =
+  | {
+      routes?: CoordinateExternalRoute;
+      tracks?: CoordinateTrackPoint[];
+    }
+  | undefined;
+
 export enum CenterPlaceStatus {
   GEO_LOADING = "GEO_LOADING",
   QUERYING_INFO = "QUERYING_INFO",
@@ -584,6 +597,7 @@ export default defineComponent({
         <BusinessQuotingMap
           class={"demo"}
           isBezierCurve
+          isNeedMapRouteData
           from={{
             displayName: "The Malayan Council",
             name: "10 Winstedt Rd, #01-17, Singapore 227977",
@@ -662,7 +676,7 @@ export default defineComponent({
         relayToTitle="上个乘客将\n在这下车"
         bookDispatchingTitle="2月14日 11:00 用车"
         dispatchingTitle="正在为您搜索附近司机"
-        bookDispatchedTitle="*6月12日 11:00* 用车"
+        renderBookDispatchedTitle={() => "*6月12日 11:00* 用车"}
         driverArrivedTitle="司机已等待 00:35"
         renderStartSerivceTitle={({ distance, duration }) =>
           `距你*${distance}*公里, *${duration}*分钟`
@@ -678,6 +692,21 @@ export default defineComponent({
             { lng: 121.403581, lat: 31.216415, type: "gcj02", angle: 30, timestamp: 1698058442000 },
           ]);
         }}
+        // getDriverRouteOrTrack 与 getDriverPositionTrack 二选一
+        getDriverRouteOrTrack={async () => {
+          //  后端返回司机的真实导航路径或者历史轨迹
+          return Promise.resolve<GetDriverRouteOrTrackOutput>({
+            routes: {
+              distance: 4270,
+              duration: 1310,
+              path: [
+                {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+                {lng: 121.401554, lat: 31.21653, type: "gcj02"},
+                {lng: 121.401795, lat: 31.21654, type: "gcj02"},
+              ],
+            },
+          });
+        }}
         interval={5000}
         mapContext={mapContext}
       />

package/dist/v2/App.js

@@ -15,13 +15,12 @@ const App = defineComponent({
         "amapKey": amapApiKey,
         "amapSecret": amapApiSecret,
         "gmapId": gmapId,
+        "amapLimitBounds": [-180, 18.158333, 180, 90],
         "gmapKey": gmapApiKey,
-        "language": "zh",
+        "language": "en",
         "supplier": supplierRef.value,
         "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": {

package/dist/v2/Demo/DemoBusinessRecomendPlace.js

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

package/dist/v2/Demo/DemoBusinessTaxiService.d.ts

@@ -1,4 +1,4 @@
-import { type CoordinatePlace, type CoordinateTrackPoint, type DriverStatus } from "../types/interface";
+import { type CoordinatePlace, type CoordinateTrackPoint, type DriverStatus, type GetDriverRouteOrTrackOutput } from "../types/interface";
 export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent<Readonly<{}>, {
     mapContext: import("../hooks-business/useBusinessTaxiServiceMap").BusinessTaxiServiceContext;
 }, {
@@ -9,4 +9,7 @@ export declare const DemoBusinessTaxiService: import("vue-demi").DefineComponent
     contentHeight: number;
 }, {}, {
     getDriverPositionTrack(): Promise<CoordinateTrackPoint[]>;
+    renderStartServiceSubTitle(): string;
+    renderStartSubTitle(): string;
+    getDriverRouteOrTrack(): Promise<GetDriverRouteOrTrackOutput>;
 }, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue-demi").ExtractPropTypes<Readonly<{}>>>, {}>;

package/dist/v2/Demo/DemoBusinessTaxiService.js

@@ -4,7 +4,9 @@ import { BusinessTaxiServiceMap } from "../business-components/BusinessTaxiServi
 import { useBusinessTaxiServiceMap } from "../hooks-business/useBusinessTaxiServiceMap.js";
 import { isCoordinatePoint } from "../utils/typeChecking.js";
 import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
+import { mockExternalRoute } from "./demo.data.mock.js";
 const allDriverStatus = ["dispatching", "book-dispatching", "dispatched", "driverStartRelayService", "driverStartService", "book-driverStartService", "book-dispatched", "driverArrived", "inService", "canceled", "endService", "completed", "canceling", "banlanceRefund", "waitBanlanceRefund", "rechargePayed", "waitRechargePay", "payed", "waitpay", "refund", "confirmed", "assign"];
+const mockDriverRoute = mockExternalRoute;
 const mockDriverTrackPoints = [{
   lng: 121.4036983,
   lat: 31.216324,
@@ -39,7 +41,7 @@ const DemoBusinessTaxiService = defineComponent({
       from: {},
       to: {},
       relayTo: {},
-      status: "driverStartRelayService",
+      status: "dispatched",
       contentHeight: 200
     };
   },
@@ -89,16 +91,30 @@ const DemoBusinessTaxiService = defineComponent({
   methods: {
     getDriverPositionTrack() {
       return Promise.resolve(mockDriverTrackPoints);
+    },
+    renderStartServiceSubTitle() {
+      return "司機未按路線接駕？" + Math.random().toFixed(2);
+    },
+    renderStartSubTitle() {
+      return "接駕路線錯誤？" + Math.random().toFixed(2);
+    },
+    getDriverRouteOrTrack() {
+      return Promise.resolve({
+        routes: mockDriverRoute
+      });
     }
   },
   render() {
     const {
       mapContext,
       getDriverPositionTrack,
+      getDriverRouteOrTrack,
       from,
       to,
       status,
-      relayTo
+      relayTo,
+      renderStartServiceSubTitle,
+      renderStartSubTitle
     } = this;
     const isReady = isCoordinatePoint(from) && isCoordinatePoint(to);
     if (!isReady)
@@ -117,20 +133,27 @@ const DemoBusinessTaxiService = defineComponent({
         "driverStatus": status,
         "relayToTitle": "上个乘客将\n在这下车",
         "bookDispatchingTitle": "2月14日 11:00 用车",
-        "bookDispatchedTitle": "*6月12日 11:00* 用车",
+        "renderBookDispatchedTitle": () => "*6月12日 11:00* 用车",
         "dispatchingTitle": "正在为您搜索附近司机",
         "driverArrivedTitle": "司机已等待 00:35",
         "renderStartSerivceTitle": ({
           distance,
           duration
         }) => `距你*${distance / 1e3}*公里, *${duration}*分钟`,
+        "renderStartServiceSubTitle": renderStartServiceSubTitle,
+        "renderStartSubTitle": renderStartSubTitle,
         "renderInServiceTitle": ({
           distance,
           duration
         }) => `距离终点*${distance / 1e3}*公里, 预计*${duration}*分钟`,
         "getDriverPositionTrack": getDriverPositionTrack,
+        "getDriverRouteOrTrack": getDriverRouteOrTrack,
         "interval": 5e3,
         "mapContext": mapContext
+      },
+      "on": {
+        "clickStartServicePoint": () => console.log("777-onClickStartServicePoint被点击了"),
+        "clickStartPoint": (value) => console.log("7777-onClickStartPoint:路线规划接口参数", value)
       }
     }), h("div", {
       "style": {

package/dist/v2/Demo/demo.data.mock.d.ts

@@ -0,0 +1,4 @@
+import type { CoordinateExternalRoute, CoordinatePoint } from "../types/interface";
+export declare const mockPath: CoordinatePoint[];
+export declare const mockExternalRoute: CoordinateExternalRoute;
+export declare const mockConfirmedPath: CoordinatePoint[];