From a6ff89dd8eed9ea4e6162ff5491d4583e4ef621a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 08 Aug 2019 14:34:17 +0800
Subject: [PATCH] AQI计算
---
src/main/webapp/view/uavTrajectory.jsp | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index 8ad31c3..c0ed2d9 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -134,11 +134,14 @@
],
{strokeColor: "green", strokeWeight: 2, 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,12 +150,12 @@
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);
@@ -168,11 +171,9 @@
}
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)});
- }
}
}
@@ -216,7 +217,16 @@
}
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",
--
Gitblit v1.8.0