Changeset 32602 in osm for applications/viewer

Timestamp:

2016-07-08T03:04:49+02:00 (8 years ago)

Author:

donvip

Message:

sonar - squid:S2148 / squid:S1449

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• DefaultMapController.java (modified) (2 diffs)
• OsmMercator.java (modified) (1 diff)
• tilesources/ScanexTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

@@ -8 +8 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
+import java.util.Locale;
 
 /**
@@ -185 +186 @@
     public static boolean isPlatformOsx() {
         String os = System.getProperty("os.name");
-        return os != null && os.toLowerCase().startsWith("mac os x");
+        return os != null && os.toLowerCase(Locale.ENGLISH).startsWith("mac os x");
     }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java

@@ -22 +22 @@
     public static final double MIN_LAT = -85.05112877980659;
     /** equatorial earth radius for EPSG:3857 (Mercator) */
-    public static final double EARTH_RADIUS = 6378137;
+    public static final double EARTH_RADIUS = 6_378_137;
 
     /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java

@@ -24 +24 @@
     // Latitude to Y and back calculations.
 
-    /** radius of Earth at equator, m */
-    private static double RADIUS_E = 6378137;
-    /** equator length, m */
-    private static double EQUATOR = 40075016.68557849;
     /** eccentricity of Earth's ellipsoid */
     private static double E = 0.0818191908426;