Changeset 9241 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

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

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (8 diffs)

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

@@ -10 +10 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -74 +75 @@
      * Constructs a {@code MultiFetchServerObjectReader}.
      */
-    public MultiFetchServerObjectReader() {
+    protected MultiFetchServerObjectReader() {
         nodes = new LinkedHashSet<>();
         ways = new LinkedHashSet<>();
@@ -80 +81 @@
         this.outputDataSet = new DataSet();
         this.missingPrimitives = new LinkedHashSet<>();
+    }
+
+    /**
+     * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
+     * depending on the {@code download.overpass.for-multi-fetch} preference.
+     *
+     * @return a new instance
+     * @since 9241
+     */
+    public static MultiFetchServerObjectReader create() {
+        return create(Main.pref.getBoolean("download.overpass.for-multi-fetch", false));
+    }
+
+    /**
+     * Creates a new instance of {@link MultiFetchServerObjectReader} or {@link MultiFetchOverpassObjectReader}
+     * depending on the {@code fromMirror} parameter.
+     *
+     * @param fromMirror {@code false} for {@link MultiFetchServerObjectReader}, {@code true} for {@link MultiFetchOverpassObjectReader}
+     * @return a new instance
+     * @since 9241
+     */
+    static MultiFetchServerObjectReader create(final boolean fromMirror) {
+        if (fromMirror) {
+            return new MultiFetchOverpassObjectReader();
+        } else {
+            return new MultiFetchServerObjectReader();
+        }
     }
 
@@ -240 +268 @@
      * @return the request string
      */
-    protected static String buildRequestString(OsmPrimitiveType type, Set<Long> idPackage) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(type.getAPIName()).append("s?")
-        .append(type.getAPIName()).append("s=");
-
-        Iterator<Long> it = idPackage.iterator();
-        for (int i = 0; i < idPackage.size(); i++) {
-            sb.append(it.next());
-            if (i < idPackage.size()-1) {
-                sb.append(',');
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * builds the Multi Get request string for a single id and a given {@link OsmPrimitiveType}.
-     *
-     * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY},
-     * {@link OsmPrimitiveType#RELATION RELATION}
-     * @param id the id
-     * @return the request string
-     */
-    protected static String buildRequestString(OsmPrimitiveType type, long id) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(type.getAPIName()).append("s?")
-        .append(type.getAPIName()).append("s=")
-        .append(id);
-        return sb.toString();
+    protected String buildRequestString(final OsmPrimitiveType type, Set<Long> idPackage) {
+        return type.getAPIName() + "s?" + type.getAPIName() + "s=" + Utils.join(",", idPackage);
+    }
+
+    @Override
+    protected String getBaseUrl() {
+        return super.getBaseUrl();
     }
 
@@ -304 +310 @@
     protected void fetchPrimitives(Set<Long> ids, OsmPrimitiveType type, ProgressMonitor progressMonitor) throws OsmTransferException {
         String msg = "";
-        String baseUrl = OsmApi.getOsmApi().getBaseUrl();
+        final String baseUrl = getBaseUrl();
         switch (type) {
             case NODE:     msg = tr("Fetching a package of nodes from ''{0}''",     baseUrl); break;
@@ -429 +435 @@
      * @see FetchResult
      */
-    protected static class Fetcher extends OsmServerReader implements Callable<FetchResult> {
+    protected class Fetcher extends OsmServerReader implements Callable<FetchResult> {
 
         private final Set<Long> pkg;
@@ -477 +483 @@
                 }
             }
+        }
+
+        @Override
+        protected String getBaseUrl() {
+            return MultiFetchServerObjectReader.this.getBaseUrl();
         }
 
@@ -520 +531 @@
          */
         protected DataSet singleGetId(OsmPrimitiveType type, long id, ProgressMonitor progressMonitor) throws OsmTransferException {
-            String request = buildRequestString(type, id);
+            String request = buildRequestString(type, Collections.singleton(id));
             DataSet result = null;
             try (InputStream in = getInputStream(request, NullProgressMonitor.INSTANCE)) {