From 75aeb4e63339b60f9559af984c7d9f87a7cba24a Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 09 五月 2024 17:40:47 +0800
Subject: [PATCH] 轨迹动画和任务管理
---
src/utils/map/animation.js | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/utils/map/animation.js b/src/utils/map/animation.js
index 551b3bb..05c8ba7 100644
--- a/src/utils/map/animation.js
+++ b/src/utils/map/animation.js
@@ -2,13 +2,16 @@
import calculate from '@/utils/map/calculate';
import Layer from '@/utils/map/3dLayer';
import sector from '@/utils/map/sector';
-import map from '@/utils/map/index_old';
+import { map } from '@/utils/map/index_old';
+import util from '@/utils/map/util';
+import car_driving from '@/assets/mipmap/car_driving.png';
+import boat_driving from '@/assets/mipmap/boat_driving.png';
function MapAnimation() {
// 闈炶繛缁潗鏍囩偣鏈�澶ц窛绂�(绫�)
this.maxD = 500;
// 褰撳墠缁樺埗鐨勭洃娴嬪洜瀛愮被鍨�
- this.factorType = 0;
+ this.factorType;
this.factorDatas;
// 杞藉叿绫诲瀷
this.vehicleType = 0; // 0: 杞﹁締锛�1锛氭棤浜烘満锛�2锛氭棤浜鸿埞
@@ -113,7 +116,7 @@
var fData2 = factorDatas.getByIndex(i + 1, i + 2);
// 璁＄畻鍔ㄧ敾杞ㄨ抗
- for (let i = 0; i < count - 1; i++) {
+ for (let i = 0; i < count; i++) {
// path
var length = d * (i + 1);
if (isNaN(angle)) {
@@ -146,26 +149,16 @@
animationData,
function (data, index, count) {
var length = data.length();
- var start = length - count + 1;
+ var start = length - count;
// 1.鑾峰彇鏁版嵁
var d = data.getByIndex(0, start + index + 1);
- var f = d.factor[that.factorType + 1 + ''];
+ var f = d.factor[that.factorType];
// 2.缁樺埗鍥惧舰
if (length > count || index > 0) {
// 3d鍥惧舰
- // var lnglat = d.lnglats_GD[d.lnglats_GD.length - 1];
Layer.drawMesh(d, f);
- // MapUtil.drawLine(lnglat)
-
// 椋庡悜椋庨��
- sector.drawSector(d, start + index);
- // if (d.factor['17'] != undefined && d.factor['16'] != undefined) {
- // var windDir = d.factor['17'].datas;
- // windDir = windDir[windDir.length - 1].factorData;
- // var windSpeed = d.factor['16'].datas;
- // windSpeed = windSpeed[windSpeed.length - 1].factorData;
- // MapUtil.drawSector4(lnglat, windDir, windSpeed);
- // }
+ sector.drawSectorAna(d, start + index);
}
var pos = d.lnglats_GD[d.lnglats_GD.length - 1];
@@ -264,16 +257,16 @@
var url;
switch (this.vehicleType) {
case 0:
- url = './asset/mipmap/car_driving.png';
+ url = car_driving;
break;
case 1:
- url = './asset/mipmap/car_driving.png';
+ url = car_driving;
break;
case 2:
- url = './asset/mipmap/boat_driving.png';
+ url = boat_driving;
break;
default:
- url = './asset/mipmap/car_driving.png';
+ url = car_driving;
break;
}
// var url = "./asset/mipmap/car_offline.png";
@@ -292,26 +285,33 @@
// break;
// }
+ // eslint-disable-next-line no-undef
var icon = new AMap.Icon({
+ // eslint-disable-next-line no-undef
size: new AMap.Size(60, 30),
+ // eslint-disable-next-line no-undef
imageSize: new AMap.Size(54, 21),
image: url
// imageOffset: new AMap.Pixel(-16, -16) // 鐩稿浜庡熀鐐圭殑鍋忕Щ浣嶇疆
});
+ // eslint-disable-next-line no-undef
var car = new AMap.Marker({
icon: icon,
position: lnglat, // 鍩虹偣浣嶇疆
+ // eslint-disable-next-line no-undef
offset: new AMap.Pixel(-20, -15) // 鐩稿浜庡熀鐐圭殑鍋忕Щ浣嶇疆
});
- MapUtil._map.add(car);
+ map.add(car);
this.moveViews['car'] = car;
// 鏃堕棿
+ // eslint-disable-next-line no-undef
var text = new AMap.Text({
text: time,
position: lnglat,
+ // eslint-disable-next-line no-undef
offset: new AMap.Pixel(5, 20),
style: {
'font-size': '13px',
@@ -324,10 +324,10 @@
padding: '0 4px'
}
});
- MapUtil._map.add(text);
+ map.add(text);
this.moveViews['text'] = text;
} else {
- MapUtil.setCenter(lnglat);
+ util.setCenter(lnglat);
this.moveViews['car'].setPosition(lnglat);
this.moveViews['text'].setPosition(lnglat);
this.moveViews['text'].setText(time);
--
Gitblit v1.9.3