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

Timestamp:

2016-01-01T18:52:02+01:00 (8 years ago)

Author:

simon04

Message:

see #7670 - Possibility to download from mirror with all download action

Set preference key download.overpass.for-multi-fetch to true in order to use Overpass API

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OverpassDownloadAction.java (modified) (2 diffs)
• UpdateSelectionAction.java (modified) (1 diff)
• downloadtasks/DownloadReferrersTask.java (modified) (1 diff)

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

@@ -60 +60 @@
 
     /**
+     * The {@link StringProperty property} of the currently selected Overpass server.
+     *
+     * @since 9241
+     */
+    public static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");
+
+    /**
      * Constructs a new {@code OverpassDownloadAction}.
      */
@@ -121 +128 @@
         private JosmTextArea overpassQuery;
         private static OverpassDownloadDialog instance;
-        private static final StringProperty OVERPASS_SERVER = new StringProperty("download.overpass.server", "http://overpass-api.de/api/");
         private static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
                 Arrays.asList("http://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));

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

@@ -39 +39 @@
      */
     public static void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
-        MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
+        MultiFetchServerObjectReader reader = MultiFetchServerObjectReader.create();
         reader.append(getCurrentDataSet(), id, type);
         try {

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

@@ -220 +220 @@
             nodes.removeAll(targetLayer.data.getNodes());
             if (!nodes.isEmpty()) {
-                reader = new MultiFetchServerObjectReader();
+                reader = MultiFetchServerObjectReader.create();
                 ((MultiFetchServerObjectReader) reader).append(nodes);
                 DataSet wayNodes = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));