Changeset 16770 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2020-07-15T15:54:08+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19451: Update data: Do not download incomplete ways

• if no download areas exist download again all objects with are neither new nor incomplete
• don't stop post processing of downloaded data if one or more download areas are empty

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateDataAction.java (modified) (1 diff)
• downloadtasks/DownloadTaskList.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -86 +86 @@
 
         if (areasToDownload.isEmpty()) {
-            // no bounds defined in the dataset? we update all primitives in the data set using a series of multi fetch requests
-            UpdateSelectionAction.updatePrimitives(editLayer.data.allPrimitives());
+            // no bounds defined in the dataset? We update all but the incomplete primitives in the data set
+            UpdateSelectionAction.updatePrimitives(editLayer.data.allPrimitives().stream()
+                    .filter(p -> !p.isNew() && !p.isIncomplete()).collect(Collectors.toList()));
         } else {
             // bounds defined? => use the bbox downloader

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

@@ -266 +266 @@
                                         Utils.joinAsHtmlUnorderedList(items)) + "</html>",
                                 tr("Errors during download"), JOptionPane.ERROR_MESSAGE);
+                        return;
                     }
                 });
-
-                return;
             }