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