From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/view/uavtrajectory.jsp | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/view/uavtrajectory.jsp b/src/main/webapp/view/uavtrajectory.jsp
index 95a5809..c258a2e 100644
--- a/src/main/webapp/view/uavtrajectory.jsp
+++ b/src/main/webapp/view/uavtrajectory.jsp
@@ -271,7 +271,7 @@
var trackPoints = []; //���������������������������������������������������������������
var coincidentPoints = new Array();
var flyingParameters = ['e76', 'e77', 'e78', 'e79', 'e80', 'e81'];
- var monitorParameters = ['e1', 'e2', 'e10', 'e11', 'e16', 'e15', 'e17', 'e28', 'e7', 'e6', 'e82'];
+ var monitorParameters = ['e1', 'e2', 'e10', 'e11', 'e16', 'e15', 'e17', 'e28', 'e7', 'e6', 'e82', 'e40'];
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
if (typeof (value.e76) == "undefined") {
@@ -457,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