| 1 | ### Eclipse Workspace Patch 1.0
|
|---|
| 2 | #P JMapViewer
|
|---|
| 3 | Index: src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
|
|---|
| 4 | ===================================================================
|
|---|
| 5 | --- src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (revision 36495)
|
|---|
| 6 | +++ src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (working copy)
|
|---|
| 7 | @@ -6,6 +6,7 @@
|
|---|
| 8 | import java.io.IOException;
|
|---|
| 9 | import java.io.InputStream;
|
|---|
| 10 | import java.net.HttpURLConnection;
|
|---|
| 11 | +import java.net.URI;
|
|---|
| 12 | import java.net.URL;
|
|---|
| 13 | import java.net.URLConnection;
|
|---|
| 14 | import java.util.HashMap;
|
|---|
| 15 | @@ -142,11 +143,16 @@
|
|---|
| 16 | }
|
|---|
| 17 |
|
|---|
| 18 | protected URLConnection loadTileFromOsm(Tile tile) throws IOException {
|
|---|
| 19 | - URL url;
|
|---|
| 20 | - url = new URL(tile.getUrl());
|
|---|
| 21 | - URLConnection urlConn = url.openConnection();
|
|---|
| 22 | + URI uri = URI.create(tile.getUrl());
|
|---|
| 23 | + URLConnection urlConn = uri.toURL().openConnection();
|
|---|
| 24 | +
|
|---|
| 25 | if (urlConn instanceof HttpURLConnection) {
|
|---|
| 26 | - prepareHttpUrlConnection((HttpURLConnection) urlConn);
|
|---|
| 27 | + HttpURLConnection httpConn = (HttpURLConnection) urlConn;
|
|---|
| 28 | +
|
|---|
| 29 | + httpConn.setConnectTimeout(5000);
|
|---|
| 30 | + httpConn.setReadTimeout(10000);
|
|---|
| 31 | +
|
|---|
| 32 | + prepareHttpUrlConnection(httpConn);
|
|---|
| 33 | }
|
|---|
| 34 | return urlConn;
|
|---|
| 35 | }
|
|---|
