Changeset 11073 in josm for trunk

Timestamp:

2016-10-02T22:12:40+02:00 (8 years ago)

Author:

simon04

Message:

see #13749 - Enhance supported URLs for downloading GPS data

• ​http://www.openstreetmap.org/user/foo/traces/2277313
• ​http://www.openstreetmap.org/edit?gpx=2277313

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.net.URL;
+import java.util.Optional;
 import java.util.concurrent.Future;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.Main;
@@ -39 +41 @@
 
     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=.*,.*,.*,.*";
@@ -49 +53 @@
     @Override
     public String[] getPatterns() {
-        return new String[] {PATTERN_EXTERNAL_GPX_FILE, PATTERN_EXTERNAL_GPX_SCRIPT, PATTERN_TRACE_ID, PATTERN_TRACKPOINTS_BBOX};
+        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,
+        };
     }
 
@@ -69 +77 @@
     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))
+                .filter(Matcher::matches)
+                .map(m -> "https://www.openstreetmap.org/trace/" + m.group(2) + "/data")
+                .findFirst();
+        if (mappedUrl.isPresent()) {
+            return loadUrl(newLayer, mappedUrl.get(), progressMonitor);
+        }
         if (url.matches(PATTERN_TRACE_ID)
          || url.matches(PATTERN_EXTERNAL_GPX_SCRIPT)

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java

@@ -42 +42 @@
         assertTrue(task.acceptsUrl("http://www.openstreetmap.org/trace/5000/data"));
         assertTrue(task.acceptsUrl("http://www.trackmyjourney.co.uk/exportgpx.php?session=S6rZR2Bh6GwX1wpB0C&trk=79292"));
+        assertTrue(task.acceptsUrl("https://www.openstreetmap.org/user/simon04/traces/750057"));
+        assertTrue(task.acceptsUrl("https://www.openstreetmap.org/edit?gpx=750057"));
         assertTrue(task.acceptsUrl(REMOTE_FILE));
     }