Changeset 31145 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2015-05-24T22:49:30+02:00 (10 years ago)

Author:

wiktorn

Message:

Set URLConnection.setUseCaches(false) when forcing reload of tiles. Closes #josm5717

Location:

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

Files:

• OsmTileLoader.java (modified) (4 diffs)
• interfaces/TileJob.java (modified) (1 diff)

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

@@ -41 +41 @@
 
             InputStream input = null;
+            boolean force = false;
 
             public void run() {
@@ -52 +53 @@
                 try {
                     URLConnection conn = loadTileFromOsm(tile);
+                    if (force) {
+                        conn.setUseCaches(false);
+                    }
                     loadTileMetadata(tile, conn);
                     if ("no-tile".equals(tile.getValue("tile-info"))) {
@@ -89 +93 @@
             @Override
             public void submit() {
-                run();
+                submit(false);
 
             }
+
+            @Override
+            public void submit(boolean force) {
+                this.force = force;
+                run();
+            }
+
         };
     }
@@ -102 +113 @@
             prepareHttpUrlConnection((HttpURLConnection)urlConn);
         }
-        urlConn.setReadTimeout(30000); // 30 seconds read timeout
         return urlConn;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileJob.java

@@ -23 +23 @@
      */
     void submit();
+
+    /**
+     * submits download job to backend.
+     * @param true if the load should skip all the caches (local & remote)
+     */
+    void submit(boolean force);
+
 }