Changeset 5345 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

Timestamp:

2012-07-15T16:34:27+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7857 - Mark osmChange primitives inside <modify> block as modified + allow to load remote .osc files

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java (modified) (2 diffs)

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

@@ -36 +36 @@
     @Override
     public boolean acceptsUrl(String url) {
-        return url != null && url.matches("http://.*/api/0.6/changeset/\\p{Digit}+/download");
+        return url != null && (
+                url.matches("http://.*/api/0.6/changeset/\\p{Digit}+/download") // OSM API 0.6 changesets
+             || url.matches("http://.*/.*\\.osc")                               // Remote .osc files
+                );
     }
 
@@ -57 +60 @@
                 new OsmServerLocationReader(url),
                 progressMonitor);
+        // Extract .osc filename from URL to set the new layer name
+        extractOsmFilename("http://.*/(.*\\.osc)", url);
         return Main.worker.submit(downloadTask);
     }