Changeset 8216 in josm for trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

Timestamp:

2015-04-18T11:50:47+02:00 (9 years ago)

Author:

simon04

Message:

fix #10867 - Notes download: inform user about reaching download limit

File:

• trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -162 +162 @@
 
     @Override
-    public List<Note> parseNotes(Integer noteLimit, Integer daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException {
+    public List<Note> parseNotes(Integer noteLimit, Integer daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException, MoreNotesException {
         progressMonitor.beginTask("Downloading notes");
         noteLimit = checkNoteLimit(noteLimit);
@@ -180 +180 @@
             InputStream is = getInputStream(url, progressMonitor.createSubTaskMonitor(1, false));
             NoteReader reader = new NoteReader(is);
-            return reader.parse();
+            final List<Note> notes = reader.parse();
+            if (notes.size() == noteLimit) {
+                throw new MoreNotesException(noteLimit);
+            }
+            return notes;
         } catch (IOException e) {
             throw new OsmTransferException(e);
@@ -187 +191 @@
         } finally {
             progressMonitor.finishTask();
+        }
+    }
+
+    /**
+     * Indicates that the number of fetched notes equals the specified limit. Thus there might be more notes to download.
+     */
+    public static class MoreNotesException extends RuntimeException{
+        /**
+         * The download limit sent to the server.
+         */
+        public final int limit;
+
+        public MoreNotesException(int limit) {
+            this.limit = limit;
         }
     }
@@ -194 +212 @@
             limit = Main.pref.getInteger("osm.notes.downloadLimit", 1000);
         }
-        if (limit > 10000) {
-            Main.error("Requested note limit is over API hard limit of 10000. Reducing to 10000.");
-            limit = 10000;
+        if (limit > 50000) {
+            // see max_number_of_nodes in https://github.com/openstreetmap/openstreetmap-website/blob/master/config/example.application.yml
+            Main.error("Requested note limit is over API hard limit of 50000. Reducing to 50000.");
+            limit = 50000;
         }
         if (limit < 1) {
@@ -202 +221 @@
             limit = 1;
         }
-        Main.debug("returning note limit: " + limit);
         return limit;
     }
@@ -214 +232 @@
             days = -1;
         }
-        Main.debug("returning days closed: " + days);
         return days;
     }