From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/webapp/view/uavtrajectory.jsp | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/view/uavtrajectory.jsp b/src/main/webapp/view/uavtrajectory.jsp
index d02f958..c25c5bb 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++) {
--
Gitblit v1.8.0