Changeset 12445 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2017-07-01T16:44:05+02:00 (8 years ago)

Author:

Don-vip

Message:

update to error-prone 2.0.21, groovy 2.4.12

File:

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

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

@@ -160 +160 @@
      * Constants used in the transformation.
      */
-    private double b, e;
+    private double b, g;
 
     /**
@@ -249 +249 @@
             }
         }
-        e = f += d;
-        e = f * Math.pow(tsfn(latCenter, sinph0), b);
+        g = f += d;
+        g = f * Math.pow(tsfn(latCenter, sinph0), b);
 
         /*
@@ -288 +288 @@
             final double h = Math.pow(tsfn(lat1, Math.sin(lat1)), b);
             final double l = Math.pow(tsfn(lat2, Math.sin(lat2)), b);
-            final double fp = e / h;
+            final double fp = g / h;
             final double p = (l - h) / (l + h);
-            double j = e * e;
+            double j = g * g;
             j = (j - l * h) / (j + l * h);
             double diff = lon1 - lon2;
@@ -379 +379 @@
         double u, v;
         if (Math.abs(Math.abs(y) - Math.PI/2.0) > EPSILON) {
-            double q = e / Math.pow(tsfn(y, Math.sin(y)), b);
+            double q = g / Math.pow(tsfn(y, Math.sin(y)), b);
             double temp = 1.0 / q;
             double s = 0.5 * (q - temp);
@@ -420 +420 @@
         } else {
             return new double[] {
-                cphi2(Math.pow(e / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
+                cphi2(Math.pow(g / Math.sqrt((1. + up) / (1. - up)), 1.0 / b)), //calculate t
                 -Math.atan2(sp * cosgamma0 - vp * singamma0, Math.cos(bra * u)) / b};
         }