Changeset 10033 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2016-03-23T21:52:44+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12632 - Use WGS84 Ellipsoid constant instead of fixed value for R

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint.mapcss;
+
+import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
 
 import java.util.Collection;
@@ -637 +639 @@
         }
 
-        private static final double R = 6378135;
-
         public static double level2scale(int lvl) {
             if (lvl < 0)
@@ -644 +644 @@
             // preliminary formula - map such that mapnik imagery tiles of the same
             // or similar level are displayed at the given scale
-            return 2.0 * Math.PI * R / Math.pow(2.0, lvl) / 2.56;
+            return 2.0 * Math.PI * WGS84.a / Math.pow(2.0, lvl) / 2.56;
         }
 
@@ -650 +650 @@
             if (scale < 0)
                 throw new IllegalArgumentException("scale must be >= 0 but is "+scale);
-            return (int) Math.floor(Math.log(2 * Math.PI * R / 2.56 / scale) / Math.log(2));
+            return (int) Math.floor(Math.log(2 * Math.PI * WGS84.a / 2.56 / scale) / Math.log(2));
         }