Changeset 5523 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2012-09-30T23:59:28+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

@@ -46 +46 @@
         cDdFormatter.applyPattern("###0.0######");
     }
+    
+    private static final String cDms60 = cDmsSecondFormatter.format(60.0);
+    private static final String cDms00 = cDmsSecondFormatter.format( 0.0);
+    private static final String cDm60 = cDmMinuteFormatter.format(60.0);
+    private static final String cDm00 = cDmMinuteFormatter.format( 0.0);
 
     /**
@@ -115 +120 @@
         String sSeconds = cDmsSecondFormatter.format(tSeconds);
         
-        if (sSeconds.equals("60.0")) {
-            sSeconds = "00.0";
+        if (sSeconds.equals(cDms60)) {
+            sSeconds = cDms00;
             sMinutes = cDmsMinuteFormatter.format(tMinutes+1);
         }
@@ -141 +146 @@
         String sMinutes = cDmMinuteFormatter.format(tMinutes);
         
-        if (sMinutes.equals("60.000")) {
-            sMinutes = "00.000";
+        if (sMinutes.equals(cDm60)) {
+            sMinutes = cDm00;
             sDegrees = Integer.toString(tDegree+1);
         }