Changeset 13645 in osm for applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java

Timestamp:

2009-02-10T17:42:52+01:00 (16 years ago)

Author:

stoecker

Message:

apply patches from xeen: #1954 and #1906

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java (modified) (3 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java

@@ -21 +21 @@
 public class YAHOOGrabber extends WMSGrabber{
     protected String browserCmd;
+    protected Cache cache = new wmsplugin.Cache();
 
     YAHOOGrabber(String baseURL, Bounds b, Projection proj,
             double pixelPerDegree, GeorefImage image, MapView mv, WMSLayer layer) {
-        super("file:///" + Main.pref.getPreferencesDir() + "plugins/wmsplugin/ymap.html?"
-//                + "request=getmap&format=image/jpeg"
+        super("file:///" + WMSPlugin.getPrefsPath() + "ymap.html?"
         , b, proj, pixelPerDegree, image, mv, layer);
         this.browserCmd = baseURL.replaceFirst("yahoo://", "");
@@ -31 +31 @@
 
     protected BufferedImage grab(URL url) throws IOException {
-        ArrayList<String> cmdParams = new ArrayList<String>();
         String urlstring = url.toExternalForm();
         // work around a problem in URL removing 2 slashes
         if(!urlstring.startsWith("file:///"))
             urlstring = urlstring.replaceFirst("file:", "file://");
+
+        BufferedImage cached = cache.getImg(urlstring);
+        if(cached != null) return cached;
+
+        ArrayList<String> cmdParams = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer(MessageFormat.format(browserCmd, urlstring));
         while( st.hasMoreTokens() )
@@ -50 +54 @@
         }
 
-        return ImageIO.read(browser.getInputStream());
+        return cache.saveImg(urlstring, ImageIO.read(browser.getInputStream()), true);
     }
 }