|
|
@@ -294,6 +294,7 @@
|
|
|
}
|
|
|
}
|
|
|
function setmarker(data){
|
|
|
+ console.log(JSON.stringify(data))
|
|
|
for(var i = 0;i<data.length;i++){
|
|
|
if(data[i].equip_type == 2){
|
|
|
var iconurl = '../images/2.png';
|
|
|
@@ -318,15 +319,14 @@
|
|
|
//convert wgs84 to cj02
|
|
|
var cj02 = coordtransform.wgs84togcj02(data[i].lng, data[i].lat);//gps转火星定位
|
|
|
//convert cj02 to bd09
|
|
|
- var bd09 = coordtransform.gcj02tobd09(cj02[0], cj02[1]);//火星转百度定位
|
|
|
- var point = new plus.maps.Point(bd09[0], bd09[1]);
|
|
|
+ // var bd09 = coordtransform.gcj02tobd09(cj02[0], cj02[1]);//火星转百度定位
|
|
|
+ var point = new plus.maps.Point(cj02[0], cj02[1]);
|
|
|
}else if(data[i].gps == 2){
|
|
|
- var baidulnglat = coordtransform.gcj02tobd09(data[i].lng, data[i].lat) //火星转百度定位
|
|
|
- var point = new plus.maps.Point(baidulnglat[0], baidulnglat[1]);
|
|
|
+ // var baidulnglat = coordtransform.gcj02tobd09(data[i].lng, data[i].lat) //火星转百度定位
|
|
|
+ var point = new plus.maps.Point(data[i].lng, data[i].lat);
|
|
|
}
|
|
|
}else if(data[i].equip_type == 5){
|
|
|
- var bd09 = coordtransform.gcj02tobd09(data[i].lng, data[i].lat);//火星转百度定位
|
|
|
- var point = new plus.maps.Point(bd09[0], bd09[1]);
|
|
|
+ var point = new plus.maps.Point(data[i].lng, data[i].lat);
|
|
|
}else{
|
|
|
var point = new plus.maps.Point(data[i].lng, data[i].lat);
|
|
|
}
|
