From 78ef097ed84dee4e69124b25c109a1562c960b57 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 20 Aug 2019 13:15:08 +0800
Subject: [PATCH] 修改速度表示及修改核辐射相关无人机最大值和最小值显示为空问题
---
src/main/webapp/view/uavTrajectory.jsp | 196 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 174 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/view/uavTrajectory.jsp b/src/main/webapp/view/uavTrajectory.jsp
index e110ffe..7f28e28 100644
--- a/src/main/webapp/view/uavTrajectory.jsp
+++ b/src/main/webapp/view/uavTrajectory.jsp
@@ -63,20 +63,18 @@
.BMap_bubble_title {
color: white;
- font-size: 13px;
- font-weight: bold;
- text-align: left;
- padding: 5px 5px 0 5px;
+ padding: 0 5px 0 5px;
background-color: #2DA0EB;
}
.BMap_bubble_content {
background-color: white;
- padding: 5px 5px 10px 5px;
+ padding: 5px;
}
- .BMap_pop img {
- top: 45px !important;
+ .BMap_pop > img {
+ top: 42px !important;
+ margin-left: -10px;
}
.BMap_pop div:nth-child(1) div {
@@ -120,6 +118,133 @@
minZoom: 12,
maxZoom: 20
};*/
+ var GPS = {
+ PI: 3.14159265358979324,
+ x_pi: 3.14159265358979324 * 3000.0 / 180.0,
+ delta: function (lat, lon) {
+ var a = 6378245.0; // a: ������������������������������������������������������������������
+ var ee = 0.00669342162296594323; // ee: ���������������������
+ var dLat = this.transformLat(lon - 105.0, lat - 35.0);
+ var dLon = this.transformLon(lon - 105.0, lat - 35.0);
+ var radLat = lat / 180.0 * this.PI;
+ var magic = Math.sin(radLat);
+ magic = 1 - ee * magic * magic;
+ var sqrtMagic = Math.sqrt(magic);
+ dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * this.PI);
+ dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * this.PI);
+ return {'lat': dLat, 'lon': dLon};
+ },
+
+ //WGS-84 to GCJ-02
+ gcj_encrypt: function (wgsLat, wgsLon) {
+ if (this.outOfChina(wgsLat, wgsLon))
+ return {'lat': wgsLat, 'lon': wgsLon};
+
+ var d = this.delta(wgsLat, wgsLon);
+ return {'lat': wgsLat + d.lat, 'lon': wgsLon + d.lon};
+ },
+ //GCJ-02 to WGS-84
+ gcj_decrypt: function (gcjLat, gcjLon) {
+ if (this.outOfChina(gcjLat, gcjLon))
+ return {'lat': gcjLat, 'lon': gcjLon};
+
+ var d = this.delta(gcjLat, gcjLon);
+ return {'lat': gcjLat - d.lat, 'lon': gcjLon - d.lon};
+ },
+ //GCJ-02 to WGS-84 exactly
+ gcj_decrypt_exact: function (gcjLat, gcjLon) {
+ var initDelta = 0.01;
+ var threshold = 0.000000001;
+ var dLat = initDelta, dLon = initDelta;
+ var mLat = gcjLat - dLat, mLon = gcjLon - dLon;
+ var pLat = gcjLat + dLat, pLon = gcjLon + dLon;
+ var wgsLat, wgsLon, i = 0;
+ while (1) {
+ wgsLat = (mLat + pLat) / 2;
+ wgsLon = (mLon + pLon) / 2;
+ var tmp = this.gcj_encrypt(wgsLat, wgsLon)
+ dLat = tmp.lat - gcjLat;
+ dLon = tmp.lon - gcjLon;
+ if ((Math.abs(dLat) < threshold) && (Math.abs(dLon) < threshold))
+ break;
+
+ if (dLat > 0) pLat = wgsLat; else mLat = wgsLat;
+ if (dLon > 0) pLon = wgsLon; else mLon = wgsLon;
+
+ if (++i > 10000) break;
+ }
+ //console.log(i);
+ return {'lat': wgsLat, 'lon': wgsLon};
+ },
+ //GCJ-02 to BD-09
+ bd_encrypt: function (gcjLat, gcjLon) {
+ var x = gcjLon, y = gcjLat;
+ var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.x_pi);
+ var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.x_pi);
+ bdLon = z * Math.cos(theta) + 0.0065;
+ bdLat = z * Math.sin(theta) + 0.006;
+ return {'lat': bdLat, 'lon': bdLon};
+ },
+ //BD-09 to GCJ-02
+ bd_decrypt: function (bdLat, bdLon) {
+ var x = bdLon - 0.0065, y = bdLat - 0.006;
+ var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * this.x_pi);
+ var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * this.x_pi);
+ var gcjLon = z * Math.cos(theta);
+ var gcjLat = z * Math.sin(theta);
+ return {'lat': gcjLat, 'lon': gcjLon};
+ },
+ //WGS-84 to Web mercator
+ //mercatorLat -> y mercatorLon -> x
+ mercator_encrypt: function (wgsLat, wgsLon) {
+ var x = wgsLon * 20037508.34 / 180.;
+ var y = Math.log(Math.tan((90. + wgsLat) * this.PI / 360.)) / (this.PI / 180.);
+ y = y * 20037508.34 / 180.;
+ return {'lat': y, 'lon': x};
+ },
+ // Web mercator to WGS-84
+ // mercatorLat -> y mercatorLon -> x
+ mercator_decrypt: function (mercatorLat, mercatorLon) {
+ var x = mercatorLon / 20037508.34 * 180.;
+ var y = mercatorLat / 20037508.34 * 180.;
+ y = 180 / this.PI * (2 * Math.atan(Math.exp(y * this.PI / 180.)) - this.PI / 2);
+ return {'lat': y, 'lon': x};
+ },
+ // two point's distance
+ distance: function (latA, lonA, latB, lonB) {
+ var earthR = 6371000.;
+ var x = Math.cos(latA * this.PI / 180.) * Math.cos(latB * this.PI / 180.) * Math.cos((lonA - lonB) * this.PI / 180);
+ var y = Math.sin(latA * this.PI / 180.) * Math.sin(latB * this.PI / 180.);
+ var s = x + y;
+ if (s > 1) s = 1;
+ if (s < -1) s = -1;
+ var alpha = Math.acos(s);
+ var distance = alpha * earthR;
+ return distance;
+ },
+ outOfChina: function (lat, lon) {
+ if (lon < 72.004 || lon > 137.8347)
+ return true;
+ if (lat < 0.8293 || lat > 55.8271)
+ return true;
+ return false;
+ },
+ transformLat: function (x, y) {
+ var ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+ ret += (20.0 * Math.sin(6.0 * x * this.PI) + 20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(y * this.PI) + 40.0 * Math.sin(y / 3.0 * this.PI)) * 2.0 / 3.0;
+ ret += (160.0 * Math.sin(y / 12.0 * this.PI) + 320 * Math.sin(y * this.PI / 30.0)) * 2.0 / 3.0;
+ return ret;
+ },
+ transformLon: function (x, y) {
+ var ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+ ret += (20.0 * Math.sin(6.0 * x * this.PI) + 20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(x * this.PI) + 40.0 * Math.sin(x / 3.0 * this.PI)) * 2.0 / 3.0;
+ ret += (150.0 * Math.sin(x / 12.0 * this.PI) + 300.0 * Math.sin(x / 30.0 * this.PI)) * 2.0 / 3.0;
+ return ret;
+ }
+ };
+
var mapStyle = {
features: ["road", "building", "water", "land"], // ������������������poi
style: "normal" // ������������������������������
@@ -144,14 +269,20 @@
}
var trackPoints = []; //���������������������������������������������������������������
var coincidentPoints = new Array();
- var flyingParameters = ['������', '������', '������', '������x', '������y', '������z'];
+ var flyingParameters = ['������', '������', '������', '������������', '������������', '������������'];
var monitorParameters = ['PM2.5', 'PM10', '������������', '������������', '������������', '������', 'VOCs������', '������', '������', '������', '���������'];
if (sensorInfo.length > 0) {
$.each(sensorInfo, function (item, value) {
if (typeof (value.������) == "undefined") {
showNoFlightTrajectory();
} else {
- trackPoints.push(new BMap.Point(value.������.substr(0, value.������.length - 1), value.������.substr(0, value.������.length - 1)));
+ var lon = parseFloat(value.������.substr(0, value.������.length - 1));
+ var lat = parseFloat(value.������.substr(0, value.������.length - 1));
+ var lon1 = GPS.gcj_encrypt(lat, lon).lon;
+ 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));
}
})
for (var i = 0; i < trackPoints.length; i++) {
@@ -241,13 +372,13 @@
'<div style="min-height:20px;overflow:auto;max-height:400px;" >';
var opts = {
width: 420,
- title: '<h4>���������' + sensorInfo[i].������ + '</h4>', // ������������������
+ title: '<h3>���������' + sensorInfo[i].������ + '</h3>', // ������������������
enableMessage: false, //���������������������������������
}
var optsCoincide = {
width: 220,
- title: '<h4>���������������������</h4>', // ������������������
+ title: '<h3>���������������������</h3>', // ������������������
enableMessage: false, //���������������������������������
}
@@ -272,17 +403,25 @@
if (coincidentPoints.indexOf(i) > -1) {
winfowText = winfowText + "</div>";
} else {
- winfowText += '<h4 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText += '<h3 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in monitorDataResult) {
if (monitorDataResult.hasOwnProperty(prop)) {
- monitorSensorsCount++;
+ for (var j = 0; j < monitorParameters.length; j++) {
+ if (prop == monitorParameters[j]) {
+ monitorSensorsCount = j;
+ }
+ }
winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + monitorDataResult[prop] + '<input id="a' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="aa' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="b' + i + monitorSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="bb' + i + monitorSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
- winfowText += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in flyingDataResult) {
if (flyingDataResult.hasOwnProperty(prop)) {
- flyingSensorsCount++;
+ for (var j = 0; j < flyingParameters.length; j++) {
+ if (prop == flyingParameters[j]) {
+ flyingSensorsCount = j;
+ }
+ }
winfowText += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + flyingDataResult[prop] + '<input id="c' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="cc' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="d' + i + flyingSensorsCount + '" class="' + i + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="dd' + i + flyingSensorsCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
@@ -297,7 +436,6 @@
}
marker.addEventListener("click", function () {
this.openInfoWindow(infoWindow);
- $(".BMap_pop img").css('margin-left', '-10px');
for (var i = 0; i < list.length; i++) {
$("#" + list[i]).css('color', 'blue');
}
@@ -308,31 +446,45 @@
if (list.indexOf(e.id) == -1) {
list.push(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 lona = parseFloat(sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.length - 1));
+ var lata = parseFloat(sensorInfo[e.id].������.substr(0, sensorInfo[e.id].������.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 monitorDataCoincide = monitorDataSort(sensorInfo[e.id], monitorData, monitorParameters);
var flyingDataCoincide = flyingDataSort(sensorInfo[e.id], flyingData, flyingParameters);
var winfowText1 =
'<div style="min-height:20px;overflow:auto;max-height:400px;" >';
- winfowText1 += '<h4 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText1 += '<h3 style="background-color: #CD5C5C;color:white;margin-bottom: 1px">������������������</h3>';
var monitorSensorsCoincideCount = -1;
var flyingSensorsCoincideCount = -1;
for (var prop in monitorDataCoincide) {
if (monitorDataCoincide.hasOwnProperty(prop)) {
- monitorSensorsCoincideCount++;
+ for (var j = 0; j < monitorParameters.length; j++) {
+ if (prop == monitorParameters[j]) {
+ monitorSensorsCoincideCount = j;
+ }
+ }
winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + monitorDataCoincide[prop] + '<input id="e' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMin,monitorDataMin,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="ee' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="f' + e.id + monitorSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showMonitorMinOrMax(this,sensorInfoMax,monitorDataMax,monitorParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="ff' + e.id + monitorSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
- winfowText1 += '<h4 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h4>';
+ winfowText1 += '<h3 style="background-color: #66CD00;color:white;margin-bottom: 1px">������������������</h3>';
for (var prop in flyingDataCoincide) {
if (flyingDataCoincide.hasOwnProperty(prop)) {
- flyingSensorsCoincideCount++;
+ for (var j = 0; j < flyingParameters.length; j++) {
+ if (prop == flyingParameters[j]) {
+ flyingSensorsCoincideCount = j;
+ }
+ }
winfowText1 += ("<p style='height: 22px;line-height: 22px'>" + prop + "���" + flyingDataCoincide[prop] + '<input id="g' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMin,flyingDataMin,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:120px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white "/><span id="gg' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:120px;text-align: center"></span><input id="h' + e.id + flyingSensorsCoincideCount + '" class="' + e.id + '" type="button" value="���������" onclick="showFlyingMinOrMax(this,sensorInfoMax,flyingDataMax,flyingParameters)" onmousemove="moveChangeColor(this)" onmouseout="outChangeColor(this)" style="width:80px;height:18px;margin-top:2px;display: inline-block;position: absolute;right:25px;border-width: 0px;border-radius: 3px; background:#7C73E9;cursor: pointer; outline: none;color:white"/><span id="hh' + e.id + flyingSensorsCoincideCount + '" style="width:80px;display: none;position: absolute;right:25px;text-align: center"></span>' + "</p>");
}
}
winfowText1 += "</div>";
var optsCoincideChild = {
width: 420,
- title: '<h4>���������' + sensorInfo[e.id].������ + '</h4>', // ������������������
+ title: '<h3>���������' + sensorInfo[e.id].������ + '</h3>', // ������������������
enableMessage: false, //���������������������������������
}
var infoWindow1 = new BMap.InfoWindow(winfowText1, optsCoincideChild);
--
Gitblit v1.8.0