Changeset 22794 in osm for applications/editors/josm/plugins/wmsplugin

Timestamp:

2010-08-26T19:47:34+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5378 Ghost images appear when wmsplugin.url.overlap=true

Location:

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

Files:

• GeorefImage.java (modified) (2 diffs)
• Grabber.java (modified) (4 diffs)
• WMSLayer.java (modified) (11 diffs)
• WMSPlugin.java (modified) (4 diffs)
• WMSPreferenceEditor.java (modified) (2 diffs)

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

@@ -99 +99 @@
 
         private BufferedImage createImage() {
-                int left = layer.getImageX(xIndex);
-                int bottom = layer.getImageY(yIndex);
-                int width = layer.getImageX(xIndex + 1) - left;
-                int height = layer.getImageY(yIndex + 1) - bottom;
-
-                return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+                return new BufferedImage(layer.getImageWidth(xIndex), layer.getImageHeight(yIndex), BufferedImage.TYPE_INT_RGB);
         }
 
@@ -117 +112 @@
                 int left = layer.getImageX(xIndex);
                 int bottom = layer.getImageY(yIndex);
-                int width = layer.getImageX(xIndex + 1) - left;
-                int height = layer.getImageY(yIndex + 1) - bottom;
+                int width = layer.getImageWidth(xIndex);
+                int height = layer.getImageHeight(yIndex);
 
                 int x = left - leftEdge;

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

@@ -18 +18 @@
         protected Projection proj;
         protected double pixelPerDegree;
+        protected WMSRequest request;
         protected volatile boolean canceled;
 
@@ -30 +31 @@
                                 layer.getEastNorth(request.getXIndex(), request.getYIndex()),
                                 layer.getEastNorth(request.getXIndex() + 1, request.getYIndex() + 1));
-                if (b.min != null && b.max != null && WMSPlugin.doOverlap) {
+                if (b.min != null && b.max != null && WMSPlugin.PROP_OVERLAP.get()) {
                         double eastSize =  b.max.east() - b.min.east();
                         double northSize =  b.max.north() - b.min.north();
 
-                        double eastCoef = WMSPlugin.overlapEast / 100.0;
-                        double northCoef = WMSPlugin.overlapNorth / 100.0;
+                        double eastCoef = WMSPlugin.PROP_OVERLAP_EAST.get() / 100.0;
+                        double northCoef = WMSPlugin.PROP_OVERLAP_NORTH.get() / 100.0;
 
                         this.b = new ProjectionBounds( new EastNorth(b.min.east(),
@@ -45 +46 @@
                 this.proj = Main.proj;
                 this.pixelPerDegree = request.getPixelPerDegree();
+                this.request = request;
         }
 
@@ -50 +52 @@
 
         int width(){
-                return (int) ((b.max.north() - b.min.north()) * pixelPerDegree);
+                return layer.getImageWidth(request.getXIndex());
         }
         int height(){
-                return (int) ((b.max.east() - b.min.east()) * pixelPerDegree);
+                return layer.getImageHeight(request.getYIndex());
         }
 

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

@@ -53 +53 @@
  */
 public class WMSLayer extends Layer implements PreferenceChangedListener {
+
         protected static final Icon icon =
                 new ImageIcon(Toolkit.getDefaultToolkit().createImage(WMSPlugin.class.getResource("/images/wms_small.png")));
@@ -67 +68 @@
         protected int minZoom = 3;
 
-        protected boolean deltaChanged;
         protected double dx = 0.0;
         protected double dy = 0.0;
@@ -77 +77 @@
         protected final int serializeFormatVersion = 5;
         protected boolean autoDownloadEnabled = true;
+        protected boolean settingsChanged;
 
         // Image index boundary for current view
@@ -86 +87 @@
         private volatile int bottomEdge;
 
-
+        // Request queue
         private final List<WMSRequest> requestQueue = new ArrayList<WMSRequest>();
         private final List<WMSRequest> finishedRequests = new ArrayList<WMSRequest>();
@@ -202 +203 @@
 
         @Override public void paint(Graphics2D g, final MapView mv, Bounds b) {
-                deltaChanged = false;
                 if(baseURL == null) return;
                 if (usesInvalidUrl && !isInvalidUrlConfirmed) return;
+
+                settingsChanged = false;
 
                 ProjectionBounds bounds = mv.getProjectionBounds();
@@ -261 +263 @@
 
         public void displace(double dx, double dy) {
-                deltaChanged = true;
+                settingsChanged = true;
                 this.dx += dx;
                 this.dy += dy;
@@ -280 +282 @@
         public int getImageY(int imageIndex) {
                 return (int)(imageIndex * imageSize * (getPPD() / pixelPerDegree) + dy * getPPD());
+        }
+
+        public int getImageWidth(int xIndex) {
+                int overlap = (int)(WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_EAST.get() * imageSize * getPPD() / pixelPerDegree / 100:0);
+                return getImageX(xIndex + 1) - getImageX(xIndex) + overlap;
+        }
+
+        public int getImageHeight(int yIndex) {
+                int overlap = (int)(WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_NORTH.get() * imageSize * getPPD() / pixelPerDegree / 100:0);
+                return getImageY(yIndex + 1) - getImageY(yIndex) + overlap;
         }
 
@@ -514 +526 @@
                         resolution = mv.getDist100PixelText();
                         pixelPerDegree = getPPD();
+                        settingsChanged = true;
                         mv.repaint();
                 }
@@ -627 +640 @@
                                 ois.close();
                                 fis.close();
+                                settingsChanged = true;
                                 mv.repaint();
                         }
@@ -743 +757 @@
                 requestQueueLock.lock();
                 try {
-                        return !finishedRequests.isEmpty() || deltaChanged;
+                        return !finishedRequests.isEmpty() || settingsChanged;
                 } finally {
                         requestQueueLock.unlock();
@@ -753 +767 @@
                         cancelGrabberThreads(true);
                         startGrabberThreads();
-                }
-        }
+                } else if (
+                                event.getKey().equals(WMSPlugin.PROP_OVERLAP.getKey())
+                                || event.getKey().equals(WMSPlugin.PROP_OVERLAP_EAST.getKey())
+                                || event.getKey().equals(WMSPlugin.PROP_OVERLAP_NORTH.getKey())) {
+                        for (int i=0; i<images.length; i++) {
+                                for (int k=0; k<images[i].length; k++) {
+                                        images[i][k] = new GeorefImage(this);
+                                }
+                        }
+
+                        settingsChanged = true;
+                }
+        }
+
 }

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

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.IconToggleButton;
@@ -50 +51 @@
 
         public static final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("wmsplugin.simultaneousConnections", 3);
