@heycar/heycars-map 0.6.10 → 0.7.0
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/dist/Demo/Demo.d.ts +1 -0
- package/dist/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceSection.d.ts +4 -0
- package/dist/business-components/PassengerCircle/PassengerCircle.d.ts +2 -0
- package/dist/components/Amap/Amap.d.ts +2 -1
- package/dist/hooks/useDeviceOrientation.d.ts +16 -0
- package/dist/hooks/useMapInChina.d.ts +10 -0
- package/dist/hooks/useMapPlace.d.ts +3 -0
- package/dist/hooks/useMapRecomendPlace.d.ts +6 -0
- package/dist/hooks-business/useBusinessRecomendPlaceMap.d.ts +3 -0
- package/dist/index.cjs +1656 -42
- package/dist/index.js +1656 -42
- package/dist/types/interface.d.ts +1 -0
- package/dist/utils/transform.d.ts +6 -0
- package/package.json +1 -1
- package/todo.md +4 -129
package/dist/index.cjs
CHANGED
|
@@ -388,12 +388,12 @@ var now = function() {
|
|
|
388
388
|
return root$1.Date.now();
|
|
389
389
|
};
|
|
390
390
|
const now$1 = now;
|
|
391
|
-
var FUNC_ERROR_TEXT = "Expected a function";
|
|
391
|
+
var FUNC_ERROR_TEXT$1 = "Expected a function";
|
|
392
392
|
var nativeMax = Math.max, nativeMin = Math.min;
|
|
393
393
|
function debounce(func, wait, options) {
|
|
394
394
|
var lastArgs, lastThis, maxWait, result, timerId, lastCallTime, lastInvokeTime = 0, leading = false, maxing = false, trailing = true;
|
|
395
395
|
if (typeof func != "function") {
|
|
396
|
-
throw new TypeError(FUNC_ERROR_TEXT);
|
|
396
|
+
throw new TypeError(FUNC_ERROR_TEXT$1);
|
|
397
397
|
}
|
|
398
398
|
wait = toNumber(wait) || 0;
|
|
399
399
|
if (isObject(options)) {
|
|
@@ -475,6 +475,22 @@ var kebabCase = createCompounder(function(result, word, index) {
|
|
|
475
475
|
return result + (index ? "-" : "") + word.toLowerCase();
|
|
476
476
|
});
|
|
477
477
|
const kebabCase$1 = kebabCase;
|
|
478
|
+
var FUNC_ERROR_TEXT = "Expected a function";
|
|
479
|
+
function throttle(func, wait, options) {
|
|
480
|
+
var leading = true, trailing = true;
|
|
481
|
+
if (typeof func != "function") {
|
|
482
|
+
throw new TypeError(FUNC_ERROR_TEXT);
|
|
483
|
+
}
|
|
484
|
+
if (isObject(options)) {
|
|
485
|
+
leading = "leading" in options ? !!options.leading : leading;
|
|
486
|
+
trailing = "trailing" in options ? !!options.trailing : trailing;
|
|
487
|
+
}
|
|
488
|
+
return debounce(func, wait, {
|
|
489
|
+
"leading": leading,
|
|
490
|
+
"maxWait": wait,
|
|
491
|
+
"trailing": trailing
|
|
492
|
+
});
|
|
493
|
+
}
|
|
478
494
|
function defineSetup(setup) {
|
|
479
495
|
return Vue.defineComponent({
|
|
480
496
|
name: setup.name,
|
|
@@ -966,14 +982,34 @@ const isGeoPositionEqual = (p1, p2) => {
|
|
|
966
982
|
return false;
|
|
967
983
|
return p1.coords.longitude === p2.coords.longitude && p1.coords.latitude === p2.coords.latitude;
|
|
968
984
|
};
|
|
985
|
+
const amapPlaceName2DisplayName = (name, options) => {
|
|
986
|
+
const { isChina, province, city, district, township } = options;
|
|
987
|
+
if (!name)
|
|
988
|
+
return name;
|
|
989
|
+
if (!isChina)
|
|
990
|
+
return name.split(",")[0];
|
|
991
|
+
let result = name;
|
|
992
|
+
for (const item of [province, city, district, township]) {
|
|
993
|
+
if (result.trim() === item)
|
|
994
|
+
return item;
|
|
995
|
+
result = result.replace(item, "");
|
|
996
|
+
}
|
|
997
|
+
return result;
|
|
998
|
+
};
|
|
969
999
|
const toPlaceType = (maybePlace) => {
|
|
1000
|
+
var _a;
|
|
970
1001
|
const lng = Number(maybePlace.lng);
|
|
971
1002
|
if (isNaN(lng))
|
|
972
1003
|
throw new Error("MyError: expect lng to be number");
|
|
973
1004
|
const lat = Number(maybePlace.lat);
|
|
974
1005
|
if (isNaN(lat))
|
|
975
1006
|
throw new Error("MyError: expect lat to be number");
|
|
976
|
-
return {
|
|
1007
|
+
return {
|
|
1008
|
+
lng,
|
|
1009
|
+
lat,
|
|
1010
|
+
name: maybePlace.name,
|
|
1011
|
+
displayName: (_a = maybePlace.displayName) != null ? _a : maybePlace.name
|
|
1012
|
+
};
|
|
977
1013
|
};
|
|
978
1014
|
const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
|
|
979
1015
|
const { longitude, latitude, accuracy } = res;
|
|
@@ -1184,10 +1220,12 @@ const GmapAdvancedMarkerView = defineSetup(function GmapAdvancedMarkerView2(prop
|
|
|
1184
1220
|
return () => null;
|
|
1185
1221
|
});
|
|
1186
1222
|
const createDom = (tag, props, innerHtml) => {
|
|
1187
|
-
const { class: className, ...restProps } = props != null ? props : {};
|
|
1223
|
+
const { class: className, style: style2, ...restProps } = props != null ? props : {};
|
|
1188
1224
|
const elm = document.createElement(tag);
|
|
1189
1225
|
if (className)
|
|
1190
1226
|
elm.className = className;
|
|
1227
|
+
if (style2)
|
|
1228
|
+
elm.style.cssText = style2;
|
|
1191
1229
|
Object.assign(elm, restProps);
|
|
1192
1230
|
if (innerHtml)
|
|
1193
1231
|
elm.innerHTML = innerHtml;
|
|
@@ -3068,10 +3106,12 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
|
|
|
3068
3106
|
const deferedSetFitView = pipeDefer(registerOverlay.setFitView);
|
|
3069
3107
|
return () => {
|
|
3070
3108
|
const {
|
|
3071
|
-
from:
|
|
3072
|
-
to:
|
|
3109
|
+
from: inputFromPlace,
|
|
3110
|
+
to: inputToPlace,
|
|
3073
3111
|
fromDescription
|
|
3074
3112
|
} = props;
|
|
3113
|
+
const fromPlace = toPlaceType(inputFromPlace);
|
|
3114
|
+
const toPlace = toPlaceType(inputToPlace);
|
|
3075
3115
|
const from = place2point(fromPlace);
|
|
3076
3116
|
const to = place2point(toPlace);
|
|
3077
3117
|
return Vue.h(HeycarMap, {
|
|
@@ -3088,7 +3128,7 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
|
|
|
3088
3128
|
"type": "start",
|
|
3089
3129
|
"registerOverlay": registerOverlay,
|
|
3090
3130
|
"position": from,
|
|
3091
|
-
"title": fromPlace.
|
|
3131
|
+
"title": fromPlace.displayName,
|
|
3092
3132
|
"description": fromDescription
|
|
3093
3133
|
}
|
|
3094
3134
|
}), Vue.h(DrivingRoute, {
|
|
@@ -3108,7 +3148,7 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
|
|
|
3108
3148
|
"type": "end",
|
|
3109
3149
|
"registerOverlay": fittableRegistryOverlay,
|
|
3110
3150
|
"position": to,
|
|
3111
|
-
"title": toPlace.
|
|
3151
|
+
"title": toPlace.displayName,
|
|
3112
3152
|
"description": renderDescription({
|
|
3113
3153
|
distance,
|
|
3114
3154
|
duration
|
|
@@ -3415,12 +3455,28 @@ const useAmapDrag = (props) => {
|
|
|
3415
3455
|
const centerRef = Vue.ref([0, 0]);
|
|
3416
3456
|
const isDragging = Vue.ref(false);
|
|
3417
3457
|
const isDragEndWaitingMovingEndRef = Vue.ref(false);
|
|
3458
|
+
let isZoom = false;
|
|
3459
|
+
let zoomStartCenter = void 0;
|
|
3418
3460
|
let watchId = void 0;
|
|
3419
3461
|
const emitDragStart = () => {
|
|
3420
3462
|
pipeAsync(() => {
|
|
3421
3463
|
isDragging.value = true;
|
|
3422
3464
|
})();
|
|
3423
3465
|
};
|
|
3466
|
+
const handleZoomStart = () => {
|
|
3467
|
+
var _a;
|
|
3468
|
+
isZoom = true;
|
|
3469
|
+
zoomStartCenter = (_a = mapRef.value) == null ? void 0 : _a.getCenter().toJSON();
|
|
3470
|
+
};
|
|
3471
|
+
const handleChange = (value) => {
|
|
3472
|
+
console.log("useAmapDrag value, zoomStartCenter = ", value, zoomStartCenter);
|
|
3473
|
+
if (isZoom) {
|
|
3474
|
+
isZoom = false;
|
|
3475
|
+
if (isPointEqual(value, zoomStartCenter))
|
|
3476
|
+
return;
|
|
3477
|
+
}
|
|
3478
|
+
onChange == null ? void 0 : onChange(value);
|
|
3479
|
+
};
|
|
3424
3480
|
const handleDragEndWithAnimationEnd = (target) => {
|
|
3425
3481
|
var _a;
|
|
3426
3482
|
isDragEndWaitingMovingEndRef.value = false;
|
|
@@ -3428,7 +3484,7 @@ const useAmapDrag = (props) => {
|
|
|
3428
3484
|
const { lng, lat } = target.getCenter();
|
|
3429
3485
|
spaceLog("onDragEndWithAnimationEnd", "[lng, lat] = ", [lng, lat]);
|
|
3430
3486
|
centerRef.value = [lng, lat];
|
|
3431
|
-
(_a = pipeAsync(
|
|
3487
|
+
(_a = pipeAsync(handleChange)) == null ? void 0 : _a([lng, lat]);
|
|
3432
3488
|
};
|
|
3433
3489
|
const emitDragEnd = (_, { target }) => {
|
|
3434
3490
|
const { lng: baseLng, lat: baseLat } = target.getCenter();
|
|
@@ -3450,6 +3506,9 @@ const useAmapDrag = (props) => {
|
|
|
3450
3506
|
return;
|
|
3451
3507
|
handleDragEndWithAnimationEnd(target);
|
|
3452
3508
|
};
|
|
3509
|
+
watchPostEffectForAMapEvent(mapRef, {}, handleZoomStart, [
|
|
3510
|
+
"onZoomStart"
|
|
3511
|
+
]);
|
|
3453
3512
|
watchPostEffectForAMapEvent(mapRef, {}, emitDragStart, [
|
|
3454
3513
|
"onDragStart"
|
|
3455
3514
|
]);
|
|
@@ -3491,6 +3550,1495 @@ const useMapDrag = (props) => {
|
|
|
3491
3550
|
const { supplier } = useMapSupplier();
|
|
3492
3551
|
return supplier === "gmap" ? useGmapDrag(props) : useAmapDrag(props);
|
|
3493
3552
|
};
|
|
3553
|
+
const chinaBounds = [
|
|
3554
|
+
[
|
|
3555
|
+
108.03446,
|
|
3556
|
+
21.545871
|
|
3557
|
+
],
|
|
3558
|
+
[
|
|
3559
|
+
107.889498,
|
|
3560
|
+
21.616829
|
|
3561
|
+
],
|
|
3562
|
+
[
|
|
3563
|
+
107.710692,
|
|
3564
|
+
21.616402
|
|
3565
|
+
],
|
|
3566
|
+
[
|
|
3567
|
+
107.494665,
|
|
3568
|
+
21.595056
|
|
3569
|
+
],
|
|
3570
|
+
[
|
|
3571
|
+
106.786034,
|
|
3572
|
+
22.007796
|
|
3573
|
+
],
|
|
3574
|
+
[
|
|
3575
|
+
106.680021,
|
|
3576
|
+
22.187266
|
|
3577
|
+
],
|
|
3578
|
+
[
|
|
3579
|
+
106.669469,
|
|
3580
|
+
22.309079
|
|
3581
|
+
],
|
|
3582
|
+
[
|
|
3583
|
+
106.599328,
|
|
3584
|
+
22.336445
|
|
3585
|
+
],
|
|
3586
|
+
[
|
|
3587
|
+
106.587391,
|
|
3588
|
+
22.392428
|
|
3589
|
+
],
|
|
3590
|
+
[
|
|
3591
|
+
106.560298,
|
|
3592
|
+
22.455572
|
|
3593
|
+
],
|
|
3594
|
+
[
|
|
3595
|
+
106.593701,
|
|
3596
|
+
22.535936
|
|
3597
|
+
],
|
|
3598
|
+
[
|
|
3599
|
+
106.638878,
|
|
3600
|
+
22.58798
|
|
3601
|
+
],
|
|
3602
|
+
[
|
|
3603
|
+
106.728994,
|
|
3604
|
+
22.590963
|
|
3605
|
+
],
|
|
3606
|
+
[
|
|
3607
|
+
106.728814,
|
|
3608
|
+
22.638742
|
|
3609
|
+
],
|
|
3610
|
+
[
|
|
3611
|
+
106.768026,
|
|
3612
|
+
22.697825
|
|
3613
|
+
],
|
|
3614
|
+
[
|
|
3615
|
+
106.791692,
|
|
3616
|
+
22.755067
|
|
3617
|
+
],
|
|
3618
|
+
[
|
|
3619
|
+
106.84036,
|
|
3620
|
+
22.800812
|
|
3621
|
+
],
|
|
3622
|
+
[
|
|
3623
|
+
106.735961,
|
|
3624
|
+
22.846833
|
|
3625
|
+
],
|
|
3626
|
+
[
|
|
3627
|
+
105.959328,
|
|
3628
|
+
22.948955
|
|
3629
|
+
],
|
|
3630
|
+
[
|
|
3631
|
+
105.353314,
|
|
3632
|
+
23.356081
|
|
3633
|
+
],
|
|
3634
|
+
[
|
|
3635
|
+
104.732794,
|
|
3636
|
+
22.852108
|
|
3637
|
+
],
|
|
3638
|
+
[
|
|
3639
|
+
104.600128,
|
|
3640
|
+
22.817385
|
|
3641
|
+
],
|
|
3642
|
+
[
|
|
3643
|
+
104.340241,
|
|
3644
|
+
22.71984
|
|
3645
|
+
],
|
|
3646
|
+
[
|
|
3647
|
+
104.126583,
|
|
3648
|
+
22.811413
|
|
3649
|
+
],
|
|
3650
|
+
[
|
|
3651
|
+
103.970906,
|
|
3652
|
+
22.508551
|
|
3653
|
+
],
|
|
3654
|
+
[
|
|
3655
|
+
103.620566,
|
|
3656
|
+
22.783873
|
|
3657
|
+
],
|
|
3658
|
+
[
|
|
3659
|
+
103.477354,
|
|
3660
|
+
22.638803
|
|
3661
|
+
],
|
|
3662
|
+
[
|
|
3663
|
+
103.284426,
|
|
3664
|
+
22.680987
|
|
3665
|
+
],
|
|
3666
|
+
[
|
|
3667
|
+
103.10565,
|
|
3668
|
+
22.513882
|
|
3669
|
+
],
|
|
3670
|
+
[
|
|
3671
|
+
102.879153,
|
|
3672
|
+
22.582463
|
|
3673
|
+
],
|
|
3674
|
+
[
|
|
3675
|
+
102.555288,
|
|
3676
|
+
22.729169
|
|
3677
|
+
],
|
|
3678
|
+
[
|
|
3679
|
+
102.343946,
|
|
3680
|
+
22.559298
|
|
3681
|
+
],
|
|
3682
|
+
[
|
|
3683
|
+
101.85524,
|
|
3684
|
+
22.396103
|
|
3685
|
+
],
|
|
3686
|
+
[
|
|
3687
|
+
101.827202,
|
|
3688
|
+
21.613912
|
|
3689
|
+
],
|
|
3690
|
+
[
|
|
3691
|
+
101.204804,
|
|
3692
|
+
21.319458
|
|
3693
|
+
],
|
|
3694
|
+
[
|
|
3695
|
+
101.122342,
|
|
3696
|
+
21.773805
|
|
3697
|
+
],
|
|
3698
|
+
[
|
|
3699
|
+
101.018928,
|
|
3700
|
+
21.716981
|
|
3701
|
+
],
|
|
3702
|
+
[
|
|
3703
|
+
100.905368,
|
|
3704
|
+
21.685013
|
|
3705
|
+
],
|
|
3706
|
+
[
|
|
3707
|
+
100.862341,
|
|
3708
|
+
21.659141
|
|
3709
|
+
],
|
|
3710
|
+
[
|
|
3711
|
+
100.831063,
|
|
3712
|
+
21.630827
|
|
3713
|
+
],
|
|
3714
|
+
[
|
|
3715
|
+
100.344532,
|
|
3716
|
+
21.523776
|
|
3717
|
+
],
|
|
3718
|
+
[
|
|
3719
|
+
100.307578,
|
|
3720
|
+
21.488182
|
|
3721
|
+
],
|
|
3722
|
+
[
|
|
3723
|
+
100.272498,
|
|
3724
|
+
21.471719
|
|
3725
|
+
],
|
|
3726
|
+
[
|
|
3727
|
+
100.235514,
|
|
3728
|
+
21.466919
|
|
3729
|
+
],
|
|
3730
|
+
[
|
|
3731
|
+
100.122838,
|
|
3732
|
+
21.538441
|
|
3733
|
+
],
|
|
3734
|
+
[
|
|
3735
|
+
100.144342,
|
|
3736
|
+
21.687965
|
|
3737
|
+
],
|
|
3738
|
+
[
|
|
3739
|
+
99.970902,
|
|
3740
|
+
21.759593
|
|
3741
|
+
],
|
|
3742
|
+
[
|
|
3743
|
+
99.976349,
|
|
3744
|
+
21.911722
|
|
3745
|
+
],
|
|
3746
|
+
[
|
|
3747
|
+
99.75302,
|
|
3748
|
+
22.069356
|
|
3749
|
+
],
|
|
3750
|
+
[
|
|
3751
|
+
99.577471,
|
|
3752
|
+
22.09497
|
|
3753
|
+
],
|
|
3754
|
+
[
|
|
3755
|
+
99.218434,
|
|
3756
|
+
22.111416
|
|
3757
|
+
],
|
|
3758
|
+
[
|
|
3759
|
+
99.165397,
|
|
3760
|
+
22.14945
|
|
3761
|
+
],
|
|
3762
|
+
[
|
|
3763
|
+
99.236667,
|
|
3764
|
+
22.297601
|
|
3765
|
+
],
|
|
3766
|
+
[
|
|
3767
|
+
99.359108,
|
|
3768
|
+
22.524123
|
|
3769
|
+
],
|
|
3770
|
+
[
|
|
3771
|
+
99.329472,
|
|
3772
|
+
22.715709
|
|
3773
|
+
],
|
|
3774
|
+
[
|
|
3775
|
+
99.338877,
|
|
3776
|
+
22.751654
|
|
3777
|
+
],
|
|
3778
|
+
[
|
|
3779
|
+
99.378146,
|
|
3780
|
+
22.762179
|
|
3781
|
+
],
|
|
3782
|
+
[
|
|
3783
|
+
99.400754,
|
|
3784
|
+
22.825682
|
|
3785
|
+
],
|
|
3786
|
+
[
|
|
3787
|
+
99.447563,
|
|
3788
|
+
22.844585
|
|
3789
|
+
],
|
|
3790
|
+
[
|
|
3791
|
+
99.44777,
|
|
3792
|
+
22.881018
|
|
3793
|
+
],
|
|
3794
|
+
[
|
|
3795
|
+
99.544938,
|
|
3796
|
+
22.958751
|
|
3797
|
+
],
|
|
3798
|
+
[
|
|
3799
|
+
99.206721,
|
|
3800
|
+
23.104579
|
|
3801
|
+
],
|
|
3802
|
+
[
|
|
3803
|
+
99.000191,
|
|
3804
|
+
23.161668
|
|
3805
|
+
],
|
|
3806
|
+
[
|
|
3807
|
+
98.930812,
|
|
3808
|
+
23.17934
|
|
3809
|
+
],
|
|
3810
|
+
[
|
|
3811
|
+
98.89451,
|
|
3812
|
+
23.205769
|
|
3813
|
+
],
|
|
3814
|
+
[
|
|
3815
|
+
98.915037,
|
|
3816
|
+
23.254704
|
|
3817
|
+
],
|
|
3818
|
+
[
|
|
3819
|
+
98.828171,
|
|
3820
|
+
23.690326
|
|
3821
|
+
],
|
|
3822
|
+
[
|
|
3823
|
+
98.698028,
|
|
3824
|
+
23.784237
|
|
3825
|
+
],
|
|
3826
|
+
[
|
|
3827
|
+
98.880603,
|
|
3828
|
+
24.149213
|
|
3829
|
+
],
|
|
3830
|
+
[
|
|
3831
|
+
98.544094,
|
|
3832
|
+
24.128618
|
|
3833
|
+
],
|
|
3834
|
+
[
|
|
3835
|
+
98.340976,
|
|
3836
|
+
24.10009
|
|
3837
|
+
],
|
|
3838
|
+
[
|
|
3839
|
+
98.108482,
|
|
3840
|
+
24.091463
|
|
3841
|
+
],
|
|
3842
|
+
[
|
|
3843
|
+
98.013226,
|
|
3844
|
+
24.053379
|
|
3845
|
+
],
|
|
3846
|
+
[
|
|
3847
|
+
97.728248,
|
|
3848
|
+
23.895521
|
|
3849
|
+
],
|
|
3850
|
+
[
|
|
3851
|
+
97.529325,
|
|
3852
|
+
23.943102
|
|
3853
|
+
],
|
|
3854
|
+
[
|
|
3855
|
+
97.655234,
|
|
3856
|
+
24.060011
|
|
3857
|
+
],
|
|
3858
|
+
[
|
|
3859
|
+
97.739942,
|
|
3860
|
+
24.184029
|
|
3861
|
+
],
|
|
3862
|
+
[
|
|
3863
|
+
97.702694,
|
|
3864
|
+
24.343731
|
|
3865
|
+
],
|
|
3866
|
+
[
|
|
3867
|
+
97.555387,
|
|
3868
|
+
24.509707
|
|
3869
|
+
],
|
|
3870
|
+
[
|
|
3871
|
+
97.566348,
|
|
3872
|
+
24.70096
|
|
3873
|
+
],
|
|
3874
|
+
[
|
|
3875
|
+
97.683272,
|
|
3876
|
+
24.8271
|
|
3877
|
+
],
|
|
3878
|
+
[
|
|
3879
|
+
97.729442,
|
|
3880
|
+
24.909341
|
|
3881
|
+
],
|
|
3882
|
+
[
|
|
3883
|
+
97.729984,
|
|
3884
|
+
25.086406
|
|
3885
|
+
],
|
|
3886
|
+
[
|
|
3887
|
+
97.88904,
|
|
3888
|
+
25.235727
|
|
3889
|
+
],
|
|
3890
|
+
[
|
|
3891
|
+
98.138872,
|
|
3892
|
+
25.495217
|
|
3893
|
+
],
|
|
3894
|
+
[
|
|
3895
|
+
98.683766,
|
|
3896
|
+
25.931162
|
|
3897
|
+
],
|
|
3898
|
+
[
|
|
3899
|
+
98.627679,
|
|
3900
|
+
26.144535
|
|
3901
|
+
],
|
|
3902
|
+
[
|
|
3903
|
+
98.674957,
|
|
3904
|
+
26.238435
|
|
3905
|
+
],
|
|
3906
|
+
[
|
|
3907
|
+
98.756509,
|
|
3908
|
+
26.496577
|
|
3909
|
+
],
|
|
3910
|
+
[
|
|
3911
|
+
98.758612,
|
|
3912
|
+
26.764705
|
|
3913
|
+
],
|
|
3914
|
+
[
|
|
3915
|
+
98.766671,
|
|
3916
|
+
27.041643
|
|
3917
|
+
],
|
|
3918
|
+
[
|
|
3919
|
+
98.732483,
|
|
3920
|
+
27.284239
|
|
3921
|
+
],
|
|
3922
|
+
[
|
|
3923
|
+
98.699537,
|
|
3924
|
+
27.546633
|
|
3925
|
+
],
|
|
3926
|
+
[
|
|
3927
|
+
98.431871,
|
|
3928
|
+
27.662925
|
|
3929
|
+
],
|
|
3930
|
+
[
|
|
3931
|
+
98.286812,
|
|
3932
|
+
27.634612
|
|
3933
|
+
],
|
|
3934
|
+
[
|
|
3935
|
+
98.174766,
|
|
3936
|
+
27.862864
|
|
3937
|
+
],
|
|
3938
|
+
[
|
|
3939
|
+
98.131544,
|
|
3940
|
+
28.149559
|
|
3941
|
+
],
|
|
3942
|
+
[
|
|
3943
|
+
97.494182,
|
|
3944
|
+
28.359752
|
|
3945
|
+
],
|
|
3946
|
+
[
|
|
3947
|
+
97.420181,
|
|
3948
|
+
28.295909
|
|
3949
|
+
],
|
|
3950
|
+
[
|
|
3951
|
+
97.357902,
|
|
3952
|
+
28.182283
|
|
3953
|
+
],
|
|
3954
|
+
[
|
|
3955
|
+
97.372545,
|
|
3956
|
+
28.048383
|
|
3957
|
+
],
|
|
3958
|
+
[
|
|
3959
|
+
97.182406,
|
|
3960
|
+
27.827862
|
|
3961
|
+
],
|
|
3962
|
+
[
|
|
3963
|
+
97.000801,
|
|
3964
|
+
27.825301
|
|
3965
|
+
],
|
|
3966
|
+
[
|
|
3967
|
+
96.846837,
|
|
3968
|
+
27.877626
|
|
3969
|
+
],
|
|
3970
|
+
[
|
|
3971
|
+
96.537778,
|
|
3972
|
+
28.075202
|
|
3973
|
+
],
|
|
3974
|
+
[
|
|
3975
|
+
96.358196,
|
|
3976
|
+
28.122047
|
|
3977
|
+
],
|
|
3978
|
+
[
|
|
3979
|
+
96.158626,
|
|
3980
|
+
28.209232
|
|
3981
|
+
],
|
|
3982
|
+
[
|
|
3983
|
+
94.975683,
|
|
3984
|
+
27.804592
|
|
3985
|
+
],
|
|
3986
|
+
[
|
|
3987
|
+
92.125949,
|
|
3988
|
+
27.273214
|
|
3989
|
+
],
|
|
3990
|
+
[
|
|
3991
|
+
91.151716,
|
|
3992
|
+
27.907706
|
|
3993
|
+
],
|
|
3994
|
+
[
|
|
3995
|
+
90.122462,
|
|
3996
|
+
28.168784
|
|
3997
|
+
],
|
|
3998
|
+
[
|
|
3999
|
+
89.116165,
|
|
4000
|
+
27.539676
|
|
4001
|
+
],
|
|
4002
|
+
[
|
|
4003
|
+
88.79551,
|
|
4004
|
+
28.038329
|
|
4005
|
+
],
|
|
4006
|
+
[
|
|
4007
|
+
87.664174,
|
|
4008
|
+
27.833584
|
|
4009
|
+
],
|
|
4010
|
+
[
|
|
4011
|
+
87.034909,
|
|
4012
|
+
27.946381
|
|
4013
|
+
],
|
|
4014
|
+
[
|
|
4015
|
+
86.102037,
|
|
4016
|
+
27.989154
|
|
4017
|
+
],
|
|
4018
|
+
[
|
|
4019
|
+
85.959927,
|
|
4020
|
+
27.960275
|
|
4021
|
+
],
|
|
4022
|
+
[
|
|
4023
|
+
85.542653,
|
|
4024
|
+
28.314901
|
|
4025
|
+
],
|
|
4026
|
+
[
|
|
4027
|
+
85.352214,
|
|
4028
|
+
28.283591
|
|
4029
|
+
],
|
|
4030
|
+
[
|
|
4031
|
+
84.760124,
|
|
4032
|
+
28.608553
|
|
4033
|
+
],
|
|
4034
|
+
[
|
|
4035
|
+
83.696663,
|
|
4036
|
+
29.223277
|
|
4037
|
+
],
|
|
4038
|
+
[
|
|
4039
|
+
82.694473,
|
|
4040
|
+
29.762103
|
|
4041
|
+
],
|
|
4042
|
+
[
|
|
4043
|
+
81.681759,
|
|
4044
|
+
30.423961
|
|
4045
|
+
],
|
|
4046
|
+
[
|
|
4047
|
+
81.002579,
|
|
4048
|
+
30.264622
|
|
4049
|
+
],
|
|
4050
|
+
[
|
|
4051
|
+
79.451148,
|
|
4052
|
+
31.026692
|
|
4053
|
+
],
|
|
4054
|
+
[
|
|
4055
|
+
78.768535,
|
|
4056
|
+
31.940859
|
|
4057
|
+
],
|
|
4058
|
+
[
|
|
4059
|
+
78.637775,
|
|
4060
|
+
32.011523
|
|
4061
|
+
],
|
|
4062
|
+
[
|
|
4063
|
+
78.591482,
|
|
4064
|
+
32.063503
|
|
4065
|
+
],
|
|
4066
|
+
[
|
|
4067
|
+
78.447248,
|
|
4068
|
+
32.152441
|
|
4069
|
+
],
|
|
4070
|
+
[
|
|
4071
|
+
79.055473,
|
|
4072
|
+
32.381378
|
|
4073
|
+
],
|
|
4074
|
+
[
|
|
4075
|
+
79.232139,
|
|
4076
|
+
32.840006
|
|
4077
|
+
],
|
|
4078
|
+
[
|
|
4079
|
+
79.224739,
|
|
4080
|
+
32.961698
|
|
4081
|
+
],
|
|
4082
|
+
[
|
|
4083
|
+
78.73849,
|
|
4084
|
+
33.949955
|
|
4085
|
+
],
|
|
4086
|
+
[
|
|
4087
|
+
78.674047,
|
|
4088
|
+
34.530945
|
|
4089
|
+
],
|
|
4090
|
+
[
|
|
4091
|
+
78.017015,
|
|
4092
|
+
35.228305
|
|
4093
|
+
],
|
|
4094
|
+
[
|
|
4095
|
+
76.941478,
|
|
4096
|
+
35.601395
|
|
4097
|
+
],
|
|
4098
|
+
[
|
|
4099
|
+
76.034841,
|
|
4100
|
+
36.40917
|
|
4101
|
+
],
|
|
4102
|
+
[
|
|
4103
|
+
75.906013,
|
|
4104
|
+
36.633077
|
|
4105
|
+
],
|
|
4106
|
+
[
|
|
4107
|
+
75.44202,
|
|
4108
|
+
36.751892
|
|
4109
|
+
],
|
|
4110
|
+
[
|
|
4111
|
+
74.771692,
|
|
4112
|
+
37.264013
|
|
4113
|
+
],
|
|
4114
|
+
[
|
|
4115
|
+
74.79294,
|
|
4116
|
+
38.536098
|
|
4117
|
+
],
|
|
4118
|
+
[
|
|
4119
|
+
73.628595,
|
|
4120
|
+
39.23079
|
|
4121
|
+
],
|
|
4122
|
+
[
|
|
4123
|
+
74.464917,
|
|
4124
|
+
40.163006
|
|
4125
|
+
],
|
|
4126
|
+
[
|
|
4127
|
+
75.697795,
|
|
4128
|
+
40.288419
|
|
4129
|
+
],
|
|
4130
|
+
[
|
|
4131
|
+
76.734113,
|
|
4132
|
+
40.847349
|
|
4133
|
+
],
|
|
4134
|
+
[
|
|
4135
|
+
77.805877,
|
|
4136
|
+
41.115185
|
|
4137
|
+
],
|
|
4138
|
+
[
|
|
4139
|
+
78.100761,
|
|
4140
|
+
41.225242
|
|
4141
|
+
],
|
|
4142
|
+
[
|
|
4143
|
+
78.317208,
|
|
4144
|
+
41.386984
|
|
4145
|
+
],
|
|
4146
|
+
[
|
|
4147
|
+
78.828532,
|
|
4148
|
+
41.565219
|
|
4149
|
+
],
|
|
4150
|
+
[
|
|
4151
|
+
79.796619,
|
|
4152
|
+
41.917362
|
|
4153
|
+
],
|
|
4154
|
+
[
|
|
4155
|
+
80.230197,
|
|
4156
|
+
42.396788
|
|
4157
|
+
],
|
|
4158
|
+
[
|
|
4159
|
+
80.178769,
|
|
4160
|
+
42.661476
|
|
4161
|
+
],
|
|
4162
|
+
[
|
|
4163
|
+
80.293244,
|
|
4164
|
+
42.836441
|
|
4165
|
+
],
|
|
4166
|
+
[
|
|
4167
|
+
80.337978,
|
|
4168
|
+
42.831579
|
|
4169
|
+
],
|
|
4170
|
+
[
|
|
4171
|
+
80.405903,
|
|
4172
|
+
42.834648
|
|
4173
|
+
],
|
|
4174
|
+
[
|
|
4175
|
+
80.498695,
|
|
4176
|
+
42.871935
|
|
4177
|
+
],
|
|
4178
|
+
[
|
|
4179
|
+
80.485526,
|
|
4180
|
+
42.949773
|
|
4181
|
+
],
|
|
4182
|
+
[
|
|
4183
|
+
80.523771,
|
|
4184
|
+
43.830106
|
|
4185
|
+
],
|
|
4186
|
+
[
|
|
4187
|
+
80.519548,
|
|
4188
|
+
43.862665
|
|
4189
|
+
],
|
|
4190
|
+
[
|
|
4191
|
+
80.509814,
|
|
4192
|
+
43.876346
|
|
4193
|
+
],
|
|
4194
|
+
[
|
|
4195
|
+
80.502334,
|
|
4196
|
+
43.912321
|
|
4197
|
+
],
|
|
4198
|
+
[
|
|
4199
|
+
80.490832,
|
|
4200
|
+
43.920575
|
|
4201
|
+
],
|
|
4202
|
+
[
|
|
4203
|
+
80.481667,
|
|
4204
|
+
43.931551
|
|
4205
|
+
],
|
|
4206
|
+
[
|
|
4207
|
+
80.477151,
|
|
4208
|
+
43.947949
|
|
4209
|
+
],
|
|
4210
|
+
[
|
|
4211
|
+
80.475736,
|
|
4212
|
+
43.964042
|
|
4213
|
+
],
|
|
4214
|
+
[
|
|
4215
|
+
80.458271,
|
|
4216
|
+
43.976397
|
|
4217
|
+
],
|
|
4218
|
+
[
|
|
4219
|
+
80.453132,
|
|
4220
|
+
43.991877
|
|
4221
|
+
],
|
|
4222
|
+
[
|
|
4223
|
+
80.454728,
|
|
4224
|
+
44.04903
|
|
4225
|
+
],
|
|
4226
|
+
[
|
|
4227
|
+
80.342239,
|
|
4228
|
+
44.686627
|
|
4229
|
+
],
|
|
4230
|
+
[
|
|
4231
|
+
80.927203,
|
|
4232
|
+
45.149323
|
|
4233
|
+
],
|
|
4234
|
+
[
|
|
4235
|
+
82.601014,
|
|
4236
|
+
45.34621
|
|
4237
|
+
],
|
|
4238
|
+
[
|
|
4239
|
+
84.305399,
|
|
4240
|
+
46.995313
|
|
4241
|
+
],
|
|
4242
|
+
[
|
|
4243
|
+
85.560607,
|
|
4244
|
+
47.118155
|
|
4245
|
+
],
|
|
4246
|
+
[
|
|
4247
|
+
85.537708,
|
|
4248
|
+
48.047127
|
|
4249
|
+
],
|
|
4250
|
+
[
|
|
4251
|
+
85.596757,
|
|
4252
|
+
48.197207
|
|
4253
|
+
],
|
|
4254
|
+
[
|
|
4255
|
+
85.703562,
|
|
4256
|
+
48.343172
|
|
4257
|
+
],
|
|
4258
|
+
[
|
|
4259
|
+
86.175389,
|
|
4260
|
+
48.436248
|
|
4261
|
+
],
|
|
4262
|
+
[
|
|
4263
|
+
86.580777,
|
|
4264
|
+
48.539797
|
|
4265
|
+
],
|
|
4266
|
+
[
|
|
4267
|
+
86.753356,
|
|
4268
|
+
48.704785
|
|
4269
|
+
],
|
|
4270
|
+
[
|
|
4271
|
+
86.820571,
|
|
4272
|
+
48.835791
|
|
4273
|
+
],
|
|
4274
|
+
[
|
|
4275
|
+
86.733414,
|
|
4276
|
+
48.974695
|
|
4277
|
+
],
|
|
4278
|
+
[
|
|
4279
|
+
86.895933,
|
|
4280
|
+
49.133785
|
|
4281
|
+
],
|
|
4282
|
+
[
|
|
4283
|
+
87.822671,
|
|
4284
|
+
48.947236
|
|
4285
|
+
],
|
|
4286
|
+
[
|
|
4287
|
+
88.576766,
|
|
4288
|
+
48.350514
|
|
4289
|
+
],
|
|
4290
|
+
[
|
|
4291
|
+
89.743723,
|
|
4292
|
+
47.888328
|
|
4293
|
+
],
|
|
4294
|
+
[
|
|
4295
|
+
91.061776,
|
|
4296
|
+
46.533367
|
|
4297
|
+
],
|
|
4298
|
+
[
|
|
4299
|
+
93.173971,
|
|
4300
|
+
45.015263
|
|
4301
|
+
],
|
|
4302
|
+
[
|
|
4303
|
+
96.758654,
|
|
4304
|
+
42.75641
|
|
4305
|
+
],
|
|
4306
|
+
[
|
|
4307
|
+
101.938753,
|
|
4308
|
+
42.36899
|
|
4309
|
+
],
|
|
4310
|
+
[
|
|
4311
|
+
111.056885,
|
|
4312
|
+
43.346543
|
|
4313
|
+
],
|
|
4314
|
+
[
|
|
4315
|
+
113.995954,
|
|
4316
|
+
44.922372
|
|
4317
|
+
],
|
|
4318
|
+
[
|
|
4319
|
+
118.508368,
|
|
4320
|
+
46.700918
|
|
4321
|
+
],
|
|
4322
|
+
[
|
|
4323
|
+
119.707908,
|
|
4324
|
+
47.200464
|
|
4325
|
+
],
|
|
4326
|
+
[
|
|
4327
|
+
119.662314,
|
|
4328
|
+
47.226698
|
|
4329
|
+
],
|
|
4330
|
+
[
|
|
4331
|
+
119.626751,
|
|
4332
|
+
47.247533
|
|
4333
|
+
],
|
|
4334
|
+
[
|
|
4335
|
+
119.562861,
|
|
4336
|
+
47.261987
|
|
4337
|
+
],
|
|
4338
|
+
[
|
|
4339
|
+
119.562568,
|
|
4340
|
+
47.282336
|
|
4341
|
+
],
|
|
4342
|
+
[
|
|
4343
|
+
119.544295,
|
|
4344
|
+
47.304695
|
|
4345
|
+
],
|
|
4346
|
+
[
|
|
4347
|
+
119.515891,
|
|
4348
|
+
47.322902
|
|
4349
|
+
],
|
|
4350
|
+
[
|
|
4351
|
+
119.463333,
|
|
4352
|
+
47.349624
|
|
4353
|
+
],
|
|
4354
|
+
[
|
|
4355
|
+
119.396152,
|
|
4356
|
+
47.394452
|
|
4357
|
+
],
|
|
4358
|
+
[
|
|
4359
|
+
119.334168,
|
|
4360
|
+
47.42353
|
|
4361
|
+
],
|
|
4362
|
+
[
|
|
4363
|
+
118.276281,
|
|
4364
|
+
48.009287
|
|
4365
|
+
],
|
|
4366
|
+
[
|
|
4367
|
+
118.11109,
|
|
4368
|
+
48.041824
|
|
4369
|
+
],
|
|
4370
|
+
[
|
|
4371
|
+
118.016416,
|
|
4372
|
+
48.014965
|
|
4373
|
+
],
|
|
4374
|
+
[
|
|
4375
|
+
117.895415,
|
|
4376
|
+
48.022554
|
|
4377
|
+
],
|
|
4378
|
+
[
|
|
4379
|
+
117.81506,
|
|
4380
|
+
49.527378
|
|
4381
|
+
],
|
|
4382
|
+
[
|
|
4383
|
+
117.959284,
|
|
4384
|
+
49.607066
|
|
4385
|
+
],
|
|
4386
|
+
[
|
|
4387
|
+
118.119232,
|
|
4388
|
+
49.650908
|
|
4389
|
+
],
|
|
4390
|
+
[
|
|
4391
|
+
118.226441,
|
|
4392
|
+
49.725456
|
|
4393
|
+
],
|
|
4394
|
+
[
|
|
4395
|
+
118.388378,
|
|
4396
|
+
49.785914
|
|
4397
|
+
],
|
|
4398
|
+
[
|
|
4399
|
+
118.484226,
|
|
4400
|
+
49.829849
|
|
4401
|
+
],
|
|
4402
|
+
[
|
|
4403
|
+
118.558769,
|
|
4404
|
+
49.904695
|
|
4405
|
+
],
|
|
4406
|
+
[
|
|
4407
|
+
118.663826,
|
|
4408
|
+
49.950365
|
|
4409
|
+
],
|
|
4410
|
+
[
|
|
4411
|
+
118.794449,
|
|
4412
|
+
49.958426
|
|
4413
|
+
],
|
|
4414
|
+
[
|
|
4415
|
+
118.898088,
|
|
4416
|
+
49.975079
|
|
4417
|
+
],
|
|
4418
|
+
[
|
|
4419
|
+
118.996016,
|
|
4420
|
+
49.974912
|
|
4421
|
+
],
|
|
4422
|
+
[
|
|
4423
|
+
119.127524,
|
|
4424
|
+
50.009768
|
|
4425
|
+
],
|
|
4426
|
+
[
|
|
4427
|
+
119.191791,
|
|
4428
|
+
50.074864
|
|
4429
|
+
],
|
|
4430
|
+
[
|
|
4431
|
+
119.298834,
|
|
4432
|
+
50.134203
|
|
4433
|
+
],
|
|
4434
|
+
[
|
|
4435
|
+
119.32342,
|
|
4436
|
+
50.234727
|
|
4437
|
+
],
|
|
4438
|
+
[
|
|
4439
|
+
119.349315,
|
|
4440
|
+
50.357748
|
|
4441
|
+
],
|
|
4442
|
+
[
|
|
4443
|
+
119.141688,
|
|
4444
|
+
50.388553
|
|
4445
|
+
],
|
|
4446
|
+
[
|
|
4447
|
+
119.282088,
|
|
4448
|
+
50.550625
|
|
4449
|
+
],
|
|
4450
|
+
[
|
|
4451
|
+
119.473796,
|
|
4452
|
+
50.723148
|
|
4453
|
+
],
|
|
4454
|
+
[
|
|
4455
|
+
119.541671,
|
|
4456
|
+
50.914479
|
|
4457
|
+
],
|
|
4458
|
+
[
|
|
4459
|
+
119.742397,
|
|
4460
|
+
51.086222
|
|
4461
|
+
],
|
|
4462
|
+
[
|
|
4463
|
+
119.761579,
|
|
4464
|
+
51.211474
|
|
4465
|
+
],
|
|
4466
|
+
[
|
|
4467
|
+
119.924927,
|
|
4468
|
+
51.371112
|
|
4469
|
+
],
|
|
4470
|
+
[
|
|
4471
|
+
120.047332,
|
|
4472
|
+
51.546316
|
|
4473
|
+
],
|
|
4474
|
+
[
|
|
4475
|
+
120.343526,
|
|
4476
|
+
51.78839
|
|
4477
|
+
],
|
|
4478
|
+
[
|
|
4479
|
+
120.688186,
|
|
4480
|
+
52.042069
|
|
4481
|
+
],
|
|
4482
|
+
[
|
|
4483
|
+
120.634178,
|
|
4484
|
+
52.31611
|
|
4485
|
+
],
|
|
4486
|
+
[
|
|
4487
|
+
120.655763,
|
|
4488
|
+
52.56758
|
|
4489
|
+
],
|
|
4490
|
+
[
|
|
4491
|
+
120.058786,
|
|
4492
|
+
52.729041
|
|
4493
|
+
],
|
|
4494
|
+
[
|
|
4495
|
+
120.476405,
|
|
4496
|
+
53.019791
|
|
4497
|
+
],
|
|
4498
|
+
[
|
|
4499
|
+
120.845509,
|
|
4500
|
+
53.274051
|
|
4501
|
+
],
|
|
4502
|
+
[
|
|
4503
|
+
121.377348,
|
|
4504
|
+
53.324047
|
|
4505
|
+
],
|
|
4506
|
+
[
|
|
4507
|
+
123.454169,
|
|
4508
|
+
53.536539
|
|
4509
|
+
],
|
|
4510
|
+
[
|
|
4511
|
+
124.742151,
|
|
4512
|
+
53.145277
|
|
4513
|
+
],
|
|
4514
|
+
[
|
|
4515
|
+
125.801275,
|
|
4516
|
+
52.894911
|
|
4517
|
+
],
|
|
4518
|
+
[
|
|
4519
|
+
126.318372,
|
|
4520
|
+
52.332237
|
|
4521
|
+
],
|
|
4522
|
+
[
|
|
4523
|
+
126.871437,
|
|
4524
|
+
51.344172
|
|
4525
|
+
],
|
|
4526
|
+
[
|
|
4527
|
+
127.680238,
|
|
4528
|
+
49.693854
|
|
4529
|
+
],
|
|
4530
|
+
[
|
|
4531
|
+
129.750825,
|
|
4532
|
+
49.214848
|
|
4533
|
+
],
|
|
4534
|
+
[
|
|
4535
|
+
131.835618,
|
|
4536
|
+
47.67606
|
|
4537
|
+
],
|
|
4538
|
+
[
|
|
4539
|
+
134.131409,
|
|
4540
|
+
48.335466
|
|
4541
|
+
],
|
|
4542
|
+
[
|
|
4543
|
+
134.661344,
|
|
4544
|
+
47.899298
|
|
4545
|
+
],
|
|
4546
|
+
[
|
|
4547
|
+
134.141398,
|
|
4548
|
+
47.091504
|
|
4549
|
+
],
|
|
4550
|
+
[
|
|
4551
|
+
133.854501,
|
|
4552
|
+
46.207167
|
|
4553
|
+
],
|
|
4554
|
+
[
|
|
4555
|
+
133.479263,
|
|
4556
|
+
45.694204
|
|
4557
|
+
],
|
|
4558
|
+
[
|
|
4559
|
+
133.335969,
|
|
4560
|
+
45.558506
|
|
4561
|
+
],
|
|
4562
|
+
[
|
|
4563
|
+
133.201179,
|
|
4564
|
+
45.513549
|
|
4565
|
+
],
|
|
4566
|
+
[
|
|
4567
|
+
133.14563,
|
|
4568
|
+
45.407197
|
|
4569
|
+
],
|
|
4570
|
+
[
|
|
4571
|
+
133.108862,
|
|
4572
|
+
45.299488
|
|
4573
|
+
],
|
|
4574
|
+
[
|
|
4575
|
+
133.118577,
|
|
4576
|
+
45.223635
|
|
4577
|
+
],
|
|
4578
|
+
[
|
|
4579
|
+
133.139374,
|
|
4580
|
+
45.140375
|
|
4581
|
+
],
|
|
4582
|
+
[
|
|
4583
|
+
133.047802,
|
|
4584
|
+
45.074051
|
|
4585
|
+
],
|
|
4586
|
+
[
|
|
4587
|
+
132.98035,
|
|
4588
|
+
45.027061
|
|
4589
|
+
],
|
|
4590
|
+
[
|
|
4591
|
+
132.885386,
|
|
4592
|
+
45.050022
|
|
4593
|
+
],
|
|
4594
|
+
[
|
|
4595
|
+
131.821761,
|
|
4596
|
+
45.286547
|
|
4597
|
+
],
|
|
4598
|
+
[
|
|
4599
|
+
131.666157,
|
|
4600
|
+
45.186423
|
|
4601
|
+
],
|
|
4602
|
+
[
|
|
4603
|
+
131.634896,
|
|
4604
|
+
45.086127
|
|
4605
|
+
],
|
|
4606
|
+
[
|
|
4607
|
+
131.516843,
|
|
4608
|
+
45.01066
|
|
4609
|
+
],
|
|
4610
|
+
[
|
|
4611
|
+
131.433657,
|
|
4612
|
+
44.969994
|
|
4613
|
+
],
|
|
4614
|
+
[
|
|
4615
|
+
131.30964,
|
|
4616
|
+
44.945363
|
|
4617
|
+
],
|
|
4618
|
+
[
|
|
4619
|
+
131.196394,
|
|
4620
|
+
44.936051
|
|
4621
|
+
],
|
|
4622
|
+
[
|
|
4623
|
+
131.088924,
|
|
4624
|
+
44.918352
|
|
4625
|
+
],
|
|
4626
|
+
[
|
|
4627
|
+
131.009774,
|
|
4628
|
+
44.867761
|
|
4629
|
+
],
|
|
4630
|
+
[
|
|
4631
|
+
131.001474,
|
|
4632
|
+
44.822688
|
|
4633
|
+
],
|
|
4634
|
+
[
|
|
4635
|
+
131.068543,
|
|
4636
|
+
44.776215
|
|
4637
|
+
],
|
|
4638
|
+
[
|
|
4639
|
+
131.113969,
|
|
4640
|
+
44.701966
|
|
4641
|
+
],
|
|
4642
|
+
[
|
|
4643
|
+
131.226653,
|
|
4644
|
+
44.32782
|
|
4645
|
+
],
|
|
4646
|
+
[
|
|
4647
|
+
131.299841,
|
|
4648
|
+
44.082309
|
|
4649
|
+
],
|
|
4650
|
+
[
|
|
4651
|
+
131.244767,
|
|
4652
|
+
43.965231
|
|
4653
|
+
],
|
|
4654
|
+
[
|
|
4655
|
+
131.236322,
|
|
4656
|
+
43.859105
|
|
4657
|
+
],
|
|
4658
|
+
[
|
|
4659
|
+
131.218416,
|
|
4660
|
+
43.735163
|
|
4661
|
+
],
|
|
4662
|
+
[
|
|
4663
|
+
131.244792,
|
|
4664
|
+
43.600775
|
|
4665
|
+
],
|
|
4666
|
+
[
|
|
4667
|
+
131.22764,
|
|
4668
|
+
43.516604
|
|
4669
|
+
],
|
|
4670
|
+
[
|
|
4671
|
+
131.299078,
|
|
4672
|
+
43.446043
|
|
4673
|
+
],
|
|
4674
|
+
[
|
|
4675
|
+
131.277299,
|
|
4676
|
+
43.364086
|
|
4677
|
+
],
|
|
4678
|
+
[
|
|
4679
|
+
131.244194,
|
|
4680
|
+
43.26145
|
|
4681
|
+
],
|
|
4682
|
+
[
|
|
4683
|
+
131.209384,
|
|
4684
|
+
43.167874
|
|
4685
|
+
],
|
|
4686
|
+
[
|
|
4687
|
+
131.171747,
|
|
4688
|
+
43.06971
|
|
4689
|
+
],
|
|
4690
|
+
[
|
|
4691
|
+
131.107312,
|
|
4692
|
+
43.018119
|
|
4693
|
+
],
|
|
4694
|
+
[
|
|
4695
|
+
131.147602,
|
|
4696
|
+
42.968828
|
|
4697
|
+
],
|
|
4698
|
+
[
|
|
4699
|
+
131.082704,
|
|
4700
|
+
42.923031
|
|
4701
|
+
],
|
|
4702
|
+
[
|
|
4703
|
+
131.042517,
|
|
4704
|
+
42.874081
|
|
4705
|
+
],
|
|
4706
|
+
[
|
|
4707
|
+
130.939636,
|
|
4708
|
+
42.875503
|
|
4709
|
+
],
|
|
4710
|
+
[
|
|
4711
|
+
130.828255,
|
|
4712
|
+
42.882591
|
|
4713
|
+
],
|
|
4714
|
+
[
|
|
4715
|
+
130.729328,
|
|
4716
|
+
42.832937
|
|
4717
|
+
],
|
|
4718
|
+
[
|
|
4719
|
+
130.589394,
|
|
4720
|
+
42.816248
|
|
4721
|
+
],
|
|
4722
|
+
[
|
|
4723
|
+
130.487425,
|
|
4724
|
+
42.775189
|
|
4725
|
+
],
|
|
4726
|
+
[
|
|
4727
|
+
130.414629,
|
|
4728
|
+
42.718256
|
|
4729
|
+
],
|
|
4730
|
+
[
|
|
4731
|
+
130.516292,
|
|
4732
|
+
42.698041
|
|
4733
|
+
],
|
|
4734
|
+
[
|
|
4735
|
+
130.603538,
|
|
4736
|
+
42.644474
|
|
4737
|
+
],
|
|
4738
|
+
[
|
|
4739
|
+
130.616763,
|
|
4740
|
+
42.57076
|
|
4741
|
+
],
|
|
4742
|
+
[
|
|
4743
|
+
130.576431,
|
|
4744
|
+
42.499097
|
|
4745
|
+
],
|
|
4746
|
+
[
|
|
4747
|
+
130.627935,
|
|
4748
|
+
42.42872
|
|
4749
|
+
],
|
|
4750
|
+
[
|
|
4751
|
+
129.955711,
|
|
4752
|
+
42.998491
|
|
4753
|
+
],
|
|
4754
|
+
[
|
|
4755
|
+
129.759647,
|
|
4756
|
+
42.622362
|
|
4757
|
+
],
|
|
4758
|
+
[
|
|
4759
|
+
129.374176,
|
|
4760
|
+
42.424374
|
|
4761
|
+
],
|
|
4762
|
+
[
|
|
4763
|
+
129.222104,
|
|
4764
|
+
42.217951
|
|
4765
|
+
],
|
|
4766
|
+
[
|
|
4767
|
+
128.654411,
|
|
4768
|
+
42.030835
|
|
4769
|
+
],
|
|
4770
|
+
[
|
|
4771
|
+
128.124469,
|
|
4772
|
+
42.02136
|
|
4773
|
+
],
|
|
4774
|
+
[
|
|
4775
|
+
128.132575,
|
|
4776
|
+
41.783637
|
|
4777
|
+
],
|
|
4778
|
+
[
|
|
4779
|
+
128.164254,
|
|
4780
|
+
41.721631
|
|
4781
|
+
],
|
|
4782
|
+
[
|
|
4783
|
+
128.257805,
|
|
4784
|
+
41.67428
|
|
4785
|
+
],
|
|
4786
|
+
[
|
|
4787
|
+
128.286252,
|
|
4788
|
+
41.627057
|
|
4789
|
+
],
|
|
4790
|
+
[
|
|
4791
|
+
128.317485,
|
|
4792
|
+
41.592099
|
|
4793
|
+
],
|
|
4794
|
+
[
|
|
4795
|
+
128.268725,
|
|
4796
|
+
41.515996
|
|
4797
|
+
],
|
|
4798
|
+
[
|
|
4799
|
+
128.210082,
|
|
4800
|
+
41.414117
|
|
4801
|
+
],
|
|
4802
|
+
[
|
|
4803
|
+
128.083168,
|
|
4804
|
+
41.392912
|
|
4805
|
+
],
|
|
4806
|
+
[
|
|
4807
|
+
128.015652,
|
|
4808
|
+
41.42919
|
|
4809
|
+
],
|
|
4810
|
+
[
|
|
4811
|
+
127.911191,
|
|
4812
|
+
41.430006
|
|
4813
|
+
],
|
|
4814
|
+
[
|
|
4815
|
+
127.800482,
|
|
4816
|
+
41.423708
|
|
4817
|
+
],
|
|
4818
|
+
[
|
|
4819
|
+
127.656269,
|
|
4820
|
+
41.417726
|
|
4821
|
+
],
|
|
4822
|
+
[
|
|
4823
|
+
127.478761,
|
|
4824
|
+
41.474763
|
|
4825
|
+
],
|
|
4826
|
+
[
|
|
4827
|
+
127.32972,
|
|
4828
|
+
41.472449
|
|
4829
|
+
],
|
|
4830
|
+
[
|
|
4831
|
+
127.214172,
|
|
4832
|
+
41.529969
|
|
4833
|
+
],
|
|
4834
|
+
[
|
|
4835
|
+
127.180659,
|
|
4836
|
+
41.599146
|
|
4837
|
+
],
|
|
4838
|
+
[
|
|
4839
|
+
127.079883,
|
|
4840
|
+
41.694041
|
|
4841
|
+
],
|
|
4842
|
+
[
|
|
4843
|
+
126.937418,
|
|
4844
|
+
41.811868
|
|
4845
|
+
],
|
|
4846
|
+
[
|
|
4847
|
+
126.779087,
|
|
4848
|
+
41.700814
|
|
4849
|
+
],
|
|
4850
|
+
[
|
|
4851
|
+
126.625351,
|
|
4852
|
+
41.677409
|
|
4853
|
+
],
|
|
4854
|
+
[
|
|
4855
|
+
126.540357,
|
|
4856
|
+
41.508061
|
|
4857
|
+
],
|
|
4858
|
+
[
|
|
4859
|
+
126.519458,
|
|
4860
|
+
41.348596
|
|
4861
|
+
],
|
|
4862
|
+
[
|
|
4863
|
+
126.289851,
|
|
4864
|
+
41.183266
|
|
4865
|
+
],
|
|
4866
|
+
[
|
|
4867
|
+
126.0431,
|
|
4868
|
+
40.943182
|
|
4869
|
+
],
|
|
4870
|
+
[
|
|
4871
|
+
125.874989,
|
|
4872
|
+
40.908349
|
|
4873
|
+
],
|
|
4874
|
+
[
|
|
4875
|
+
125.578403,
|
|
4876
|
+
40.791802
|
|
4877
|
+
],
|
|
4878
|
+
[
|
|
4879
|
+
124.995845,
|
|
4880
|
+
40.477146
|
|
4881
|
+
],
|
|
4882
|
+
[
|
|
4883
|
+
124.697208,
|
|
4884
|
+
40.312753
|
|
4885
|
+
],
|
|
4886
|
+
[
|
|
4887
|
+
124.612879,
|
|
4888
|
+
40.284932
|
|
4889
|
+
],
|
|
4890
|
+
[
|
|
4891
|
+
124.579533,
|
|
4892
|
+
40.260931
|
|
4893
|
+
],
|
|
4894
|
+
[
|
|
4895
|
+
124.530494,
|
|
4896
|
+
40.231865
|
|
4897
|
+
],
|
|
4898
|
+
[
|
|
4899
|
+
124.50676,
|
|
4900
|
+
40.204386
|
|
4901
|
+
],
|
|
4902
|
+
[
|
|
4903
|
+
124.445293,
|
|
4904
|
+
40.163118
|
|
4905
|
+
],
|
|
4906
|
+
[
|
|
4907
|
+
124.360534,
|
|
4908
|
+
40.039812
|
|
4909
|
+
],
|
|
4910
|
+
[
|
|
4911
|
+
124.298568,
|
|
4912
|
+
39.96955
|
|
4913
|
+
],
|
|
4914
|
+
[
|
|
4915
|
+
124.223942,
|
|
4916
|
+
39.905642
|
|
4917
|
+
],
|
|
4918
|
+
[
|
|
4919
|
+
123.984623,
|
|
4920
|
+
33.407531
|
|
4921
|
+
],
|
|
4922
|
+
[
|
|
4923
|
+
123.729428,
|
|
4924
|
+
30.330603
|
|
4925
|
+
],
|
|
4926
|
+
[
|
|
4927
|
+
122.898128,
|
|
4928
|
+
24.531923
|
|
4929
|
+
],
|
|
4930
|
+
[
|
|
4931
|
+
122.58719,
|
|
4932
|
+
23.395406
|
|
4933
|
+
],
|
|
4934
|
+
[
|
|
4935
|
+
121.965315,
|
|
4936
|
+
21.614499
|
|
4937
|
+
],
|
|
4938
|
+
[
|
|
4939
|
+
121.156877,
|
|
4940
|
+
20.744706
|
|
4941
|
+
],
|
|
4942
|
+
[
|
|
4943
|
+
120.037502,
|
|
4944
|
+
18.931393
|
|
4945
|
+
],
|
|
4946
|
+
[
|
|
4947
|
+
119.415626,
|
|
4948
|
+
17.869266
|
|
4949
|
+
],
|
|
4950
|
+
[
|
|
4951
|
+
119.104688,
|
|
4952
|
+
15.905688
|
|
4953
|
+
],
|
|
4954
|
+
[
|
|
4955
|
+
119.104688,
|
|
4956
|
+
14.706078
|
|
4957
|
+
],
|
|
4958
|
+
[
|
|
4959
|
+
119.074712,
|
|
4960
|
+
11.892775
|
|
4961
|
+
],
|
|
4962
|
+
[
|
|
4963
|
+
118.445276,
|
|
4964
|
+
10.848763
|
|
4965
|
+
],
|
|
4966
|
+
[
|
|
4967
|
+
116.15903,
|
|
4968
|
+
8.105345
|
|
4969
|
+
],
|
|
4970
|
+
[
|
|
4971
|
+
115.455905,
|
|
4972
|
+
6.972663
|
|
4973
|
+
],
|
|
4974
|
+
[
|
|
4975
|
+
113.504273,
|
|
4976
|
+
5.646439
|
|
4977
|
+
],
|
|
4978
|
+
[
|
|
4979
|
+
112.848833,
|
|
4980
|
+
3.837665
|
|
4981
|
+
],
|
|
4982
|
+
[
|
|
4983
|
+
111.588373,
|
|
4984
|
+
3.535781
|
|
4985
|
+
],
|
|
4986
|
+
[
|
|
4987
|
+
108.311177,
|
|
4988
|
+
5.997547
|
|
4989
|
+
],
|
|
4990
|
+
[
|
|
4991
|
+
108.159922,
|
|
4992
|
+
7.149526
|
|
4993
|
+
],
|
|
4994
|
+
[
|
|
4995
|
+
110.62192,
|
|
4996
|
+
12.2567
|
|
4997
|
+
],
|
|
4998
|
+
[
|
|
4999
|
+
110.109868,
|
|
5000
|
+
14.800002
|
|
5001
|
+
],
|
|
5002
|
+
[
|
|
5003
|
+
109.318852,
|
|
5004
|
+
16.07078
|
|
5005
|
+
],
|
|
5006
|
+
[
|
|
5007
|
+
107.705911,
|
|
5008
|
+
18.528627
|
|
5009
|
+
],
|
|
5010
|
+
[
|
|
5011
|
+
108.109362,
|
|
5012
|
+
21.108139
|
|
5013
|
+
],
|
|
5014
|
+
[
|
|
5015
|
+
108.069339,
|
|
5016
|
+
21.500669
|
|
5017
|
+
]
|
|
5018
|
+
];
|
|
5019
|
+
const useAmapInChina = () => {
|
|
5020
|
+
const payload = useMapSupplier();
|
|
5021
|
+
const inChina = (point) => {
|
|
5022
|
+
if (payload.status !== Status.SUCCESS)
|
|
5023
|
+
return false;
|
|
5024
|
+
return AMap.GeometryUtil.isPointInRing(point, chinaBounds);
|
|
5025
|
+
};
|
|
5026
|
+
return { inChina };
|
|
5027
|
+
};
|
|
5028
|
+
const useGmapInChina = () => {
|
|
5029
|
+
const payload = useMapSupplier();
|
|
5030
|
+
const inChina = (point) => {
|
|
5031
|
+
if (payload.status !== Status.SUCCESS)
|
|
5032
|
+
return false;
|
|
5033
|
+
const chinaPolygon = new google.maps.Polygon({ paths: chinaBounds });
|
|
5034
|
+
return google.maps.geometry.poly.containsLocation(vec2lnglat(point), chinaPolygon);
|
|
5035
|
+
};
|
|
5036
|
+
return { inChina };
|
|
5037
|
+
};
|
|
5038
|
+
const useMapInChina = () => {
|
|
5039
|
+
const { supplier } = useMapSupplier();
|
|
5040
|
+
return supplier === "gmap" ? useGmapInChina() : useAmapInChina();
|
|
5041
|
+
};
|
|
3494
5042
|
const useUpdate = () => {
|
|
3495
5043
|
const idx = Vue.ref(0);
|
|
3496
5044
|
const update = () => {
|
|
@@ -3503,10 +5051,12 @@ const useAmapPlace = (props) => {
|
|
|
3503
5051
|
const defaultPoint = [...props.pointRef.value];
|
|
3504
5052
|
const pointRef = Vue.ref(defaultPoint);
|
|
3505
5053
|
const { readyPromise } = useMapSupplier();
|
|
5054
|
+
const { inChina } = useAmapInChina();
|
|
3506
5055
|
const place = Vue.reactive({
|
|
3507
5056
|
lng: pointRef.value[0],
|
|
3508
5057
|
lat: pointRef.value[1],
|
|
3509
|
-
name: ""
|
|
5058
|
+
name: "",
|
|
5059
|
+
displayName: ""
|
|
3510
5060
|
});
|
|
3511
5061
|
const { idx: placeKey, update } = useUpdate();
|
|
3512
5062
|
const updatePlace = (value) => {
|
|
@@ -3517,6 +5067,7 @@ const useAmapPlace = (props) => {
|
|
|
3517
5067
|
place.lng = value.lng;
|
|
3518
5068
|
place.lat = value.lat;
|
|
3519
5069
|
place.name = value.name;
|
|
5070
|
+
place.displayName = value.displayName;
|
|
3520
5071
|
};
|
|
3521
5072
|
Vue.watch(
|
|
3522
5073
|
() => [placeKey.value],
|
|
@@ -3524,23 +5075,30 @@ const useAmapPlace = (props) => {
|
|
|
3524
5075
|
await readyPromise;
|
|
3525
5076
|
const geocoder = new AMap.Geocoder({ lang: LANGUAGE });
|
|
3526
5077
|
const [lng, lat] = pointRef.value;
|
|
5078
|
+
const isChina = inChina([lng, lat]);
|
|
3527
5079
|
geocoder.getAddress(new AMap.LngLat(lng, lat), (status, result) => {
|
|
3528
5080
|
switch (status) {
|
|
3529
5081
|
case "complete": {
|
|
3530
|
-
const { formattedAddress } = result.regeocode;
|
|
5082
|
+
const { formattedAddress, addressComponent } = result.regeocode;
|
|
3531
5083
|
const name = formattedAddress ? formattedAddress : emptyPlaceName;
|
|
5084
|
+
const displayName = amapPlaceName2DisplayName(name, { isChina, ...addressComponent });
|
|
3532
5085
|
place.name = name;
|
|
5086
|
+
place.displayName = displayName;
|
|
3533
5087
|
place.lng = lng;
|
|
3534
5088
|
place.lat = lat;
|
|
3535
|
-
onChange == null ? void 0 : onChange({ lng, lat, name });
|
|
5089
|
+
onChange == null ? void 0 : onChange({ lng, lat, name, displayName });
|
|
3536
5090
|
return;
|
|
3537
5091
|
}
|
|
3538
|
-
case "no_data":
|
|
3539
|
-
|
|
5092
|
+
case "no_data": {
|
|
5093
|
+
const name = emptyPlaceName;
|
|
5094
|
+
const displayName = emptyPlaceName;
|
|
5095
|
+
place.name = name;
|
|
5096
|
+
place.displayName = displayName;
|
|
3540
5097
|
place.lng = lng;
|
|
3541
5098
|
place.lat = lat;
|
|
3542
|
-
onChange == null ? void 0 : onChange({ lng, lat, name
|
|
5099
|
+
onChange == null ? void 0 : onChange({ lng, lat, name, displayName });
|
|
3543
5100
|
return;
|
|
5101
|
+
}
|
|
3544
5102
|
case "error":
|
|
3545
5103
|
throw result;
|
|
3546
5104
|
}
|
|
@@ -3558,7 +5116,8 @@ const useGmapPlace = (props) => {
|
|
|
3558
5116
|
const place = Vue.reactive({
|
|
3559
5117
|
lng: pointRef.value[0],
|
|
3560
5118
|
lat: pointRef.value[1],
|
|
3561
|
-
name: ""
|
|
5119
|
+
name: "",
|
|
5120
|
+
displayName: ""
|
|
3562
5121
|
});
|
|
3563
5122
|
const updatePlace = (value) => {
|
|
3564
5123
|
pointRef.value = value;
|
|
@@ -3568,6 +5127,7 @@ const useGmapPlace = (props) => {
|
|
|
3568
5127
|
place.lng = value.lng;
|
|
3569
5128
|
place.lat = value.lat;
|
|
3570
5129
|
place.name = value.name;
|
|
5130
|
+
place.displayName = value.displayName;
|
|
3571
5131
|
};
|
|
3572
5132
|
Vue.watch(
|
|
3573
5133
|
() => placeKey.value,
|
|
@@ -3577,10 +5137,12 @@ const useGmapPlace = (props) => {
|
|
|
3577
5137
|
const [lng, lat] = pointRef.value;
|
|
3578
5138
|
const { results } = await geocoder.geocode({ language: LANGUAGE, location: { lng, lat } });
|
|
3579
5139
|
const name = results[0].formatted_address ? results[0].formatted_address : emptyPlaceName;
|
|
5140
|
+
const displayName = name;
|
|
3580
5141
|
place.lng = lng;
|
|
3581
5142
|
place.lat = lat;
|
|
3582
5143
|
place.name = name;
|
|
3583
|
-
|
|
5144
|
+
place.displayName = displayName;
|
|
5145
|
+
onChange == null ? void 0 : onChange({ lng, lat, name, displayName });
|
|
3584
5146
|
}
|
|
3585
5147
|
);
|
|
3586
5148
|
return { place, updatePlace, setPlace };
|
|
@@ -3632,7 +5194,8 @@ const useAmapRecomendPlace = (props) => {
|
|
|
3632
5194
|
);
|
|
3633
5195
|
});
|
|
3634
5196
|
const updatePlaceCandidates = async (place2) => {
|
|
3635
|
-
const
|
|
5197
|
+
const inputPlaceCandidates = await getRecomendPlace({ ...place2 }, context2);
|
|
5198
|
+
const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
|
|
3636
5199
|
availableRef.value = placeCandidates !== void 0;
|
|
3637
5200
|
placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
|
|
3638
5201
|
};
|
|
@@ -3640,7 +5203,8 @@ const useAmapRecomendPlace = (props) => {
|
|
|
3640
5203
|
() => recomendPlaceKey.value,
|
|
3641
5204
|
async () => {
|
|
3642
5205
|
await readyPromise;
|
|
3643
|
-
const
|
|
5206
|
+
const inputPlaceCandidates = await getRecomendPlace({ ...place }, context2);
|
|
5207
|
+
const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
|
|
3644
5208
|
if (placeCandidates === void 0) {
|
|
3645
5209
|
availableRef.value = false;
|
|
3646
5210
|
placeCandidatesRef.value = [];
|
|
@@ -3774,16 +5338,19 @@ const useMapZoom = (props) => {
|
|
|
3774
5338
|
const { supplier } = useMapSupplier();
|
|
3775
5339
|
return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
|
|
3776
5340
|
};
|
|
5341
|
+
const imgPassengerCircleArrow = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjAiIGhlaWdodD0iNjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxmaWx0ZXIgeD0iLTI4LjYlIiB5PSItMjguNiUiIHdpZHRoPSIxNTcuMSUiIGhlaWdodD0iMTU3LjElIiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giIGlkPSJwcmVmaXhfX2EiPjxmZU9mZnNldCBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMjc3NDUzMDE2IDAiIGluPSJzaGFkb3dCbHVyT3V0ZXIxIi8+PC9maWx0ZXI+PGNpcmNsZSBpZD0icHJlZml4X19iIiBjeD0iMzAiIGN5PSIzMCIgcj0iMTAuNSIvPjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxjaXJjbGUgc3Ryb2tlLW9wYWNpdHk9Ii4xIiBzdHJva2U9IiMwMDNERkYiIGZpbGwtb3BhY2l0eT0iLjE1IiBmaWxsPSIjNDg3M0ZFIiBjeD0iMzAiIGN5PSIzMCIgcj0iMjkuNSIvPjxwYXRoIGZpbGw9IiM0ODcxRjEiIGQ9Ik0zMCAxMC41NTdsNi4zNDIgMTIuNjg0SDIzLjY1OHoiLz48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNwcmVmaXhfX2EpIiB4bGluazpocmVmPSIjcHJlZml4X19iIi8+PGNpcmNsZSBzdHJva2U9IiNGRkYiIHN0cm9rZS13aWR0aD0iMyIgc3Ryb2tlLWxpbmVqb2luPSJzcXVhcmUiIGZpbGw9IiM0ODcxRjEiIGN4PSIzMCIgY3k9IjMwIiByPSI5Ii8+PC9nPjwvc3ZnPg==";
|
|
3777
5342
|
const imgPassengerCircle = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjEiIGhlaWdodD0iNjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxmaWx0ZXIgeD0iLTcuMSUiIHk9Ii03LjElIiB3aWR0aD0iMTE0LjMlIiBoZWlnaHQ9IjExNC4zJSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0icHJlZml4X19hIj48ZmVPZmZzZXQgaW49IlNvdXJjZUFscGhhIiByZXN1bHQ9InNoYWRvd09mZnNldE91dGVyMSIvPjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249Ii41IiBpbj0ic2hhZG93T2Zmc2V0T3V0ZXIxIiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb21wb3NpdGUgaW49InNoYWRvd0JsdXJPdXRlcjEiIGluMj0iU291cmNlQWxwaGEiIG9wZXJhdG9yPSJvdXQiIHJlc3VsdD0ic2hhZG93Qmx1ck91dGVyMSIvPjxmZUNvbG9yTWF0cml4IHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4yNzc0NTMwMTYgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48Y2lyY2xlIGlkPSJwcmVmaXhfX2IiIGN4PSIzMCIgY3k9IjMwIiByPSIxMC41Ii8+PC9kZWZzPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC40MDUgLjI2NCkiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PGNpcmNsZSBzdHJva2Utb3BhY2l0eT0iLjEiIHN0cm9rZT0iIzAwM0RGRiIgZmlsbC1vcGFjaXR5PSIuMTUiIGZpbGw9IiM0ODczRkUiIGN4PSIzMCIgY3k9IjMwIiByPSIyOS41Ii8+PHVzZSBmaWxsPSIjMDAwIiBmaWx0ZXI9InVybCgjcHJlZml4X19hKSIgeGxpbms6aHJlZj0iI3ByZWZpeF9fYiIvPjxjaXJjbGUgc3Ryb2tlPSIjRkZGIiBzdHJva2Utd2lkdGg9IjIuNCIgc3Ryb2tlLWxpbmVqb2luPSJzcXVhcmUiIGZpbGw9IiM0ODcxRjEiIGN4PSIzMCIgY3k9IjMwIiByPSI5LjMiLz48L2c+PC9zdmc+";
|
|
5343
|
+
const imgPassengerSmallArrow = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjkiIGhlaWdodD0iMzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxmaWx0ZXIgeD0iLTI4LjYlIiB5PSItMjguNiUiIHdpZHRoPSIxNTcuMSUiIGhlaWdodD0iMTU3LjElIiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giIGlkPSJwcmVmaXhfX2EiPjxmZU9mZnNldCBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMjQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48Y2lyY2xlIGlkPSJwcmVmaXhfX2IiIGN4PSIxMC41IiBjeT0iMTkuNSIgcj0iMTAuNSIvPjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGZpbGw9IiM0NDcxRkYiIGQ9Ik0xNC40ODEgMGw2LjYwMyAxMy4xODFINy44Nzl6Ii8+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNCkiPjx1c2UgZmlsbD0iIzAwMCIgZmlsdGVyPSJ1cmwoI3ByZWZpeF9fYSkiIHhsaW5rOmhyZWY9IiNwcmVmaXhfX2IiLz48Y2lyY2xlIHN0cm9rZT0iI0ZGRiIgc3Ryb2tlLXdpZHRoPSIyLjQiIHN0cm9rZS1saW5lam9pbj0ic3F1YXJlIiBmaWxsPSIjNDg3MUYxIiBjeD0iMTAuNSIgY3k9IjE5LjUiIHI9IjkuMyIvPjwvZz48L2c+PC9zdmc+";
|
|
3778
5344
|
const imgPassengerSmall = "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjgiIGhlaWdodD0iMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxmaWx0ZXIgeD0iLTMwJSIgeT0iLTMwJSIgd2lkdGg9IjE2MCUiIGhlaWdodD0iMTYwJSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0icHJlZml4X19hIj48ZmVPZmZzZXQgaW49IlNvdXJjZUFscGhhIiByZXN1bHQ9InNoYWRvd09mZnNldE91dGVyMSIvPjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiIGluPSJzaGFkb3dPZmZzZXRPdXRlcjEiIHJlc3VsdD0ic2hhZG93Qmx1ck91dGVyMSIvPjxmZUNvbXBvc2l0ZSBpbj0ic2hhZG93Qmx1ck91dGVyMSIgaW4yPSJTb3VyY2VBbHBoYSIgb3BlcmF0b3I9Im91dCIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29sb3JNYXRyaXggdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjI0IDAiIGluPSJzaGFkb3dCbHVyT3V0ZXIxIi8+PC9maWx0ZXI+PGNpcmNsZSBpZD0icHJlZml4X19iIiBjeD0iMTU3IiBjeT0iMzUyIiByPSIxMCIvPjwvZGVmcz48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTQzIC0zMzgpIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjx1c2UgZmlsbD0iIzAwMCIgZmlsdGVyPSJ1cmwoI3ByZWZpeF9fYSkiIHhsaW5rOmhyZWY9IiNwcmVmaXhfX2IiLz48Y2lyY2xlIHN0cm9rZT0iI0ZGRiIgc3Ryb2tlLXdpZHRoPSIyLjQiIHN0cm9rZS1saW5lam9pbj0ic3F1YXJlIiBmaWxsPSIjNDg3MUYxIiBjeD0iMTU3IiBjeT0iMzUyIiByPSI4LjgiLz48L2c+PC9zdmc+";
|
|
3779
5345
|
const PassengerCircle_css_ts_vanilla = "";
|
|
3780
5346
|
var passengerCircle = createRuntimeFn({ defaultClassName: "_1l6offo0", variantClassNames: { size: { small: "_1l6offo1", large: "_1l6offo2" } }, defaultVariants: {}, compoundVariants: [] });
|
|
3781
5347
|
const APassengerCircle = defineSetup(function APassengerCircle2(props) {
|
|
3782
5348
|
const contentRef = Vue.computed(() => {
|
|
3783
5349
|
const {
|
|
3784
|
-
size = "large"
|
|
5350
|
+
size = "large",
|
|
5351
|
+
angle
|
|
3785
5352
|
} = props;
|
|
3786
|
-
const src = size === "large" ? imgPassengerCircle : imgPassengerSmall;
|
|
5353
|
+
const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
|
|
3787
5354
|
return `
|
|
3788
5355
|
<img src="${src}" class="${passengerCircle({
|
|
3789
5356
|
size
|
|
@@ -3796,6 +5363,7 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
|
|
|
3796
5363
|
"position": props.position,
|
|
3797
5364
|
"content": contentRef.value,
|
|
3798
5365
|
"anchor": "bottom-center",
|
|
5366
|
+
"angle": props.angle,
|
|
3799
5367
|
"registerOverlay": props.registerOverlay,
|
|
3800
5368
|
"zIndex": ZINDEX_PASSENGER_LAYER
|
|
3801
5369
|
}
|
|
@@ -3805,14 +5373,17 @@ const APassengerCircle = defineSetup(function APassengerCircle2(props) {
|
|
|
3805
5373
|
const GPassengerCircle = defineSetup(function GPassengerCircle2(props) {
|
|
3806
5374
|
const contentRef = Vue.computed(() => {
|
|
3807
5375
|
const {
|
|
3808
|
-
size = "large"
|
|
5376
|
+
size = "large",
|
|
5377
|
+
angle
|
|
3809
5378
|
} = props;
|
|
3810
|
-
const src = size === "large" ? imgPassengerCircle : imgPassengerSmall;
|
|
5379
|
+
const src = size === "large" ? angle === void 0 ? imgPassengerCircle : imgPassengerCircleArrow : angle === void 0 ? imgPassengerSmall : imgPassengerSmallArrow;
|
|
5380
|
+
const style2 = angle === void 0 ? "" : `transform: rotate(${angle}deg)`;
|
|
3811
5381
|
return createDom("img", {
|
|
3812
5382
|
class: passengerCircle({
|
|
3813
5383
|
size
|
|
3814
5384
|
}),
|
|
3815
|
-
src
|
|
5385
|
+
src,
|
|
5386
|
+
style: style2
|
|
3816
5387
|
});
|
|
3817
5388
|
});
|
|
3818
5389
|
return () => Vue.h(GmapAdvancedMarkerView, {
|
|
@@ -3836,6 +5407,7 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
|
|
|
3836
5407
|
return () => {
|
|
3837
5408
|
const {
|
|
3838
5409
|
position,
|
|
5410
|
+
angle,
|
|
3839
5411
|
condition,
|
|
3840
5412
|
registerOverlay
|
|
3841
5413
|
} = props;
|
|
@@ -3851,6 +5423,7 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
|
|
|
3851
5423
|
return Vue.h("div", [Vue.h(PassengerCircle, {
|
|
3852
5424
|
"attrs": {
|
|
3853
5425
|
"position": position,
|
|
5426
|
+
"angle": angle,
|
|
3854
5427
|
"size": "small",
|
|
3855
5428
|
"registerOverlay": registerOverlay
|
|
3856
5429
|
}
|
|
@@ -4082,7 +5655,7 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
|
|
|
4082
5655
|
return () => {
|
|
4083
5656
|
return Vue.h("div", [props.places.map((place, idx) => {
|
|
4084
5657
|
const direction = directions.value[idx];
|
|
4085
|
-
const label2 = renderLabel ? renderLabel(place) : place.
|
|
5658
|
+
const label2 = renderLabel ? renderLabel(place) : place.displayName;
|
|
4086
5659
|
return Vue.h(PlaceCircle, {
|
|
4087
5660
|
"attrs": {
|
|
4088
5661
|
"position": place2point(place),
|
|
@@ -4145,7 +5718,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
|
|
|
4145
5718
|
const centerPlace = Vue.reactive({
|
|
4146
5719
|
lng: (_a = geoDefaultPosition == null ? void 0 : geoDefaultPosition[0]) != null ? _a : 0,
|
|
4147
5720
|
lat: (_b = geoDefaultPosition == null ? void 0 : geoDefaultPosition[1]) != null ? _b : 0,
|
|
4148
|
-
name: ""
|
|
5721
|
+
name: "",
|
|
5722
|
+
displayName: ""
|
|
4149
5723
|
});
|
|
4150
5724
|
const centerPoint = Vue.computed(() => [centerPlace.lng, centerPlace.lat]);
|
|
4151
5725
|
const centerSource = {
|
|
@@ -4161,6 +5735,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
|
|
|
4161
5735
|
centerPlace.lng = place.lng;
|
|
4162
5736
|
centerPlace.lat = place.lat;
|
|
4163
5737
|
centerPlace.name = place.name;
|
|
5738
|
+
centerPlace.displayName = place.displayName;
|
|
4164
5739
|
emit("changePlace", {
|
|
4165
5740
|
...place
|
|
4166
5741
|
});
|
|
@@ -4172,6 +5747,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
|
|
|
4172
5747
|
centerPlace.lng = place.lng;
|
|
4173
5748
|
centerPlace.lat = place.lat;
|
|
4174
5749
|
centerPlace.name = place.name;
|
|
5750
|
+
centerPlace.displayName = place.displayName;
|
|
4175
5751
|
};
|
|
4176
5752
|
const defaultCenterPlacePromise = new Promise((resolve) => {
|
|
4177
5753
|
getDefaultCenterPlace().then(resolve).catch(() => resolve(void 0));
|
|
@@ -4280,7 +5856,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
|
|
|
4280
5856
|
recomendDescription,
|
|
4281
5857
|
unavailableTitle
|
|
4282
5858
|
} = props;
|
|
4283
|
-
const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.
|
|
5859
|
+
const title = geoLoading.value ? geoLoadingTitle : !availableRef.value ? unavailableTitle : centerPlace.displayName;
|
|
4284
5860
|
const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
|
|
4285
5861
|
return Vue.h(HeycarMap, {
|
|
4286
5862
|
"attrs": {
|
|
@@ -4298,7 +5874,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
|
|
|
4298
5874
|
}), zoomRef.value >= RECOMMEND_PLACE_ZOOM_MIN && Vue.h(PickupPoints, {
|
|
4299
5875
|
"attrs": {
|
|
4300
5876
|
"places": placeCandidates.value,
|
|
4301
|
-
"renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.
|
|
5877
|
+
"renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.displayName
|
|
4302
5878
|
},
|
|
4303
5879
|
"on": {
|
|
4304
5880
|
"click": setCenterByPlace
|
|
@@ -4712,7 +6288,7 @@ const SectionDispatching = defineSetup(function SectionDispatching2(props) {
|
|
|
4712
6288
|
}), Vue.h(PlaceCircle, {
|
|
4713
6289
|
"attrs": {
|
|
4714
6290
|
"position": from,
|
|
4715
|
-
"label": fromPlace.
|
|
6291
|
+
"label": fromPlace.displayName,
|
|
4716
6292
|
"hideIcon": true
|
|
4717
6293
|
}
|
|
4718
6294
|
}), Vue.h(FitViewOnce, {
|
|
@@ -4731,6 +6307,7 @@ const SectionConfirmed = defineSetup(function SectionConfirmed2(props) {
|
|
|
4731
6307
|
from: fromPlace,
|
|
4732
6308
|
to: toPlace,
|
|
4733
6309
|
passengerPosition,
|
|
6310
|
+
passengerAngle,
|
|
4734
6311
|
registerOverlay
|
|
4735
6312
|
} = props;
|
|
4736
6313
|
const from = place2point(fromPlace);
|
|
@@ -4751,6 +6328,7 @@ const SectionConfirmed = defineSetup(function SectionConfirmed2(props) {
|
|
|
4751
6328
|
}), Vue.h(ConditionalFittablePassengerCircle, {
|
|
4752
6329
|
"attrs": {
|
|
4753
6330
|
"position": passengerPosition,
|
|
6331
|
+
"angle": passengerAngle,
|
|
4754
6332
|
"condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
|
|
4755
6333
|
"registerOverlay": registerOverlay
|
|
4756
6334
|
}
|
|
@@ -4769,13 +6347,13 @@ const SectionConfirmed = defineSetup(function SectionConfirmed2(props) {
|
|
|
4769
6347
|
}), Vue.h(PlaceCircle, {
|
|
4770
6348
|
"attrs": {
|
|
4771
6349
|
"position": from,
|
|
4772
|
-
"label": fromPlace.
|
|
6350
|
+
"label": fromPlace.displayName,
|
|
4773
6351
|
"hideIcon": true
|
|
4774
6352
|
}
|
|
4775
6353
|
}), Vue.h(PlaceCircle, {
|
|
4776
6354
|
"attrs": {
|
|
4777
6355
|
"position": to,
|
|
4778
|
-
"label": toPlace.
|
|
6356
|
+
"label": toPlace.displayName,
|
|
4779
6357
|
"hideIcon": true
|
|
4780
6358
|
}
|
|
4781
6359
|
}), Vue.h(FitViewOnce, {
|
|
@@ -4795,6 +6373,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
|
|
|
4795
6373
|
carPosition,
|
|
4796
6374
|
carAngle,
|
|
4797
6375
|
passengerPosition,
|
|
6376
|
+
passengerAngle,
|
|
4798
6377
|
renderTitle,
|
|
4799
6378
|
registerOverlay
|
|
4800
6379
|
} = props;
|
|
@@ -4804,6 +6383,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
|
|
|
4804
6383
|
return Vue.h("div", [Vue.h(ConditionalFittablePassengerCircle, {
|
|
4805
6384
|
"attrs": {
|
|
4806
6385
|
"position": passengerPosition,
|
|
6386
|
+
"angle": passengerAngle,
|
|
4807
6387
|
"condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
|
|
4808
6388
|
"registerOverlay": registerOverlay
|
|
4809
6389
|
}
|
|
@@ -4816,7 +6396,7 @@ const SectionDriverStartService = defineSetup(function SectionDriverStartService
|
|
|
4816
6396
|
}), Vue.h(PlaceCircle, {
|
|
4817
6397
|
"attrs": {
|
|
4818
6398
|
"position": from,
|
|
4819
|
-
"label": fromPlace.
|
|
6399
|
+
"label": fromPlace.displayName,
|
|
4820
6400
|
"hideIcon": true
|
|
4821
6401
|
}
|
|
4822
6402
|
}), !carPosition || !carDistance ? null : carDistance > CAR_DISTANCE_MIN ? Vue.h(DrivingRoute, {
|
|
@@ -4896,6 +6476,7 @@ const SectionBookDispatched = defineSetup(function SectionBookDispatched2(props)
|
|
|
4896
6476
|
from: fromPlace,
|
|
4897
6477
|
to: toPlace,
|
|
4898
6478
|
passengerPosition,
|
|
6479
|
+
passengerAngle,
|
|
4899
6480
|
registerOverlay
|
|
4900
6481
|
} = props;
|
|
4901
6482
|
const from = place2point(fromPlace);
|
|
@@ -4928,6 +6509,7 @@ const SectionBookDispatched = defineSetup(function SectionBookDispatched2(props)
|
|
|
4928
6509
|
}), Vue.h(ConditionalFittablePassengerCircle, {
|
|
4929
6510
|
"attrs": {
|
|
4930
6511
|
"position": passengerPosition,
|
|
6512
|
+
"angle": passengerAngle,
|
|
4931
6513
|
"condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
|
|
4932
6514
|
"registerOverlay": registerOverlay
|
|
4933
6515
|
}
|
|
@@ -4946,13 +6528,13 @@ const SectionBookDispatched = defineSetup(function SectionBookDispatched2(props)
|
|
|
4946
6528
|
}), Vue.h(PlaceCircle, {
|
|
4947
6529
|
"attrs": {
|
|
4948
6530
|
"position": from,
|
|
4949
|
-
"label": fromPlace.
|
|
6531
|
+
"label": fromPlace.displayName,
|
|
4950
6532
|
"hideIcon": true
|
|
4951
6533
|
}
|
|
4952
6534
|
}), Vue.h(PlaceCircle, {
|
|
4953
6535
|
"attrs": {
|
|
4954
6536
|
"position": to,
|
|
4955
|
-
"label": toPlace.
|
|
6537
|
+
"label": toPlace.displayName,
|
|
4956
6538
|
"hideIcon": true
|
|
4957
6539
|
}
|
|
4958
6540
|
}), Vue.h(FitViewOnce, {
|
|
@@ -4972,6 +6554,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
|
|
|
4972
6554
|
carPosition,
|
|
4973
6555
|
carAngle,
|
|
4974
6556
|
passengerPosition,
|
|
6557
|
+
passengerAngle,
|
|
4975
6558
|
title,
|
|
4976
6559
|
registerOverlay
|
|
4977
6560
|
} = props;
|
|
@@ -4992,6 +6575,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
|
|
|
4992
6575
|
}), Vue.h(ConditionalFittablePassengerCircle, {
|
|
4993
6576
|
"attrs": {
|
|
4994
6577
|
"position": passengerPosition,
|
|
6578
|
+
"angle": passengerAngle,
|
|
4995
6579
|
"condition": !!passengerDistance && passengerDistance < PASSENGER_DISTANCE_MAX,
|
|
4996
6580
|
"registerOverlay": registerOverlay
|
|
4997
6581
|
}
|
|
@@ -5016,7 +6600,7 @@ const SectionDriverArrived = defineSetup(function SectionDriverArrived2(props) {
|
|
|
5016
6600
|
}), Vue.h(PlaceCircle, {
|
|
5017
6601
|
"attrs": {
|
|
5018
6602
|
"position": from,
|
|
5019
|
-
"label": fromPlace.
|
|
6603
|
+
"label": fromPlace.displayName,
|
|
5020
6604
|
"hideIcon": true
|
|
5021
6605
|
}
|
|
5022
6606
|
}), Vue.h(FitViewOnce, {
|
|
@@ -5098,7 +6682,7 @@ const SectionInService = defineSetup(function SectionInService2(props) {
|
|
|
5098
6682
|
}), Vue.h(PlaceCircle, {
|
|
5099
6683
|
"attrs": {
|
|
5100
6684
|
"position": to,
|
|
5101
|
-
"label": toPlace.
|
|
6685
|
+
"label": toPlace.displayName,
|
|
5102
6686
|
"hideIcon": true
|
|
5103
6687
|
}
|
|
5104
6688
|
}), Vue.h(FitViewOnce, {
|
|
@@ -5132,13 +6716,13 @@ const SectionCanceled = defineSetup(function SectionCanceled2(props) {
|
|
|
5132
6716
|
}), Vue.h(PlaceCircle, {
|
|
5133
6717
|
"attrs": {
|
|
5134
6718
|
"position": from,
|
|
5135
|
-
"label": fromPlace.
|
|
6719
|
+
"label": fromPlace.displayName,
|
|
5136
6720
|
"hideIcon": true
|
|
5137
6721
|
}
|
|
5138
6722
|
}), Vue.h(PlaceCircle, {
|
|
5139
6723
|
"attrs": {
|
|
5140
6724
|
"position": to,
|
|
5141
|
-
"label": toPlace.
|
|
6725
|
+
"label": toPlace.displayName,
|
|
5142
6726
|
"hideIcon": true
|
|
5143
6727
|
}
|
|
5144
6728
|
}), Vue.h(FitViewOnce, {
|
|
@@ -5185,13 +6769,13 @@ const SectionEndService = defineSetup(function SectionEndService2(props) {
|
|
|
5185
6769
|
}), Vue.h(PlaceCircle, {
|
|
5186
6770
|
"attrs": {
|
|
5187
6771
|
"position": from,
|
|
5188
|
-
"label": fromPlace.
|
|
6772
|
+
"label": fromPlace.displayName,
|
|
5189
6773
|
"hideIcon": true
|
|
5190
6774
|
}
|
|
5191
6775
|
}), Vue.h(PlaceCircle, {
|
|
5192
6776
|
"attrs": {
|
|
5193
6777
|
"position": to,
|
|
5194
|
-
"label": toPlace.
|
|
6778
|
+
"label": toPlace.displayName,
|
|
5195
6779
|
"hideIcon": true
|
|
5196
6780
|
}
|
|
5197
6781
|
}), Vue.h(FitViewOnce, {
|
|
@@ -5242,6 +6826,24 @@ const BusinessTaxiEndMap = defineSetup(function BusinessTaxiEndMap2(props) {
|
|
|
5242
6826
|
})]);
|
|
5243
6827
|
};
|
|
5244
6828
|
});
|
|
6829
|
+
const DEVICE_ORIENTATION_INTERVAL = 100;
|
|
6830
|
+
const useDeviceOrientation = (props) => {
|
|
6831
|
+
const orientation = Vue.reactive({});
|
|
6832
|
+
const { onChange } = props != null ? props : {};
|
|
6833
|
+
Vue.watchEffect((onCleanup) => {
|
|
6834
|
+
const handleDeviceOrientation = throttle((event) => {
|
|
6835
|
+
var _a, _b, _c;
|
|
6836
|
+
const alpha = (_a = event.alpha) != null ? _a : void 0;
|
|
6837
|
+
const beta = (_b = event.beta) != null ? _b : void 0;
|
|
6838
|
+
const gamma = (_c = event.gamma) != null ? _c : void 0;
|
|
6839
|
+
Object.assign(orientation, { alpha, beta, gamma });
|
|
6840
|
+
onChange == null ? void 0 : onChange({ alpha, beta, gamma });
|
|
6841
|
+
}, DEVICE_ORIENTATION_INTERVAL);
|
|
6842
|
+
addEventListener("deviceorientation", handleDeviceOrientation);
|
|
6843
|
+
onCleanup(() => removeEventListener("deviceorientation", handleDeviceOrientation));
|
|
6844
|
+
});
|
|
6845
|
+
return { orientation };
|
|
6846
|
+
};
|
|
5245
6847
|
const STATUS_NEED_CAR_POSITION = ["book-driverStartService", "dispatched", "driverStartService", "inService", "driverArrived"];
|
|
5246
6848
|
const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap2(props) {
|
|
5247
6849
|
const {
|
|
@@ -5257,6 +6859,9 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5257
6859
|
geoPosition,
|
|
5258
6860
|
geoError
|
|
5259
6861
|
} = useGeoLocation();
|
|
6862
|
+
const {
|
|
6863
|
+
orientation
|
|
6864
|
+
} = useDeviceOrientation();
|
|
5260
6865
|
const carPositionRef = Vue.ref();
|
|
5261
6866
|
const carAngleRef = Vue.ref();
|
|
5262
6867
|
const {
|
|
@@ -5297,6 +6902,8 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5297
6902
|
const carAngle = carAngleRef.value;
|
|
5298
6903
|
const touchEnable = !["canceled", "canceling", "completed", "endService", "waitpay", "waitRechargePay", "refund", "rechargePayed", "payed"].includes(driverStatus);
|
|
5299
6904
|
const passengerPosition = geoError.value ? void 0 : geoPosition.value;
|
|
6905
|
+
const passengerAngle = orientation.alpha === void 0 ? void 0 : 360 - orientation.alpha;
|
|
6906
|
+
console.log("passengerAngle = ", passengerAngle);
|
|
5300
6907
|
return Vue.h(HeycarMap, {
|
|
5301
6908
|
"attrs": {
|
|
5302
6909
|
"center": place2point(from),
|
|
@@ -5324,6 +6931,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5324
6931
|
"from": from,
|
|
5325
6932
|
"to": to,
|
|
5326
6933
|
"passengerPosition": passengerPosition,
|
|
6934
|
+
"passengerAngle": passengerAngle,
|
|
5327
6935
|
"registerOverlay": registerOverlay
|
|
5328
6936
|
}
|
|
5329
6937
|
}) : driverStatus === "dispatched" || driverStatus === "driverStartService" || driverStatus === "book-driverStartService" ? Vue.h(SectionDriverStartService, {
|
|
@@ -5332,6 +6940,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5332
6940
|
"carPosition": carPosition,
|
|
5333
6941
|
"carAngle": carAngle,
|
|
5334
6942
|
"passengerPosition": passengerPosition,
|
|
6943
|
+
"passengerAngle": passengerAngle,
|
|
5335
6944
|
"renderTitle": renderStartSerivceTitle,
|
|
5336
6945
|
"registerOverlay": registerOverlay
|
|
5337
6946
|
}
|
|
@@ -5340,6 +6949,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5340
6949
|
"from": from,
|
|
5341
6950
|
"to": to,
|
|
5342
6951
|
"passengerPosition": passengerPosition,
|
|
6952
|
+
"passengerAngle": passengerAngle,
|
|
5343
6953
|
"registerOverlay": registerOverlay
|
|
5344
6954
|
}
|
|
5345
6955
|
}) : driverStatus === "inService" ? Vue.h(SectionInService, {
|
|
@@ -5356,6 +6966,7 @@ const BusinessTaxiServiceMap = defineLagecySetup(function BusinessTaxiServiceMap
|
|
|
5356
6966
|
"carPosition": carPosition,
|
|
5357
6967
|
"carAngle": carAngle,
|
|
5358
6968
|
"passengerPosition": passengerPosition,
|
|
6969
|
+
"passengerAngle": passengerAngle,
|
|
5359
6970
|
"title": driverArrivedTitle,
|
|
5360
6971
|
"registerOverlay": registerOverlay
|
|
5361
6972
|
}
|
|
@@ -5395,10 +7006,12 @@ const useBusinessRecomendPlaceMap = () => {
|
|
|
5395
7006
|
const centerPlace = Vue.reactive({
|
|
5396
7007
|
lng: 0,
|
|
5397
7008
|
lat: 0,
|
|
5398
|
-
name: ""
|
|
7009
|
+
name: "",
|
|
7010
|
+
displayName: ""
|
|
5399
7011
|
});
|
|
5400
7012
|
const placeCandidates = Vue.ref([]);
|
|
5401
7013
|
const { apiMapDistance } = useMapGeometry();
|
|
7014
|
+
const { inChina } = useMapInChina();
|
|
5402
7015
|
const panToGeoPositionByRecomend = (value) => mapContext.panToGeoPositionByRecomend(value);
|
|
5403
7016
|
const setCenterPlaceByUserSpecified = (value) => mapContext.setCenterPlaceByUserSpecified(value);
|
|
5404
7017
|
const mapContext = {
|
|
@@ -5421,7 +7034,8 @@ const useBusinessRecomendPlaceMap = () => {
|
|
|
5421
7034
|
placeCandidates,
|
|
5422
7035
|
panToGeoPositionByRecomend,
|
|
5423
7036
|
setCenterPlaceByUserSpecified,
|
|
5424
|
-
apiMapDistance
|
|
7037
|
+
apiMapDistance,
|
|
7038
|
+
apiMapInChina: inChina
|
|
5425
7039
|
};
|
|
5426
7040
|
};
|
|
5427
7041
|
const useBusinessTaxiServiceMap = () => {
|