Changeset 15091 in osm for applications/editors

Timestamp:

2009-05-17T13:19:29+02:00 (16 years ago)

Author:

stoecker

Message:

close #2589, #2310

Location:

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

Files:

• Cache.java (modified) (6 diffs)
• GeorefImage.java (modified) (4 diffs)
• Grabber.java (modified) (2 diffs)
• WMSLayer.java (modified) (8 diffs)
• WMSPlugin.java (modified) (2 diffs)
• WMSPreferenceEditor.java (modified) (9 diffs)

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

@@ -8 +8 @@
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
 import javax.imageio.*;
-
 
 import org.openstreetmap.josm.Main;
@@ -24 +24 @@
     // If the cache is full, we don't want to delete just one file
     private final int cleanUpThreshold = 20;
+    // After how many file-writes do we want to check if the cache needs emptying?
+    private final int cleanUpInterval = 5;
 
     Cache() {
@@ -73 +75 @@
         }
 
-        // Clean up must be called manually
+        checkCleanUp();
     }
 
@@ -79 +81 @@
         saveImg(ident, image);
         return image;
+    }
+
+    public void checkCleanUp() {
+        // The Cache class isn't persistent in its current implementation,
+        // therefore clean up on random intervals, but not every write
+        if(new Random().nextInt(cleanUpInterval) == 0)
+            cleanUp();
     }
 
@@ -112 +121 @@
     }
 
