Changeset 3747 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2010-12-27T19:40:35+01:00 (13 years ago)

Author:

jttt

Message:

Make sure wms layer will not try to download the same area twice

Location:

trunk/src/org/openstreetmap/josm/io/imagery

Files:

• Grabber.java (modified) (3 diffs)
• HTMLGrabber.java (modified) (1 diff)
• WMSGrabber.java (modified) (6 diffs)
• WMSRequest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -23 +23 @@
     protected volatile boolean canceled;
 
-    Grabber(MapView mv, WMSLayer layer, CacheFiles cache) {
+    Grabber(MapView mv, WMSLayer layer) {
         this.mv = mv;
         this.layer = layer;
@@ -50 +50 @@
     }
 
-    abstract void fetch(WMSRequest request) throws Exception; // the image fetch code
+    abstract void fetch(WMSRequest request, int attempt) throws Exception; // the image fetch code
 
     int width(){
@@ -86 +86 @@
                 if (!layer.requestIsValid(request))
                     return;
-                fetch(request);
+                fetch(request, i);
                 break; // break out of the retry loop
             } catch (Exception e) {

trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.io.CacheFiles;
 
 public class HTMLGrabber extends WMSGrabber {
     public static final StringProperty PROP_BROWSER = new StringProperty("imagery.wms.browser", "webkit-image {0}");
 
-    public HTMLGrabber(MapView mv, WMSLayer layer, CacheFiles cache) {
-        super(mv, layer, cache);
+    public HTMLGrabber(MapView mv, WMSLayer layer) {
+        super(mv, layer);
     }
 
     @Override
-    protected BufferedImage grab(URL url) throws IOException {
+    protected BufferedImage grab(URL url, int attempt) throws IOException {
         String urlstring = url.toExternalForm();
 
-        System.out.println("Grabbing HTML " + url);
+        System.out.println("Grabbing HTML " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
 
         ArrayList<String> cmdParams = new ArrayList<String>();

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.imagery.GeorefImage.State;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
-import org.openstreetmap.josm.data.imagery.GeorefImage.State;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.io.CacheFiles;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
@@ -42 +41 @@
     private final boolean urlWithPatterns;
 
-    public WMSGrabber(MapView mv, WMSLayer layer, CacheFiles cache) {
-        super(mv, layer, cache);
+    public WMSGrabber(MapView mv, WMSLayer layer) {
+        super(mv, layer);
         this.baseURL = layer.getInfo().getURL();
         /* URL containing placeholders? */
@@ -50 +49 @@
 
     @Override
-    void fetch(WMSRequest request) throws Exception{
+    void fetch(WMSRequest request, int attempt) throws Exception{
         URL url = null;
         try {
@@ -57 +56 @@
                     b.max.east(), b.max.north(),
                     width(), height());
-            request.finish(State.IMAGE, grab(url));
+            request.finish(State.IMAGE, grab(url, attempt));
 
         } catch(Exception e) {
@@ -165 +164 @@
     }
 
-    protected BufferedImage grab(URL url) throws IOException, OsmTransferException {
-        System.out.println("Grabbing WMS " + url);
+    protected BufferedImage grab(URL url, int attempt) throws IOException, OsmTransferException {
+        System.out.println("Grabbing WMS " + (attempt > 1? "(attempt " + attempt + ") ":"") + url);
 
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -193 +192 @@
         InputStream in = conn.getInputStream();
         BufferedReader br = new BufferedReader(new InputStreamReader(in));
-
-        String line = null;
-        while( (line = br.readLine()) != null) {
-            // filter non-ASCII characters and control characters
-            exception.append(line.replaceAll("[^\\p{Print}]", ""));
-            exception.append('\n');
-        }
-        return exception.toString();
+        try {
+            String line = null;
+            while( (line = br.readLine()) != null) {
+                // filter non-ASCII characters and control characters
+                exception.append(line.replaceAll("[^\\p{Print}]", ""));
+                exception.append('\n');
+            }
+            return exception.toString();
+        } finally {
+            br.close();
+        }
     }
 }

trunk/src/org/openstreetmap/josm/io/imagery/WMSRequest.java

@@ -4 +4 @@
 import java.awt.image.BufferedImage;
 
-import org.openstreetmap.josm.data.imagery.GeorefImage;
 import org.openstreetmap.josm.data.imagery.GeorefImage.State;