Changeset 8403 in josm for trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

Timestamp:

2015-05-20T21:47:44+02:00 (9 years ago)

Author:

wiktorn

Message:

Rework the per host limit, so the queue will never reject the submited job. Also - sort tiles during loading in TMS, so center tiles will be loaded first. closes: #11437

File:

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

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

@@ -22 +22 @@
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -1194 +1195 @@
         }
 
+        private Comparator<Tile> getTileDistanceComparator() {
+            final int centerX = (int) Math.ceil((x0 + x1) / 2);
+            final int centerY = (int) Math.ceil((y0 + y1) / 2);
+            return new Comparator<Tile>() {
+                private int getDistance(Tile t) {
+                    return Math.abs(t.getXtile() - centerX) + Math.abs(t.getYtile() - centerY);
+                }
+                @Override
+                public int compare(Tile o1, Tile o2) {
+                    int distance1 = getDistance(o1);
+                    int distance2 = getDistance(o2);
+                    return Integer.compare(distance1, distance2);
+                }
+            };
+        }
+
         private void loadAllTiles(boolean force) {
             if (!autoLoad && !force)
                 return;
-            for (Tile t : this.allTilesCreate()) {
+            List<Tile> allTiles = allTilesCreate();
+            Collections.sort(allTiles, getTileDistanceComparator());
+            for (Tile t : allTiles) { //, getTileDistanceComparator())) {
                 loadTile(t, false);
             }