Changeset 22794 in osm for applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

Timestamp:

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

Author:

jttt

Message:

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

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (modified) (11 diffs)

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