Changeset 12735 in josm for trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

Timestamp:

2017-09-05T17:58:01+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - move CoordinateFormat code out of LatLon class

File:

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

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

@@ -25 +25 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
+import org.openstreetmap.josm.data.coor.conversion.NauticalCoordinateFormat;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -69 +72 @@
     public static final LatLon SOUTH_POLE = new LatLon(-90, 0);
 
-    private static DecimalFormat cDmsMinuteFormatter = new DecimalFormat("00");
-    private static DecimalFormat cDmsSecondFormatter = new DecimalFormat(
-            Main.pref == null ? "00.0" : Main.pref.get("latlon.dms.decimal-format", "00.0"));
-    private static DecimalFormat cDmMinuteFormatter = new DecimalFormat(
-            Main.pref == null ? "00.000" : Main.pref.get("latlon.dm.decimal-format", "00.000"));
     /**
      * The normal number format for server precision coordinates
@@ -90 +88 @@
         cDdHighPecisionFormatter.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);
 
     /** Character denoting South, as string */
@@ -217 +210 @@
      * @return The coordinate in degrees/minutes/seconds format
      * @since 12561
-     */
+     * @deprecated use {@link DMSCoordinateFormat#degreesMinutesSeconds(double)}
+     */
+    @Deprecated
     public static String degreesMinutesSeconds(double pCoordinate) {
-
-        double tAbsCoord = Math.abs(pCoordinate);
-        int tDegree = (int) tAbsCoord;
-        double tTmpMinutes = (tAbsCoord - tDegree) * 60;
-        int tMinutes = (int) tTmpMinutes;
-        double tSeconds = (tTmpMinutes - tMinutes) * 60;
-
-        String sDegrees = Integer.toString(tDegree);
-        String sMinutes = cDmsMinuteFormatter.format(tMinutes);
-        String sSeconds = cDmsSecondFormatter.format(tSeconds);
-
-        if (cDms60.equals(sSeconds)) {
-            sSeconds = cDms00;
-            sMinutes = cDmsMinuteFormatter.format(tMinutes+1L);
-        }
-        if ("60".equals(sMinutes)) {
-            sMinutes = "00";
-            sDegrees = Integer.toString(tDegree+1);
-        }
-
-        return sDegrees + '\u00B0' + sMinutes + '\'' + sSeconds + '\"';
+        return DMSCoordinateFormat.degreesMinutesSeconds(pCoordinate);
     }
 
@@ -247 +222 @@
      * @return The coordinate in degrees/minutes format
      * @since 12537
-     */
+     * @deprecated use {@link NauticalCoordinateFormat#degreesMinutes(double)}
+     */
+    @Deprecated
     public static String degreesMinutes(double pCoordinate) {
-
-        double tAbsCoord = Math.abs(pCoordinate);
-        int tDegree = (int) tAbsCoord;
-        double tMinutes = (tAbsCoord - tDegree) * 60;
-
-        String sDegrees = Integer.toString(tDegree);
-        String sMinutes = cDmMinuteFormatter.format(tMinutes);
-
-        if (sMinutes.equals(cDm60)) {
-            sMinutes = cDm00;
-            sDegrees = Integer.toString(tDegree+1);
-        }
-
-        return sDegrees + '\u00B0' + sMinutes + '\'';
+        return NauticalCoordinateFormat.degreesMinutes(pCoordinate);
     }
 
@@ -302 +266 @@
      * @param d the coordinate format to use
      * @return the formatted latitude
-     */
+     * @deprecated use {@link org.openstreetmap.josm.data.coor.format.ICoordinateFormat#latToString(ILatLon)
+     */
+    @Deprecated
     public String latToString(CoordinateFormat d) {
-        switch(d) {
-        case DECIMAL_DEGREES: return cDdFormatter.format(y);
-        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(Main.getProjection()).north());
-        default: return "ERR";
-        }
+        return d.getICoordinateFormat().latToString(this);
     }
 
@@ -322 +282 @@
      * @param d the coordinate format to use
      * @return the formatted longitude
-     */
+     * @deprecated use {@link org.openstreetmap.josm.data.coor.format.ICoordinateFormat#lonToString(ILatLon)
+     */
+    @Deprecated
     public String lonToString(CoordinateFormat d) {
-        switch(d) {
-        case DECIMAL_DEGREES: return cDdFormatter.format(x);
-        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(Main.getProjection()).east());
-        default: return "ERR";
-        }
+        return d.getICoordinateFormat().lonToString(this);
     }
 
@@ -469 +425 @@
     public String toStringCSV(String separator) {
         return Utils.join(separator, Arrays.asList(
-                latToString(CoordinateFormat.DECIMAL_DEGREES),
-                lonToString(CoordinateFormat.DECIMAL_DEGREES)
+                DecimalDegreesCoordinateFormat.INSTANCE.latToString(this),
+                DecimalDegreesCoordinateFormat.INSTANCE.lonToString(this)
         ));
     }