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

Timestamp:

2010-07-12T16:53:14+02:00 (14 years ago)

Author:

stoecker

Message:

better handling of grey tiles

Location:

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

Files:

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

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

@@ -25 +25 @@
         public boolean downloadingStarted;
         public boolean failed = false;
+        public boolean infotext = false;
 
         public GeorefImage(boolean downloadingStarted) {

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

@@ -89 +89 @@
         image.image = img;
         image.flushedResizedCachedInstance();
-        image.failed = true;
+        image.infotext = true;
         image.downloadingStarted = false;
         g.setFont(font);
@@ -114 +114 @@
     }
 
-    abstract public boolean loadFromCache();
+    abstract public boolean loadFromCache(boolean real);
 }

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

@@ -155 +155 @@
 
     @Override
-        public boolean loadFromCache(){
+        public boolean loadFromCache(boolean real){
         URL url = null;
         try{
@@ -166 +166 @@
         }
         BufferedImage cached = cache.getImg(url.toString());
-        if(!layer.hasAutoDownload() || cached != null){
+        if((!real && !layer.hasAutoDownload()) || cached != null){
            image.min = b.min;
            image.max = b.max;

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

@@ -198 +198 @@
             }
         } else {
-            downloadAndPaintVisible(g, mv);
+            downloadAndPaintVisible(g, mv, false);
         }
     }
@@ -236 +236 @@
     }
 
-    protected void downloadAndPaintVisible(Graphics g, final MapView mv){
+    protected void downloadAndPaintVisible(Graphics g, final MapView mv,
+    boolean real){
         if (usesInvalidUrl)
             return;
@@ -249 +250 @@
             for(int y = bminy; y<bmaxy; ++y){
                 GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
-                if(!img.paint(g, mv, dx, dy) && !img.downloadingStarted){
+                if((!img.paint(g, mv, dx, dy) || img.infotext) && !img.downloadingStarted){
                     img.downloadingStarted = true;
                     img.image = null;
                     img.flushedResizedCachedInstance();
                     Grabber gr = WMSPlugin.getGrabber(XYtoBounds(x,y), img, mv, this);
-                    if(!gr.loadFromCache()){
+                    if(!gr.loadFromCache(real)){
                         gr.setPriority(1);
                         executor.submit(gr);
@@ -320 +321 @@
                 );
             } else {
-                downloadAndPaintVisible(mv.getGraphics(), mv);
+                downloadAndPaintVisible(mv.getGraphics(), mv, true);
             }
         }