Changeset 31053 in osm for applications/viewer/jmapviewer

Timestamp:

2015-03-06T02:36:22+01:00 (9 years ago)

Author:

bastik

Message:

see #josm11193 - handle the case X-VE-Tile-Info: no-tile and no max-age header (use mtime from tags file)

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (modified) (6 diffs)

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

@@ -132 +132 @@
         File tileCacheDir;
         File tileFile = null;
+        File tagsFile = null;
         Long fileMtime = null;
         Long now = null; // current time in milliseconds (keep consistent value for the whole run)
@@ -155 +156 @@
             now = System.currentTimeMillis();
             tileCacheDir = getSourceCacheDir(tile.getSource());
+            tileFile = getTileFile();
+            tagsFile = getTagsFile();
 
             loadTagsFromFile();
 
-            if (isTileFileValid() && (isNoTileAtZoom() || loadTileFromFile())) {
+            if (isCacheValid() && (isNoTileAtZoom() || loadTileFromFile())) {
                 log.log(Level.FINE, "TMS - found in tile cache: {0}", tile);
                 tile.setLoaded(true);
@@ -287 +290 @@
         }
 
-        protected boolean isTileFileValid() {
+        protected boolean isCacheValid() {
             Long expires = null;
             try {
@@ -305 +308 @@
                     // so handle properly the case, when only tags file exists
                     fileMtime = tileFile.lastModified();
-                    if (now - fileMtime > DEFAULT_EXPIRES_TIME) {
-                        log.log(Level.FINE, "TMS - Tile has expired, maximum file age reached {0}", tile);
-                        return false;
-                    }
+                } else if (tagsFile.exists()) {
+                    fileMtime = tagsFile.lastModified();
+                } else
+                    return false;
+
+                if (now - fileMtime > DEFAULT_EXPIRES_TIME) {
+                    log.log(Level.FINE, "TMS - Tile has expired, maximum file age reached {0}", tile);
+                    return false;
                 }
             }
@@ -337 +344 @@
                 log.log(Level.WARNING, "TMS - Error while loading image from tile cache: {0}; {1}", new Object[]{e.getMessage(), tile});
                 tileFile.delete();
-                File tileMetaData = getTagsFile();
-                if (tileMetaData.exists())
-                    tileMetaData.delete();
+                if (tagsFile.exists()) {
+                    tagsFile.delete();
+                }
                 tileFile = null;
                 fileMtime = null;
@@ -454 +461 @@
 
         protected boolean loadTagsFromFile() {
-            tileFile = getTileFile();
             File tagsFile = getTagsFile();
             try (BufferedReader f = new BufferedReader(new InputStreamReader(new FileInputStream(tagsFile), TAGS_CHARSET))) {