Changeset 19240 in osm for applications/editors/josm/plugins/wmsplugin/src

Timestamp:

2009-12-30T16:59:35+01:00 (16 years ago)

Author:

petrdlouhy

Message:

search in cache is not threaded

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• Grabber.java (modified) (1 diff)
• HTMLGrabber.java (modified) (1 diff)
• WMSGrabber.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java ¶

@@ -113 +113 @@
         return (int)(Math.random() * ((max+1)-min) ) + min;
     }
+
+    abstract public boolean loadFromCache();
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/HTMLGrabber.java ¶

@@ -27 +27 @@
         System.out.println("Grabbing HTML " + url);
 
-        BufferedImage cached = cache.getImg(urlstring);
-        if(cached != null) return cached;
-
         ArrayList<String> cmdParams = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer(MessageFormat.format(

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java ¶

@@ -66 +66 @@
 
             if(image.isVisible(mv, layer.getDx(), layer.getDy())) { //don't download, if the image isn't visible already
-                BufferedImage img = grab(url); 
-                if(img == null)return;
-                image.image = img;
+                image.image = grab(url);
                 image.flushedResizedCachedInstance();
             }
@@ -154 +152 @@
     }
 
-    protected BufferedImage grab(URL url) throws IOException, OsmTransferException {
+    public boolean loadFromCache(){
+        URL url = null;
+        try{
+           url = getURL(
+              b.min.east(), b.min.north(),
+              b.max.east(), b.max.north(),
+              width(), height());
+        } catch(Exception e) {
+           return false;
+        }
         BufferedImage cached = cache.getImg(url.toString());
         if(!layer.hasAutoDownload() || cached != null){
-           if(cached == null) grabNotInCache();
-           return cached;
-        }
-
+           image.min = b.min;
+           image.max = b.max;
+           if(cached == null){
+              grabNotInCache();
+              return true;
+           }
+           image.image = cached;
+           image.flushedResizedCachedInstance();
+           image.downloadingStarted = false;
+           return true;
+        }
+        return false;
+    }
+
+    protected BufferedImage grab(URL url) throws IOException, OsmTransferException {
         System.out.println("Grabbing WMS " + url);
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java ¶

@@ -252 +252 @@
                     img.flushedResizedCachedInstance();
                     Grabber gr = WMSPlugin.getGrabber(XYtoBounds(x,y), img, mv, this);
-                    gr.setPriority(1);
-                    executor.submit(gr);
+                    if(!gr.loadFromCache()){
+                       gr.setPriority(1);
+                       executor.submit(gr);
+                    }
                 }
             }