Changeset 11329 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-11-27T10:42:36+01:00 (7 years ago)

Author:

simon04

Message:

see #13201 - OsmUrlToBounds: also take Geo URLs into account

This adds Geo URL support to various actions, such as:

• Download dialog
• Jump to Position
• Commandline parameters (OSM or GPS download)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• OpenLocationAction.java (modified) (2 diffs)
• downloadtasks/DownloadGeoUrlTask.java (deleted)
• downloadtasks/DownloadOsmUrlTask.java (modified) (2 diffs)

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

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadGeoUrlTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask;
@@ -75 +74 @@
         addDownloadTaskClass(DownloadOsmChangeTask.class);
         addDownloadTaskClass(DownloadOsmUrlTask.class);
-        addDownloadTaskClass(DownloadGeoUrlTask.class);
         addDownloadTaskClass(DownloadOsmIdTask.class);
         addDownloadTaskClass(DownloadOsmCompressedTask.class);

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.GeoUrlToBounds;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 
@@ -24 +25 @@
         return new String[]{
                 "https?://www\\.(osm|openstreetmap)\\.org/\\?lat=.*&lon=.*",
-                "https?://www\\.(osm|openstreetmap)\\.org/(.*)?#map=\\p{Digit}+/.*/.*"};
+                "https?://www\\.(osm|openstreetmap)\\.org/(.*)?#map=\\p{Digit}+/.*/.*",
+                GeoUrlToBounds.PATTERN.toString(),
+        };
     }