Changeset 4538 in josm

Timestamp:

2011-10-23T12:17:50+02:00 (13 years ago)

Author:

stoecker

Message:

support {header} pattern also for TMS

Location:

trunk

Files:

• data/el.lang (modified) ( previous)
• data/et.lang (modified) ( previous)
• data/fr.lang (modified) ( previous)
• data/ja.lang (modified) ( previous)
• data/ru.lang (modified) ( previous)
• src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (3 diffs)

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

@@ -24 +24 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -108 +109 @@
     protected MemoryTileCache tileCache;
     protected TileSource tileSource;
-    protected TileLoader tileLoader;
+    protected OsmTileLoader tileLoader;
     JobDispatcher jobDispatcher = JobDispatcher.getInstance();
 
@@ -276 +277 @@
         if (tileLoader == null) {
             tileLoader = new OsmTileLoader(this);
+        }
+        tileLoader.timeoutConnect = Main.pref.getInteger("socket.timeout.connect",15) * 1000;
+        tileLoader.timeoutRead = Main.pref.getInteger("socket.timeout.read", 30) * 1000;
+        if (tileSource instanceof TemplatedTMSTileSource) {
+            for(Entry<String, String> e : ((TemplatedTMSTileSource)tileSource).getHeaders().entrySet()) {
+                tileLoader.headers.put(e.getKey(), e.getValue());
+            }
         }
     }