Index: src/org/openstreetmap/josm/actions/DownloadAlongAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadAlongAction.java (revision 18327) +++ src/org/openstreetmap/josm/actions/DownloadAlongAction.java (working copy) @@ -125,15 +125,16 @@ * @param gpxDownload Set to true if GPX data should be downloaded * @param title the title string for the confirmation dialog * @param newLayer Set to true if all areas should be put into a single new layer + * @param confirmNumDownloads Require user to confirm if more than this many download requests, otherwise don't ask */ protected static void confirmAndDownloadAreas(Area a, double maxArea, boolean osmDownload, boolean gpxDownload, String title, - boolean newLayer) { + boolean newLayer, int confirmNumDownloads) { List toDownload = new ArrayList<>(); addToDownload(a, a.getBounds(), toDownload, maxArea); if (toDownload.isEmpty()) { return; } - if (toDownload.size() > 1) { + if (toDownload.size() > confirmNumDownloads) { JPanel msg = new JPanel(new GridBagLayout()); msg.add(new JLabel(trn( "This action will require {0} individual
download request. Do you wish
to continue?", @@ -185,9 +186,10 @@ * @param panel the panel that was displayed to the user and now contains his selections * @param confirmTitle the title to display in the confirmation panel * @param newLayer Set to true if all areas should be put into a single new layer + * @param confirmNumDownloads Require user to confirm if more than this many download requests, otherwise don't ask * @return the task or null if canceled by user */ - protected PleaseWaitRunnable createCalcTask(Path2D alongPath, DownloadAlongPanel panel, String confirmTitle, boolean newLayer) { + protected PleaseWaitRunnable createCalcTask(Path2D alongPath, DownloadAlongPanel panel, String confirmTitle, boolean newLayer, int confirmNumDownloads) { /* * Find the average latitude for the data we're contemplating, so we can know how many * metres per degree of longitude we have. @@ -253,7 +255,7 @@ return; } confirmAndDownloadAreas(new Area(downloadPath), maxArea, panel.isDownloadOsmData(), panel.isDownloadGpxData(), - confirmTitle, newLayer); + confirmTitle, newLayer, confirmNumDownloads); } /** Index: src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java (revision 18327) +++ src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java (working copy) @@ -16,6 +16,7 @@ import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.layer.gpx.DownloadAlongPanel; +import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.Shortcut; /** @@ -28,6 +29,9 @@ private static final String PREF_DOWNLOAD_ALONG_WAY_DISTANCE = "downloadAlongWay.distance"; private static final String PREF_DOWNLOAD_ALONG_WAY_AREA = "downloadAlongWay.area"; + // Ask user to confirm the download if there are more than this many requests. + private static final String PREF_DOWNLOAD_ALONG_WAY_DL_REQ_CONFIRM = "downloadAlongWay.numDownloadRequestConfirmation"; + private static final String PREF_DOWNLOAD_ALONG_WAY_OSM = "downloadAlongWay.download.osm"; private static final String PREF_DOWNLOAD_ALONG_WAY_GPS = "downloadAlongWay.download.gps"; @@ -71,7 +75,8 @@ } } } - return createCalcTask(alongPath, panel, tr("Download from OSM along selected ways"), 1 == ret); + int confirmNumDownloads = Config.getPref().getInt(PREF_DOWNLOAD_ALONG_WAY_DL_REQ_CONFIRM, 1); + return createCalcTask(alongPath, panel, tr("Download from OSM along selected ways"), 1 == ret, confirmNumDownloads); } @Override Index: src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 18327) +++ src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (working copy) @@ -12,7 +12,7 @@ import javax.swing.Action; import javax.swing.JMenuItem; -import org.openstreetmap.josm.actions.DownloadAlongAction; +mport org.openstreetmap.josm.actions.DownloadAlongAction; import org.openstreetmap.josm.data.gpx.GpxData; import org.openstreetmap.josm.data.gpx.WayPoint; import org.openstreetmap.josm.gui.PleaseWaitRunnable; @@ -19,6 +19,7 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.Utils; /** @@ -39,7 +40,10 @@ private static final String PREF_DOWNLOAD_ALONG_TRACK_DISTANCE = "downloadAlongTrack.distance"; private static final String PREF_DOWNLOAD_ALONG_TRACK_AREA = "downloadAlongTrack.area"; private static final String PREF_DOWNLOAD_ALONG_TRACK_NEAR = "downloadAlongTrack.near"; + // Ask user to confirm the download if there are more than this many requests. + private static final String PREF_DOWNLOAD_ALONG_TRACK_DL_REQ_CONFIRM = "downloadAlongTrack.numDownloadRequestConfirmation"; + private final transient Collection data; /** @@ -85,7 +89,8 @@ gpxPath.closePath(); }); } - return createCalcTask(gpxPath, panel, tr("Download from OSM along this track"), 1 == ret); + int confirmNumDownloads = Config.getPref().getInt(PREF_DOWNLOAD_ALONG_TRACK_DL_REQ_CONFIRM, 1); + return createCalcTask(gpxPath, panel, tr("Download from OSM along this track"), 1 == ret, confirmNumDownloads); } @Override