Ticket #19451: 19451.2.patch
File 19451.2.patch, 2.3 KB (added by , 4 years ago) |
---|
-
src/org/openstreetmap/josm/actions/UpdateDataAction.java
12 12 import java.util.stream.Collectors; 13 13 14 14 import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList; 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 16 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 16 17 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor; 17 18 import org.openstreetmap.josm.io.NetworkManager; … … 85 86 .collect(Collectors.toList()); 86 87 87 88 if (areasToDownload.isEmpty()) { 88 // no bounds defined in the dataset? we update all primitives in the data set using a series of multi fetch requests 89 UpdateSelectionAction.updatePrimitives(editLayer.data.allPrimitives()); 89 // no bounds defined in the dataset? we update all selectable primitives in the data set using a series of multi fetch requests 90 UpdateSelectionAction.updatePrimitives(editLayer.data.allPrimitives().stream() 91 .filter(OsmPrimitive::isSelectable).collect(Collectors.toList())); 90 92 } else { 91 93 // bounds defined? => use the bbox downloader 92 94 final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data")); -
src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
265 265 + tr("The following errors occurred during mass download: {0}", 266 266 Utils.joinAsHtmlUnorderedList(items)) + "</html>", 267 267 tr("Errors during download"), JOptionPane.ERROR_MESSAGE); 268 return; 268 269 } 269 270 }); 270 271 return;272 271 } 273 272 274 273 // FIXME: this is a hack. We assume that the user canceled the whole download if at