Changeset 19394 in josm for trunk

Timestamp:

2025-04-25T22:46:01+02:00 (16 hours ago)

Author:

stoecker

Message:

fix #24104 - drop remaining deprecations

Location:

trunk/src/org/openstreetmap/josm/data/coor

Files:

• ILatLon.java (modified) (4 diffs)
• LatLon.java (modified) (2 diffs)

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

@@ -73 +73 @@
      * @return <code>true</code> if the other point has almost the same lat/lon
      * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
-     * @since 18464 (extracted from {@link LatLon})
+     * @since 18464
      */
     default boolean equalsEpsilon(ILatLon other) {
@@ -85 +85 @@
      * @return <code>true</code> if the other point has almost the same lat/lon
      * values, only differing by no more than 1 / precision.
-     * @since 18464 (extracted from {@link LatLon})
+     * @since 18464
      */
     default boolean equalsEpsilon(ILatLon other, double precision) {
@@ -97 +97 @@
      * @param other the other point.
      * @return distance in metres.
-     * @since 18494 (extracted from {@link LatLon})
+     * @since 18494
      */
     default double greatCircleDistance(ILatLon other) {
@@ -128 +128 @@
      * @param other the "destination" position
      * @return heading in radians in the range 0 &lt;= hd &lt; 2*PI
-     * @since 18494 (extracted from {@link LatLon}, added in 9796)
+     * @since 18494
      */
     default double bearing(ILatLon other) {

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

@@ -170 +170 @@
 
     /**
-     * Determines if the other point has almost the same lat/lon values.
-     * @param other other lat/lon
-     * @return <code>true</code> if the other point has almost the same lat/lon
-     * values, only differing by no more than 1 / {@link #MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
-     * @deprecated since 18464 (use {@link ILatLon#equalsEpsilon(ILatLon)} instead)
-     */
-    @Deprecated(since = "18464", forRemoval = true)
-    public boolean equalsEpsilon(LatLon other) {
-        return ILatLon.super.equalsEpsilon(other);
-    }
-
-    /**
      * Determines if this lat/lon is within the given bounding box.
      * @param b bounding box
@@ -198 +186 @@
     public boolean isIn(Area a) {
         return a == null || a.contains(x, y);
-    }
-
-    /**
-     * Computes the distance between this lat/lon and another point on the earth.
-     * Uses <a href="https://en.wikipedia.org/wiki/Haversine_formula">Haversine formula</a>.
-     * @param other the other point.
-     * @return distance in metres.
-     * @deprecated since 18494 (use {@link ILatLon#greatCircleDistance(ILatLon)} instead)
-     */
-    @Deprecated(since = "18494", forRemoval = true)
-    public double greatCircleDistance(LatLon other) {
-        return ILatLon.super.greatCircleDistance(other);
-    }
-
-    /**
-     * Returns bearing from this point to another.
-     *
-     * Angle starts from north and increases clockwise, PI/2 means east.
-     *
-     * Please note that reverse bearing (from other point to this point) should NOT be
-     * calculated from return value of this method, because great circle path
-     * between the two points have different bearings at each position.
-     *
-     * To get bearing from another point to this point call other.bearing(this)
-     *
-     * @param other the "destination" position
-     * @return heading in radians in the range 0 &lt;= hd &lt; 2*PI
-     * @since 9796
-     * @deprecated since 18494 (use {@link ILatLon#bearing(ILatLon)} instead)
-     */
-    @Deprecated(since = "18494", forRemoval = true)
-    public double bearing(LatLon other) {
-        return ILatLon.super.bearing(other);
     }