潘钊 / bsth_control · Commits

Commit 8a883fe736c81c2777cc1a0782f40fd6d3159d9c

Authored by yiming
1 parent b28b06c8
build: skipped

线调电子围栏异常

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
  View file @8a883fe
@@ -64,7 +64,7 @@ var gb_map_baidu = (function(){ @@ -64,7 +64,7 @@ var gb_map_baidu = (function(){
64 for(var i=0,polyline;polyline=polylines[id][i++];){ 64 for(var i=0,polyline;polyline=polylines[id][i++];){
65 if(polyline.isVisible()){ 65 if(polyline.isVisible()){
66 if(checked) 66 if(checked)
67 - polyline.setStrokeOpacity(0.3); 67 + polyline.setStrokeOpacity(0.1);
68 else 68 else
69 polyline.setStrokeOpacity(0.6); 69 polyline.setStrokeOpacity(0.6);
70 } 70 }
@@ -167,7 +167,7 @@ var gb_map_baidu = (function(){ @@ -167,7 +167,7 @@ var gb_map_baidu = (function(){
167 167
168 //中心点 168 //中心点
169 var ts = this.gCenterPoint.split(' ') 169 var ts = this.gCenterPoint.split(' ')
170 - ,coord = TransGPS.wgsToBD(parseFloat(ts[1]), parseFloat(ts[0])); 170 + ,coord = CoordinateConverter.transformFromWGSToBaidu(CoordinateConverter.locationMake(parseFloat(ts[0]), parseFloat(ts[1])));
171 polygon._centerPoint = new BMap.Point(coord.lng, coord.lat); 171 polygon._centerPoint = new BMap.Point(coord.lng, coord.lat);
172 172
173 //info window 173 //info window
@@ -266,7 +266,7 @@ var gb_map_baidu = (function(){ @@ -266,7 +266,7 @@ var gb_map_baidu = (function(){
266 return; 266 return;
267 } 267 }
268 268
269 - var coord = TransGPS.wgsToBD(opt.lat, opt.lon); 269 + var coord = CoordinateConverter.transformFromWGSToBaidu(CoordinateConverter.locationMake(opt.lon, opt.lat));
270 var circle = new BMap.Circle(new BMap.Point(coord.lng, coord.lat), opt.radius); 270 var circle = new BMap.Circle(new BMap.Point(coord.lng, coord.lat), opt.radius);
271 circle.setStrokeColor(opt.color); 271 circle.setStrokeColor(opt.color);
272 circle.setStrokeWeight(opt.weight); 272 circle.setStrokeWeight(opt.weight);
@@ -282,7 +282,7 @@ var gb_map_baidu = (function(){ @@ -282,7 +282,7 @@ var gb_map_baidu = (function(){
282 //绘制多边形 282 //绘制多边形
283 drawPolygon: function(opt){ 283 drawPolygon: function(opt){
284 var station = opt.station 284 var station = opt.station
285 - ,code = station.stationCode; 285 + ,code = station.stationRouteId;
286 if(electronicFences[code]){ 286 if(electronicFences[code]){
287 electronicFences[code].show(); 287 electronicFences[code].show();
288 return; 288 return;
@@ -307,7 +307,7 @@ var gb_map_baidu = (function(){ @@ -307,7 +307,7 @@ var gb_map_baidu = (function(){
307 return; 307 return;
308 var bdPoints = [],coord; 308 var bdPoints = [],coord;
309 $.each(obj._gPoints, function () { 309 $.each(obj._gPoints, function () {
310 - coord = TransGPS.wgsToBD(this.lat, this.lng); 310 + coord = CoordinateConverter.transformFromWGSToBaidu(CoordinateConverter.locationMake(this.lng, this.lat));
311 bdPoints.push(new BMap.Point(coord.lng, coord.lat)); 311 bdPoints.push(new BMap.Point(coord.lng, coord.lat));
312 }); 312 });
313 313
@@ -315,7 +315,7 @@ var gb_map_baidu = (function(){ @@ -315,7 +315,7 @@ var gb_map_baidu = (function(){
315 } 315 }
316 316
317 function transCoord(gps) { 317 function transCoord(gps) {
318 - var coord = TransGPS.wgsToBD(gps.lat, gps.lon); 318 + var coord = CoordinateConverter.transformFromWGSToBaidu(CoordinateConverter.locationMake(gps.lon, gps.lat));
319 gps.bd_lat = coord.lat; 319 gps.bd_lat = coord.lat;
320 gps.bd_lon = coord.lng; 320 gps.bd_lon = coord.lng;
321 } 321 }