+        public static final BooleanProperty PROP_OVERLAP = new BooleanProperty("wmsplugin.url.overlap", false);
+        public static final IntegerProperty PROP_OVERLAP_EAST = new IntegerProperty("wmsplugin.url.overlapEast", 14);
+        public static final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("wmsplugin.url.overlapNorth", 4);
 
         WMSLayer wmsLayer;
@@ -57 +61 @@
         static TreeMap<String,String> wmsListDefault = new TreeMap<String,String>();
 
-        static boolean doOverlap = false;
-        static int overlapEast = 14;
-        static int overlapNorth = 4;
         // remember state of menu item to restore on changed preferences
         static private boolean menuEnabled = false;
@@ -255 +256 @@
                 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 {
-                        overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast"));
-                } catch (Exception e) {} // If sth fails, we drop to default settings.
-
-                try {
-                        overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth"));
-                } catch (Exception e) {} // If sth fails, we drop to default settings.
-
                 // And then the names+urls of WMS servers
                 int prefid = 0;

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

@@ -169 +169 @@
                 p.add(Box.createHorizontalGlue(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
 
-                overlapCheckBox = new JCheckBox(tr("Overlap tiles"), WMSPlugin.doOverlap );
+                overlapCheckBox = new JCheckBox(tr("Overlap tiles"), WMSPlugin.PROP_OVERLAP.get() );
                 JLabel labelEast = new JLabel(tr("% of east:"));
                 JLabel labelNorth = new JLabel(tr("% of north:"));
-                spinEast = new JSpinner(new SpinnerNumberModel(WMSPlugin.overlapEast, 1, 50, 1));
-                spinNorth = new JSpinner(new SpinnerNumberModel(WMSPlugin.overlapNorth, 1, 50, 1));
+                spinEast = new JSpinner(new SpinnerNumberModel(WMSPlugin.PROP_OVERLAP_EAST.get(), 1, 50, 1));
+                spinNorth = new JSpinner(new SpinnerNumberModel(WMSPlugin.PROP_OVERLAP_NORTH.get(), 1, 50, 1));
 
                 JPanel overlapPanel = new JPanel(new FlowLayout());
@@ -240 +240 @@
                 if (change) WMSPlugin.refreshMenu();
 
-                WMSPlugin.doOverlap = overlapCheckBox.getModel().isSelected();
-                WMSPlugin.overlapEast = (Integer) spinEast.getModel().getValue();
-                WMSPlugin.overlapNorth = (Integer) spinNorth.getModel().getValue();
+                WMSPlugin.PROP_OVERLAP.put(overlapCheckBox.getModel().isSelected());
+                WMSPlugin.PROP_OVERLAP_EAST.put((Integer) spinEast.getModel().getValue());
+                WMSPlugin.PROP_OVERLAP_NORTH.put((Integer) spinNorth.getModel().getValue());
                 WMSPlugin.PROP_SIMULTANEOUS_CONNECTIONS.put((Integer) spinSimConn.getModel().getValue());
                 allowRemoteControl = remoteCheckBox.getModel().isSelected();
-
-                Main.pref.put("wmsplugin.url.overlap",    String.valueOf(WMSPlugin.doOverlap));
-                Main.pref.put("wmsplugin.url.overlapEast", String.valueOf(WMSPlugin.overlapEast));
-                Main.pref.put("wmsplugin.url.overlapNorth", String.valueOf(WMSPlugin.overlapNorth));
 
                 Main.pref.put("wmsplugin.browser", browser.getEditor().getItem().toString());