Changeset 8649 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2015-08-08T18:32:10+02:00 (9 years ago)

Author:

wiktorn

Message:

• performance improvements - move all cache accesses to worker thread, as now, mostly we will have accesses to disks
• follow HTTP 302 redirection when downloading tiles. Addresses: #11770

File:

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

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

@@ -37 +37 @@
  */
 public class TemplatedWMSTileSource extends TMSTileSource implements TemplatedTileSource {
-    private Map<String, String> headers = new ConcurrentHashMap<>();
+    private final Map<String, String> headers = new ConcurrentHashMap<>();
     private final Set<String> serverProjections;
     private EastNorth topLeftCorner;
     private Bounds worldBounds;
+    private int[] tileXMax;
+    private int[] tileYMax;
 
     private static final Pattern PATTERN_HEADER  = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
@@ -89 +91 @@
         EastNorth max = proj.latlon2eastNorth(worldBounds.getMax());
         this.topLeftCorner = new EastNorth(min.east(), max.north());
+
+        LatLon bottomRight = new LatLon(worldBounds.getMinLat(), worldBounds.getMaxLon());
+        tileXMax = new int[getMaxZoom() + 1];
+        tileYMax = new int[getMaxZoom() + 1];
+        for(int zoom = getMinZoom(); zoom <= getMaxZoom(); zoom++) {
+            TileXY maxTileIndex = latLonToTileXY(bottomRight.toCoordinate(), zoom);
+            tileXMax[zoom] = maxTileIndex.getXIndex();
+            tileYMax[zoom] = maxTileIndex.getYIndex();
+        }
     }
 
@@ -229 +240 @@
     @Override
     public int getTileXMax(int zoom) {
-        LatLon bottomRight = new LatLon(worldBounds.getMinLat(), worldBounds.getMaxLon());
-        return latLonToTileXY(bottomRight.toCoordinate(), zoom).getXIndex();
+        return tileXMax[zoom];
     }
 
@@ -240 +250 @@
     @Override
     public int getTileYMax(int zoom) {
-        LatLon bottomRight = new LatLon(worldBounds.getMinLat(), worldBounds.getMaxLon());
-        return latLonToTileXY(bottomRight.toCoordinate(), zoom).getYIndex();
+        return tileYMax[zoom];
     }