From 159270197844a589953f765c97c1d53376ca30af Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 17:06:03 +0800
Subject: [PATCH] 更新地图图标生成方式
---
gx_tieta/WebRoot/index.jsp | 20 ++-
gx_tieta/WebRoot/ele_statistics.jsp | 9 +
gx_tieta/WebRoot/pages/js/GPS.js | 222 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 241 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index a3bfb88..9367c0d 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -260,7 +260,7 @@
$('#pageCurr').val(1);
formjson = jsontemp;
}
- loading.showLoading();
+ var load = layer.load();
//console.info($("#search_form").serialize());
var temp = createSearchForm();
var json = JSON.stringify(temp);
@@ -268,7 +268,7 @@
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
//alert(123);
data=eval("("+data.result+")");
- //console.info(data);
+ console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
battinfo_list = data;
@@ -377,10 +377,11 @@
$('#pageCurr').val(1);
$('#maintence_infor').text('');
}
- loading.hideLoading();
+
+ layer.close(load);
}).error(function(){
noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
- loading.hideLoading();
+ layer.close(load);
});
});
});
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 7d2e767..0a5081b 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -369,6 +369,7 @@
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript" src="pages/js/pages/index-common.js"></script>
+ <script type="text/javascript" src="pages/js/GPS.js"></script>
<script type="text/javascript" src="js/panel.js"></script>
<script type="text/javascript" src="js/search.js"></script>
<script type="text/javascript" src="js/changePinYin.js"></script>
@@ -1986,6 +1987,8 @@
function getAddHomeInfo() {
var lng = $('.add-panel .lng').text(); // 鑾峰彇缁忓害
var lat = $('.add-panel .lat').text(); // 鑾峰彇绾害
+ var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
+
var addr = $('.add-panel .addr').text(); // 鑾峰彇鍦板潃
var homeName = $('.add-panel select option:selected').text(); // 鏈烘埧鍚嶇О
var homeId = $('.add-panel select option:selected').val(); // 鏈烘埧ID
@@ -1994,8 +1997,8 @@
StationId:homeId, //鏈烘埧缂栧彿
StationName:homeName, //鏈烘埧鍚嶇О
Address:addr, //鏈烘埧鐗╃悊淇℃伅
- longitude:lng, // 缁忓害
- latitude:lat, // 绾害
+ longitude: wgsPoint.lon, // 缁忓害
+ latitude: wgsPoint.lat, // 绾害
information:"", //澶囨敞
};
var json = JSON.stringify(temp);
@@ -2265,9 +2268,11 @@
// 鏍煎紡鍖栨煡璇㈢粨鏋�
function formatAllStation(list) {
var obj = new Object();
+ // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+ var point = GPS.wgs2bd(list.latitude, list.longitude);
// 鏋勯�犵粨鏋滈泦
- obj.lng = list.longitude;
- obj.lat = list.latitude;
+ obj.lng = point.lon;
+ obj.lat = point.lat;
obj.title = list.StationName;
obj.sId = list.StationId;
obj.fbsId = list.FBSDeviceId;
@@ -2326,9 +2331,12 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
+ console.log(list);
+ // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+ var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
- obj.lng = data.longitude;
- obj.lat = data.latitude;
+ obj.lng = point.lon;
+ obj.lat = point.lat;
obj.title = data.StationName;
obj.sId = data.StationId;
obj.fbsId = data.FBSDeviceId;
diff --git a/gx_tieta/WebRoot/pages/js/GPS.js b/gx_tieta/WebRoot/pages/js/GPS.js
new file mode 100644
index 0000000..7451a26
--- /dev/null
+++ b/gx_tieta/WebRoot/pages/js/GPS.js
@@ -0,0 +1,222 @@
+var GPS = {
+ PI : 3.14159265358979324,
+ x_pi : 3.14159265358979324 * 3000.0 / 180.0,
+ delta : function (lat, lon) {
+ // Krasovsky 1940
+ //
+ // a = 6378245.0, 1/f = 298.3
+ // b = a * (1 - f)
+ // ee = (a^2 - b^2) / a^2;
+ 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 BD-09
+ wgs2bd: function(lat, lon) {
+ var point = this.gcj_encrypt(lat, lon);
+ var bdPoint = this.bd_encrypt(point.lat, point.lon);
+ return bdPoint;
+ },
+
+ // BD-09 to WGS-84
+ bd2wgs: function(lat, lon) {
+ var point = this.bd_decrypt(lat, lon);
+ var wgsPoint = this.gcj_decrypt_exact(point.lat, point.lon);
+ return wgsPoint;
+ },
+
+ //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};
+ /*
+ if ((Math.abs(wgsLon) > 180 || Math.abs(wgsLat) > 90))
+ return null;
+ var x = 6378137.0 * wgsLon * 0.017453292519943295;
+ var a = wgsLat * 0.017453292519943295;
+ var y = 3189068.5 * Math.log((1.0 + Math.sin(a)) / (1.0 - Math.sin(a)));
+ 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};
+ /*
+ if (Math.abs(mercatorLon) < 180 && Math.abs(mercatorLat) < 90)
+ return null;
+ if ((Math.abs(mercatorLon) > 20037508.3427892) || (Math.abs(mercatorLat) > 20037508.3427892))
+ return null;
+ var a = mercatorLon / 6378137.0 * 57.295779513082323;
+ var x = a - (Math.floor(((a + 180.0) / 360.0)) * 360.0);
+ var y = (1.5707963267948966 - (2.0 * Math.atan(Math.exp((-1.0 * mercatorLat) / 6378137.0)))) * 57.295779513082323;
+ 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 pi = 3.14159265358979324;
+var a = 6378245.0;
+var ee = 0.00669342162296594323;
+var x_pi = pi*3000.0/180.0;
+
+//
+function convertorPoint(lat, lon) {
+
+
+
+ return gcj2bdR;
+}
+
+// 鑾峰彇鐧惧害鍦板浘鍧愭爣
+function gcj2bd(lat,lon) {
+ var x = lon, y = lat;
+ var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+ var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+ var bd_lon = z * Math.cos(theta) + 0.0065;
+ var bd_lat = z * Math.sin(theta) + 0.006;
+ var result = [];
+ result.push(bd_lat);
+ result.push(bd_lon);
+ return result;
+}
+
+function wgs2gcj(lat,lon) {
+ var dLat = transformLat(lon - 105.0, lat - 35.0);
+ var dLon = transformLon(lon - 105.0, lat - 35.0);
+ var radLat = lat / 180.0 * 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) * pi);
+ dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+ var mgLat = lat + dLat;
+ var mgLon = lon + dLon;
+ var result = [];
+ result.push(mgLat);
+ result.push(mgLon);
+ return result;
+}
+
+function transformLat(lat,lon) {
+ var ret = -100.0 + 2.0 * lat + 3.0 * lon + 0.2 * lon * lon + 0.1 * lat * lon + 0.2 * Math.sqrt(Math.abs(lat));
+ ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(lon * pi) + 40.0 * Math.sin(lon / 3.0 * pi)) * 2.0 / 3.0;
+ ret += (160.0 * Math.sin(lon / 12.0 * pi) + 320 * Math.sin(lon * pi / 30.0)) * 2.0 / 3.0;
+ return ret;
+}
+
+function transformLon(lat,lon) {
+ var ret = 300.0 + lat + 2.0 * lon + 0.1 * lat * lat + 0.1 * lat * lon + 0.1 * Math.sqrt(Math.abs(lat));
+ ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(lat * pi) + 40.0 * Math.sin(lat / 3.0 * pi)) * 2.0 / 3.0;
+ ret += (150.0 * Math.sin(lat / 12.0 * pi) + 300.0 * Math.sin(lat / 30.0 * pi)) * 2.0 / 3.0;
+ return ret;
+}
\ No newline at end of file
--
Gitblit v1.9.1