Changeset 11329 in josm for trunk/src

Timestamp:

2016-11-27T10:42:36+01:00 (8 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

Files:

• actions/OpenLocationAction.java (modified) (2 diffs)
• actions/downloadtasks/DownloadGeoUrlTask.java (deleted)
• actions/downloadtasks/DownloadOsmUrlTask.java (modified) (2 diffs)
• tools/GeoUrlToBounds.java (modified) (1 diff)
• tools/OsmUrlToBounds.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(),
+        };
     }
 

trunk/src/org/openstreetmap/josm/tools/GeoUrlToBounds.java

@@ -12 +12 @@
 /**
  * Parses a Geo URL (as specified in <a href="https://tools.ietf.org/html/rfc5870">RFC 5870</a>) into {@link Bounds}.
+ *
+ * Note that Geo URLs are also handled by {@link OsmUrlToBounds}.
  */
 public final class GeoUrlToBounds {

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
+/**
+ * Parses various URL used in OpenStreetMap projects into {@link Bounds}.
+ */
 public final class OsmUrlToBounds {
     private static final String SHORTLINK_PREFIX = "http://osm.org/go/";
@@ -24 +27 @@
     }
 
+    /**
+     * Parses an URL into {@link Bounds}
+     * @param url the URL to be parsed
+     * @return the parsed {@link Bounds}, or {@code null}
+     */
     public static Bounds parse(String url) {
+        if (url.startsWith("geo:")) {
+            return GeoUrlToBounds.parse(url);
+        }
         try {
             // a percent sign indicates an encoded URL (RFC 1738).