Changeset 12090 in josm for trunk

Timestamp:

2017-05-08T22:03:16+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14756 - Download dialog should also parse URLs which dont contain "#map="

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java (modified) (1 diff)

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

@@ -47 +47 @@
         if (b != null)
             return b;
-        if (url.contains("#map")) {
+        if (url.contains("#map") || url.contains("/#")) {
             // probably it's a URL following the new scheme?
             return parseHashURLs(url);
@@ -95 +95 @@
      */
     private static Bounds parseHashURLs(String url) {
-        int startIndex = url.indexOf("#map=");
+        int startIndex = url.indexOf('#');
         if (startIndex == -1) return null;
         int endIndex = url.indexOf('&', startIndex);
         if (endIndex == -1) endIndex = url.length();
-        String coordPart = url.substring(startIndex+5, endIndex);
+        String coordPart = url.substring(startIndex+(url.contains("#map=") ? "#map=".length() : "#".length()), endIndex);
         String[] parts = coordPart.split("/");
         if (parts.length < 3) {

trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java

@@ -73 +73 @@
         new ParseTestItem("https://www.openstreetmap.org/#map", null),
         new ParseTestItem("https://www.openstreetmap.org/#map=foo", null),
-        new ParseTestItem("https://www.openstreetmap.org/#map=fooz/foolat/foolon", null)
+        new ParseTestItem("https://www.openstreetmap.org/#map=fooz/foolat/foolon", null),
+        new ParseTestItem("http://tyrasd.github.io/latest-changes/#13/51.6891/10.2312",
+                OsmUrlToBounds.positionToBounds(51.6891, 10.2312, 13))
     };