Changeset 5474 in josm for trunk

Timestamp:

2012-08-23T23:37:57+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7994 - WGS84-DMS-ordinates are shown as 01'60,0" instead of 02'00,0"

File:

• trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -100 +100 @@
     /**
      * Replies the coordinate in degrees/minutes/seconds format
+     * @param pCoordinate The coordinate to convert
+     * @return The coordinate in degrees/minutes/seconds format
      */
     public static String dms(double pCoordinate) {
@@ -108 +110 @@
         int tMinutes = (int) tTmpMinutes;
         double tSeconds = (tTmpMinutes - tMinutes) * 60;
-
-        return tDegree + "\u00B0" + cDmsMinuteFormatter.format(tMinutes) + "\'"
-        + cDmsSecondFormatter.format(tSeconds) + "\"";
-    }
-
+        
+        String sDegrees = Integer.toString(tDegree);
+        String sMinutes = cDmsMinuteFormatter.format(tMinutes);
+        String sSeconds = cDmsSecondFormatter.format(tSeconds);
+        
+        if (sSeconds.equals("60.0")) {
+            sSeconds = "00.0";
+            sMinutes = cDmsMinuteFormatter.format(tMinutes+1);
+        }
+        if (sMinutes.equals("60")) {
+            sMinutes = "00";
+            sDegrees = Integer.toString(tDegree+1);
+        }
+
+        return sDegrees + "\u00B0" + sMinutes + "\'" + sSeconds + "\"";
+    }
+
+    /**
+     * Replies the coordinate in degrees/minutes format
+     * @param pCoordinate The coordinate to convert
+     * @return The coordinate in degrees/minutes format
+     */
     public static String dm(double pCoordinate) {
 
@@ -118 +137 @@
         int tDegree = (int) tAbsCoord;
         double tMinutes = (tAbsCoord - tDegree) * 60;
-        return tDegree + "\u00B0" + cDmMinuteFormatter.format(tMinutes) + "\'";
+        
+        String sDegrees = Integer.toString(tDegree);
+        String sMinutes = cDmMinuteFormatter.format(tMinutes);
+        
+        if (sMinutes.equals("60.000")) {
+            sMinutes = "00.000";
+            sDegrees = Integer.toString(tDegree+1);
+        }
+        
+        return sDegrees + "\u00B0" + sMinutes + "\'";
     }