Changeset 9825 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-02-18T21:41:08+01:00 (9 years ago)

Author:

wiktorn

Message:

Improvements for native scales.

• make ScaleList immutable object
• reduce number of ScaleList object creation
• use ScaleList.snapZoom for getBestZoom in WMTS

See: #12350

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (4 diffs)

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

@@ -47 +47 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.layer.NativeScaleLayer.Scale;
 import org.openstreetmap.josm.gui.layer.NativeScaleLayer.ScaleList;
 import org.openstreetmap.josm.io.CachedFile;
@@ -246 +245 @@
     private TransferMode transferMode;
 
+    private ScaleList nativeScaleList;
+
     /**
      * Creates a tile source based on imagery info
@@ -631 +632 @@
 
         this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();
+
+        Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
+        if (currentTileMatrixSet != null) {
+            for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
+                scales.add(tileMatrix.scaleDenominator * 0.28e-03);
+            }
+        }
+        this.nativeScaleList = new ScaleList(scales);
     }
 
@@ -919 +928 @@
      */
     public ScaleList getNativeScales() {
-        ScaleList scales = new ScaleList();
-        if (currentTileMatrixSet != null) {
-            for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
-                scales.add(new Scale(tileMatrix.scaleDenominator * 0.28e-03));
-            }
-        }
-        return scales;
+        return nativeScaleList;
     }