Changeset 13634 in josm for trunk/src/org

Timestamp:

2018-04-15T18:22:42+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16129 - Transverse Mercator: Minor coefficient error in tmerc inverse transform (see ​https://github.com/OSGeo/proj.4/issues/174)

File:

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

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

@@ -82 +82 @@
 
     /**
-     * Contants used for the forward and inverse transform for the eliptical
+     * Constants used for the forward and inverse transform for the elliptical
      * case of the Transverse Mercator.
      */
@@ -101 +101 @@
     /**
      * A derived quantity of excentricity, computed by <code>e'² = (a²-b²)/b² = es/(1-es)</code>
-     * where <var>a</var> is the semi-major axis length and <var>b</var> is the semi-minor axis
-     * length.
+     * where <var>a</var> is the semi-major axis length and <var>b</var> is the semi-minor axis length.
      */
     private double eb2;
@@ -109 +108 @@
      * Latitude of origin in <u>radians</u>. Default value is 0, the equator.
      * This is called '<var>phi0</var>' in Snyder.
-     * <p>
-     * <strong>Consider this field as final</strong>. It is not final only
-     * because some classes need to modify it at construction time.
      */
     protected double latitudeOfOrigin;
@@ -151 +147 @@
 
         if (params.gamma != null) {
-                rectifiedGridAngle = Utils.toRadians(params.gamma);
+            rectifiedGridAngle = Utils.toRadians(params.gamma);
         } else {
-                rectifiedGridAngle = 0.0;
+            rectifiedGridAngle = 0.0;
         }
         sinrot = Math.sin(rectifiedGridAngle);
         cosrot = Math.cos(rectifiedGridAngle);
-
     }
 
@@ -220 +215 @@
                 FC4 * (5.0 + t*(3.0 - 9.0*n) + n*(1.0 - 4*n) - ds *
                 FC6 * (61.0 + t*(90.0 - 252.0*n + 45.0*t) + 46.0*n - ds *
-                FC8 * (1385.0 + t*(3633.0 + t*(4095.0 + 1574.0*t))))));
+                FC8 * (1385.0 + t*(3633.0 + t*(4095.0 + 1575.0*t))))));
 
             x = d*(FC1 - ds * FC3 * (1.0 + 2.0*t + n -