Changeset 13645 in osm for applications/editors/josm/plugins

Timestamp:

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

Author:

stoecker

Message:

apply patches from xeen: #1954 and #1906

Location:

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

Files:

• Cache.java (added)
• GeorefImage.java (modified) (3 diffs)
• WMSGrabber.java (modified) (3 diffs)
• WMSInfo.java (modified) (2 diffs)
• WMSLayer.java (modified) (1 diff)
• WMSPlugin.java (modified) (3 diffs)
• YAHOOGrabber.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package wmsplugin;
 
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Point;
@@ -16 +17 @@
 public class GeorefImage implements Serializable {
     public BufferedImage image = null;
+    private BufferedImage reImg = null;
+    private Dimension reImgHash = new Dimension(0, 0);
     public EastNorth min, max;
     public boolean downloadingStarted;
@@ -44 +47 @@
         Point minPt = nc.getPoint(mi), maxPt = nc.getPoint(ma);
 
+        // downloadAndPaintVisible in WMSLayer.java requests visible images only
+        // so this path is never hit. 
         /* this is isVisible() but taking dx, dy into account */
-        if(!(g.hitClip(minPt.x, maxPt.y,
-                maxPt.x - minPt.x, minPt.y - maxPt.y)))
+        /*if(!(g.hitClip(minPt.x, maxPt.y, maxPt.x - minPt.x, minPt.y - maxPt.y))) {
             return false;
+        }*/
+        
+        // Width and height flicker about 2 pixels due to rounding errors, typically only 1
+        int width = Math.abs(maxPt.x-minPt.x);
+        int height = Math.abs(minPt.y-maxPt.y);
+        int diffx = reImgHash.width - width;
+        int diffy = reImgHash.height - height;
+        
+        // We still need to re-render if the requested size is larger (otherwise we'll have black lines)
+        // If it's only up to two pixels smaller, just draw the old image, the errors are minimal
+        // but the performance improvements when moving are huge
+        // Zooming is still slow because the images need to be resized
+        if(diffx >= 0 && diffx <= 2 && diffy >= 0 && diffy <= 2 && reImg != null) {
+            g.drawImage(reImg, minPt.x, maxPt.y, null);
+            return true;
+        }
 
-        g.drawImage(image,
-            minPt.x, maxPt.y, maxPt.x, minPt.y, // dest
+        // We haven't got a saved resized copy, so resize and cache it        
+        reImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        reImg.getGraphics().drawImage(image,
+            0, 0, width, height, // dest
             0, 0, image.getWidth(), image.getHeight(), // src
             null);
 
+        reImgHash.setSize(width, height);        
+        g.drawImage(reImg, minPt.x, maxPt.y, null);
         return true;
     }

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

@@ -31 +31 @@
 public class WMSGrabber extends Grabber {
     protected String baseURL;
+    protected Cache cache = new wmsplugin.Cache();
     private static Boolean shownWarning = false;
 
@@ -112 +113 @@
 
     protected BufferedImage grab(URL url) throws IOException {
+        BufferedImage cached = cache.getImg(url.toString());
+        if(cached != null) return cached;
+    
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
 
@@ -123 +127 @@
         BufferedImage img = ImageIO.read(is);
         is.close();
-        return img;
+        
+        return cache.saveImg(url.toString(), img, true);
     }
 

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

@@ -8 +8 @@
  * @author Frederik Ramm <frederik@remote.org>
  */
-public class WMSInfo implements Comparable {
+public class WMSInfo implements Comparable<WMSInfo> {
 
     String name;
@@ -23 +23 @@
         Main.pref.put("wmsplugin.url." + prefid + ".url", url);
     }
-    public int compareTo(Object c)
+    public int compareTo(WMSInfo c)
     {
-        Integer i = 0;
-        if(c instanceof WMSInfo)
-        {
-            WMSInfo in = (WMSInfo)c;
-            i = name.compareTo(in.name);
-            if(i == 0)
-                i = url.compareTo(in.url);
-            if(i == 0)
-                i = prefid-in.prefid;
-        }
+        WMSInfo in = (WMSInfo)c;
+        Integer i = name.compareTo(in.name);
+        if(i == 0)
+            i = url.compareTo(in.url);
+        if(i == 0)
+            i = prefid-in.prefid;
         return i;
     }

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

@@ -177 +177 @@
             }
         }
+
+        new wmsplugin.Cache().cleanUp();
     }
 

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

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.MapView;
 
-
-// NW 151006 only add the landsat task when the map frame is initialised with
-// data.
-
-
-
 public class WMSPlugin extends Plugin {
 
@@ -66 +60 @@
     public void copy(String from, String to) throws FileNotFoundException, IOException
     {
-        File pluginDir = new File(Main.pref.getPreferencesDir() + "plugins/wmsplugin/");
+        File pluginDir = new File(getPrefsPath());
         if (!pluginDir.exists())
             pluginDir.mkdirs();
-        FileOutputStream out = new FileOutputStream(Main.pref.getPreferencesDir() + "plugins/wmsplugin/" + to);
+        FileOutputStream out = new FileOutputStream(getPrefsPath() + to);
         InputStream in = WMSPlugin.class.getResourceAsStream(from);
         byte[] buffer = new byte[8192];
@@ -222 +216 @@
         return new WMSPreferenceEditor();
     }
+
+    static public String getPrefsPath()
+    {
+        return Main.pref.getPluginsDirFile().getPath() + "wmsplugin/";
+    }
 }

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);
     }
 }