diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java index 838c1124..a0d5b09c 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/bd/Gga.java @@ -119,8 +119,8 @@ public class Gga { if(params.length == 11){ Gga gga = new Gga(); try { - gga.setLatitude(Double.parseDouble(params[2])); - gga.setLongitude(Double.parseDouble(params[4])); + gga.setLatitude(transGGAPos(Double.parseDouble(params[2]))); + gga.setLongitude(transGGAPos(Double.parseDouble(params[4]))); gga.setAltitude(Double.parseDouble(params[9])); gga.setQuality(Integer.parseInt(params[6])); gga.setSatellitesInUsed(Integer.parseInt(params[7])); @@ -135,6 +135,11 @@ public class Gga { return null; } + static double transGGAPos(double pos){ + int degree = (int) (pos/100); + return degree + (pos-degree*100)/60; + } + public Gga(double latitude, double longitude) { this.latitude = latitude; this.longitude = longitude; diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html index 7af84ae0..22979d17 100644 --- a/sec-beidou/src/main/resources/templates/page/device_overview.html +++ b/sec-beidou/src/main/resources/templates/page/device_overview.html @@ -86,11 +86,17 @@ [ [# th:each="device : ${deviceList}"] {deviceid:[[${device.deviceid}]], - latitude:[[${device.latitude}]]/100, - longitude:[[${device.longitude}]]/100}, + latitude:[[${device.latitude}]], + longitude:[[${device.longitude}]]}, [/] ]; //console.log(deviceList); + /*var i=0; + for(; i0) map.setCenter(point);*/ translateCallback = function (data){ if(data.status === 0) {