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

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

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

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

@@ -9 +9 @@
 import static java.lang.Math.sqrt;
 import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
-import static org.openstreetmap.josm.tools.I18n.trc;
 import static org.openstreetmap.josm.tools.Utils.toRadians;
 
@@ -15 +14 @@
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.Objects;
@@ -21 +19 @@
 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.LatLonParser;
-import org.openstreetmap.josm.data.coor.conversion.NauticalCoordinateFormat;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -87 +81 @@
 
     /**
-     * Character denoting South, as string.
-     * @deprecated use {@link LatLonParser#SOUTH}
-     */
-    @Deprecated
-    public static final String SOUTH = trc("compass", "S");
-    /**
-     * Character denoting North, as string.
-     * @deprecated use {@link LatLonParser#NORTH}
-     */
-    @Deprecated
-    public static final String NORTH = trc("compass", "N");
-    /**
-     * Character denoting West, as string.
-     * @deprecated use {@link LatLonParser#WEST}
-     */
-    @Deprecated
-    public static final String WEST = trc("compass", "W");
-    /**
-     * Character denoting East, as string.
-     * @deprecated use {@link LatLonParser#EAST}
-     */
-    @Deprecated
-    public static final String EAST = trc("compass", "E");
-
-    /**
      * Replies true if lat is in the range [-90,90]
      *
@@ -185 +154 @@
 
     /**
-     * Replies the coordinate in degrees/minutes/seconds format
-     * @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
-     * @deprecated use {@link DMSCoordinateFormat#degreesMinutesSeconds(double)}
-     */
-    @Deprecated
-    public static String degreesMinutesSeconds(double pCoordinate) {
-        return DMSCoordinateFormat.degreesMinutesSeconds(pCoordinate);
-    }
-
-    /**
-     * Replies the coordinate in degrees/minutes format
-     * @param pCoordinate The coordinate to convert
-     * @return The coordinate in degrees/minutes format
-     * @since 12537
-     * @deprecated use {@link NauticalCoordinateFormat#degreesMinutes(double)}
-     */
-    @Deprecated
-    public static String degreesMinutes(double pCoordinate) {
-        return NauticalCoordinateFormat.degreesMinutes(pCoordinate);
-    }
-
-    /**
-     * Replies the coordinate in degrees/minutes format
-     * @param pCoordinate The coordinate to convert
-     * @return The coordinate in degrees/minutes format
-     * @deprecated use {@link #degreesMinutes(double)} instead
-     */
-    @Deprecated
-    public static String dm(double pCoordinate) {
-        return degreesMinutes(pCoordinate);
-    }
-
-    /**
      * Constructs a new object representing the given latitude/longitude.
      * @param lat the latitude, i.e., the north-south position in degrees
@@ -252 +175 @@
     }
 
-    /**
-     * Formats the latitude part according to the given format
-     * @param d the coordinate format to use
-     * @return the formatted latitude
-     * @deprecated use {@link org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat#latToString(ILatLon)}
-     */
-    @Deprecated
-    public String latToString(CoordinateFormat d) {
-        return d.getICoordinateFormat().latToString(this);
-    }
-
     @Override
     public double lon() {
         return x;
-    }
-
-    /**
-     * Formats the longitude part according to the given format
-     * @param d the coordinate format to use
-     * @return the formatted longitude
-     * @deprecated use {@link org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat#lonToString(ILatLon)}
-     */
-    @Deprecated
-    public String lonToString(CoordinateFormat d) {
-        return d.getICoordinateFormat().lonToString(this);
     }
 
@@ -409 +310 @@
 
     /**
-     * Returns this lat/lon pair in human-readable format separated by {@code separator}.
-     * @param separator values separator
-     * @return String in the format {@code "1.23456[separator]2.34567"}
-     * @deprecated method removed without replacement
-     */
-    @Deprecated
-    public String toStringCSV(String separator) {
-        return Utils.join(separator, Arrays.asList(
-                DecimalDegreesCoordinateFormat.INSTANCE.latToString(this),
-                DecimalDegreesCoordinateFormat.INSTANCE.lonToString(this)
-        ));
-    }
-
-    /**
      * Interpolate between this and a other latlon
      * @param ll2 The other lat/lon object
@@ -506 +393 @@
                Double.compare(that.y, y) == 0;
     }
-
-    /**
-     * Parses the given string as lat/lon.
-     * @param coord String to parse
-     * @return parsed lat/lon
-     * @since 11045
-     * @deprecated use {@link LatLonParser#parse(java.lang.String)}
-     */
-    @Deprecated
-    public static LatLon parse(String coord) {
-        return LatLonParser.parse(coord);
-    }
 }