Changeset 12561 in josm for trunk

Timestamp:

2017-08-02T23:17:16+02:00 (7 years ago)

Author:

Don-vip

Message:

deprecate LatLon.dms

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified) (1 diff)

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

@@ -205 +205 @@
      * @param pCoordinate The coordinate to convert
      * @return The coordinate in degrees/minutes/seconds format
-     */
+     * @deprecated use {@link #degreesMinutesSeconds} instead
+     */
+    @Deprecated
     public static String dms(double pCoordinate) {
+        return degreesMinutesSeconds(pCoordinate);
+    }
+
+    /**
+     * Replies the coordinate in degrees/minutes/seconds format
+     * @param pCoordinate The coordinate to convert
+     * @return The coordinate in degrees/minutes/seconds format
+     * @since 12561
+     */
+    public static String degreesMinutesSeconds(double pCoordinate) {
 
         double tAbsCoord = Math.abs(pCoordinate);
@@ -302 +314 @@
         switch(d) {
         case DECIMAL_DEGREES: return cDdFormatter.format(y);
-        case DEGREES_MINUTES_SECONDS: return dms(y) + ((y < 0) ? SOUTH : NORTH);
+        case DEGREES_MINUTES_SECONDS: return degreesMinutesSeconds(y) + ((y < 0) ? SOUTH : NORTH);
         case NAUTICAL: return degreesMinutes(y) + ((y < 0) ? SOUTH : NORTH);
         case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().north());
@@ -322 +334 @@
         switch(d) {
         case DECIMAL_DEGREES: return cDdFormatter.format(x);
-        case DEGREES_MINUTES_SECONDS: return dms(x) + ((x < 0) ? WEST : EAST);
+        case DEGREES_MINUTES_SECONDS: return degreesMinutesSeconds(x) + ((x < 0) ? WEST : EAST);
         case NAUTICAL: return degreesMinutes(x) + ((x < 0) ? WEST : EAST);
         case EAST_NORTH: return cDdFormatter.format(this.getEastNorth().east());

trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

@@ -104 +104 @@
         assertNotNull(latlon);
         DecimalFormat f = new DecimalFormat("00.0");
-        assertEquals("51°46'"+f.format(43.0)+"\"", LatLon.dms(latlon.lat()));
-        assertEquals("8°21'"+f.format(56.3)+"\"", LatLon.dms(latlon.lon()));
+        assertEquals("51°46'"+f.format(43.0)+"\"", LatLon.degreesMinutesSeconds(latlon.lat()));
+        assertEquals("8°21'"+f.format(56.3)+"\"", LatLon.degreesMinutesSeconds(latlon.lon()));
     }