Changeset 22929 in osm for applications/editors/josm

Timestamp:

2010-09-01T20:45:20+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5400 WMS plugin change it's zoom level

Location:

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

Files:

• GeorefImage.java (modified) (2 diffs)
• Grabber.java (modified) (1 diff)
• WMSLayer.java (modified) (1 diff)

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

@@ -99 +99 @@
 
         private BufferedImage createImage() {
-                return new BufferedImage(layer.getImageWidth(xIndex), layer.getImageHeight(yIndex), BufferedImage.TYPE_INT_RGB);
+                return new BufferedImage(layer.getBaseImageWidth(), layer.getBaseImageHeight(), BufferedImage.TYPE_INT_RGB);
         }
 
@@ -217 +217 @@
                 return yIndex;
         }
-        
+
         public void setLayer(WMSLayer layer) {
-            this.layer = layer;
+                this.layer = layer;
         }
 }

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

@@ -52 +52 @@
 
         int width(){
-                return layer.getImageWidth(request.getXIndex());
+                return layer.getBaseImageWidth();
         }
         int height(){
-                return layer.getImageHeight(request.getYIndex());
+                return layer.getBaseImageHeight();
         }
 

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

@@ -297 +297 @@
         /**
          *
+         * @return Size of image in original zoom
+         */
+        public int getBaseImageWidth() {
+                int overlap = (WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_EAST.get() * imageSize / 100:0);
+                return imageSize + overlap;
+        }
+
+        /**
+         *
+         * @return Size of image in original zoom
+         */
+        public int getBaseImageHeight() {
+                int overlap = (WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_NORTH.get() * imageSize / 100:0);
+                return imageSize + overlap;
+        }
+
+
+        /**
+         *
          * @param xIndex
          * @param yIndex