Changeset 10378 in josm for trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java

Timestamp:

2016-06-15T10:30:37+02:00 (8 years ago)

Author:

Don-vip

Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

File:

• trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java

@@ -100 +100 @@
 
         final double sinphi;
-        qp     = qsfn(1);
-        rq     = Math.sqrt(0.5 * qp);
+        qp = qsfn(1);
+        rq = Math.sqrt(0.5 * qp);
         sinphi = Math.sin(latitudeOfOrigin);
         sinb1 = qsfn(sinphi) / qp;
@@ -107 +107 @@
         switch (mode) {
             case NORTH_POLE:  // Fall through
-            case SOUTH_POLE: {
-                dd  = 1.0;
+            case SOUTH_POLE:
+                dd = 1.0;
                 xmf = ymf = rq;
                 break;
-            }
-            case EQUATORIAL: {
-                dd  = 1.0 / rq;
+            case EQUATORIAL:
+                dd = 1.0 / rq;
                 xmf = 1.0;
                 ymf = 0.5 * qp;
                 break;
-            }
-            case OBLIQUE: {
-                dd  = Math.cos(latitudeOfOrigin) /
-                        (Math.sqrt(1.0 - e2 * sinphi * sinphi) * rq * cosb1);
+            case OBLIQUE:
+                dd = Math.cos(latitudeOfOrigin) / (Math.sqrt(1.0 - e2 * sinphi * sinphi) * rq * cosb1);
                 xmf = rq * dd;
                 ymf = rq / dd;
                 break;
-            }
-            default: {
+            default:
                 throw new AssertionError(mode);
-            }
         }
     }
@@ -139 +134 @@
         final double sinb, cosb, b, c, x, y;
         switch (mode) {
-            case OBLIQUE: {
+            case OBLIQUE:
                 sinb = q / qp;
                 cosb = Math.sqrt(1.0 - sinb * sinb);
-                c    = 1.0 + sinb1 * sinb + cosb1 * cosb * coslam;
-                b    = Math.sqrt(2.0 / c);
-                y    = ymf * b * (cosb1 * sinb - sinb1 * cosb * coslam);
-                x    = xmf * b * cosb * sinlam;
-                break;
-            }
-            case EQUATORIAL: {
+                c = 1.0 + sinb1 * sinb + cosb1 * cosb * coslam;
+                b = Math.sqrt(2.0 / c);
+                y = ymf * b * (cosb1 * sinb - sinb1 * cosb * coslam);
+                x = xmf * b * cosb * sinlam;
+                break;
+            case EQUATORIAL:
                 sinb = q / qp;
                 cosb = Math.sqrt(1.0 - sinb * sinb);
-                c    = 1.0 + cosb * coslam;
-                b    = Math.sqrt(2.0 / c);
-                y    = ymf * b * sinb;
-                x    = xmf * b * cosb * sinlam;
-                break;
-            }
-            case NORTH_POLE: {
+                c = 1.0 + cosb * coslam;
+                b = Math.sqrt(2.0 / c);
+                y = ymf * b * sinb;
+                x = xmf * b * cosb * sinlam;
+                break;
+            case NORTH_POLE:
                 c = (Math.PI / 2) + phi;
                 q = qp - q;
@@ -168 +161 @@
                 }
                 break;
-            }
-            case SOUTH_POLE: {
+            case SOUTH_POLE:
                 c = phi - (Math.PI / 2);
                 q = qp + q;
@@ -180 +172 @@
                 }
                 break;
-            }
-            default: {
+            default:
                 throw new AssertionError(mode);
-            }
         }
         if (Math.abs(c) < EPSILON_LATITUDE) {
@@ -211 +201 @@
                     if (mode == Mode.OBLIQUE) {
                         ab = cCe * sinb1 + y * sCe * cosb1 / rho;
-                        y  = rho * cosb1 * cCe - y * sinb1 * sCe;
+                        y = rho * cosb1 * cCe - y * sinb1 * sCe;
                     } else {
                         ab = y * sCe / rho;
-                        y  = rho * cCe;
+                        y = rho * cCe;
                     }
                     lambda = Math.atan2(x, y);