Changeset 8626 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-07-28T00:33:09+02:00 (9 years ago)

Author:

wiktorn

Message:

checkstyle and sonar issues fixes

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -8 +8 @@
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
@@ -37 +38 @@
 public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTileSource {
     private Map<String, String> headers = new ConcurrentHashMap<>();
-    private final List<String> serverProjections;
+    private final Set<String> serverProjections;
     private EastNorth topLeftCorner;
     private Bounds worldBounds;
@@ -63 +64 @@
     public TemplatedWMSTileSource(ImageryInfo info) {
         super(info);
-        this.serverProjections = info.getServerProjections();
+        this.serverProjections = new TreeSet<>(info.getServerProjections());
         handleTemplate();
         initProjection();
@@ -143 +144 @@
         // CHECKSTYLE.ON: LineLength
         boolean switchLatLon = false;
-        if (baseUrl.toLowerCase().contains("crs=epsg:4326")) {
+        if (baseUrl.toLowerCase(Locale.US).contains("crs=epsg:4326")) {
             switchLatLon = true;
-        } else if (baseUrl.toLowerCase().contains("crs=")) {
+        } else if (baseUrl.toLowerCase(Locale.US).contains("crs=")) {
             // assume WMS 1.3.0
             switchLatLon = Main.getProjection().switchXY();
@@ -354 +355 @@
         EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
 
-        int tilesPerZoom = (int) Math.pow(2, zoom - 1);
+        int tilesPerZoom = (int) Math.pow(2d, zoom - 1);
         return Math.max(
                 Math.abs(max.getY() - min.getY()) / tilesPerZoom,
@@ -366 +367 @@
      * pole, the same way they are capped in Mercator projection, so conversions should work properly
      */
-    private final static Bounds getWorldBounds() {
+    private static Bounds getWorldBounds() {
         Projection proj = Main.getProjection();
         Bounds bounds = proj.getWorldBoundsLatLon();