Changeset 8240 in josm

Timestamp:

2015-04-20T00:15:43+02:00 (9 years ago)

Author:

simon04

Message:

Open Location: enable loading of nodes/ways/relations/changesets from OSM website URL

Up to now, only corresponding API URLs have been supported.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OpenLocationAction.java (modified) (2 diffs)
• downloadtasks/DownloadNotesUrlIdTask.java (modified) (1 diff)
• downloadtasks/DownloadOsmChangeTask.java (modified) (4 diffs)
• downloadtasks/DownloadOsmIdTask.java (added)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmChangeTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmCompressedTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmIdTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmUrlTask;
@@ -68 +69 @@
         addDownloadTaskClass(DownloadOsmChangeTask.class);
         addDownloadTaskClass(DownloadOsmUrlTask.class);
+        addDownloadTaskClass(DownloadOsmIdTask.class);
         addDownloadTaskClass(DownloadOsmCompressedTask.class);
         addDownloadTaskClass(DownloadOsmChangeCompressedTask.class);

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

@@ -17 +17 @@
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
         final Matcher matcher = Pattern.compile(URL_ID_PATTERN).matcher(url);
-        final long id;
-        try {
-            matcher.matches();
+        if (matcher.matches()) {
             return download(newLayer, Long.parseLong(matcher.group(2)), null);
-        } catch (RuntimeException ex) {
+        } else {
             throw new IllegalStateException("Failed to parse note id from " + url);
         }

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

@@ -10 +10 @@
 import java.util.Map;
 import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -32 +34 @@
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmServerReader;
@@ -42 +45 @@
 public class DownloadOsmChangeTask extends DownloadOsmTask {
 
+    private static final String OSM_WEBSITE_PATTERN = "https?://www\\.(osm|openstreetmap)\\.org/changeset/(\\p{Digit}+).*";
+
     @Override
     public String[] getPatterns() {
         return new String[]{"https?://.*/api/0.6/changeset/\\p{Digit}+/download", // OSM API 0.6 changesets
+            OSM_WEBSITE_PATTERN, // OSM changesets
             "https?://.*/.*\\.osc" // Remote .osc files
         };
@@ -61 +67 @@
 
     @Override
-    public Future<?> loadUrl(boolean new_layer, String url,
-            ProgressMonitor progressMonitor) {
-        downloadTask = new DownloadTask(new_layer,
-                new OsmServerLocationReader(url),
-                progressMonitor);
+    public Future<?> loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
+        final Matcher matcher = Pattern.compile(OSM_WEBSITE_PATTERN).matcher(url);
+        if (matcher.matches()) {
+            url = OsmApi.getOsmApi().getBaseUrl() + "changeset/" + Long.parseLong(matcher.group(2)) + "/download";
+        }
+        downloadTask = new DownloadTask(new_layer, new OsmServerLocationReader(url), progressMonitor);
         // Extract .osc filename from URL to set the new layer name
         extractOsmFilename("https?://.*/(.*\\.osc)", url);