From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/webapp/view/uavtrajectory.jsp | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/view/uavtrajectory.jsp b/src/main/webapp/view/uavtrajectory.jsp
index d02f958..c258a2e 100644
--- a/src/main/webapp/view/uavtrajectory.jsp
+++ b/src/main/webapp/view/uavtrajectory.jsp
@@ -283,9 +283,7 @@
var lat1 = GPS.gcj_encrypt(lat, lon).lat;
var lon2 = GPS.bd_encrypt(lat1, lon1).lon;
var lat2 = GPS.bd_encrypt(lat1, lon1).lat;
- if (lon2 > 0.1 && lat2 > 0.1) {
- trackPoints.push(new BMap.Point(lon2, lat2));
- }
+ trackPoints.push(new BMap.Point(lon2, lat2));
}
})
for (var i = 0; i < trackPoints.length; i++) {
@@ -459,13 +457,7 @@
if (list.indexOf(e.id) == -1) {
list.push(e.id);
}
- var lona = parseFloat(sensorInfo[e.id].e76.substr(0, sensorInfo[e.id].e76.length - 1));
- var lata = parseFloat(sensorInfo[e.id].e77.substr(0, sensorInfo[e.id].e77.length - 1));
- var lona1 = GPS.gcj_encrypt(lata, lona).lon;
- var lata1 = GPS.gcj_encrypt(lata, lona).lat;
- var lona2 = GPS.bd_encrypt(lata1, lona1).lon;
- var lata2 = GPS.bd_encrypt(lata1, lata1).lat;
- var point = new BMap.Point(lona2, lata2);
+ var point = trackPoints[e.id];
var monitorDataCoincide = monitorDataSort(sensorInfo[e.id], monitorData, monitorParameters);
var flyingDataCoincide = flyingDataSort(sensorInfo[e.id], flyingData, flyingParameters);
var winfowText1 =
--
Gitblit v1.8.0