Changeset 8168 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

Timestamp:

2015-04-06T01:43:03+02:00 (10 years ago)

Author:

bastiK

Message:

see #11216 - Limit size of TMS cache (patch by wiktorn)

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -12 +12 @@
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -26 +28 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
@@ -114 +117 @@
     public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
 
-    private OsmTileLoader cachedLoader;
+    private TileLoader cachedLoader;
     private OsmTileLoader uncachedLoader;
 
@@ -132 +135 @@
         SpringLayout springLayout = new SpringLayout();
         setLayout(springLayout);
-        TMSLayer.setMaxWorkers();
-        cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this);
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("User-Agent", Version.getInstance().getFullAgentString());
+
+        cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this, headers);
 
         uncachedLoader = new OsmTileLoader(this);
-        uncachedLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
+        uncachedLoader.headers.putAll(headers);
         setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false));
         setMapMarkerVisible(false);