From 90f46db2793f5b242f13bf6959ab6c7f5a596c43 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 31 Mar 2020 13:50:04 +0800
Subject: [PATCH] 无人机和当天AQI分钟表改表

---
 src/main/webapp/view/uavtrajectory.jsp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/view/uavtrajectory.jsp b/src/main/webapp/view/uavtrajectory.jsp
index 95a5809..d02f958 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") {
@@ -283,7 +283,9 @@
                 var lat1 = GPS.gcj_encrypt(lat, lon).lat;
                 var lon2 = GPS.bd_encrypt(lat1, lon1).lon;
                 var lat2 = GPS.bd_encrypt(lat1, lon1).lat;
-                trackPoints.push(new BMap.Point(lon2, lat2));
+                if (lon2 > 0.1 && lat2 > 0.1) {
+                    trackPoints.push(new BMap.Point(lon2, lat2));
+                }
             }
         })
         for (var i = 0; i < trackPoints.length; i++) {

--
Gitblit v1.8.0