Changeset 13335 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-01-19T20:15:02+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15800 - autofix common issues in overpass queries, like overpass turbo

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/download/OverpassDownloadSource.java (modified) (1 diff)
• io/OverpassDownloadReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java

@@ -192 +192 @@
             };
 
-            return new OverpassDownloadData(query, errorReporter);
+            return new OverpassDownloadData(OverpassDownloadReader.fixQuery(query), errorReporter);
         }
 

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

@@ -394 +394 @@
         return ds;
     }
+
+    /**
+     * Fixes Overpass API query to make sure it will be accepted by JOSM.
+     * @param query Overpass query to check
+     * @return fixed query
+     * @since 13335
+     */
+    public static String fixQuery(String query) {
+        return query.replaceFirst("out( body| skel| ids)?( id| qt)?;", "out meta$2;");
+    }
 }