Changeset 31468 in osm for applications/editors

Timestamp:

2015-08-08T13:39:33+02:00 (9 years ago)

Author:

wiktorn

Message:

Pass custom headers to OsmTileLoader

Location:

applications/editors/josm/plugins/imagerycache

Files:

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

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="8526"/>
+    <property name="plugin.main.version" value="8648"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -20 +20 @@
     TileLoaderFactory factory = new TileLoaderFactory() {
         @Override
-        public OsmTileLoader makeTileLoader(TileLoaderListener listener) {
+        public OsmTileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers) {
             String cachePath = CachedTileLoaderFactory.PROP_TILECACHE_DIR.get();
             try {
@@ -29 +29 @@
             
             if (cachePath != null && !cachePath.isEmpty()) {
-                return new OsmDBTilesLoader(listener, new File(cachePath));
+                return new OsmDBTilesLoader(listener, new File(cachePath), headers);
             }
             return null;
@@ -35 +35 @@
 
         @Override
-        public TileLoader makeTileLoader(TileLoaderListener listener,
-                Map<String, String> headers) {
-            return makeTileLoader(listener);
+        public TileLoader makeTileLoader(TileLoaderListener listener) {
+            return makeTileLoader(listener, null);
         }
     };

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

@@ -40 +40 @@
     protected long recheckAfter = FILE_AGE_ONE_DAY;
 
-    public OsmDBTilesLoader(TileLoaderListener smap, File cacheFolder) {
-        super(smap);
+    public OsmDBTilesLoader(TileLoaderListener smap, File cacheFolder, Map<String, String> headers) {
+        super(smap, headers);
         dao = TileDAOMapDB.getInstance();
         dao.setCacheFolder(cacheFolder);