Changeset 9899 in josm for trunk/src

Timestamp:

2016-02-28T14:06:46+01:00 (9 years ago)

Author:

wiktorn

Message:

Use one static instance of NativeScaleLayer for all TMS layers.

See: #12568

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -48 +48 @@
             true);
 
-    private ScaleList nativeScaleList;
+    private static final ScaleList nativeScaleList = initNativeScaleList();
 
     /**
@@ -56 +56 @@
     public TMSLayer(ImageryInfo info) {
         super(info);
-        Collection<Double> scales = new ArrayList<>(info.getMaxZoom());
-        for (int zoom = AbstractTileSourceLayer.MIN_ZOOM; zoom <= AbstractTileSourceLayer.MAX_ZOOM; zoom++) {
-            double scale = OsmMercator.EARTH_RADIUS * Math.PI * 2 / Math.pow(2, zoom) / OsmMercator.DEFAUL_TILE_SIZE;
-            scales.add(scale);
-        }
-        this.nativeScaleList = new ScaleList(scales);
     }
 
@@ -162 +156 @@
         return nativeScaleList;
     }
+
+    private static ScaleList initNativeScaleList() {
+        Collection<Double> scales = new ArrayList<>(AbstractTileSourceLayer.MAX_ZOOM);
+        for (int zoom = AbstractTileSourceLayer.MIN_ZOOM; zoom <= AbstractTileSourceLayer.MAX_ZOOM; zoom++) {
+            double scale = OsmMercator.EARTH_RADIUS * Math.PI * 2 / Math.pow(2, zoom) / OsmMercator.DEFAUL_TILE_SIZE;
+            scales.add(scale);
+        }
+        return new ScaleList(scales);
+    }
  }