Changeset 16144 in josm

Timestamp:

2020-03-15T21:59:03+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18936 - fix layer name detection of Overpass xapi URLs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• io/UrlPatterns.java (modified) (1 diff)

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

@@ -189 +189 @@
         if (newLayerName == null || newLayerName.isEmpty()) {
             Matcher matcher = Pattern.compile(pattern).matcher(url);
-            newLayerName = matcher.matches() && matcher.groupCount() > 0 ? matcher.group(1) : null;
+            newLayerName = matcher.matches() && matcher.groupCount() > 0 ? Utils.decodeUrl(matcher.group(1)) : null;
         }
     }

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

@@ -139 +139 @@
         OVERPASS_API_URL        (".*/interpreter\\?data=.*"),
         /** URL of Overpass API (XAPI compatibility) */
-        OVERPASS_API_XAPI_URL   (".*/xapi(\\?.*\\[@meta\\]|_meta\\?).*"),
+        OVERPASS_API_XAPI_URL   (".*/xapi(?:\\?.*\\[@meta\\]|_meta\\?)(.*)"),
         /** URL of remote .osm file */
         EXTERNAL_OSM_FILE       (".*/(.*\\.osm)"),