From 0126003781a26848df94f2697df0d562d3ee6006 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 09 Aug 2019 17:26:34 +0800
Subject: [PATCH] 删除查询无人机因子接口
---
src/main/webapp/view/uavTrajectory.jsp | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 0d4dc41..2b36e91 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -85,7 +85,7 @@
var coincidentPoints = new Array();
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
- trackPoints.push(new BMap.Point(value.������, value.������));
+ trackPoints.push(new BMap.Point(value.������.substr(0,value.������.length-1), value.������.substr(0,value.������.length-1)));
})
for (var i = 0; i < trackPoints.length; i++) {
var startPoint = trackPoints[i];
@@ -132,13 +132,16 @@
startPoint,
endPoint
],
- {strokeColor: "green", strokeWeight: 2, strokeOpacity: 1}
+ {strokeColor: "#5298FF", strokeWeight: 5, strokeOpacity: 1}
);
- if (i < trackPoints.length - 1) {
+ if (i < trackPoints.length - 1 && trackPoints.length > 1) {
map.addOverlay(polyline);// ���������������
- if (i != 0) {
- addArrow(polyline, arrowLength, Math.PI / 7);
+ if (i == 0) {
+ map.centerAndZoom(startPoint, 17);
}
+ addArrow(polyline, arrowLength, Math.PI / 7);
+ } else if (trackPoints.length == 1) {
+ map.centerAndZoom(trackPoints[0], 17);
}
if (coincidentPoints.indexOf(i) > -1) {
//������������������������������������������������������������������
@@ -147,18 +150,19 @@
var startIcon = new BMap.Icon("/img/start.png", new BMap.Size(48, 48));
var endIcon = new BMap.Icon("/img/end.png", new BMap.Size(48, 48));
- if (i == 0) {
- map.centerAndZoom(startPoint, 17);
- marker = new BMap.Marker(startPoint, {icon: startIcon, offset: new BMap.Size(0, -20)});
- }
+ var aggregationIcon = new BMap.Icon("/img/aggregation.png", new BMap.Size(48, 48));
if (i == trackPoints.length - 1) {
marker = new BMap.Marker(startPoint, {icon: endIcon, offset: new BMap.Size(0, -20)});
+ }
+ if (i == 0) {
+ marker = new BMap.Marker(startPoint, {icon: startIcon, offset: new BMap.Size(0, -20)});
}
if (i != 0 && i != trackPoints.length - 1) {
marker = new BMap.Marker(startPoint);
}
var count = 0;
- var winfowText = "";
+ var winfowText =
+ '<div style="min-height:20px;overflow-y:auto;max-height:400px;" >';
for (var j = i + 1; j < trackPoints.length; j++) {
distance = map.getDistance(trackPoints[i], trackPoints[j]).toFixed(5);
if (distance <= 1.9) {
@@ -167,24 +171,22 @@
}
coincidentPoints.push(j);
count++;
+ marker = new BMap.Marker(startPoint, {icon: aggregationIcon});
winfowTextAdd = '<p id="' + j + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[j].������ + "</p>";
winfowText += winfowTextAdd;
- if (j == trackPoints.length - 1) {
- marker = new BMap.Marker(trackPoints[j], {icon: endIcon, offset: new BMap.Size(0, -20)});
- }
}
}
if (coincidentPoints.indexOf(i) > -1) {
- winfowText = '<p id="' + i + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[i].������ + "</p>" + winfowText;
+ winfowText = '<p id="' + i + '" onclick="openInfo(this)" onmousemove="red(this.id)" onmouseout="black(this.id)">' + "���������" + sensorInfo[i].������ + "</p>" + winfowText + "</div>";
} else {
- for(var prop in sensorInfo[i]){
+ for (var prop in sensorInfo[i]) {
if (sensorInfo[i].hasOwnProperty(prop)) {
- winfowText+=(prop+"���"+sensorInfo[i][prop]+"</br>");
+ winfowText += (prop + "���" + sensorInfo[i][prop] + "</br>");
}
}
+ winfowText += "</div>";
}
-
(function (x) {
var infoWindow = new BMap.InfoWindow(winfowText, {enableMessage: false});
marker.addEventListener("click", function () {
@@ -193,11 +195,11 @@
})(i);
function openInfo(e) {
- var point = new BMap.Point(sensorInfo[e.id].������, sensorInfo[e.id].������);
- var winfowText1="";
- for(var prop in sensorInfo[e.id]){
+ var point = new BMap.Point(sensorInfo[e.id].������.substr(0,sensorInfo[e.id].������.length-1), sensorInfo[e.id].������.substr(0,sensorInfo[e.id].������.length-1));
+ var winfowText1 = "";
+ for (var prop in sensorInfo[e.id]) {
if (sensorInfo[e.id].hasOwnProperty(prop)) {
- winfowText1+=(prop+"���"+sensorInfo[e.id][prop]+"</br>");
+ winfowText1 += (prop + "���" + sensorInfo[e.id][prop] + "</br>");
}
}
var infoWindow1 = new BMap.InfoWindow(winfowText1, {enableMessage: false});
@@ -205,19 +207,26 @@
map.openInfoWindow(infoWindow1, point);
}
- function red(x)
- {
- document.getElementById(x).style.color="#FF1111";
- document.getElementById(x).style.cursor="pointer";
+ function red(x) {
+ document.getElementById(x).style.color = "#FF1111";
+ document.getElementById(x).style.cursor = "pointer";
}
- function black(x)
- {
- document.getElementById(x).style.color="#000000";
+ function black(x) {
+ document.getElementById(x).style.color = "#000000";
}
if (count > 0) {
- var lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7, -23)});
+ var lab;
+ if (count > 0 && count <= 8) {
+ lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-5, -9)});
+ } else if (count > 8 && count <= 98) {
+ lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-10, -9)});
+ } else if (count > 98 && count <= 998) {
+ lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-14, -9)});
+ } else {
+ lab = new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-18, -9)});
+ }
lab.setStyle({
color: "#fff",
fontSize: "16px",
@@ -276,7 +285,7 @@
var pointArrow1 = map.pixelToPoint(new BMap.Pixel(pixelX1, pixelY1));
var pointMiddle = map.pixelToPoint(new BMap.Pixel(poMiddleX, poMiddleY));
var Arrow = new BMap.Polyline([pointArrow, pointMiddle, pointArrow1],
- {strokeColor: "green", strokeWeight: 2, strokeOpacity: 1});
+ {strokeColor: "#5298FF", strokeWeight: 5, strokeOpacity: 1});
map.addOverlay(Arrow);
}
};
--
Gitblit v1.8.0