Changeset 8659 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

Timestamp:

2015-08-12T23:10:17+02:00 (9 years ago)

Author:

wiktorn

Message:

More performance improvements

• Use one MemoryTileCache instance per multiple layers. This results in smaller memory footprint when working with many layers
• fix default maximum TimeToLive in JCS
• TemplatedWMSTileSource now caches degreesPerZoom, so it's not computed on every request

File:

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

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

@@ -43 +43 @@
     private int[] tileXMax;
     private int[] tileYMax;
+    private double[] degreesPerTile;
 
     private static final Pattern PATTERN_HEADER  = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
@@ -95 +96 @@
         tileXMax = new int[getMaxZoom() + 1];
         tileYMax = new int[getMaxZoom() + 1];
+        degreesPerTile = new double[getMaxZoom() +1];
         for (int zoom = getMinZoom(); zoom <= getMaxZoom(); zoom++) {
             TileXY maxTileIndex = latLonToTileXY(bottomRight.toCoordinate(), zoom);
             tileXMax[zoom] = maxTileIndex.getXIndex();
             tileYMax[zoom] = maxTileIndex.getYIndex();
-        }
+            int tilesPerZoom = (int) Math.pow(2d, zoom - 1);
+            degreesPerTile[zoom] = Math.max(
+                    Math.abs(max.getY() - min.getY()) / tilesPerZoom,
+                    Math.abs(max.getX() - min.getX()) / tilesPerZoom
+                    );
+
+        }
+
     }
 
@@ -382 +391 @@
 
     private double getDegreesPerTile(int zoom) {
-        Projection proj = Main.getProjection();
-        EastNorth min = proj.latlon2eastNorth(worldBounds.getMin());
-        EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
-
-        int tilesPerZoom = (int) Math.pow(2d, zoom - 1);
-        return Math.max(
-                Math.abs(max.getY() - min.getY()) / tilesPerZoom,
-                Math.abs(max.getX() - min.getX()) / tilesPerZoom
-                );
+        return degreesPerTile[zoom];
     }