Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/data/coor

Timestamp:

24.01.2012 21:52:43 (4 months ago)

Author:

jttt

Message:

Use final were appropriate

File:

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

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.coor;
-
-import static org.openstreetmap.josm.tools.I18n.trc;
 
 import static java.lang.Math.PI;
@@ -11 +9 @@
 import static java.lang.Math.sqrt;
 import static java.lang.Math.toRadians;
+import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.math.BigDecimal;
@@ -30 +29 @@
 public class LatLon extends Coordinate {
 
-    
+
     /**
      * Minimum difference in location to not be represented as the same position.
@@ -41 +40 @@
     private static DecimalFormat cDmsSecondFormatter = new DecimalFormat("00.0");
     private static DecimalFormat cDmMinuteFormatter = new DecimalFormat("00.000");
-    public static DecimalFormat cDdFormatter;
+    public static final DecimalFormat cDdFormatter;
     static {
         // Don't use the localized decimal separator. This way we can present
@@ -68 +67 @@
         return lon >= -180d && lon <= 180d;
     }
-                     
-        /**
-         * Replies true if lat is in the range [-90,90] and lon is in the range [-180,180]
-         * 
-         * @return true if lat is in the range [-90,90] and lon is in the range [-180,180]
-         */
-        public boolean isValid() {
-                return isValidLat(lat()) && isValidLon(lon());
-        }
-        
+
+    /**
+     * Replies true if lat is in the range [-90,90] and lon is in the range [-180,180]
+     *
+     * @return true if lat is in the range [-90,90] and lon is in the range [-180,180]
+     */
+    public boolean isValid() {
+        return isValidLat(lat()) && isValidLon(lon());
+    }
+
     public static double toIntervalLat(double value) {
         if (value < -90)
@@ -88 +87 @@
     /**
      * Returns a valid OSM longitude [-180,+180] for the given extended longitude value.
-     * For example, a value of -181 will return +179, a value of +181 will return -179. 
+     * For example, a value of -181 will return +179, a value of +181 will return -179.
      * @param lon A longitude value not restricted to the [-180,+180] range.
      */
     public static double toIntervalLon(double value) {
-        if (isValidLon(value)) {
+        if (isValidLon(value))
             return value;
-        } else {
+        else {
             int n = (int) (value + Math.signum(value)*180.0) / 360;
             return value - n*360.0;
         }
     }
-        
+
     /**
      * Replies the coordinate in degrees/minutes/seconds format
@@ -180 +179 @@
         Bounds b = Main.getProjection().getWorldBoundsLatLon();
         return lat() < b.getMin().lat() || lat() > b.getMax().lat() ||
-        lon() < b.getMin().lon() || lon() > b.getMax().lon();
+                lon() < b.getMin().lon() || lon() > b.getMax().lon();
     }
 
@@ -220 +219 @@
      * http://math.stackexchange.com/questions/720/how-to-calculate-a-heading-on-the-earths-surface
      * for some hints how it is derived.)
-     * 
+     *
      * @param other the "destination" position
      * @return heading in the range 0 <= hd < 2*PI
@@ -233 +232 @@
         }
         return hd;
-     }
+    }
 
     /**
@@ -258 +257 @@
         return "LatLon[lat="+lat()+",lon="+lon()+"]";
     }
-    
+
     /**
      * Returns the value rounded to OSM precisions, i.e. to
@@ -278 +277 @@
     public static double roundToOsmPrecisionStrict(double value) {
         double absV = Math.abs(value);
-        int numOfDigits = MAX_SERVER_DIGITS + (absV < 1 ? 0 : (absV < 10 ? 1 : (absV < 100 ? 2 : 3))); 
+        int numOfDigits = MAX_SERVER_DIGITS + (absV < 1 ? 0 : (absV < 10 ? 1 : (absV < 100 ? 2 : 3)));
         return BigDecimal.valueOf(value).round(new MathContext(numOfDigits)).doubleValue();
     }
@@ -292 +291 @@
                 roundToOsmPrecision(lat()),
                 roundToOsmPrecision(lon())
-        );
+                );
     }
 
@@ -305 +304 @@
                 roundToOsmPrecisionStrict(lat()),
                 roundToOsmPrecisionStrict(lon())
-        );
+                );
     }