+    public void deleteSmallFiles(int size) {
+        if(disabled) return;
+        for(File f : getFiles()) {
+            if(f.length() < size)
+                f.delete();
+        }
+    }
+
     private long getDirSize() {
+        if(disabled) return -1;
         long dirsize = 0;
 
@@ -121 +139 @@
 
     private File[] getFiles() {
+        if(disabled) return null;
         return dir.listFiles(
             new FileFilter() {

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

@@ -1 +1 @@
 package wmsplugin;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -80 +81 @@
         // Zooming is still slow because the images need to be resized
         if(diffx >= 0 && diffx <= 2 && diffy >= 0 && diffy <= 2 && reImg != null) {
+            /*g.setColor(Color.RED);
+              g.drawRect(minPt.x, minPt.y-height, width, height);*/
             g.drawImage(reImg, minPt.x, maxPt.y, null);
             return true;
@@ -120 +123 @@
 
                 reImgHash.setSize(width, height);
+                /*g.setColor(Color.RED);
+                  g.drawRect(minPt.x, minPt.y-height, width, height);*/
                 g.drawImage(reImg, minPt.x, maxPt.y, null);
             }
@@ -153 +158 @@
 
     private Image clearAlpha(Image img) {
-                ImageProducer ip = img.getSource();
-                RGBImageFilter filter = new RGBImageFilter() {
-                        public int filterRGB(int x, int y, int rgb) {
-                                return rgb | 0xff000000;
-                        }
-                };
-                ImageProducer filt_ip = new FilteredImageSource(ip, filter);
-                Image out_img = Toolkit.getDefaultToolkit().createImage(filt_ip);
+        ImageProducer ip = img.getSource();
+        RGBImageFilter filter = new RGBImageFilter() {
+            public int filterRGB(int x, int y, int rgb) {
+                return rgb | 0xff000000;
+            }
+        };
+        ImageProducer filt_ip = new FilteredImageSource(ip, filter);
+        Image out_img = Toolkit.getDefaultToolkit().createImage(filt_ip);
 
-                return out_img;
-        }
+        return out_img;
+    }
 
     public void flushedResizedCachedInstance() {

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

@@ -12 +12 @@
 import java.awt.Font;
 import javax.swing.JOptionPane;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 abstract public class Grabber implements Runnable {
@@ -21 +22 @@
     protected GeorefImage image;
 
-    Grabber(Bounds b, Projection proj,
-            double pixelPerDegree, GeorefImage image, MapView mv, WMSLayer layer) {
-        this.b = b;
+    Grabber(Bounds b, Projection proj, double pixelPerDegree, GeorefImage image,
+    MapView mv, WMSLayer layer)
+    {
+        if (b.min != null && b.max != null && WMSPlugin.doOverlap)
+        {
+            double latCent = (b.min.lat() + b.max.lat()) / 2;
+            double lonCent = (b.min.lon() + b.max.lon()) / 2;
+
+            double latSize =  b.max.lat() - b.min.lat();
+            double lonSize =  b.max.lon() - b.min.lon();
+
+            double latCoef = (100.0 + WMSPlugin.overlapLat) / 100.0 / 2.0;
+            double lonCoef = (100.0 + WMSPlugin.overlapLon) / 100.0 / 2.0;
+
+            this.b = new Bounds( new LatLon(latCent - latCoef * latSize,
+                                            lonCent - lonCoef * lonSize),
+                                 new LatLon(latCent + latCoef * latSize,
+                                            lonCent + lonCoef * lonSize));
+        }
+        else
+            this.b = b;
+
         this.proj = proj;
         this.pixelPerDegree = pixelPerDegree;

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

@@ -42 +42 @@
  */
 public class WMSLayer extends Layer {
-
     protected static final Icon icon =
         new ImageIcon(Toolkit.getDefaultToolkit().createImage(WMSPlugin.class.getResource("/images/wms_small.png")));
@@ -80 +79 @@
         mv = Main.map.mapView;
         getPPD();
-        
+
         executor = Executors.newFixedThreadPool(3);
     }
-    
+
+    @Override
     public void destroy() {
-        try { 
-            executor.shutdown();  
+        try {
+            executor.shutdown();
         // Might not be initalized, so catch NullPointer as well
         } catch(Exception x) {}
@@ -172 +172 @@
             return;
         }
-        
+
         for(int x = bminx; x<bmaxx; ++x)
             for(int y = bminy; y<bmaxy; ++y){
                 GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
+                g.drawRect(x, y, dax, bminy);
                 if(!img.paint(g, mv, dx, dy) && !img.downloadingStarted){
                     img.downloadingStarted = true;
@@ -184 +185 @@
             }
         }
-
-        new wmsplugin.Cache().cleanUp();
     }
 
@@ -248 +247 @@
         }
     }
-    
+
     public class reloadErrorTilesAction extends AbstractAction {
         public reloadErrorTilesAction() {
@@ -254 +253 @@
         }
         public void actionPerformed(ActionEvent ev) {
+            // Delete small files, because they're probably blank tiles.
+            // See https://josm.openstreetmap.de/ticket/2307
+            new wmsplugin.Cache().deleteSmallFiles(2048);
+
             for (int x = 0; x < dax; ++x) {
                 for (int y = 0; y < day; ++y) {
@@ -266 +269 @@
         }
     }
-    
+
     public class ToggleAlphaAction extends AbstractAction {
         public ToggleAlphaAction() {
@@ -275 +278 @@
             boolean alphaChannel = checkbox.isSelected();
             Main.pref.put("wmsplugin.alpha_channel", alphaChannel);
-            
+
             // clear all resized cached instances and repaint the layer
             for (int x = 0; x < dax; ++x) {

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

@@ -37 +37 @@
     static ArrayList<WMSInfo> wmsList = new ArrayList<WMSInfo>();
     static TreeMap<String,String> wmsListDefault = new TreeMap<String,String>();
+
+    static boolean doOverlap = false;
+    static int overlapLat = 4;
+    static int overlapLon = 14;
 
     // remember state of menu item to restore on changed preferences
@@ -77 +81 @@
 
         TreeSet<String> keys = new TreeSet<String>(prefs.keySet());
+
+        // Here we load the settings for "overlap" checkbox and spinboxes.
+
+        try {
+            doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapLat = Integer.valueOf(prefs.get("wmsplugin.url.overlapLat"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapLon = Integer.valueOf(prefs.get("wmsplugin.url.overlapLon"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        // And then the names+urls of WMS servers
         int prefid = 0;
         String name = null;

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

@@ -1 +1 @@
 package wmsplugin;
 
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import javax.swing.JCheckBox;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import org.openstreetmap.josm.Main;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -9 +15 @@
 import java.util.HashMap;
 import java.util.Map;
-
 
 import javax.swing.Box;
@@ -21 +26 @@
 import javax.swing.table.DefaultTableModel;
 
-
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -27 +31 @@
 
 public class WMSPreferenceEditor implements PreferenceSetting {
-
     private Map<String,String> orig;
     private DefaultTableModel model;
     private HashMap<Integer, WMSInfo> oldValues = new HashMap<Integer, WMSInfo>();
+
+    JCheckBox overlapCheckBox;
+    JSpinner spinLat;
+    JSpinner spinLon;
 
     public void addGui(final PreferenceDialog gui) {
@@ -59 +66 @@
         }
 
+        JPanel buttonPanel = new JPanel(new FlowLayout());
+
         JButton add = new JButton(tr("Add"));
-        p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
-        p.add(add, GBC.std().insets(0,5,0,0));
+        buttonPanel.add(add, GBC.std().insets(0,5,0,0));
         add.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
@@ -79 +87 @@
 
         JButton delete = new JButton(tr("Delete"));
-        p.add(delete, GBC.std().insets(0,5,0,0));
+        buttonPanel.add(delete, GBC.std().insets(0,5,0,0));
         delete.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
@@ -94 +102 @@
 
         JButton copy = new JButton(tr("Copy Default"));
-        p.add(copy, GBC.std().insets(0,5,0,0));
+        buttonPanel.add(copy, GBC.std().insets(0,5,0,0));
         copy.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
@@ -107 +115 @@
             }
         });
+
+        p.add(buttonPanel);
+        p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
+
+        overlapCheckBox = new JCheckBox(tr("Overlap tiles"), WMSPlugin.doOverlap );
+        JLabel labelLat = new JLabel(tr("% of lat:"));
+        JLabel labelLon = new JLabel(tr("% of lon:"));
+        spinLat = new JSpinner(new SpinnerNumberModel(WMSPlugin.overlapLat, 1, 50, 1));
+        spinLon = new JSpinner(new SpinnerNumberModel(WMSPlugin.overlapLon, 1, 50, 1));
+
+        JPanel overlapPanel = new JPanel(new FlowLayout());
+        overlapPanel.add(overlapCheckBox);
+        overlapPanel.add(labelLat);
+        overlapPanel.add(spinLat);
+        overlapPanel.add(labelLon);
+        overlapPanel.add(spinLon);
+
+        p.add(overlapPanel);
     }
 
@@ -145 +171 @@
 
         if (change) WMSPlugin.refreshMenu();
+
+        WMSPlugin.doOverlap = overlapCheckBox.getModel().isSelected();
+        WMSPlugin.overlapLat = (Integer) spinLat.getModel().getValue();
+        WMSPlugin.overlapLon = (Integer) spinLon.getModel().getValue();
+
+        Main.pref.put("wmsplugin.url.overlap",    String.valueOf(WMSPlugin.doOverlap));
+        Main.pref.put("wmsplugin.url.overlapLat", String.valueOf(WMSPlugin.overlapLat));
+        Main.pref.put("wmsplugin.url.overlapLon", String.valueOf(WMSPlugin.overlapLon));
+
         return false;
     }