Changeset 10914 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-08-29T17:44:50+02:00 (8 years ago)

Author:

michael2402

Message:

Use Utils.clamp in LatLon. Document public methods.

File:

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

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

@@ -131 +131 @@
     }
 
+    /**
+     * Clamp the lat value to be inside the world.
+     * @param value The value
+     * @return The value clamped to the world.
+     */
     public static double toIntervalLat(double value) {
-        if (value < -90)
-            return -90;
-        if (value > 90)
-            return 90;
-        return value;
+        return Utils.clamp(value, -90, 90);
     }
 
@@ -419 +420 @@
     }
 
+    /**
+     * Interpolate between this and a other latlon
+     * @param ll2 The other lat/lon object
+     * @param proportion The proportion to interpolate
+     * @return a new latlon at this position if proportion is 0, at the other position it proportion is 1 and lineary interpolated otherwise.
+     */
     public LatLon interpolate(LatLon ll2, double proportion) {
         return new LatLon(this.lat() + proportion * (ll2.lat() - this.lat()),
@@ -424 +431 @@
     }
 
+    /**
+     * Get the center between two lat/lon points
+     * @param ll2 The other {@link LatLon}
+     * @return The center at the average coordinates of the two points. Does not take the 180° meridian into account.
+     */
     public LatLon getCenter(LatLon ll2) {
-        return new LatLon((this.lat() + ll2.lat())/2.0, (this.lon() + ll2.lon())/2.0);
+        return interpolate(ll2, .5);
     }