Changeset 12679 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2017-08-27T23:42:54+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - make actions.downloadtasks.Download*Task depend on io.OsmServerLocationReader, not the opposite

Location:

trunk/src/org/openstreetmap/josm/actions/downloadtasks

Files:

• DownloadGpsTask.java (modified) (7 diffs)
• DownloadNotesTask.java (modified) (4 diffs)
• DownloadOsmTask.java (modified) (5 diffs)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.Future;
@@ -31 +32 @@
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
+import org.openstreetmap.josm.io.OsmServerLocationReader.GpxUrlPattern;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -44 +46 @@
     private GpxLayer gpxLayer;
 
-    private static final String PATTERN_TRACE_ID = "https?://.*(osm|openstreetmap).org/trace/\\p{Digit}+/data";
-    private static final String PATTERN_USER_TRACE_ID = "https?://.*(osm|openstreetmap).org/user/[^/]+/traces/(\\p{Digit}+)";
-    private static final String PATTERN_EDIT_TRACE_ID = "https?://.*(osm|openstreetmap).org/edit/?\\?gpx=(\\p{Digit}+)(#.*)?";
-
-    private static final String PATTERN_TRACKPOINTS_BBOX = "https?://.*/api/0.6/trackpoints\\?bbox=.*,.*,.*,.*";
-
-    private static final String PATTERN_EXTERNAL_GPX_SCRIPT = "https?://.*exportgpx.*";
-    private static final String PATTERN_EXTERNAL_GPX_FILE = "https?://.*/(.*\\.gpx)";
-
     protected String newLayerName;
 
     @Override
     public String[] getPatterns() {
-        return new String[] {
-                PATTERN_EXTERNAL_GPX_FILE, PATTERN_EXTERNAL_GPX_SCRIPT,
-                PATTERN_TRACE_ID, PATTERN_USER_TRACE_ID, PATTERN_EDIT_TRACE_ID,
-                PATTERN_TRACKPOINTS_BBOX,
-        };
+        return Arrays.stream(GpxUrlPattern.values()).map(GpxUrlPattern::pattern).toArray(String[]::new);
     }
 
@@ -81 +70 @@
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(url, "url");
-        final Optional<String> mappedUrl = Stream.of(PATTERN_USER_TRACE_ID, PATTERN_EDIT_TRACE_ID)
-                .map(p -> Pattern.compile(p).matcher(url))
+        final Optional<String> mappedUrl = Stream.of(GpxUrlPattern.USER_TRACE_ID, GpxUrlPattern.EDIT_TRACE_ID)
+                .map(p -> Pattern.compile(p.pattern()).matcher(url))
                 .filter(Matcher::matches)
                 .map(m -> "https://www.openstreetmap.org/trace/" + m.group(2) + "/data")
@@ -89 +78 @@
             return loadUrl(newLayer, mappedUrl.get(), progressMonitor);
         }
-        if (url.matches(PATTERN_TRACE_ID)
-         || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)
-         || url.matches(PATTERN_EXTERNAL_GPX_FILE)) {
+        if (Stream.of(GpxUrlPattern.TRACE_ID, GpxUrlPattern.EXTERNAL_GPX_SCRIPT, GpxUrlPattern.EXTERNAL_GPX_FILE)
+                .anyMatch(p -> url.matches(p.pattern()))) {
             downloadTask = new DownloadTask(newLayer,
                     new OsmServerLocationReader(url), progressMonitor);
             // Extract .gpx filename from URL to set the new layer name
-            Matcher matcher = Pattern.compile(PATTERN_EXTERNAL_GPX_FILE).matcher(url);
+            Matcher matcher = Pattern.compile(GpxUrlPattern.EXTERNAL_GPX_FILE.pattern()).matcher(url);
             newLayerName = matcher.matches() ? matcher.group(1) : null;
             // We need submit instead of execute so we can wait for it to finish and get the error
@@ -101 +89 @@
             return MainApplication.worker.submit(downloadTask);
 
-        } else if (url.matches(PATTERN_TRACKPOINTS_BBOX)) {
+        } else if (url.matches(GpxUrlPattern.TRACKPOINTS_BBOX.pattern())) {
             String[] table = url.split("\\?|=|&");
             for (int i = 0; i < table.length; i++) {
@@ -224 +212 @@
         return true;
     }
-
-    /**
-     * Determines if the given URL denotes an OSM gpx-related API call.
-     * @param url The url to check
-     * @return true if the url matches "Trace ID" API call or "Trackpoints bbox" API call, false otherwise
-     * @see GpxData#fromServer
-     * @since 5745
-     */
-    public static final boolean isFromServer(String url) {
-        return url != null && (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_TRACKPOINTS_BBOX));
-    }
 }

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -28 +29 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
+import org.openstreetmap.josm.io.OsmServerLocationReader.NoteUrlPattern;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -41 +43 @@
 public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
 
-    private static final String PATTERN_API_URL = "https?://.*/api/0.6/notes.*";
-    private static final String PATTERN_DUMP_FILE = "https?://.*/(.*\\.osn(.bz2)?)";
     /** Property defining the number of notes to be downloaded */
     public static final IntegerProperty DOWNLOAD_LIMIT = new IntegerProperty("osm.notes.downloadLimit", 1000);
@@ -98 +98 @@
     @Override
     public String[] getPatterns() {
-        return new String[] {PATTERN_API_URL, PATTERN_DUMP_FILE};
+        return Arrays.stream(NoteUrlPattern.values()).map(NoteUrlPattern::pattern).toArray(String[]::new);
     }
 

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

@@ -7 +7 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -35 +36 @@
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
+import org.openstreetmap.josm.io.OsmServerLocationReader.OsmUrlPattern;
 import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
@@ -48 +50 @@
 public class DownloadOsmTask extends AbstractDownloadTask<DataSet> {
 
-    // CHECKSTYLE.OFF: SingleSpaceSeparator
-    protected static final String PATTERN_OSM_API_URL           = "https?://.*/api/0.6/(map|nodes?|ways?|relations?|\\*).*";
-    protected static final String PATTERN_OVERPASS_API_URL      = "https?://.*/interpreter\\?data=.*";
-    protected static final String PATTERN_OVERPASS_API_XAPI_URL = "https?://.*/xapi(\\?.*\\[@meta\\]|_meta\\?).*";
-    protected static final String PATTERN_EXTERNAL_OSM_FILE     = "https?://.*/.*\\.osm";
-    // CHECKSTYLE.ON: SingleSpaceSeparator
-
     protected Bounds currentBounds;
     protected DownloadTask downloadTask;
@@ -66 +61 @@
     public String[] getPatterns() {
         if (this.getClass() == DownloadOsmTask.class) {
-            return new String[]{PATTERN_OSM_API_URL, PATTERN_OVERPASS_API_URL,
-                PATTERN_OVERPASS_API_XAPI_URL, PATTERN_EXTERNAL_OSM_FILE};
+            return Arrays.stream(OsmUrlPattern.values()).map(OsmUrlPattern::pattern).toArray(String[]::new);
         } else {
             return super.getPatterns();
@@ -408 +402 @@
         if (url != null) {
             String urlString = url.toExternalForm();
-            if (urlString.matches(PATTERN_OSM_API_URL)) {
+            if (urlString.matches(OsmUrlPattern.OSM_API_URL.pattern())) {
                 // TODO: proper i18n after stabilization
                 Collection<String> items = new ArrayList<>();