Changeset 31083 in osm

Timestamp:

2015-04-10T14:16:34+02:00 (9 years ago)

Author:

bastik

Message:

see #josm11312 - imagerycache Plugin broken by recent changes in JOSM (patch by wiktorn)

Location:

applications/editors/josm/plugins/imagerycache

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imagerycache/ImageryCachePlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java (modified) (7 diffs)

applications/editors/josm/plugins/imagerycache/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="[JOSM_ImageryCache]: correct database cleaning, at last"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="8186"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/ImageryCachePlugin.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.util.Map;
+
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
@@ -28 +31 @@
             return null;
         }
+
+        @Override
+        public TileLoader makeTileLoader(TileLoaderListener listener,
+                Map<String, String> headers) {
+            return makeTileLoader(listener);
+        }
     };
 

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java

@@ -16 +16 @@
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
@@ -41 +40 @@
     protected long recheckAfter = FILE_AGE_ONE_DAY;
 
-
     public OsmDBTilesLoader(TileLoaderListener smap, File cacheFolder) {
         super(smap);
@@ -55 +53 @@
     @Override
     public void clearCache(TileSource source) {
-        clearCache(source, null);
-    }
-
-    @Override
-    public void clearCache(TileSource source, TileClearController controller) {
         dao.cleanStorage(source.getName());
     }
@@ -95 +88 @@
                 tile.initLoading();
             }
-            if (loadTileFromFile()) {
-                return;
-            }
-            if (dbTile != null) {
-                TileJob job = new TileJob() {
-                    @Override public void run() {
-                        loadOrUpdateTileFromServer();
-                    }
-                    @Override public Tile getTile() {
-                        return tile;
-                    }
-                };
-                JobDispatcher.getInstance().addJob(job);
-            } else {
-                loadOrUpdateTileFromServer();
-            }
+
+            TileJob job = new TileJob() {
+                @Override public void run() {
+                    if (loadTileFromFile()) {
+                        return;
+                    }
+
+                    loadOrUpdateTileFromServer();
+                }
+                @Override public Tile getTile() {
+                    return tile;
+                }
+                @Override
+                public void submit() {
+                    run();
+
+                }
+            };
+            JobDispatcher.getInstance().addJob(job);
         }
 
@@ -151 +147 @@
                 }
             } catch (Exception e) {
-                Main.error("Error: Can not load tile from database: "+sourceName+":"+id);
-                Main.error(e);
+                Main.error("Error: Can not load tile from database: "+sourceName+":"+id);
+                Main.error(e);
                 try {
                     if (bin != null) {
@@ -164 +160 @@
             } catch (Error e) { // this is bad, bat MapDB throws it
                 Main.error("Serious database error: Can not load tile from database: "+sourceName+":"+id);
-                Main.error(e);
-                dbTile = null;  fileAge = 0;  return false;
+                Main.error(e);
+                dbTile = null;  
+                fileAge = 0; 
+                return false;
             }
         }
@@ -341 +339 @@
             }
         }
+
+        @Override
+        public void submit() {
+            run();
+            
+        }
     }
 }