Changeset 17561 in osm for applications/editors/josm

Timestamp:

2009-09-09T17:05:43+02:00 (15 years ago)

Author:

petrdlouhy

Message:

fix of adjust action

Location:

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

Files:

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

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

@@ -35 +35 @@
     }
 
-    /* this does not take dx and dy offset into account! */
-    public boolean isVisible(NavigatableComponent nc) {
-        Point minPt = nc.getPoint(min), maxPt = nc.getPoint(max);
+    public boolean isVisible(NavigatableComponent nc, double dx, double dy) {
+        EastNorth mi = new EastNorth(min.east()+dx, min.north()+dy);
+        EastNorth ma = new EastNorth(max.east()+dx, max.north()+dy);
+        Point minPt = nc.getPoint(mi), maxPt = nc.getPoint(ma);
         Graphics g = nc.getGraphics();
 
@@ -51 +52 @@
         Point minPt = nc.getPoint(mi), maxPt = nc.getPoint(ma);
 
-        /* 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(!isVisible(nc, dx, dy)){
             return false;
         }

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

@@ -65 +65 @@
             image.max = b.max;
 
-            if(image.isVisible(mv)) { //don't download, if the image isn't visible already
+            if(image.isVisible(mv, layer.getDx(), layer.getDy())) { //don't download, if the image isn't visible already
                 image.image = grab(url);
                 image.flushedResizedCachedInstance();

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

@@ -101 +101 @@
                         }
                 }
+        }
+
+        public double getDx(){
+                return dx;
+        }
+
+        public double getDy(){
+                return dy;
         }
 
@@ -207 +215 @@
                         return;
                 ProjectionBounds bounds = mv.getProjectionBounds();
-                int bminx= (int)Math.floor ((bounds.min.east() * pixelPerDegree ) / ImageSize );
-                int bminy= (int)Math.floor ((bounds.min.north() * pixelPerDegree ) / ImageSize );
-                int bmaxx= (int)Math.ceil  ((bounds.max.east() * pixelPerDegree ) / ImageSize );
-                int bmaxy= (int)Math.ceil  ((bounds.max.north() * pixelPerDegree ) / ImageSize );
+                int bminx= (int)Math.floor (((bounds.min.east() - dx) * pixelPerDegree) / ImageSize );
+                int bminy= (int)Math.floor (((bounds.min.north() - dy) * pixelPerDegree) / ImageSize );
+                int bmaxx= (int)Math.ceil  (((bounds.max.east() - dx) * pixelPerDegree) / ImageSize );
+                int bmaxy= (int)Math.ceil  (((bounds.max.north() - dy) * pixelPerDegree) / ImageSize );
 
                 if((bmaxx - bminx > dax) || (bmaxy - bminy > day)){