@heycar/heycars-map 2.12.0-color7 → 2.13.0-relay1
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 +8 -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 -0
- package/dist/v2/api/cdn.js +3 -1
- package/dist/v2/api/contants.d.ts +1 -1
- package/dist/v2/api/contants.js +1 -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 +1 -1
- package/dist/v2/business-components/StartEndPoint/StartEndPoint.js +4 -4
- package/dist/v2/business-components/TaxiCar/TaxiCar.js +1 -1
- package/dist/v2/chunks/{StartEndPoint.css.ca6c9719.js → StartEndPoint.css.4d9c0791.js} +4 -4
- package/dist/{v3/css/PlaceCircle-00817652.css → v2/css/PlaceCircle-80eb763c.css} +1 -0
- package/dist/v2/css/{StartEndPoint-f6a6f7d3.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 +1 -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 -0
- package/dist/v3/api/cdn.js +3 -1
- package/dist/v3/api/contants.d.ts +1 -1
- package/dist/v3/api/contants.js +1 -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 +1 -1
- package/dist/v3/business-components/StartEndPoint/StartEndPoint.js +4 -4
- package/dist/v3/business-components/TaxiCar/TaxiCar.js +1 -1
- package/dist/v3/chunks/{StartEndPoint.css.ca6c9719.js → StartEndPoint.css.4d9c0791.js} +4 -4
- package/dist/{v2/css/PlaceCircle-00817652.css → v3/css/PlaceCircle-80eb763c.css} +1 -0
- package/dist/v3/css/{StartEndPoint-f6a6f7d3.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 +1 -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
|
@@ -2,7 +2,7 @@ import { createVNode } 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;
|
|
@@ -38,6 +40,7 @@ const AuxiliaryGraspRoad = defineSetup("AuxiliaryGraspRoad", function(props) {
|
|
|
38
40
|
}, null), distance > CAR_DISTANCE_MIN ? createVNode(DeviationCorrectionDrivingRoute, {
|
|
39
41
|
"tracks": trackPoints,
|
|
40
42
|
"to": lnglat2point(destination),
|
|
43
|
+
"waypoints": waypoints,
|
|
41
44
|
"deviation": MAX_DEVIATION_DISTANCE,
|
|
42
45
|
"render": ({
|
|
43
46
|
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;
|
|
@@ -128,6 +131,21 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
|
|
|
128
131
|
"passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
|
|
129
132
|
"registerOverlay": registerOverlay
|
|
130
133
|
}, null)
|
|
134
|
+
}, null) : driverStatus === "driverStartRelayService" ? createVNode(DeviceOrientation, {
|
|
135
|
+
"elementRef": mapElementRef,
|
|
136
|
+
"disable": !passengerPosition,
|
|
137
|
+
"render": (orientation) => createVNode(SectionDriverStartRelayService, {
|
|
138
|
+
"from": from,
|
|
139
|
+
"relayTo": relayTo,
|
|
140
|
+
"carPosition": carPosition,
|
|
141
|
+
"carAngle": carAngle,
|
|
142
|
+
"carTrackPositions": carTrackPositions,
|
|
143
|
+
"passengerPosition": passengerPosition,
|
|
144
|
+
"passengerAngle": orientation == null ? void 0 : orientation.cssRotationVariableName,
|
|
145
|
+
"relayToTitle": relayToTitle,
|
|
146
|
+
"renderTitle": renderStartSerivceTitle,
|
|
147
|
+
"registerOverlay": registerOverlay
|
|
148
|
+
}, null)
|
|
131
149
|
}, null) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? createVNode(DeviceOrientation, {
|
|
132
150
|
"elementRef": mapElementRef,
|
|
133
151
|
"disable": !passengerPosition,
|
|
@@ -211,7 +229,7 @@ const BusinessTaxiServiceMap = defineLagecySetup("BusinessTaxiServiceMap", funct
|
|
|
211
229
|
attrs: props,
|
|
212
230
|
key: `${payload.supplier}${instanceNo}`
|
|
213
231
|
});
|
|
214
|
-
}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
|
|
232
|
+
}).props(["bookDispatchingTitle", "bookDispatchedTitle", "dispatchingTitle", "driverArrivedTitle", "driverStatus", "fallback", "from", "getDriverPositionTrack", "interval", "disablePassenger", "loading", "mapContext", "relayTo", "relayToTitle", "renderInServiceTitle", "renderStartSerivceTitle", "to"]);
|
|
215
233
|
export {
|
|
216
234
|
BusinessTaxiServiceMap,
|
|
217
235
|
BusinessTaxiServiceMapInner
|
|
@@ -17,6 +17,15 @@ type SectionConfirmedProps = Required<MROP> & {
|
|
|
17
17
|
export declare const SectionConfirmed: import("vue").DefineComponent<import("vue").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, import("vue").PublicProps, SectionConfirmedProps, SectionConfirmedProps, import("vue").SlotsType<{} & {
|
|
18
18
|
default?: import("../../demi-polyfill").Slot | undefined;
|
|
19
19
|
}>>;
|
|
20
|
+
interface SectionDriverStartRelayServiceProps extends SectionDriverStartServiceProps {
|
|
21
|
+
relayTo?: Place;
|
|
22
|
+
relayToTitle?: string;
|
|
23
|
+
}
|
|
24
|
+
export declare const SectionDriverStartRelayService: import("vue").DefineComponent<import("vue").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, import("vue").PublicProps, SectionDriverStartRelayServiceProps, SectionDriverStartRelayServiceProps, import("vue").SlotsType<{
|
|
25
|
+
renderTitle: (props: Pick<DrivingRouteRenderProps, "duration" | "distance">) => string;
|
|
26
|
+
} & {
|
|
27
|
+
default?: import("../../demi-polyfill").Slot | undefined;
|
|
28
|
+
}>>;
|
|
20
29
|
type SectionDriverStartServiceProps = Required<MROP> & {
|
|
21
30
|
passengerPosition?: Point;
|
|
22
31
|
passengerAngle?: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createVNode } from "vue";
|
|
2
2
|
import { apiGetAuxiliaryGrapStatus } from "../../api/browser.js";
|
|
3
|
-
import {
|
|
3
|
+
import { MAX_DEVIATION_DISTANCE, CAR_DISTANCE_MIN } from "../../api/contants.js";
|
|
4
4
|
import { useMapGeometry } from "../../hooks/useMapGeometry.js";
|
|
5
5
|
import { useMapSupplier } from "../../hooks/useMapSupplier.js";
|
|
6
6
|
import { defineSetup } from "../../types/helper.js";
|
|
@@ -116,6 +116,103 @@ const SectionConfirmed = defineSetup("SectionConfirmed", function(props) {
|
|
|
116
116
|
}, null)]);
|
|
117
117
|
};
|
|
118
118
|
});
|
|
119
|
+
const SectionDriverStartRelayService = defineSetup("SectionDriverStartRelayService", function(props) {
|
|
120
|
+
const {
|
|
121
|
+
registerOverlay
|
|
122
|
+
} = props;
|
|
123
|
+
const fittableRegistryOverlay = createFittableRegisterOverlay({
|
|
124
|
+
registerOverlay,
|
|
125
|
+
immediate: true
|
|
126
|
+
});
|
|
127
|
+
const {
|
|
128
|
+
language
|
|
129
|
+
} = useMapSupplier();
|
|
130
|
+
const {
|
|
131
|
+
apiMapDistance
|
|
132
|
+
} = useMapGeometry();
|
|
133
|
+
return () => {
|
|
134
|
+
const {
|
|
135
|
+
from: fromPlace,
|
|
136
|
+
relayTo: relayToPlace,
|
|
137
|
+
carPosition,
|
|
138
|
+
carAngle,
|
|
139
|
+
carTrackPositions,
|
|
140
|
+
passengerPosition,
|
|
141
|
+
passengerAngle,
|
|
142
|
+
relayToTitle,
|
|
143
|
+
renderTitle
|
|
144
|
+
} = props;
|
|
145
|
+
const from = place2point(fromPlace);
|
|
146
|
+
const relayTo = relayToPlace ? place2point(relayToPlace) : void 0;
|
|
147
|
+
const waypoints = relayTo ? [relayTo] : void 0;
|
|
148
|
+
const passengerDistance = passengerPosition ? apiMapDistance(passengerPosition, from) : void 0;
|
|
149
|
+
const carDistance = carPosition ? apiMapDistance(carPosition, from) : void 0;
|
|
150
|
+
return createVNode("div", null, [createVNode(ConditionalFittablePassengerCircle, {
|
|
151
|
+
"position": passengerPosition,
|
|
152
|
+
"angle": passengerAngle,
|
|
153
|
+
"condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
|
|
154
|
+
"registerOverlay": registerOverlay
|
|
155
|
+
}, null), createVNode(StartEndPoint, {
|
|
156
|
+
"type": "start",
|
|
157
|
+
"position": from,
|
|
158
|
+
"registerOverlay": registerOverlay,
|
|
159
|
+
"language": language
|
|
160
|
+
}, null), createVNode(PlaceCircle, {
|
|
161
|
+
"position": from,
|
|
162
|
+
"label": fromPlace.displayName,
|
|
163
|
+
"hideIcon": true
|
|
164
|
+
}, null), !!relayTo && createVNode(StartEndPoint, {
|
|
165
|
+
"type": "waypoint",
|
|
166
|
+
"position": relayTo,
|
|
167
|
+
"registerOverlay": registerOverlay,
|
|
168
|
+
"language": language
|
|
169
|
+
}, null), !!relayTo && !!relayToTitle && createVNode(PlaceCircle, {
|
|
170
|
+
"position": relayTo,
|
|
171
|
+
"label": relayToTitle,
|
|
172
|
+
"hideIcon": true
|
|
173
|
+
}, null), !(carTrackPositions == null ? void 0 : carTrackPositions.length) || !carDistance ? null : createVNode(DeviationCorrectionDrivingRoute, {
|
|
174
|
+
"tracks": carTrackPositions,
|
|
175
|
+
"to": from,
|
|
176
|
+
"waypoints": waypoints,
|
|
177
|
+
"deviation": MAX_DEVIATION_DISTANCE,
|
|
178
|
+
"render": ({
|
|
179
|
+
path,
|
|
180
|
+
angle,
|
|
181
|
+
distance,
|
|
182
|
+
duration,
|
|
183
|
+
trafficJams
|
|
184
|
+
}) => {
|
|
185
|
+
var _a;
|
|
186
|
+
return [relayTo ? createVNode(TrafficDrivingLine, {
|
|
187
|
+
"path": path,
|
|
188
|
+
"trafficJams": trafficJams
|
|
189
|
+
}, null) : null, createVNode(TaxiCar, {
|
|
190
|
+
"position": (_a = path[0]) != null ? _a : carPosition,
|
|
191
|
+
"angle": angle != null ? angle : carAngle,
|
|
192
|
+
"title": renderTitle({
|
|
193
|
+
distance,
|
|
194
|
+
duration
|
|
195
|
+
}),
|
|
196
|
+
"registerOverlay": fittableRegistryOverlay
|
|
197
|
+
}, null)];
|
|
198
|
+
}
|
|
199
|
+
}, null), !!passengerPosition && passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX && passengerDistance > PASSENGER_DISTANCE_MIN && createVNode(WalkingRoute, {
|
|
200
|
+
"from": passengerPosition,
|
|
201
|
+
"to": from,
|
|
202
|
+
"render": ({
|
|
203
|
+
path
|
|
204
|
+
}) => createVNode(WalkingLine, {
|
|
205
|
+
"path": path
|
|
206
|
+
}, null)
|
|
207
|
+
}, null), createVNode(FitViewOnce, {
|
|
208
|
+
"registerOverlay": registerOverlay,
|
|
209
|
+
"immediate": true
|
|
210
|
+
}, null), createVNode(InterruptableIntervalFitView, {
|
|
211
|
+
"interval": AUTO_FIT_VIEW_INTERVAL,
|
|
212
|
+
"registerOverlay": registerOverlay
|
|
213
|
+
}, null)]);
|
|
214
|
+
};
|
|
215
|
+
});
|
|
119
216
|
const SectionDriverStartService = defineSetup("SectionDriverStartService", function(props) {
|
|
120
217
|
const {
|
|
121
218
|
registerOverlay
|
|
@@ -526,6 +623,7 @@ export {
|
|
|
526
623
|
SectionConfirmed,
|
|
527
624
|
SectionDispatching,
|
|
528
625
|
SectionDriverArrived,
|
|
626
|
+
SectionDriverStartRelayService,
|
|
529
627
|
SectionDriverStartService,
|
|
530
628
|
SectionEndService,
|
|
531
629
|
SectionInService
|
|
@@ -16,6 +16,11 @@ export declare const pointIcon: import("@vanilla-extract/recipes").RuntimeFn<{
|
|
|
16
16
|
width: "6.192vw";
|
|
17
17
|
height: "7.998vw";
|
|
18
18
|
};
|
|
19
|
+
waypoint: {
|
|
20
|
+
marginTop: "1.33vw";
|
|
21
|
+
width: "6.192vw";
|
|
22
|
+
height: "7.998vw";
|
|
23
|
+
};
|
|
19
24
|
};
|
|
20
25
|
}>;
|
|
21
26
|
export declare const textLayout: import("@vanilla-extract/recipes").RuntimeFn<{
|
|
@@ -2,7 +2,7 @@ import type { GmapOverlay, MapRegisterOverlayProps } from "../../hooks/useOverla
|
|
|
2
2
|
import type { Language, Point } from "../../types/interface";
|
|
3
3
|
export interface StartEndPointProps<T> extends MapRegisterOverlayProps<T> {
|
|
4
4
|
language: Language;
|
|
5
|
-
type: "start" | "end";
|
|
5
|
+
type: "start" | "end" | "waypoint";
|
|
6
6
|
position: [number, number];
|
|
7
7
|
title?: string;
|
|
8
8
|
description?: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createVNode } from "vue";
|
|
2
2
|
import { computed } from "vue-demi";
|
|
3
|
-
import { ICON_START_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_END_POINT_EN_URL } from "../../api/cdn.js";
|
|
3
|
+
import { ICON_WAYPOINT_URL, ICON_START_POINT_EN_URL, ICON_END_POINT_ZH_TW_URL, ICON_END_POINT_EN_URL } from "../../api/cdn.js";
|
|
4
4
|
import { ZINDEX_START_END_LOGO_LAYER } from "../../api/contants.js";
|
|
5
5
|
import { i as imgArrowRight } from "../../chunks/arrow-right.2c34874e.js";
|
|
6
6
|
import { AmapMarker } from "../../components/AmapMarker/AmapMarker.js";
|
|
@@ -11,7 +11,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
|
|
|
11
11
|
import { defineSetup } from "../../types/helper.js";
|
|
12
12
|
import { createDom } from "../../utils/dom.js";
|
|
13
13
|
import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
|
|
14
|
-
import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.
|
|
14
|
+
import { p as pointInfoBoxEmphasize, a as pointIcon, b as pointLayout, c as pointSingleInfoBox, d as pointInfoBoxTitle, t as textLayout, e as arrowRight, f as pointInfoBox, g as pointInfoBoxDescription } from "../../chunks/StartEndPoint.css.4d9c0791.js";
|
|
15
15
|
const imgEndPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAyNCAzMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZGVmcz48bGluZWFyR3JhZGllbnQgeDE9IjcyLjMzOSUiIHkxPSI1MCUiIHgyPSIwJSIgeTI9IjUwJSIgaWQ9ImVuZC1wb2ludF9wcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9lbmQtcG9pbnRfbGluZWFyR3JhZGllbnRfc3RvcF8xX2NvbG9yLCAjRkY4NDQ3KSIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9lbmQtcG9pbnRfbGluZWFyR3JhZGllbnRfc3RvcF8yX2NvbG9yLCAjRkY4QjRBKSIgb2Zmc2V0PSI1MC41OTYlIi8+PHN0b3Agc3RvcC1jb2xvcj0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX2VuZC1wb2ludF9saW5lYXJHcmFkaWVudF9zdG9wXzNfY29sb3IsICNGRkE5NUEpIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0xMiAzMC4yMTVjMi4xMzQgMCAzLjg2My0uODkzIDMuODYzLTEuOTk1IDAtMS4xLTEuNzMtMS45OTQtMy44NjMtMS45OTQtMi4xMzQgMC0zLjg2My44OTMtMy44NjMgMS45OTQgMCAxLjEwMiAxLjczIDEuOTk1IDMuODYzIDEuOTk1eiIgZmlsbC1vcGFjaXR5PSIuNSIgZmlsbD0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX2VuZC1wb2ludF9wYXRoX2ZpbGwsICM0MzQ4NUEpIi8+PHBhdGggZD0iTTExIDI3LjAwNmMyLjEyOCAwLS45LTMuNzQzIDUuNjIxLTYuNjQzQzE5Ljg0MiAxOC40NTMgMjIgMTQuOTUzIDIyIDEwLjk1IDIyIDQuOTAyIDE3LjA3NSAwIDExIDBTMCA0LjkwMiAwIDEwLjk1YzAgMy45MTggMi4wNjggNy4zNTYgNS4xNzcgOS4yOUMxMS43NSAyMy4yODQgOS4wNiAyNy4wMDcgMTEgMjcuMDA3eiIgc3Ryb2tlPSIjRkZGIiBmaWxsPSJ1cmwoI2VuZC1wb2ludF9wcmVmaXhfX2EpIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxIDEuMjE1KSIvPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVNlbWlib2xkLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZm9udC13ZWlnaHQ9IjUwMCIgZmlsbD0iI0ZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiPjx0c3BhbiB4PSI1IiB5PSIxNS40NDkiPue7iDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4=";
|
|
16
16
|
const imgStartPoint = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMzEiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAyNCAzMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZGVmcz48bGluZWFyR3JhZGllbnQgeDE9IjAlIiB5MT0iNTAlIiB4Mj0iMTI5LjU5OSUiIHkyPSI1MCUiIGlkPSJzdGFydC1wb2ludF9wcmVmaXhfX2EiPjxzdG9wIHN0b3AtY29sb3I9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9zdGFydC1wb2ludF9saW5lYXJHcmFkaWVudF9zdG9wXzFfY29sb3IsICMzNkE4RkYpIiBvZmZzZXQ9IjAlIi8+PHN0b3Agc3RvcC1jb2xvcj0idmFyKC0tSEVZQ0FSX01BUF9TVkdfVkFSX3N0YXJ0LXBvaW50X2xpbmVhckdyYWRpZW50X3N0b3BfMl9jb2xvciwgIzQ4NzFGMSkiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0iTTEyIDMwLjIxNWMxLjk1IDAgMy41MzItLjgxNiAzLjUzMi0xLjgyMyAwLTEuMDA3LTEuNTgxLTEuODIzLTMuNTMyLTEuODIzLTEuOTUgMC0zLjUzMi44MTYtMy41MzIgMS44MjMgMCAxLjAwNyAxLjU4MSAxLjgyMyAzLjUzMiAxLjgyM3oiIGZpbGwtb3BhY2l0eT0iLjUiIGZpbGw9InZhcigtLUhFWUNBUl9NQVBfU1ZHX1ZBUl9zdGFydC1wb2ludF9wYXRoX2ZpbGwsICM0MzQ4NUEpIi8+PHBhdGggZD0iTTExIDI3YzIuMTI4IDAtLjktMy43NDIgNS42MjEtNi42NDEgMy4yMjEtMS45MSA1LjM3OS01LjQxIDUuMzc5LTkuNDEyQzIyIDQuOTAxIDE3LjA3NSAwIDExIDBTMCA0LjkwMSAwIDEwLjk0N2MwIDMuOTE4IDIuMDY4IDcuMzU1IDUuMTc3IDkuMjlDMTEuNzUgMjMuMjc3IDkuMDYgMjcgMTEgMjd6IiBzdHJva2U9IiNGRkYiIGZpbGw9InVybCgjc3RhcnQtcG9pbnRfcHJlZml4X19hKSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMSAxLjIxNSkiLz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1TZW1pYm9sZCwgUGluZ0ZhbmcgU0MiIGZvbnQtc2l6ZT0iMTIiIGZvbnQtd2VpZ2h0PSI1MDAiIGZpbGw9IiNGRkYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEgMS4yMTUpIj48dHNwYW4geD0iNSIgeT0iMTUuNjI0Ij7otbc8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+";
|
|
17
17
|
const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
|
|
@@ -25,7 +25,7 @@ const AStartEndPoint = defineSetup("AStartEndPoint", function(props, {
|
|
|
25
25
|
type,
|
|
26
26
|
language
|
|
27
27
|
} = props;
|
|
28
|
-
const icon = type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? ICON_END_POINT_ZH_TW_URL : ICON_END_POINT_EN_URL;
|
|
28
|
+
const icon = type === "waypoint" ? ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" ? imgEndPoint : language === "zh-TW" ? ICON_END_POINT_ZH_TW_URL : ICON_END_POINT_EN_URL;
|
|
29
29
|
const titleRow = !title ? "" : decodeAsterisk(title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
|
|
30
30
|
const descriptionRow = !description ? "" : decodeAsterisk(description).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
|
|
31
31
|
if (!description && !title)
|
|
@@ -90,7 +90,7 @@ const GStartEndPoint = defineSetup("GStartEndPoint", function(props, {
|
|
|
90
90
|
type,
|
|
91
91
|
language = "zh"
|
|
92
92
|
} = props;
|
|
93
|
-
const icon = type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" || language === "zh-TW" ? imgEndPoint : ICON_END_POINT_EN_URL;
|
|
93
|
+
const icon = type === "waypoint" ? ICON_WAYPOINT_URL : type === "start" ? language === "zh" || language === "zh-TW" ? imgStartPoint : ICON_START_POINT_EN_URL : language === "zh" || language === "zh-TW" ? imgEndPoint : ICON_END_POINT_EN_URL;
|
|
94
94
|
const titleRow = !title ? "" : decodeAsterisk(title).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
|
|
95
95
|
const descriptionRow = !description ? "" : decodeAsterisk(description).map((item) => item.type === "normal" ? item.value : `<span class="${pointInfoBoxEmphasize}">${item.value}</span>`).join("");
|
|
96
96
|
if (!description && !title)
|
|
@@ -10,7 +10,7 @@ import { useMapSupplier } from "../../hooks/useMapSupplier.js";
|
|
|
10
10
|
import { defineSetup } from "../../types/helper.js";
|
|
11
11
|
import { createDom } from "../../utils/dom.js";
|
|
12
12
|
import { decodeAsterisk, vec2lnglat } from "../../utils/transform.js";
|
|
13
|
-
import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.
|
|
13
|
+
import { p as pointInfoBoxEmphasize, b as pointLayout, c as pointSingleInfoBox } from "../../chunks/StartEndPoint.css.4d9c0791.js";
|
|
14
14
|
import { c as createRuntimeFn } from "../../chunks/vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
|
|
15
15
|
const TaxiCar_css_ts_vanilla = "";
|
|
16
16
|
var carIcon = "_65j3sr1";
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import "../css/StartEndPoint-
|
|
1
|
+
import "../css/StartEndPoint-d1c9154a.css";
|
|
2
2
|
import { c as createRuntimeFn } from "./vanilla-extract-recipes-createRuntimeFn.esm.bd6fc290.js";
|
|
3
3
|
const StartEndPoint_css_ts_vanilla = "";
|
|
4
|
-
var arrowRight = createRuntimeFn({ defaultClassName: "
|
|
5
|
-
var pointIcon = createRuntimeFn({ defaultClassName: "", variantClassNames: { type: { start: "_4a4ovk6", end: "_4a4ovk7" } }, defaultVariants: {}, compoundVariants: [] });
|
|
4
|
+
var arrowRight = createRuntimeFn({ defaultClassName: "_4a4ovkb", variantClassNames: { withArrow: { true: "_4a4ovkc", false: "_4a4ovkd" } }, defaultVariants: {}, compoundVariants: [] });
|
|
5
|
+
var pointIcon = createRuntimeFn({ defaultClassName: "", variantClassNames: { type: { start: "_4a4ovk6", end: "_4a4ovk7", waypoint: "_4a4ovk8" } }, defaultVariants: {}, compoundVariants: [] });
|
|
6
6
|
var pointInfoBox = "_4a4ovk1";
|
|
7
7
|
var pointInfoBoxDescription = "_4a4ovk4";
|
|
8
8
|
var pointInfoBoxEmphasize = "_4a4ovk5";
|
|
9
9
|
var pointInfoBoxTitle = "_4a4ovk3";
|
|
10
10
|
var pointLayout = "_4a4ovk0";
|
|
11
11
|
var pointSingleInfoBox = "_4a4ovk2";
|
|
12
|
-
var textLayout = createRuntimeFn({ defaultClassName: "", variantClassNames: { withArrow: { true: "
|
|
12
|
+
var textLayout = createRuntimeFn({ defaultClassName: "", variantClassNames: { withArrow: { true: "_4a4ovk9", false: "_4a4ovka" } }, defaultVariants: {}, compoundVariants: [] });
|
|
13
13
|
export {
|
|
14
14
|
pointIcon as a,
|
|
15
15
|
pointLayout as b,
|
|
@@ -59,13 +59,18 @@
|
|
|
59
59
|
height: 7.998vw;
|
|
60
60
|
}
|
|
61
61
|
._4a4ovk8 {
|
|
62
|
+
margin-top: 1.33vw;
|
|
63
|
+
width: 6.192vw;
|
|
64
|
+
height: 7.998vw;
|
|
65
|
+
}
|
|
66
|
+
._4a4ovk9 {
|
|
62
67
|
padding-right: 2.67vw;
|
|
63
68
|
}
|
|
64
|
-
.
|
|
69
|
+
._4a4ovkb {
|
|
65
70
|
width: 1.758vw;
|
|
66
71
|
height: 2.93vw;
|
|
67
72
|
filter: invert(1);
|
|
68
73
|
}
|
|
69
|
-
.
|
|
74
|
+
._4a4ovkd {
|
|
70
75
|
display: none;
|
|
71
76
|
}
|
|
@@ -2,6 +2,7 @@ import type { Point, Route, TrackPoint } from "../types/interface";
|
|
|
2
2
|
export interface UseDeviationCorrectionDrivingRouteProps {
|
|
3
3
|
tracks: TrackPoint[];
|
|
4
4
|
to: Point;
|
|
5
|
+
waypoints?: Point[];
|
|
5
6
|
deviation: number;
|
|
6
7
|
}
|
|
7
8
|
interface SubRoute extends Route {
|
|
@@ -46,6 +47,6 @@ export declare const useDeviationCorrectionDrivingRoute: (props?: UseDeviationCo
|
|
|
46
47
|
trackIntersectionPathRef: import("vue-demi").Ref<Point[] | undefined>;
|
|
47
48
|
routeIntersectionPathRef: import("vue-demi").Ref<Point[] | undefined>;
|
|
48
49
|
extendedIntersectionPointRef: import("vue-demi").Ref<Point | undefined>;
|
|
49
|
-
apiMapDeviationCorrectionDrivingRoute: (tracks: TrackPoint[], to: Point, deviation: number, preRoute: SubRoute) => Promise<ApiMapDeviationCorrectionDrivingRouteOutput>;
|
|
50
|
+
apiMapDeviationCorrectionDrivingRoute: (tracks: TrackPoint[], to: Point, deviation: number, preRoute: SubRoute, waypoints?: Point[]) => Promise<ApiMapDeviationCorrectionDrivingRouteOutput>;
|
|
50
51
|
};
|
|
51
52
|
export {};
|
|
@@ -19,7 +19,7 @@ const useDeviationCorrectionDrivingRoute = (props) => {
|
|
|
19
19
|
const { apiMapToGraspRoadPath } = useMapGraspRoad();
|
|
20
20
|
const { apiMapDistance, apiMapDistanceOfLine } = useMapGeometry();
|
|
21
21
|
const { apiMapComputeHeading } = useMapAngle();
|
|
22
|
-
const apiMapDeviationCorrectionDrivingRoute = async (tracks, to, deviation, preRoute) => {
|
|
22
|
+
const apiMapDeviationCorrectionDrivingRoute = async (tracks, to, deviation, preRoute, waypoints = []) => {
|
|
23
23
|
var _a, _b;
|
|
24
24
|
if (tracks.length === 0) {
|
|
25
25
|
return { ...createEmptySubRoute(), angle: 0 };
|
|
@@ -67,20 +67,21 @@ const useDeviationCorrectionDrivingRoute = (props) => {
|
|
|
67
67
|
}
|
|
68
68
|
const { path: graspRoadPath } = await apiMapToGraspRoadPath(tracks);
|
|
69
69
|
const from = graspRoadPath[graspRoadPath.length - 1];
|
|
70
|
-
const route = await apiMapDrivingRoute(from, to);
|
|
70
|
+
const route = await apiMapDrivingRoute(from, to, waypoints);
|
|
71
71
|
const angle = (_b = apiMapComputeHeading(route.path[0], route.path[1])) != null ? _b : 0;
|
|
72
72
|
return { ...route, angle, graspRoadPath, baseRoute: route, index: 0 };
|
|
73
73
|
};
|
|
74
74
|
watchEffectForDeepOption(
|
|
75
75
|
() => {
|
|
76
|
-
const { tracks, to, deviation = MAX_DEVIATION_DISTANCE } = props != null ? props : {};
|
|
76
|
+
const { tracks, to, waypoints = [], deviation = MAX_DEVIATION_DISTANCE } = props != null ? props : {};
|
|
77
77
|
return {
|
|
78
78
|
tracks: tracks ? [...tracks] : void 0,
|
|
79
79
|
to: to ? [...to] : void 0,
|
|
80
|
+
waypoints,
|
|
80
81
|
deviation
|
|
81
82
|
};
|
|
82
83
|
},
|
|
83
|
-
async ({ tracks, to, deviation }) => {
|
|
84
|
+
async ({ tracks, to, waypoints, deviation }) => {
|
|
84
85
|
if (!tracks || !to)
|
|
85
86
|
return;
|
|
86
87
|
const {
|
|
@@ -90,7 +91,13 @@ const useDeviationCorrectionDrivingRoute = (props) => {
|
|
|
90
91
|
routeIntersectionPath,
|
|
91
92
|
extendedIntersectionPoint,
|
|
92
93
|
...subRoute
|
|
93
|
-
} = await apiMapDeviationCorrectionDrivingRoute(
|
|
94
|
+
} = await apiMapDeviationCorrectionDrivingRoute(
|
|
95
|
+
tracks,
|
|
96
|
+
to,
|
|
97
|
+
deviation,
|
|
98
|
+
drivingRoute,
|
|
99
|
+
waypoints
|
|
100
|
+
);
|
|
94
101
|
Object.assign(drivingRoute, subRoute);
|
|
95
102
|
angleRef.value = angle;
|
|
96
103
|
trackIntersectionPathRef.value = trackIntersectionPath;
|
|
@@ -2,6 +2,7 @@ import type { Point, Route } from "../types/interface";
|
|
|
2
2
|
export interface UseDrivingRouteProps {
|
|
3
3
|
from: Point;
|
|
4
4
|
to: Point;
|
|
5
|
+
waypoints?: Point[];
|
|
5
6
|
}
|
|
6
7
|
export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
7
8
|
route: {
|
|
@@ -16,7 +17,7 @@ export declare const useADrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
|
16
17
|
}[];
|
|
17
18
|
trafficJams?: import("../types/interface").TrafficJams | undefined;
|
|
18
19
|
};
|
|
19
|
-
apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
|
|
20
|
+
apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
|
|
20
21
|
};
|
|
21
22
|
export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
22
23
|
route: {
|
|
@@ -31,7 +32,7 @@ export declare const useGDrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
|
31
32
|
}[];
|
|
32
33
|
trafficJams?: import("../types/interface").TrafficJams | undefined;
|
|
33
34
|
};
|
|
34
|
-
apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
|
|
35
|
+
apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
|
|
35
36
|
};
|
|
36
37
|
export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
37
38
|
route: {
|
|
@@ -46,5 +47,5 @@ export declare const useDrivingRoute: (props?: UseDrivingRouteProps) => {
|
|
|
46
47
|
}[];
|
|
47
48
|
trafficJams?: import("../types/interface").TrafficJams | undefined;
|
|
48
49
|
};
|
|
49
|
-
apiMapDrivingRoute: (from: Point, to: Point) => Promise<Route>;
|
|
50
|
+
apiMapDrivingRoute: (from: Point, to: Point, waypoints?: Point[]) => Promise<Route>;
|
|
50
51
|
};
|
|
@@ -14,18 +14,18 @@ const useADrivingRoute = (props) => {
|
|
|
14
14
|
trafficJams: void 0
|
|
15
15
|
});
|
|
16
16
|
const amapDriving = new AMap.Driving({});
|
|
17
|
-
const apiMapDrivingRoute = (from, to) => {
|
|
18
|
-
return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, amapDriving);
|
|
17
|
+
const apiMapDrivingRoute = (from, to, waypoints = []) => {
|
|
18
|
+
return googleRoutesProxyUrl && inTaiwan(from) ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : amapJsApiDrivingRoute(from, to, waypoints, amapDriving);
|
|
19
19
|
};
|
|
20
20
|
watchPostEffectForDeepOption(
|
|
21
21
|
() => {
|
|
22
|
-
const { from, to } = props != null ? props : {};
|
|
23
|
-
return { from, to };
|
|
22
|
+
const { from, to, waypoints } = props != null ? props : {};
|
|
23
|
+
return { from, to, waypoints };
|
|
24
24
|
},
|
|
25
|
-
async ({ from, to }) => {
|
|
25
|
+
async ({ from, to, waypoints }) => {
|
|
26
26
|
if (!from || !to)
|
|
27
27
|
return;
|
|
28
|
-
Object.assign(outputRoute, await apiMapDrivingRoute(from, to));
|
|
28
|
+
Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
|
|
29
29
|
}
|
|
30
30
|
);
|
|
31
31
|
return { route: outputRoute, apiMapDrivingRoute };
|
|
@@ -34,18 +34,18 @@ const useGDrivingRoute = (props) => {
|
|
|
34
34
|
const { gaodeDirectionDrivingProxyUrl, googleRoutesProxyUrl } = useMapSupplier();
|
|
35
35
|
const outputRoute = reactive({ path: [], distance: 0, duration: 0, steps: [] });
|
|
36
36
|
const gmapDirectionsService = new google.maps.DirectionsService();
|
|
37
|
-
const apiMapDrivingRoute = (from, to) => {
|
|
38
|
-
return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, gmapDirectionsService);
|
|
37
|
+
const apiMapDrivingRoute = (from, to, waypoints = []) => {
|
|
38
|
+
return gaodeDirectionDrivingProxyUrl && inKorean(from) ? gaodeServiceApiDrivingRoute(from, to, waypoints, gaodeDirectionDrivingProxyUrl) : googleRoutesProxyUrl ? googleServiceApiDrivingRoute(from, to, waypoints, googleRoutesProxyUrl) : gmapJsApiDrivingRoute(from, to, waypoints, gmapDirectionsService);
|
|
39
39
|
};
|
|
40
40
|
watchPostEffectForDeepOption(
|
|
41
41
|
() => {
|
|
42
|
-
const { from, to } = props != null ? props : {};
|
|
43
|
-
return { from, to };
|
|
42
|
+
const { from, to, waypoints } = props != null ? props : {};
|
|
43
|
+
return { from, to, waypoints };
|
|
44
44
|
},
|
|
45
|
-
async ({ from, to }) => {
|
|
45
|
+
async ({ from, to, waypoints }) => {
|
|
46
46
|
if (!from || !to)
|
|
47
47
|
return;
|
|
48
|
-
Object.assign(outputRoute, await apiMapDrivingRoute(from, to));
|
|
48
|
+
Object.assign(outputRoute, await apiMapDrivingRoute(from, to, waypoints));
|
|
49
49
|
}
|
|
50
50
|
);
|
|
51
51
|
return { route: outputRoute, apiMapDrivingRoute };
|
|
@@ -91,7 +91,7 @@ export interface CoordinateTrackPoint extends TrackPoint {
|
|
|
91
91
|
type: CoordinateType;
|
|
92
92
|
}
|
|
93
93
|
export type RecommendType = "Restricted" | "Forbidden" | "Recommend";
|
|
94
|
-
export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
|
|
94
|
+
export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "driverStartRelayService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed" | "assign" | "orderReassigned";
|
|
95
95
|
export declare enum CenterPlaceStatus {
|
|
96
96
|
GEO_LOADING = "GEO_LOADING",
|
|
97
97
|
QUERYING_INFO = "QUERYING_INFO",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="google.maps" />
|
|
2
2
|
import type { Point, Route } from "../types/interface";
|
|
3
|
-
export declare function amapJsApiDrivingRoute(from: Point, to: Point, amapDriving: AMap.Driving): Promise<Route>;
|
|
4
|
-
export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, proxyUrl: string): Promise<Route>;
|
|
5
|
-
export declare function gmapJsApiDrivingRoute(from: Point, to: Point, gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
|
|
6
|
-
export declare function googleServiceApiDrivingDirection(from: Point, to: Point, proxyUrl: string): Promise<Route>;
|
|
7
|
-
export declare function googleServiceApiDrivingRoute(from: Point, to: Point, proxyUrl: string): Promise<Route>;
|
|
3
|
+
export declare function amapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], amapDriving: AMap.Driving): Promise<Route>;
|
|
4
|
+
export declare function gaodeServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
|
|
5
|
+
export declare function gmapJsApiDrivingRoute(from: Point, to: Point, waypoints: Point[], gmapDirectionsService: google.maps.DirectionsService): Promise<Route>;
|
|
6
|
+
export declare function googleServiceApiDrivingDirection(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
|
|
7
|
+
export declare function googleServiceApiDrivingRoute(from: Point, to: Point, waypoints: Point[], proxyUrl: string): Promise<Route>;
|