From b86f0064a3ad535a7d34961711ac187808f0e46c Mon Sep 17 00:00:00 2001 From: qkr7828 Date: Wed, 17 Jan 2024 13:19:26 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20DMS=20=EC=9C=A0=ED=8B=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/palnet/comn/utils/DmsUtils.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/comn/utils/DmsUtils.java b/pav-server/src/main/java/com/palnet/comn/utils/DmsUtils.java index a223a1e5..bda905e4 100644 --- a/pav-server/src/main/java/com/palnet/comn/utils/DmsUtils.java +++ b/pav-server/src/main/java/com/palnet/comn/utils/DmsUtils.java @@ -100,18 +100,17 @@ public class DmsUtils { } public static String convertDDtoDMS(Coordinate DD) { - - double latitude = DD.x; - double longitude = DD.y; - - char latitudeDirection = (latitude >= 0) ? 'N' : 'S'; + double latitude = DD.x; + double longitude = DD.y; + + char latitudeDirection = (latitude >= 0) ? 'N' : 'S'; char longitudeDirection = (longitude >= 0) ? 'E' : 'W'; latitude = Math.abs(latitude); longitude = Math.abs(longitude); - int latitudeDegrees = (int) Math.round(latitude); - int longitudeDegrees = (int) Math.round(longitude); + int latitudeDegrees = (int) Math.floor(latitude); + int longitudeDegrees = (int) Math.floor(longitude); double latitudeMinutes = (latitude - latitudeDegrees) * 60; double longitudeMinutes = (longitude - longitudeDegrees) * 60; @@ -119,10 +118,12 @@ public class DmsUtils { int latitudeSeconds = (int) ((latitudeMinutes - (int) latitudeMinutes) * 60); int longitudeSeconds = (int) ((longitudeMinutes - (int) longitudeMinutes) * 60); - String result = String.format("%d° %02d′ %02d″ %c %d° %02d′ %02d″ %c\n", latitudeDegrees, (int) latitudeMinutes, latitudeSeconds, latitudeDirection, longitudeDegrees, (int) longitudeMinutes, longitudeSeconds, longitudeDirection); - - return result; - } + String result = String.format("%d° %02d′ %02d″ %c, %d° %02d′ %02d″ %c", + latitudeDegrees, (int) latitudeMinutes, latitudeSeconds, latitudeDirection, + longitudeDegrees, (int) longitudeMinutes, longitudeSeconds, longitudeDirection); + + return result; + } public static String convertDMMtoDD(String DMM) {