Changeset 13036 in osm for applications/viewer

Timestamp:

2009-01-08T09:40:26+01:00 (16 years ago)

Author:

stotz

Message:

HTTP user agent configurable

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• OsmFileCacheTileLoader.java (modified) (2 diffs)
• OsmTileLoader.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -252 +252 @@
             url = new URL(tile.getUrl());
             HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+            prepareHttpUrlConnection(urlConn);
             urlConn.setRequestMethod("HEAD");
             urlConn.setReadTimeout(30000); // 30 seconds read timeout
@@ -267 +268 @@
             url = new URL(tile.getUrl());
             HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+            prepareHttpUrlConnection(urlConn);
             urlConn.setRequestMethod("HEAD");
             urlConn.setReadTimeout(30000); // 30 seconds read timeout

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -19 +19 @@
  */
 public class OsmTileLoader implements TileLoader {
+
+    /**
+     * Holds the used user agent used for HTTP requests. If this field is 
+     * <code>null</code>, the default Java user agent is used.
+     */
+    public static String USER_AGENT = null;
+    public static String ACCEPT = "text/html, image/png, image/jpeg, image/gif, */*";
 
     protected TileLoaderListener listener;
@@ -66 +73 @@
         url = new URL(tile.getUrl());
         HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
-        urlConn.setReadTimeout(30000); // 30 seconds read
-        // timeout
+        prepareHttpUrlConnection(urlConn);
+        urlConn.setReadTimeout(30000); // 30 seconds read timeout
         return urlConn;
+    }
+
+    protected void prepareHttpUrlConnection(HttpURLConnection urlConn) {
+        if (USER_AGENT != null)
+            urlConn.setRequestProperty("User-agent", USER_AGENT);
+        urlConn.setRequestProperty("Accept", ACCEPT);
     }