Changeset 8510 in josm for trunk/test/unit/org/openstreetmap/josm/data/projection

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/test/unit/org/openstreetmap/josm/data/projection

Files:

• EllipsoidTest.java (modified) (1 diff)
• ProjectionRegressionTest.java (modified) (3 diffs)
• ProjectionTest.java (modified) (5 diffs)
• SwissGridTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/projection/EllipsoidTest.java

@@ -20 +20 @@
         double maxErrLat = 0, maxErrLon = 0;
         Ellipsoid ellips = Ellipsoid.WGS84;
-        for (int num=0; num<1000; ++num) {
+        for (int num = 0; num < 1000; ++num) {
 
             double lat = r.nextDouble() * 180.0 - 90.0;
             double lon = r.nextDouble() * 360.0 - 180.0;
-            LatLon ll = new LatLon(lat,lon);
+            LatLon ll = new LatLon(lat, lon);
 
-            for (int i=0; i<1000; ++i) {
+            for (int i = 0; i < 1000; ++i) {
                 double[] cart = ellips.latLon2Cart(ll);
                 ll = ellips.cart2LatLon(cart);
 
-                if (!(Math.abs(lat - ll.lat())<EPSILON && Math.abs(lon - ll.lon())<EPSILON)) {
+                if (!(Math.abs(lat - ll.lat()) < EPSILON && Math.abs(lon - ll.lon()) < EPSILON)) {
                     String error = String.format("point: %s iterations: %s current: %s errorLat: %s errorLon %s",
                             new LatLon(lat, lon), i, ll, Math.abs(lat - ll.lat()), Math.abs(lon - ll.lon()));

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -65 +65 @@
             prevData = readData();
         }
-        Map<String,TestData> prevCodesMap = new HashMap<>();
+        Map<String, TestData> prevCodesMap = new HashMap<>();
         for (TestData data : prevData) {
             prevCodesMap.put(data.code, data);
@@ -116 +116 @@
                 TestData next = new TestData();
 
-                Pair<Double,Double> ll = readLine("ll", in.readLine());
-                Pair<Double,Double> en = readLine("en", in.readLine());
-                Pair<Double,Double> ll2 = readLine("ll2", in.readLine());
+                Pair<Double, Double> ll = readLine("ll", in.readLine());
+                Pair<Double, Double> en = readLine("en", in.readLine());
+                Pair<Double, Double> ll2 = readLine("ll2", in.readLine());
 
                 next.code = line;
@@ -131 +131 @@
     }
 
-    private static Pair<Double,Double> readLine(String expectedName, String input) {
+    private static Pair<Double, Double> readLine(String expectedName, String input) {
         String[] fields = input.trim().split("[ ]+");
         if (fields.length != 3) throw new AssertionError();

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionTest.java

@@ -28 +28 @@
         }
 
-        for (int i=0; i<=3; ++i) {
+        for (int i = 0; i <= 3; ++i) {
             testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(27561+i))); // Lambert 4 Zones France
         }
 
-        for (int i=0; i<=4; ++i) {
+        for (int i = 0; i <= 4; ++i) {
             testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(2176+i))); // PUWG Poland
         }
@@ -38 +38 @@
         testProj(Projections.getProjectionByCode("EPSG:21781")); // Swiss grid
 
-        for (int i=0; i<=60; ++i) {
+        for (int i = 0; i <= 60; ++i) {
             testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(32601+i))); // UTM North
             testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(32701+i))); // UTM South
@@ -44 +44 @@
 
         if (!"yes".equals(System.getProperty("suppressPermanentFailure"))) {
-            for (int i=0; i<=4; ++i) {
+            for (int i = 0; i <= 4; ++i) {
                 testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(2969+i))); // UTM France DOM
             }
         }
 
-        for (int i=0; i<=8; ++i) {
+        for (int i = 0; i <= 8; ++i) {
             testProj(Projections.getProjectionByCode("EPSG:"+Integer.toString(3942+i))); // Lambert CC9 Zones France
         }
@@ -65 +65 @@
 
             text += String.format("*** %s %s%n", p.toString(), p.toCode());
-            for (int num=0; num < 1000; ++num) {
+            for (int num = 0; num < 1000; ++num) {
 
                 double lat = rand.nextDouble() * (b.getMax().lat() - b.getMin().lat()) + b.getMin().lat();
@@ -72 +72 @@
                 LatLon ll = new LatLon(lat, lon);
 
-                for (int i=0; i<10; ++i) {
+                for (int i = 0; i < 10; ++i) {
                     EastNorth en = p.latlon2eastNorth(ll);
                     ll = p.eastNorth2latlon(en);

trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

@@ -28 +28 @@
      */
     ProjData[] data = {
-            new ProjData("Zimmerwald",      d(7,27,54.983506), d(46,52,37.540562), 947.149, 602030.680, 191775.030, 897.915),
-            new ProjData("Chrischona",      d(7,40,6.983077), d(47,34, 1.385301), 504.935,  617306.300, 268507.300, 456.064),
-            new ProjData("Pfaender",        d(9,47,3.697723), d(47,30,55.172797), 1089.372, 776668.105, 265372.681, 1042.624),
-            new ProjData("La Givrine",      d(6,6,7.326361), d(46,27,14.690021), 1258.274,  497313.292, 145625.438, 1207.434),
-            new ProjData("Monte Generoso",  d(9,1,16.389053), d(45,55,45.438020), 1685.027, 722758.810, 87649.670, 1636.600) };
+            new ProjData("Zimmerwald",      d(7, 27, 54.983506), d(46, 52, 37.540562), 947.149, 602030.680, 191775.030, 897.915),
+            new ProjData("Chrischona",      d(7, 40, 6.983077), d(47, 34, 1.385301), 504.935,  617306.300, 268507.300, 456.064),
+            new ProjData("Pfaender",        d(9, 47, 3.697723), d(47, 30, 55.172797), 1089.372, 776668.105, 265372.681, 1042.624),
+            new ProjData("La Givrine",      d(6, 6, 7.326361), d(46, 27, 14.690021), 1258.274,  497313.292, 145625.438, 1207.434),
+            new ProjData("Monte Generoso",  d(9, 1, 16.389053), d(45, 55, 45.438020), 1685.027, 722758.810, 87649.670, 1636.600) };
 
     private double d(double deg, double min, double sec) {
@@ -42 +42 @@
         public LatLon ll;
         public EastNorth en;
+
         public ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) {
             this.name = name;
@@ -128 +129 @@
     }
 
-
     @Test
     public void b_eastNorth2latlon_test() {