Changeset 8346 in josm for trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

Timestamp:

2015-05-11T13:34:53+02:00 (11 years ago)

Author:

Don-vip

Message:

squid:S00116 - Field names should comply with a naming convention

File:

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

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

@@ -15 +15 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import org.openstreetmap.josm.data.projection.CustomProjection.Param;
 import org.openstreetmap.josm.data.projection.Ellipsoid;
 import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
@@ -60 +61 @@
      * projection factor
      */
-    protected double F;
+    protected double f;
     /**
      * radius of the parallel of latitude of the false origin (2SP) or at
@@ -76 +77 @@
         ellps = params.ellps;
         e = ellps.e;
-        if (params.lat_0 == null)
-            throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_0"));
-        if (params.lat_1 != null && params.lat_2 != null) {
-            initialize2SP(params.lat_0, params.lat_1, params.lat_2);
+        if (params.lat0 == null)
+            throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", Param.lat_0.key));
+        if (params.lat1 != null && params.lat2 != null) {
+            initialize2SP(params.lat0, params.lat1, params.lat2);
         } else {
-            initialize1SP(params.lat_0);
+            initialize1SP(params.lat0);
         }
     }
@@ -103 +104 @@
 
         n  = (log(m1) - log(m2)) / (log(t1) - log(t2));
-        F  = m1 / (n * pow(t1, n));
-        r0 = F * pow(tf, n);
+        f  = m1 / (n * pow(t1, n));
+        r0 = f * pow(tf, n);
     }
 
@@ -120 +121 @@
 
         n = sin(lat_0_rad);
-        F  = m0 / (n * pow(t0, n));
-        r0 = F * pow(t0, n);
+        f  = m0 / (n * pow(t0, n));
+        r0 = f * pow(t0, n);
     }
 
@@ -153 +154 @@
         double sinphi = sin(phi);
         double L = (0.5*log((1+sinphi)/(1-sinphi))) - e/2*log((1+e*sinphi)/(1-e*sinphi));
-        double r = F*exp(-n*L);
+        double r = f*exp(-n*L);
         double gamma = n*lambda;
         double X = r*sin(gamma);
@@ -165 +166 @@
         double gamma = atan(east / (r0-north));
         double lambda = gamma/n;
-        double latIso = (-1/n) * log(abs(r/F));
+        double latIso = (-1/n) * log(abs(r/f));
         double phi = ellps.latitude(latIso, e, epsilon);
         return new double[] { phi, lambda };