Changeset 13572 in josm

Timestamp:

2018-03-26T03:54:50+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #15798 - support direct download of GPX files from HOT Tasking Manager

Location:

trunk

Files:

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

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

@@ -78 +78 @@
             return loadUrl(newLayer, mappedUrl.get(), progressMonitor);
         }
-        if (Stream.of(GpxUrlPattern.TRACE_ID, GpxUrlPattern.EXTERNAL_GPX_SCRIPT, GpxUrlPattern.EXTERNAL_GPX_FILE)
+        if (Stream.of(GpxUrlPattern.TRACE_ID, GpxUrlPattern.EXTERNAL_GPX_SCRIPT,
+                      GpxUrlPattern.EXTERNAL_GPX_FILE, GpxUrlPattern.TASKING_MANAGER)
                 .anyMatch(p -> url.matches(p.pattern()))) {
             downloadTask = new DownloadTask(newLayer,

trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

@@ -60 +60 @@
 
         TRACKPOINTS_BBOX("https?://.*/api/0.6/trackpoints\\?bbox=.*,.*,.*,.*"),
+        TASKING_MANAGER("https?://.*/api/v\\p{Digit}+/project/\\p{Digit}+/tasks_as_gpx?.*"),
 
         EXTERNAL_GPX_SCRIPT("https?://.*exportgpx.*"),

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

@@ -32 +32 @@
         assertTrue(task.acceptsUrl("https://www.openstreetmap.org/edit?gpx=750057"));
         assertTrue(task.acceptsUrl("http://www.openstreetmap.org/edit?gpx=2277313#map=14/-20.7321/-40.5328"));
+        assertTrue(task.acceptsUrl("https://tasks.hotosm.org/api/v1/project/4019/tasks_as_gpx?tasks=125&as_file=true"));
         assertTrue(task.acceptsUrl(getRemoteFileUrl()));
     }