@heycar/heycars-map 2.12.0-color7 → 2.13.0-relay2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +43 -0
- package/dist/v2/Demo/DemoBusinessQuoting.d.ts +7 -1
- package/dist/v2/Demo/DemoBusinessQuoting.js +60 -30
- package/dist/v2/Demo/DemoBusinessTaxiService.d.ts +1 -0
- package/dist/v2/Demo/DemoBusinessTaxiService.js +44 -23
- package/dist/v2/api/cdn.d.ts +1 -1
- package/dist/v2/api/cdn.js +3 -3
- package/dist/v2/api/contants.d.ts +1 -1
- package/dist/v2/api/contants.js +1 -1
- package/dist/v2/business-components/AbsoluteAddressBox/AbsoluteAddressBox.js +7 -1
- package/dist/v2/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.d.ts +1 -0
- package/dist/v2/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.js +6 -3
- package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts +2 -0
- package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js +25 -3
- package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts +5 -0
- package/dist/v2/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js +123 -1
- package/dist/v2/business-components/PlaceCircle/PlaceCircle.js +1 -1
- package/dist/v2/business-components/StartEndPoint/StartEndPoint.css.d.ts +5 -0
- package/dist/v2/business-components/StartEndPoint/StartEndPoint.d.ts +5 -2
- package/dist/v2/business-components/StartEndPoint/StartEndPoint.js +21 -6
- package/dist/v2/business-components/TaxiCar/TaxiCar.d.ts +1 -0
- package/dist/v2/business-components/TaxiCar/TaxiCar.js +17 -6
- package/dist/v2/chunks/{Loading.96f573fe.js → Loading.70dfc720.js} +7 -1
- package/dist/{v3/chunks/StartEndPoint.css.ca6c9719.js → v2/chunks/StartEndPoint.css.4d9c0791.js} +4 -4
- package/dist/v2/components/Loading/Loading.d.ts +1 -0
- package/dist/v2/components/Loading/Loading.js +2 -1
- package/dist/v2/components/Loading/index.js +1 -1
- package/dist/v2/components/MapProvider/MapProvider.js +1 -1
- package/dist/{v3/css/PlaceCircle-00817652.css → v2/css/PlaceCircle-80eb763c.css} +1 -0
- package/dist/{v3/css/StartEndPoint-f6a6f7d3.css → v2/css/StartEndPoint-d1c9154a.css} +7 -2
- package/dist/v2/hooks/useDeviationCorrectionDrivingRoute.d.ts +2 -1
- package/dist/v2/hooks/useDeviationCorrectionDrivingRoute.js +12 -5
- package/dist/v2/hooks/useDrivingRoute.d.ts +4 -3
- package/dist/v2/hooks/useDrivingRoute.js +12 -12
- package/dist/v2/types/interface.d.ts +8 -1
- package/dist/v2/utils/compatibleDrivingRoute.d.ts +5 -5
- package/dist/v2/utils/compatibleDrivingRoute.js +23 -11
- package/dist/v2/utils/log.js +1 -1
- package/dist/v3/Demo/DemoBusinessQuoting.d.ts +7 -3
- package/dist/v3/Demo/DemoBusinessQuoting.js +62 -32
- package/dist/v3/Demo/DemoBusinessTaxiService.d.ts +1 -0
- package/dist/v3/Demo/DemoBusinessTaxiService.js +44 -23
- package/dist/v3/api/cdn.d.ts +1 -1
- package/dist/v3/api/cdn.js +3 -3
- package/dist/v3/api/contants.d.ts +1 -1
- package/dist/v3/api/contants.js +1 -1
- package/dist/v3/business-components/AbsoluteAddressBox/AbsoluteAddressBox.js +7 -1
- package/dist/v3/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.d.ts +1 -0
- package/dist/v3/business-components/AuxiliaryGraspRoad/AuxiliaryGraspRoad.js +6 -3
- package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.d.ts +2 -0
- package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js +21 -3
- package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts +9 -0
- package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.js +99 -1
- package/dist/v3/business-components/PlaceCircle/PlaceCircle.js +1 -1
- package/dist/v3/business-components/StartEndPoint/StartEndPoint.css.d.ts +5 -0
- package/dist/v3/business-components/StartEndPoint/StartEndPoint.d.ts +5 -2
- package/dist/v3/business-components/StartEndPoint/StartEndPoint.js +21 -6
- package/dist/v3/business-components/TaxiCar/TaxiCar.d.ts +1 -0
- package/dist/v3/business-components/TaxiCar/TaxiCar.js +17 -6
- package/dist/v3/chunks/{Loading.8c26ab6c.js → Loading.4c949ec9.js} +7 -1
- package/dist/{v2/chunks/StartEndPoint.css.ca6c9719.js → v3/chunks/StartEndPoint.css.4d9c0791.js} +4 -4
- package/dist/v3/components/Loading/Loading.d.ts +1 -0
- package/dist/v3/components/Loading/Loading.js +2 -1
- package/dist/v3/components/Loading/index.js +1 -1
- package/dist/v3/components/MapProvider/MapProvider.js +1 -1
- package/dist/{v2/css/PlaceCircle-00817652.css → v3/css/PlaceCircle-80eb763c.css} +1 -0
- package/dist/{v2/css/StartEndPoint-f6a6f7d3.css → v3/css/StartEndPoint-d1c9154a.css} +7 -2
- package/dist/v3/hooks/useDeviationCorrectionDrivingRoute.d.ts +2 -1
- package/dist/v3/hooks/useDeviationCorrectionDrivingRoute.js +12 -5
- package/dist/v3/hooks/useDrivingRoute.d.ts +4 -3
- package/dist/v3/hooks/useDrivingRoute.js +12 -12
- package/dist/v3/types/interface.d.ts +8 -1
- package/dist/v3/utils/compatibleDrivingRoute.d.ts +5 -5
- package/dist/v3/utils/compatibleDrivingRoute.js +23 -11
- package/dist/v3/utils/log.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -50,6 +50,7 @@ body {
|
|
|
50
50
|
--HEYCAR_MAP_SVG_VAR_end-point_linearGradient_stop_2_color: #ff4040;
|
|
51
51
|
--HEYCAR_MAP_SVG_VAR_end-point_linearGradient_stop_3_color: #ff4040;
|
|
52
52
|
--HEYCAR_MAP_SVG_VAR_end-point_path_fill: rgba(0, 0, 0, 0.5);
|
|
53
|
+
--HEYCAR_MAP_SVG_VAR_waypoint_path_fill: #ff4040;
|
|
53
54
|
--HEYCAR_MAP_SVG_VAR_passenger-circle_circle_fill: #1e1e1e;
|
|
54
55
|
--HEYCAR_MAP_SVG_VAR_passenger-circle_outerCircle_fill: #4471ff;
|
|
55
56
|
--HEYCAR_MAP_SVG_VAR_passenger-circle_outerCircle_stroke: #003dff;
|
|
@@ -151,6 +152,31 @@ export interface BusinessGeolocationPositionError extends GeolocationPositionErr
|
|
|
151
152
|
|
|
152
153
|
// Restricted(绿区)Forbidden(红区)Recommend(推荐点)
|
|
153
154
|
export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
|
|
155
|
+
|
|
156
|
+
export type DriverStatus =
|
|
157
|
+
| "dispatching"
|
|
158
|
+
| "book-dispatching"
|
|
159
|
+
| "dispatched"
|
|
160
|
+
| "driverStartService"
|
|
161
|
+
| "driverStartRelayService"
|
|
162
|
+
| "book-driverStartService"
|
|
163
|
+
| "book-dispatched"
|
|
164
|
+
| "driverArrived"
|
|
165
|
+
| "inService"
|
|
166
|
+
| "canceled"
|
|
167
|
+
| "endService"
|
|
168
|
+
| "completed"
|
|
169
|
+
| "canceling"
|
|
170
|
+
| "banlanceRefund"
|
|
171
|
+
| "waitBanlanceRefund"
|
|
172
|
+
| "rechargePayed"
|
|
173
|
+
| "waitRechargePay"
|
|
174
|
+
| "payed"
|
|
175
|
+
| "waitpay"
|
|
176
|
+
| "refund"
|
|
177
|
+
| "confirmed"
|
|
178
|
+
| "assign"
|
|
179
|
+
| "orderReassigned";
|
|
154
180
|
```
|
|
155
181
|
|
|
156
182
|
#### 在 入口文件添加 `MapProvider`
|
|
@@ -200,6 +226,15 @@ export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
|
|
|
200
226
|
// ZONE_RESTRICTED_BORDER_COLOR: "#1E1E1E",
|
|
201
227
|
// ZONE_FORBIDDEN_BACKGROUND_COLOR: "#F27878",
|
|
202
228
|
// ZONE_FORBIDDEN_BORDER_COLOR: "#F41717",
|
|
229
|
+
//
|
|
230
|
+
// 支付宝迁移主题-图标
|
|
231
|
+
// ICON_START_POINT_EN_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/start-point-en.svg";
|
|
232
|
+
// ICON_END_POINT_EN_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/end-point-en.svg";
|
|
233
|
+
// ICON_END_POINT_ZH_TW_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/end-point-zh-TW.svg";
|
|
234
|
+
// ICON_TAXI_CAR_URL: "https://<支付宝oss域名>/heycar-map/svg/taxi-car.svg";
|
|
235
|
+
// ICON_DOT_LOADING_URL: "https://<支付宝oss域名>/heycar-map/gif/dot-loading.gif";
|
|
236
|
+
// ICON_LOAD_FAILED_URL: "https://<支付宝oss域名>/heycar-map/svg/load-failed.svg";
|
|
237
|
+
// ICON_WAYPOINT_URL: "https://<支付宝oss域名>/heycar-map/svg/0.12/waypoint.svg";
|
|
203
238
|
}
|
|
204
239
|
}
|
|
205
240
|
// 地图加载失败时显示的标题
|
|
@@ -604,7 +639,15 @@ export default defineComponent({
|
|
|
604
639
|
lat: 1.2966426,
|
|
605
640
|
lng: 103.7763939,
|
|
606
641
|
}}
|
|
642
|
+
relayTo={{
|
|
643
|
+
displayName: "Lucky Plaza",
|
|
644
|
+
name: "304 Orchard Rd, Lucky Plaza, Singapore 238863",
|
|
645
|
+
type: "wgs84",
|
|
646
|
+
lat: 1.3049168518726226,
|
|
647
|
+
lng: 103.83369616777854,
|
|
648
|
+
}}
|
|
607
649
|
driverStatus={"driverArrived"}
|
|
650
|
+
relayToTitle="上个乘客将\n在这下车"
|
|
608
651
|
bookDispatchingTitle="2月14日 11:00 用车"
|
|
609
652
|
dispatchingTitle="正在为您搜索附近司机"
|
|
610
653
|
bookDispatchedTitle="*6月12日 11:00* 用车"
|
|
@@ -1 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import type { CoordinatePlace } from "../types/interface";
|
|
2
|
+
export declare const DemoBusinessQuoting: import("vue-demi").DefineComponent<{}, {
|
|
3
|
+
mapContext: import("../hooks-business/useBusinessQuotingMap").BusinessQuotingContext;
|
|
4
|
+
toAmapCoordinateType: (point: import("../types/interface").Point) => import("../types/interface").CoordinateType;
|
|
5
|
+
}, {
|
|
6
|
+
from: CoordinatePlace;
|
|
7
|
+
}, {}, {}, import("vue/types/v3-component-options").ComponentOptionsMixin, import("vue/types/v3-component-options").ComponentOptionsMixin, {}, string, Readonly<import("vue-demi").ExtractPropTypes<{}>>, {}>;
|
|
@@ -1,43 +1,73 @@
|
|
|
1
1
|
import { h } from "vue";
|
|
2
|
+
import { defineComponent } from "vue-demi";
|
|
2
3
|
import { BusinessQuotingMap } from "../business-components/BusinessQuotingMap/BusinessQuotingMap.js";
|
|
3
4
|
import { useBusinessQuotingMap } from "../hooks-business/useBusinessQuotingMap.js";
|
|
4
|
-
import { defineSetup } from "../types/helper.js";
|
|
5
5
|
import { d as demo } from "../chunks/Demo.css.e921a2f6.js";
|
|
6
|
-
const DemoBusinessQuoting =
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
6
|
+
const DemoBusinessQuoting = defineComponent({
|
|
7
|
+
name: "DemoBusinessQuoting",
|
|
8
|
+
setup() {
|
|
9
|
+
const {
|
|
10
|
+
mapContext,
|
|
11
|
+
toAmapCoordinateType
|
|
12
|
+
} = useBusinessQuotingMap();
|
|
13
|
+
return {
|
|
14
|
+
mapContext,
|
|
15
|
+
toAmapCoordinateType
|
|
16
|
+
};
|
|
17
|
+
},
|
|
18
|
+
data() {
|
|
19
|
+
return {
|
|
20
|
+
from: {
|
|
21
|
+
displayName: "my",
|
|
22
|
+
name: "my",
|
|
23
|
+
type: "wgs84",
|
|
24
|
+
lat: 1.311295,
|
|
25
|
+
lng: 103.841974
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
},
|
|
29
|
+
created() {
|
|
30
|
+
window.updateFrom = () => {
|
|
31
|
+
this.from = {
|
|
15
32
|
displayName: "The Malayan Council",
|
|
16
33
|
name: "10 Winstedt Rd, #01-17, Singapore 227977",
|
|
17
34
|
type: "wgs84",
|
|
18
35
|
lat: 1.311295,
|
|
19
36
|
lng: 103.841974
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
},
|
|
40
|
+
render() {
|
|
41
|
+
const {
|
|
42
|
+
mapContext,
|
|
43
|
+
toAmapCoordinateType,
|
|
44
|
+
from
|
|
45
|
+
} = this;
|
|
46
|
+
return h("div", [h(BusinessQuotingMap, {
|
|
47
|
+
"class": demo,
|
|
48
|
+
"attrs": {
|
|
49
|
+
"from": from,
|
|
50
|
+
"to": {
|
|
51
|
+
displayName: "CDG Engie Charging Station",
|
|
52
|
+
name: "21 Kent Ridge Rd, Singapore 119220",
|
|
53
|
+
type: "wgs84",
|
|
54
|
+
lat: 1.2966426,
|
|
55
|
+
lng: 103.7763939
|
|
56
|
+
},
|
|
57
|
+
"fromDescription": "您将在此上车",
|
|
58
|
+
"renderDescription": ({
|
|
59
|
+
distance,
|
|
60
|
+
duration,
|
|
61
|
+
tolls
|
|
62
|
+
}) => `全程 *${distance / 1e3}公里* 约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
|
|
63
|
+
"mapContext": mapContext
|
|
20
64
|
},
|
|
21
|
-
"
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
},
|
|
28
|
-
"fromDescription": "您将在此上车",
|
|
29
|
-
"renderDescription": ({
|
|
30
|
-
distance,
|
|
31
|
-
duration,
|
|
32
|
-
tolls
|
|
33
|
-
}) => `全程 *${distance / 1e3}公里* 约行驶 *${duration}* 高速费用 *${tolls != null ? tolls : 0}*元`,
|
|
34
|
-
"mapContext": mapContext
|
|
35
|
-
},
|
|
36
|
-
"on": {
|
|
37
|
-
"clickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
|
|
38
|
-
"clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
|
|
39
|
-
}
|
|
40
|
-
}), h("div", ["经度 103.841974, 纬度 1.311295 在高德地图上的坐标类型是:", toAmapCoordinateType([103.841974, 1.311295])])]);
|
|
65
|
+
"on": {
|
|
66
|
+
"clickStartPoint": (place) => console.log("点击起点时触发 palce = ", place),
|
|
67
|
+
"clickEndPoint": (place) => console.log("点击终点时触发 palce = ", place)
|
|
68
|
+
}
|
|
69
|
+
}), h("div", ["经度 103.841974, 纬度 1.311295 在高德地图上的坐标类型是:", toAmapCoordinateType([103.841974, 1.311295])])]);
|
|
70
|
+
}
|
|
41
71
|
});
|
|
42
72
|
export {
|
|
43
73
|
DemoBusinessQuoting
|
|
@@ -4,7 +4,26 @@ import { BusinessTaxiServiceMap } from "../business-components/BusinessTaxiServi
|
|
|
4
4
|
import { useBusinessTaxiServiceMap } from "../hooks-business/useBusinessTaxiServiceMap.js";
|
|
5
5
|
import { isCoordinatePoint } from "../utils/typeChecking.js";
|
|
6
6
|
import { l as layout, a as adjustedDemo } from "../chunks/Demo.css.e921a2f6.js";
|
|
7
|
-
const allDriverStatus = ["dispatching", "book-dispatching", "dispatched", "driverStartService", "book-driverStartService", "book-dispatched", "driverArrived", "inService", "canceled", "endService", "completed", "canceling", "banlanceRefund", "waitBanlanceRefund", "rechargePayed", "waitRechargePay", "payed", "waitpay", "refund", "confirmed", "assign"];
|
|
7
|
+
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"];
|
|
8
|
+
const mockDriverTrackPoints = [{
|
|
9
|
+
lng: 121.4036983,
|
|
10
|
+
lat: 31.216324,
|
|
11
|
+
angle: 30,
|
|
12
|
+
timestamp: 1698058438e3,
|
|
13
|
+
type: "gcj02"
|
|
14
|
+
}, {
|
|
15
|
+
lng: 121.4036983,
|
|
16
|
+
lat: 31.216324,
|
|
17
|
+
angle: 30,
|
|
18
|
+
timestamp: 1698058439e3,
|
|
19
|
+
type: "gcj02"
|
|
20
|
+
}, {
|
|
21
|
+
lng: 121.403581,
|
|
22
|
+
lat: 31.216415,
|
|
23
|
+
angle: 30,
|
|
24
|
+
timestamp: 1698058442e3,
|
|
25
|
+
type: "gcj02"
|
|
26
|
+
}];
|
|
8
27
|
const DemoBusinessTaxiService = defineComponent({
|
|
9
28
|
name: "DemoBusinessTaxiService",
|
|
10
29
|
setup() {
|
|
@@ -19,7 +38,8 @@ const DemoBusinessTaxiService = defineComponent({
|
|
|
19
38
|
return {
|
|
20
39
|
from: {},
|
|
21
40
|
to: {},
|
|
22
|
-
|
|
41
|
+
relayTo: {},
|
|
42
|
+
status: "driverStartRelayService",
|
|
23
43
|
contentHeight: 200
|
|
24
44
|
};
|
|
25
45
|
},
|
|
@@ -37,6 +57,12 @@ const DemoBusinessTaxiService = defineComponent({
|
|
|
37
57
|
type: "gcj02",
|
|
38
58
|
name: "上海站"
|
|
39
59
|
};
|
|
60
|
+
this.relayTo = {
|
|
61
|
+
lat: 31.209073221828284,
|
|
62
|
+
lng: 121.40366014486544,
|
|
63
|
+
type: "gcj02",
|
|
64
|
+
name: "上海金虹桥国际中心"
|
|
65
|
+
};
|
|
40
66
|
}, 1e3);
|
|
41
67
|
setTimeout(() => {
|
|
42
68
|
this.contentHeight = 600;
|
|
@@ -46,31 +72,23 @@ const DemoBusinessTaxiService = defineComponent({
|
|
|
46
72
|
const {
|
|
47
73
|
value: status
|
|
48
74
|
} = statusIterator.next();
|
|
49
|
-
|
|
75
|
+
if (status)
|
|
76
|
+
this.status = status;
|
|
50
77
|
return status;
|
|
51
78
|
};
|
|
79
|
+
window.addDriverPosition = (lng, lat, type, angle = 0) => {
|
|
80
|
+
mockDriverTrackPoints.push({
|
|
81
|
+
lng,
|
|
82
|
+
lat,
|
|
83
|
+
angle,
|
|
84
|
+
timestamp: Date.now(),
|
|
85
|
+
type
|
|
86
|
+
});
|
|
87
|
+
};
|
|
52
88
|
},
|
|
53
89
|
methods: {
|
|
54
90
|
getDriverPositionTrack() {
|
|
55
|
-
return Promise.resolve(
|
|
56
|
-
lng: 121.4036983,
|
|
57
|
-
lat: 31.216324,
|
|
58
|
-
angle: 30,
|
|
59
|
-
timestamp: 1698058438e3,
|
|
60
|
-
type: "gcj02"
|
|
61
|
-
}, {
|
|
62
|
-
lng: 121.4036983,
|
|
63
|
-
lat: 31.216324,
|
|
64
|
-
angle: 30,
|
|
65
|
-
timestamp: 1698058439e3,
|
|
66
|
-
type: "gcj02"
|
|
67
|
-
}, {
|
|
68
|
-
lng: 121.403581,
|
|
69
|
-
lat: 31.216415,
|
|
70
|
-
angle: 30,
|
|
71
|
-
timestamp: 1698058442e3,
|
|
72
|
-
type: "gcj02"
|
|
73
|
-
}]);
|
|
91
|
+
return Promise.resolve(mockDriverTrackPoints);
|
|
74
92
|
}
|
|
75
93
|
},
|
|
76
94
|
render() {
|
|
@@ -79,7 +97,8 @@ const DemoBusinessTaxiService = defineComponent({
|
|
|
79
97
|
getDriverPositionTrack,
|
|
80
98
|
from,
|
|
81
99
|
to,
|
|
82
|
-
status
|
|
100
|
+
status,
|
|
101
|
+
relayTo
|
|
83
102
|
} = this;
|
|
84
103
|
const isReady = isCoordinatePoint(from) && isCoordinatePoint(to);
|
|
85
104
|
if (!isReady)
|
|
@@ -94,7 +113,9 @@ const DemoBusinessTaxiService = defineComponent({
|
|
|
94
113
|
"attrs": {
|
|
95
114
|
"from": from,
|
|
96
115
|
"to": to,
|
|
116
|
+
"relayTo": relayTo,
|
|
97
117
|
"driverStatus": status,
|
|
118
|
+
"relayToTitle": "上个乘客将\n在这下车",
|
|
98
119
|
"bookDispatchingTitle": "2月14日 11:00 用车",
|
|
99
120
|
"bookDispatchedTitle": "*6月12日 11:00* 用车",
|
|
100
121
|
"dispatchingTitle": "正在为您搜索附近司机",
|
package/dist/v2/api/cdn.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
|
|
2
|
-
export declare const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
|
|
3
2
|
export declare const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
|
|
4
3
|
export declare const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
|
|
5
4
|
export declare const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
|
|
6
5
|
export declare const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
|
|
7
6
|
export declare const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
|
|
8
7
|
export declare const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
|
|
8
|
+
export declare const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";
|
package/dist/v2/api/cdn.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
const AMAP_DEFAULT_MARKER_ICON_URL = "https://webapi.amap.com/theme/v1.3/markers/b/mark_bs.png";
|
|
2
|
-
const ICON_FULL_SCREEN_URL = "https://overseas-oss.heycars.cn/heycar-map/png/fullscreen.png";
|
|
3
2
|
const ICON_START_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/start-point-en.svg";
|
|
4
3
|
const ICON_END_POINT_EN_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-en.svg";
|
|
5
4
|
const ICON_END_POINT_ZH_TW_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/end-point-zh-TW.svg";
|
|
6
5
|
const ICON_TAXI_CAR_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/taxi-car.svg";
|
|
7
6
|
const ICON_DOT_LOADING_URL = "https://overseas-oss.heycars.cn/heycar-map/gif/dot-loading.gif";
|
|
8
7
|
const ICON_LOAD_FAILED_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/load-failed.svg";
|
|
8
|
+
const ICON_WAYPOINT_URL = "https://overseas-oss.heycars.cn/heycar-map/svg/0.12/waypoint.svg";
|
|
9
9
|
export {
|
|
10
10
|
AMAP_DEFAULT_MARKER_ICON_URL,
|
|
11
11
|
ICON_DOT_LOADING_URL,
|
|
12
12
|
ICON_END_POINT_EN_URL,
|
|
13
13
|
ICON_END_POINT_ZH_TW_URL,
|
|
14
|
-
ICON_FULL_SCREEN_URL,
|
|
15
14
|
ICON_LOAD_FAILED_URL,
|
|
16
15
|
ICON_START_POINT_EN_URL,
|
|
17
|
-
ICON_TAXI_CAR_URL
|
|
16
|
+
ICON_TAXI_CAR_URL,
|
|
17
|
+
ICON_WAYPOINT_URL
|
|
18
18
|
};
|
|
@@ -5,7 +5,7 @@ export declare const ANIMATION_DURATION_FOR_100VW = 100;
|
|
|
5
5
|
export declare const ANIMATION_DURATION_PER_ZOOM = 200;
|
|
6
6
|
export declare const BEIJIN_POINT: Point;
|
|
7
7
|
export declare const MAX_DEVIATION_DISTANCE = 30;
|
|
8
|
-
export declare const CAR_DISTANCE_MIN =
|
|
8
|
+
export declare const CAR_DISTANCE_MIN = 20;
|
|
9
9
|
export declare const ZINDEX_BUBBLE_LAYER = 50;
|
|
10
10
|
export declare const ZINDEX_START_END_LOGO_LAYER = 40;
|
|
11
11
|
export declare const ZINDEX_PLACE_LAYER = 30;
|
package/dist/v2/api/contants.js
CHANGED
|
@@ -4,7 +4,7 @@ const ANIMATION_DURATION_FOR_100VW = 100;
|
|
|
4
4
|
const ANIMATION_DURATION_PER_ZOOM = 200;
|
|
5
5
|
const BEIJIN_POINT = [116.2317, 39.5427];
|
|
6
6
|
const MAX_DEVIATION_DISTANCE = 30;
|
|
7
|
-
const CAR_DISTANCE_MIN =
|
|
7
|
+
const CAR_DISTANCE_MIN = 20;
|
|
8
8
|
const ZINDEX_BUBBLE_LAYER = 50;
|
|
9
9
|
const ZINDEX_START_END_LOGO_LAYER = 40;
|
|
10
10
|
const ZINDEX_PLACE_LAYER = 30;
|
|
@@ -5,6 +5,7 @@ import { ICON_DOT_LOADING_URL } from "../../api/cdn.js";
|
|
|
5
5
|
import { i as imgAddressLocator } from "../../chunks/address-locator.4acf83cd.js";
|
|
6
6
|
import { i as imgArrowRight } from "../../chunks/arrow-right.2c34874e.js";
|
|
7
7
|
import { SvgInlineWebComponentTag } from "../../components/SvgInline/SvgInline.web-component.js";
|
|
8
|
+
import { useMapSupplier } from "../../hooks/useMapSupplier.js";
|
|
8
9
|
import { defineSetup } from "../../types/helper.js";
|
|
9
10
|
import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
|
|
10
11
|
const imgBubbleRightArc = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0iMzIiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAxOCAzMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMCAwaDIuMTMxYTEwIDEwIDAgMDE5LjY5NiA3LjU1MkwxOCAzMkguMDQyTDAgMHoiIGZpbGw9InZhcigtLUhFWUNBUl9NQVBfQ1NTX1ZBUl9BYnNvbHV0ZUFkZHJlc3NCb3hfYm94SGVhZGVyX2JhY2tncm91bmQsICMyNTNFN0EpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiLz48L3N2Zz4=";
|
|
@@ -42,8 +43,13 @@ const MultilineTitle = defineSetup("MultilineTitle", function(props, {
|
|
|
42
43
|
const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
|
|
43
44
|
emit
|
|
44
45
|
}) {
|
|
46
|
+
var _a;
|
|
45
47
|
const handleClickText = () => emit("clickText");
|
|
46
48
|
const handleClickPhoto = () => emit("clickPhoto");
|
|
49
|
+
const {
|
|
50
|
+
themeVariables
|
|
51
|
+
} = useMapSupplier();
|
|
52
|
+
const iconLoading = (_a = themeVariables == null ? void 0 : themeVariables.ICON_DOT_LOADING_URL) != null ? _a : ICON_DOT_LOADING_URL;
|
|
47
53
|
return () => {
|
|
48
54
|
const {
|
|
49
55
|
type,
|
|
@@ -72,7 +78,7 @@ const AbsoluteAddressBox = defineSetup("AbsoluteAddressBox", function(props, {
|
|
|
72
78
|
}, [h("img", {
|
|
73
79
|
"class": imgDotLoading,
|
|
74
80
|
"attrs": {
|
|
75
|
-
"src":
|
|
81
|
+
"src": iconLoading
|
|
76
82
|
}
|
|
77
83
|
})]), h("i", {
|
|
78
84
|
"class": straightLine
|
|
@@ -4,5 +4,6 @@ export interface AuxiliaryGraspRoadProps {
|
|
|
4
4
|
trackPoints: TrackPoint[];
|
|
5
5
|
from: Place;
|
|
6
6
|
to: Place;
|
|
7
|
+
relayTo?: Place;
|
|
7
8
|
}
|
|
8
9
|
export declare const AuxiliaryGraspRoad: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<AuxiliaryGraspRoadProps>, 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<AuxiliaryGraspRoadProps, Required<AuxiliaryGraspRoadProps>>, never, AuxiliaryGraspRoadProps>;
|
|
@@ -2,7 +2,7 @@ import { h } from "vue";
|
|
|
2
2
|
import { CAR_DISTANCE_MIN, MAX_DEVIATION_DISTANCE } from "../../api/contants.js";
|
|
3
3
|
import { useMapGeometry } from "../../hooks/useMapGeometry.js";
|
|
4
4
|
import { defineSetup } from "../../types/helper.js";
|
|
5
|
-
import { lnglat2point } from "../../utils/transform.js";
|
|
5
|
+
import { place2point, lnglat2point } from "../../utils/transform.js";
|
|
6
6
|
import { AuxiliaryCircle } from "../AuxiliaryCircle/AuxiliaryCircle.js";
|
|
7
7
|
import { AuxiliaryLine } from "../AuxiliaryLine/AuxiliaryLine.js";
|
|
8
8
|
import { DeviationCorrectionDrivingRoute } from "../DeviationCorrectionDrivingRoute/DeviationCorrectionDrivingRoute.js";
|
|
@@ -16,11 +16,13 @@ const AuxiliaryGraspRoad = defineSetup("AuxiliaryGraspRoad", function(props) {
|
|
|
16
16
|
trackPoints,
|
|
17
17
|
status,
|
|
18
18
|
to,
|
|
19
|
-
from
|
|
19
|
+
from,
|
|
20
|
+
relayTo
|
|
20
21
|
} = props;
|
|
21
|
-
if (status !== "inService" && status !== "driverStartService" && status !== "dispatched" && status !== "book-driverStartService")
|
|
22
|
+
if (status !== "inService" && status !== "driverStartRelayService" && status !== "driverStartService" && status !== "dispatched" && status !== "book-driverStartService")
|
|
22
23
|
return;
|
|
23
24
|
const destination = status === "inService" ? to : from;
|
|
25
|
+
const waypoints = status === "driverStartRelayService" && relayTo ? [place2point(relayTo)] : void 0;
|
|
24
26
|
const lastTrackPoint = trackPoints[trackPoints.length - 1];
|
|
25
27
|
if (!destination || !lastTrackPoint)
|
|
26
28
|
return;
|
|
@@ -43,6 +45,7 @@ const AuxiliaryGraspRoad = defineSetup("AuxiliaryGraspRoad", function(props) {
|
|
|
43
45
|
"attrs": {
|
|
44
46
|
"tracks": trackPoints,
|
|
45
47
|
"to": lnglat2point(destination),
|
|
48
|
+
"waypoints": waypoints,
|
|
46
49
|
"deviation": MAX_DEVIATION_DISTANCE,
|
|
47
50
|
"render": ({
|
|
48
51
|
path,
|
|
@@ -6,6 +6,8 @@ export type BusinessTaxiServiceMapProps = CoordinatifyProps<Omit<HeycarMapProps,
|
|
|
6
6
|
from: CoordinatePlace;
|
|
7
7
|
to: CoordinatePlace;
|
|
8
8
|
log?: boolean;
|
|
9
|
+
relayTo?: CoordinatePlace;
|
|
10
|
+
relayToTitle?: string;
|
|
9
11
|
dispatchingTitle: string;
|
|
10
12
|
bookDispatchingTitle: string;
|
|
11
13
|
bookDispatchedTitle?: string;
|
|
@@ -15,8 +15,8 @@ import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
|
|
|
15
15
|
import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
|
|
16
16
|
import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
|
|
17
17
|
import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
|
|
18
|
-
import { SectionDispatching, SectionConfirmed, SectionDriverStartService, SectionBookDispatched, SectionInService, SectionDriverArrived, SectionCanceled, SectionEndService } from "./BusinessTaxiServiceSection.js";
|
|
19
|
-
const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
|
|
18
|
+
import { SectionDispatching, SectionConfirmed, SectionDriverStartRelayService, SectionDriverStartService, SectionBookDispatched, SectionInService, SectionDriverArrived, SectionCanceled, SectionEndService } from "./BusinessTaxiServiceSection.js";
|
|
19
|
+
const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "driverStartRelayService", "inService", "driverArrived"];
|
|
20
20
|
const BUSINESS_TAXI_SERVICE_FITVIEW_PANDING = [19, 36, 19, 26];
|
|
21
21
|
const IS_ENABLE_AUXILIARY_GRASP_ROAD = apiGetAuxiliaryGrapStatus();
|
|
22
22
|
const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", function(props, {
|
|
@@ -89,6 +89,8 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
|
|
|
89
89
|
driverStatus,
|
|
90
90
|
from: inputFrom,
|
|
91
91
|
to: inputTo,
|
|
92
|
+
relayTo: inputRelayTo,
|
|
93
|
+
relayToTitle,
|
|
92
94
|
dispatchingTitle,
|
|
93
95
|
bookDispatchingTitle,
|
|
94
96
|
bookDispatchedTitle,
|
|
@@ -96,6 +98,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
|
|
|
96
98
|
} = props;
|
|
97
99
|
const from = unCoordinatifyPlace(toCoordinatePlaceType(inputFrom));
|
|
98
100
|
const to = unCoordinatifyPlace(toCoordinatePlaceType(inputTo));
|
|
101
|
+
const relayTo = inputRelayTo ? unCoordinatifyPlace(toCoordinatePlaceType(inputRelayTo)) : void 0;
|
|
99
102
|
const carPosition = carPositionRef.value;
|
|
100
103
|
const carAngle = carAngleRef.value;
|
|
101
104
|
const carTrackPositions = carTrackPositionsRef.value;
|
|
@@ -139,6 +142,25 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
|
|
|
139
142
|
}
|
|
140
143
|
})
|
|
141
144
|
}
|
|
145
|
+
}) : driverStatus === "driverStartRelayService" ? h(DeviceOrientation, {
|
|
146
|
+
"attrs": {
|
|
147
|
+
"elementRef": mapElementRef,
|
|
148
|
+
"disable": !passengerPosition,
|
|
149
|
+
"render": (orientation) => h(SectionDriverStartRelayService, {
|
|
150
|
+
"attrs": {
|
|
151
|
+
"from": from,
|
|
152
|
+
"relayTo": relayTo,
|
|
153
|
+
"carPosition": carPosition,
|
|
154
|
+
"carAngle": carAngle,
|
|
155
|
+
"carTrackPositions": carTrackPositions,
|
|
156
|
+
"passengerPosition": passengerPosition,
|
|
157
|
+
"passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
|
|
158
|
+
"relayToTitle": relayToTitle,
|
|
159
|
+
"renderTitle": renderStartSerivceTitle,
|
|
160
|
+
"registerOverlay": registerOverlay
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
}
|
|
142
164
|
}) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? h(DeviceOrientation, {
|
|
143
165
|
"attrs": {
|
|
144
166
|
"elementRef": mapElementRef,
|
|
@@ -243,7 +265,7 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
|
|
|
243
265
|
attrs: props,
|
|
244
266
|
key: `${payload.supplier}${instanceNo}`
|
|
245
267
|
});
|
|
246
|
-
}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
|
|
268
|
+
}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
|
|
247
269
|
export {
|
|
248
270
|
BusinessTaxiServiceMap,
|
|
249
271
|
BusinessTaxiServiceMapInner
|
|
@@ -13,6 +13,11 @@ type SectionConfirmedProps = Required<MROP> & {
|
|
|
13
13
|
to: Place;
|
|
14
14
|
};
|
|
15
15
|
export declare const SectionConfirmed: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<SectionConfirmedProps>, 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<SectionConfirmedProps, Required<SectionConfirmedProps>>, never, SectionConfirmedProps>;
|
|
16
|
+
interface SectionDriverStartRelayServiceProps extends SectionDriverStartServiceProps {
|
|
17
|
+
relayTo?: Place;
|
|
18
|
+
relayToTitle?: string;
|
|
19
|
+
}
|
|
20
|
+
export declare const SectionDriverStartRelayService: import("vue").DefineComponent<import("vue3").ComponentObjectPropsOptions<SectionDriverStartRelayServiceProps>, 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<SectionDriverStartRelayServiceProps, Required<SectionDriverStartRelayServiceProps>>, never, SectionDriverStartRelayServiceProps>;
|
|
16
21
|
type SectionDriverStartServiceProps = Required<MROP> & {
|
|
17
22
|
passengerPosition?: Point;
|
|
18
23
|
passengerAngle?: string;
|