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

Timestamp:

2011-10-16T23:59:38+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6960 - Download GPX traces with Ctrl+L

Location:

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

Files:

• DownloadGpsTask.java (modified) (5 diffs)
• DownloadOsmTask.java (modified) (1 diff)
• DownloadTask.java (modified) (1 diff)

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Bounds.ParseMethod;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
+import org.openstreetmap.josm.io.OsmServerLocationReader;
+import org.openstreetmap.josm.io.OsmServerReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
@@ -21 +24 @@
 
     private DownloadTask downloadTask;
+    
+    private static final String PATTERN_TRACE_ID = "http://.*openstreetmap.org/trace/\\p{Digit}+/data";
+    
+    private static final String PATTERN_TRACKPOINTS_BBOX = "http://.*/api/0.6/trackpoints\\?bbox=.*,.*,.*,.*";
 
     public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
@@ -30 +37 @@
     }
 
-    public Future<?> loadUrl(boolean a,java.lang.String b,  ProgressMonitor progressMonitor) {
+    public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
+        if (url != null && url.matches(PATTERN_TRACE_ID)) {
+            downloadTask = new DownloadTask(newLayer,
+                    new OsmServerLocationReader(url), progressMonitor);
+            // We need submit instead of execute so we can wait for it to finish and get the error
+            // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
+            return Main.worker.submit(downloadTask);
+            
+        } else if (url != null && url.matches(PATTERN_TRACKPOINTS_BBOX)) {
+            String[] table = url.split("\\?|=|&");
+            for (int i = 0; i<table.length; i++) {
+                if (table[i].equals("bbox") && i<table.length-1 ) {
+                    return download(newLayer, new Bounds(table[i+1], ",", ParseMethod.LEFT_BOTTOM_RIGHT_TOP), progressMonitor);
+                }
+            }
+        }
         return null;
-        // FIXME this is not currently used
+    }
+
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
+     */
+    @Override
+    public boolean acceptsUrl(String url) {
+        return url != null && (url.matches(PATTERN_TRACE_ID) || url.matches(PATTERN_TRACKPOINTS_BBOX));
     }
 
@@ -42 +71 @@
 
     class DownloadTask extends PleaseWaitRunnable {
-        private BoundingBoxDownloader reader;
+        private OsmServerReader reader;
         private GpxData rawData;
         private final boolean newLayer;
 
-        public DownloadTask(boolean newLayer, BoundingBoxDownloader reader, ProgressMonitor progressMonitor) {
+        public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
             super(tr("Downloading GPS data"));
             this.reader = reader;

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

@@ -64 +64 @@
         return Main.worker.submit(downloadTask);
     }
+    
+    /* (non-Javadoc)
+     * @see org.openstreetmap.josm.actions.downloadtasks.DownloadTask#acceptsUrl(java.lang.String)
+     */
+    @Override
+    public boolean acceptsUrl(String url) {
+        return url != null && url.matches("http://.*/api/0.6/(map|nodes?|ways?|relations?).*");
+    }
 
     public void cancel() {

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

@@ -65 +65 @@
      */
     Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
+    
+    /**
+     * Returns true if the task is able to open the given URL, false otherwise.
+     * @param url the url to download from
+     * @return True if the task is able to open the given URL, false otherwise.
+     */
+    boolean acceptsUrl(String url);
 
     /**